Merge remote-tracking branch 'origin/master'

debug.log

@@ -1,5 +0,0 @@
-[0202/091751.774:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0202/114523.157:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0208/090116.538:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0225/090935.420:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0226/092705.472:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

src/views/modules/common/Chooselist.vue

@@ -177,7 +177,8 @@ export default {
       if (this.param3) {
         sql += " and active like '%" + this.param3 + "%'"
       }
-      if (this.tagNo <1000){
+      if (this.tagNo <1000 && this.tagNo !== 93){
+        console.log(this.tagNo)
         if (this.param4) {
           sql += " and site=" + this.param4
         }

src/views/modules/sys/role-add-or-update.vue

@@ -15,7 +15,6 @@
       </el-form-item>
       <el-form-item size="mini" label="授权">
         <el-tree
-
           :data="menuList"
           :props="menuListTreeProps"
           node-key="menuId"
@@ -86,7 +85,14 @@ export default {
               if (idx !== -1) {
                 data.role.menuIdList.splice(idx, data.role.menuIdList.length - idx)
               }
-              this.$refs.menuListTree.setCheckedKeys(data.role.menuIdList)
+            console.log(data.role.menuIdList)
+              let x1 = data.role.menuIdList.map(Number)
+              console.log(x1)
+              this.$nextTick(() => {
+                for (let x1Element of x1) {
+                  this.$refs.menuListTree.setChecked(x1Element,true,false)
+                }
+              })
             }
           })
         }

src/views/modules/sys/user.vue

@@ -5,9 +5,14 @@
         <el-input v-model="dataForm.userName" placeholder="用户账号" clearable></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
+        <el-button @click="getDataList()" type="primary">查询</el-button>
         <el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('sys:user:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
+        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
+                  >特殊权限
+        </el-button>
+        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
+                  >工厂授权
+        </el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -15,6 +20,8 @@
       border
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
+      highlight-current-row
+      @current-change="handleCurrentChange"
       style="width: 100%;">
       <!--      <el-table-column-->
       <!--        type="selection"-->
@@ -78,14 +85,15 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="generateData(scope.row)">审核</a>
-          <a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</a>
+          <a v-if="isAuth('sys:user:update')" type="text" size="small"
+             @click="addOrUpdateHandle(scope.row.userId)">修改</a>
           <a v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</a>
         </template>
       </el-table-column>
     </el-table>
     <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
+      highlight-current-row
+      @current-change="handleCurrentChange"
       :current-page="pageIndex"
       :page-sizes="[20, 50, 100, 200,500]"
       :page-size="pageSize"
@@ -95,7 +103,8 @@
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
 
-    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputSearch1" :visible.sync="setUp.reviewFlag" width="560px">
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputSearch1"
+               :visible.sync="setUp.reviewFlag" width="560px">
       <template>
         <el-transfer v-model="checked" :data="transferData" :titles="['所有权限', '当前权限']"></el-transfer>
       </template>
@@ -113,9 +122,11 @@
   getUserBusinessRoleList,
   saveUserBusinessRole,
 } from '@/api/auditManagement/auditType.js'
+
 export default {
   data() {
     return {
+      showButton: true,
       currentData: {},
       userId: this.$store.state.user.name,
       transferData: [],
@@ -145,6 +156,10 @@
     this.getDataList()
   },
   methods: {
+    // 选中行
+    handleCurrentChange() {
+      this.showButton = false
+    },
     saveUserRoleFlag() {
       let saveList = []
       let currentList = this.checked
@@ -278,7 +293,8 @@
             this.$message.error(data.msg)
           }
         })
-        }).catch(() => {})
+      }).catch(() => {
+      })
     }
   }
 }

src/views/modules/yieldReport/produce_order.vue

@@ -273,6 +273,96 @@ export default {
         search: '查询',
       },
       columnProduceScheduleArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceCostRollUpFlag',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "costRollUpFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已排料",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceManualFlag',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "manualFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "刀模已发",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceRepairSOFlag',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "repairSOFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "印版已发",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreResourceInfo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "preResourceInfo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "上工序机台信息",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreQtyFinished',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "preQtyFinished",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "上工序完工数",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 5302,
@@ -286,7 +376,7 @@ export default {
           columnWidth: 125,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -304,7 +394,7 @@ export default {
           columnWidth: 125,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -373,10 +463,10 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "工序号",
-          columnWidth: 50,
+          columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -412,7 +502,7 @@ export default {
           columnWidth: 60,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -443,12 +533,12 @@ export default {
           tableName: "待生产工单",
           columnProp: "qtyReported",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "已报告数量",
-          columnWidth: 70,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -463,10 +553,10 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "生产订单要求完工日期",
-          columnWidth: 130,
+          columnWidth: 170,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -502,7 +592,7 @@ export default {
           columnWidth: 110,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -993,96 +1083,7 @@ export default {
           status: true,
           fixed: false
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProduceCostRollUpFlag',
-          tableId: "5302Produce",
-          tableName: "待生产工单",
-          columnProp: "costRollUpFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "已排料",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProduceManualFlag',
-          tableId: "5302Produce",
-          tableName: "待生产工单",
-          columnProp: "manualFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "刀模已发",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProduceRepairSOFlag',
-          tableId: "5302Produce",
-          tableName: "待生产工单",
-          columnProp: "repairSOFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "印版已发",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProducePreResourceInfo',
-          tableId: "5302Produce",
-          tableName: "待生产工单",
-          columnProp: "preResourceInfo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "上工序机台信息",
-          columnWidth: 120,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProducePreQtyFinished',
-          tableId: "5302Produce",
-          tableName: "待生产工单",
-          columnProp: "preQtyFinished",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "上工序完工数",
-          columnWidth: 120,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
+
       ],
       menuButton: {
         prdButton: true,
@@ -1456,7 +1457,7 @@ export default {
       // 取消所有派工单操作
       if ('6' == val) {
         //调用提示的方法
-        this.$confirm(` 确定取消所有派工单操作`, `生产已排料`, {
+        this.$confirm(` 确定取消所有派工单操作`, `生产订单`, {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'