Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/views/ManufacturingCenter/ProductionPlanQuery/index.vue

@@ -132,6 +132,7 @@ export default {
           userName: '0000'
         }
       }).then(res => {
+        console.log(res, 9999)
       })
     },
     projectChange() {

src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue

@@ -91,7 +91,7 @@
                 {{ scope.row.修补单件工时 }}
               </template>
             </el-table-column>
-            <el-table-column label="录入准结" align="center" width="80px">
+            <el-table-column label="准结" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.修补工时 }}
               </template>

src/views/MarketingCenter/CreateProject/index.vue

@@ -380,7 +380,7 @@ export default {
     },
     addTableData1() {
       this.ADD_disable = true
-      addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate).then(response => {
+      addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate, this.$store.state.user.id).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')

src/views/dashboard/index.vue

@@ -69,8 +69,9 @@ export default {
         url: '',
         method: 'post',
         data: {
-          type: '3',
-          name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号= ${this.token} and [path] = '/'`
+          type: '1',
+          name: `菜单系统模块_首页信息_查询数据1`,
+          param: '角色编号=' + this.token
         }
       }).then(data => {
         this.fathers = []
@@ -92,8 +93,9 @@ export default {
         url: '',
         method: 'post',
         data: {
-          type: '3',
-          name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号= ${this.token} and [path] <> '/'`
+          type: '1',
+          name: `菜单系统模块_首页信息_查询数据2`,
+          param: '角色编号=' + this.token
         }
       }).then(data => {
         this.sons = []
@@ -113,8 +115,9 @@ export default {
         url: '',
         method: 'post',
         data: {
-          type: '3',
-          name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号=${this.token} and 是否通知 = 1`
+          type: '1',
+          name: `菜单系统模块_通知信息_查询数据`,
+          param: '角色编号=' + this.token
         }
       }).then(data => {
         this.sudokus = []