工艺问题修改

src/api/productionManagement/deductionPreserve.js

@@ -25,7 +25,7 @@ export const getWorkOrderByCardNo = (params) => {
 // 保存和修改扣数查询
 export const saveOrUpdate = (params) => {
   return request({
-    url: '/blade-desk/deductionPreserve/saveOrUpdate',
+    url: '/blade-desk//deductionPreserve/savaData',
     method: 'post',
     data: params,
   });

src/views/processManagement/bathRefine/planClass.vue

@@ -19,11 +19,12 @@
       @on-load="onLoad"
     >
       <template #menu="scope">
-        <!-- <el-button
+        <el-button v-if="scope.row.approvalStatus == 1" type="text" @click="editFn(scope.row)"
-          type="text"
-          @click="editFn(scope.row)"
           >修改
-          </el-button> -->
+        </el-button>
+        <el-button v-if="scope.row.approvalStatus == 1" type="text" @click="rowDel(scope.row)"
+          >删除
+        </el-button>
         <el-button
           type="text"
           v-if="
@@ -90,9 +91,9 @@ export default {
         index: true,
         selection: false,
         viewBtn: false,
-        delBtn: true,
+        delBtn: false,
         addBtn: true,
-        editBtn: true,
+        editBtn: false,
         editBtnText: '修改',
         addBtnIcon: ' ',
         viewBtnIcon: ' ',
@@ -300,10 +301,10 @@ export default {
   },
   mounted() {},
   methods: {
-    // editFn(row){
+    editFn(row) {
-    //   // this.$refs.crud.edit(row);
+      this.$refs.crud.edit(row);
-    //   console.log(this.$refs.crud);
+      // console.log(this.$refs.crud);
-    // },
+    },
     checkFn(row) {
       this.planCheckOpen = true;
       this.rowItem = row;

src/views/processManagement/components/addinPlantMaintenanceDialog.vue

@@ -246,8 +246,8 @@ export default {
   },
   methods: {
     getRoleUserList() {
-      getRoleUserList({ current: 1, size: 9999999 }).then(res => {
+      getRoleUserList().then(res => {
-        this.userData = res.data.data.records || [];
+        this.userData = res.data.data || [];
       });
     },
     getWorkCenterList() {

src/views/processManagement/components/inPlantMaintenance.vue

@@ -26,11 +26,19 @@
         <el-button type="primary" @click="handleImport">导入 </el-button>
       </template>
       <template #menu="scope">
-        <el-button type="text" @click="rowDel(scope.row)" v-if="scope.row.syncStatus==0">删除 </el-button>
+        <el-button type="text" @click="rowDel(scope.row)" v-if="scope.row.syncStatus == 0"
-        <el-button type="text" @click="handleEdit(scope.row)" v-if="scope.row.syncStatus==0">修改 </el-button>
+          >删除
+        </el-button>
+        <el-button type="text" @click="handleEdit(scope.row)" v-if="scope.row.syncStatus == 0"
+          >修改
+        </el-button>
       </template>
       <template #fileUrls="scope">
-        <el-button v-if="scope.row.fileUrl != null&&scope.row.fileUrl != ''" type="text" @click="uploadUrl(scope.row)" >
+        <el-button
+          v-if="scope.row.fileUrl != null && scope.row.fileUrl != ''"
+          type="text"
+          @click="uploadUrl(scope.row)"
+        >
           下载</el-button
         >
       </template>
@@ -372,6 +380,12 @@ export default {
         this.$message.warning('请选择至少一条数据');
         return;
       }
+      // 判断是不是 未同步的状态值
+      const hasSyncedData = this.selectionList.some(item => item.syncStatus == 1);
+      if (hasSyncedData) {
+        this.$message.warning('已同步的数据不允许删除，请只选择未同步的数据');
+        return;
+      }
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/processManagement/sinTer/index.vue

@@ -230,7 +230,6 @@ export default {
         if (!this.$refs.lineChart) return;
         const chartWidth = this.calculateChartWidth(value);
         this.$refs.lineChart.style.width = chartWidth + 'px';
-        console.log(98989898989, chartWidth);
         const mapBoxEchart = this.$echarts.init(this.$refs.lineChart);
         this.mapBoxEchart = mapBoxEchart;
 
@@ -282,7 +281,7 @@ export default {
                 if (nodeQuota !== '' && nodeQuota !== null) {
                   lineCount = 3;
                 }
-                const height = lineCount * 20 + 10;
+                const height = lineCount * 20 + 15;
 
                 return [Math.max(maxWidth, 60), height];
               },
@@ -296,7 +295,8 @@ export default {
                 color: '#fff',
                 formatter: params => {
                   const nodeData = params.data || params;
-                  const quotaText = nodeData.quota >= 0 ? `${nodeData.quota}个` : '';
+                  const quotaText =
+                    nodeData.quota >= 0 || nodeData.quota != null ? `${nodeData.quota}个` : '';
                   let result = `${nodeData.partCode}\n${nodeData.name}`;
                   if (quotaText) {
                     result += '\n' + quotaText;
@@ -339,7 +339,7 @@ export default {
       const traverse = (nodes, depth = 0) => {
         if (!nodes || nodes.length === 0) return;
         maxDepth = Math.max(maxDepth, depth);
-        
+
         nodes.forEach(node => {
           if (node.children && node.children.length > 0) {
             maxChildren = Math.max(maxChildren, node.children.length);

src/views/processManagement/taskDispatch.vue

@@ -76,7 +76,7 @@ export default {
         border: true,
         index: true,
         selection: true,
-        selectable: (row, index) => row.children,
+        selectable: (row, index) => row.children.length === 0,
         viewBtn: false,
         delBtn: false,
         editBtn: false,

src/views/productionManagement/productionMonitoring/index.vue

@@ -676,7 +676,7 @@ export default {
           let ids = this.selectionList.map(item => item.woId);
           window.open(
             window.PROCESS_FLOW_CARD_PRINT +
-              '?wolds=' +
+              '?woIds=' +
               ids.join(',') +
               '&num=' +
               this.printForm.quantity

src/views/productionManagement/workReportingManagement/workRecord.vue

@@ -227,6 +227,14 @@ export default {
             span: 12,
             width:150,
           },
+          {
+            label: '调整人',
+            prop: 'workerName',
+            search: false,
+            sortable: true,
+            span: 12,
+            width:150,
+          },
         ],
       },