change - 生产派工图纸按照dispatchCode、processId分组

hw-ui/src/views/mes/productplan/editProductPlan.vue

@@ -186,7 +186,7 @@
                 size="mini"
                 type="primary"
                 @click="handleDrawing(scope.row)"
-
+                v-if=" scope.row.userId != null"
               >图纸
               </el-button>
               <el-button
@@ -194,7 +194,7 @@
                 size="mini"
                 type="success"
                 @click="handleSop(scope.row)"
-                v-if="scope.row.processType !== PROCESS_TYPE.AUTO &&  scope.row.children != null && scope.row.children !== undefined"
+                v-if=" scope.row.userId != null"
               >SOP
               </el-button>
 
@@ -243,7 +243,8 @@
       @before-close="blueprintModel = false">
       <el-form ref="form">
         <el-form-item label="选择BOM图纸">
-          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM图纸" multiple filterable :clearable="false"  :disabled="!(nowRow.processType !== PROCESS_TYPE.AUTO && nowRow.children != null && nowRow.children !== undefined)">
+          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM图纸" multiple filterable :clearable="false"
+                     :disabled="(addProductPlanObject.planStatus !== PLAN_STATUS.DISPATCHED)">
             <el-option
               v-for="item in attachInfoList"
               :key="item.attachId"
@@ -292,7 +293,7 @@
         <span
           class="el-upload-list__item-delete"
           @click="handleRemoveDrawing(file)"
-          v-if="nowRow.processType !== PROCESS_TYPE.AUTO && nowRow.children != null && nowRow.children !== undefined"
+          v-if="addProductPlanObject.planStatus === PLAN_STATUS.DISPATCHED"
         >
           <i class="el-icon-delete"></i>
         </span>
@@ -313,7 +314,8 @@
       @before-close="sopViewModel = false">
       <el-form ref="form">
         <el-form-item label="选择BOM的SOP">
-          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM的SOP" multiple filterable :clearable="false">
+          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM的SOP" multiple filterable :clearable="false"
+                     :disabled="(addProductPlanObject.planStatus !== PLAN_STATUS.DISPATCHED)">
             <el-option
               v-for="item in attachInfoList"
               :key="item.attachId"
@@ -362,6 +364,7 @@
         <span
           class="el-upload-list__item-delete"
           @click="handleRemoveSop(file)"
+          v-if="addProductPlanObject.planStatus === PLAN_STATUS.DISPATCHED"
         >
           <i class="el-icon-delete"></i>
         </span>
@@ -477,7 +480,6 @@ export default {
   },
   data() {
     return {
-      nowRow:{},
       blueprintModel: false,
       sopViewModel: false,
       pictureDetailModel: false,
@@ -734,6 +736,8 @@ export default {
             obj.processOrder = groupedProductPlan.processOrder;
             obj.displayFlag = groupedProductPlan.displayFlag;
             obj.finalProcessFlag = groupedProductPlan.finalProcessFlag;
+            obj.attachId = groupedProductPlan.attachId;
+            obj.sopId = groupedProductPlan.sopId;
 
             obj.planBeginTime = this.form.planBeginTime;
             obj.planEndTime = this.form.planEndTime;
@@ -1158,7 +1162,7 @@ export default {
     /** 查看图纸 */
     handleDrawing(row) {
       this.fileList = [];
-      if (row.oldRowFlag && (!this.previewDrawingFlag[row.dispatchCode + "-" + row.processId]
+      if (row.planId != null && (!this.previewDrawingFlag[row.dispatchCode + "-" + row.processId]
         || this.previewDrawingFlag[row.dispatchCode + "-" + row.processId] !== "1")) {
         this.previewDrawingFlag[row.dispatchCode + "-" + row.processId] = "1";
         getDispatchDrawingList(row.dispatchCode, row.processId).then(res => {
@@ -1214,14 +1218,13 @@ export default {
     drawingFileUploadSubmit() {
       for (let i = 0; i < this.mesProductPlanList.length; i++) {
         let mesProductPlan = this.mesProductPlanList[i];
-
         if (mesProductPlan.dispatchCode === this.addProductPlanObject.dispatchCode
           && mesProductPlan.processId === this.addProductPlanObject.processId) {
           this.mesProductPlanList[i].attachId = this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId].join(",");
         }
       }
       // this.uploadAttachList = [];
-      this.addProductPlanObject = null;
+      this.addProductPlanObject = {};
       this.blueprintModel = false;
     },
 
@@ -1262,7 +1265,6 @@ export default {
     handleRemoveDrawing(file) {
       let arrPic = this.$refs.drawingUpload.uploadFiles;
       let index = arrPic.indexOf(file);
-      console.log("index",index)
       this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId].splice(index, 1);
       // this.uploadAttachList.splice(index, 1);
       this.fileList.splice(index, 1);
@@ -1281,22 +1283,10 @@ export default {
     },
 
 
-
-
-
-
-
-
-
-
-
-
-
     /** 查看sop */
     handleSop(row) {
-      this.nowRow = row
       this.fileList = [];
-      if (row.oldRowFlag && (!this.previewSopFlag[row.dispatchCode + "-" + row.processId]
+      if (row.planId != null && (!this.previewSopFlag[row.dispatchCode + "-" + row.processId]
         || this.previewSopFlag[row.dispatchCode + "-" + row.processId] !== "1")) {
         this.previewSopFlag[row.dispatchCode + "-" + row.processId] = "1";
         getDispatchSOPAttachList(row.dispatchCode, row.processId).then(res => {
@@ -1359,7 +1349,7 @@ export default {
         }
       }
       // this.uploadAttachList = [];
-      this.addProductPlanObject = null;
+      this.addProductPlanObject = {};
       this.sopViewModel = false;
     },