瀏覽代碼

修改生产准备的bug

695593266@qq.com 1 月之前
父節點
當前提交
546f8993c8

+ 36 - 6
src/views/productionPlan/components/checkProductionPreparations.vue

@@ -201,7 +201,7 @@
         <el-button type="primary" size="small" @click="save('齐套')"
         <el-button type="primary" size="small" @click="save('齐套')"
           >齐套</el-button
           >齐套</el-button
         >
         >
-        <el-button type="primary" size="small" @click="save('缺料')"
+        <el-button type="primary" size="small" @click="save('不齐套')"
           >不齐套</el-button
           >不齐套</el-button
         >
         >
       </template>
       </template>
@@ -228,6 +228,15 @@
           </el-link>
           </el-link>
         </template>
         </template>
       </ele-pro-table>
       </ele-pro-table>
+      <template v-slot:footer>
+        <el-button size="small" @click="fileVisible = false">返回</el-button>
+        <el-button type="primary" size="small" @click="saveFile('齐套')"
+          >齐套</el-button
+        >
+        <el-button type="primary" size="small" @click="saveFile('不齐套')"
+          >不齐套</el-button
+        >
+      </template>
     </ele-modal>
     </ele-modal>
 
 
     <kitting-complete ref="kittingCompleteRef"></kitting-complete>
     <kitting-complete ref="kittingCompleteRef"></kitting-complete>
@@ -547,11 +556,32 @@
         this.dialogVisible = false;
         this.dialogVisible = false;
       },
       },
       save(statusStr) {
       save(statusStr) {
-        let data = this.preReleaseList.find((item) => item.preType == 5);
-        console.log(data);
-        data.statusStr = statusStr;
-        this.updatePreRelease(data);
-        this.routeVisible = false;
+        this.$confirm(`NC代码是否确认设置为"${statusStr}"?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let data = this.preReleaseList.find((item) => item.preType == 5);
+            data.statusStr = statusStr;
+            this.updatePreRelease(data);
+            this.routeVisible = false;
+          })
+          .catch(() => {});
+      },
+      saveFile(statusStr) {
+        this.$confirm(`工艺文件是否确认设置为"${statusStr}"?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let data = this.preReleaseList.find((item) => item.preType == 4);
+            data.statusStr = statusStr;
+            this.updatePreRelease(data);
+            this.fileVisible = false;
+          })
+          .catch(() => {});
       },
       },
       updatePreRelease(item) {
       updatePreRelease(item) {
         if (this.type == 'plan') {
         if (this.type == 'plan') {

+ 10 - 10
src/views/productionPlan/components/kittingComplete.vue

@@ -79,7 +79,7 @@
             </el-col>
             </el-col>
             <el-col :span="6">
             <el-col :span="6">
               <el-form-item label="计划数量:">
               <el-form-item label="计划数量:">
-                <el-input readonly v-model="planInfo.productNum"></el-input>
+                <el-input readonly v-model="planInfo.formingNum"></el-input>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="6" v-if="produceType != 2">
             <el-col :span="6" v-if="produceType != 2">
@@ -607,15 +607,15 @@
             minWidth: 120
             minWidth: 120
           },
           },
 
 
-          {
-            label: '下发状态',
-            align: 'center',
-            minWidth: 90,
-            fixed: 'right',
-            formatter: (row) => {
-              return row.hasIssued ? '已下发' : '未下发';
-            }
-          },
+          // {
+          //   label: '下发状态',
+          //   align: 'center',
+          //   minWidth: 90,
+          //   fixed: 'right',
+          //   formatter: (row) => {
+          //     return row.hasIssued ? '已下发' : '未下发';
+          //   }
+          // },
           {
           {
             slot: 'finalStateText',
             slot: 'finalStateText',
             prop: 'finalStateText',
             prop: 'finalStateText',