Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/qms/inspectionJob/addForm.vue

@@ -465,7 +465,7 @@
                         <el-input
                           v-model="cur.remark"
                           placeholder="请输入备注"
-                          type="text"
+                          type="text" maxlength="200"
                         />
                       </el-form-item>
                     </el-col>

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -332,29 +332,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -398,23 +408,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -590,25 +610,35 @@ const submitForm = async (formType, submitData) => {
           tableObject.loading = true
           ProductionMainApi.generatePreparetoissue(res.number).then(() => {
             // message.success(t('common.createSuccess'))
-            tableObject.loading = false
-            getList()
-          }).catch(err => {
-            tableObject.loading = false
-            console.log(err)
-          })
-          // 生成收货申请
-          tableObject.loading = true
-          ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
-            // message.success(t('common.createSuccess'))
-            tableObject.loading = false
-            getList()
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
           }).catch(err => {
-            tableObject.loading = false
+            // tableObject.loading = false
             console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
           })
         }
       })
-      message.success(t('common.createSuccess'))
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -329,29 +329,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -395,23 +405,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -579,8 +599,42 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
-      await ProductionMainApi.createProductionMain(data)
-      message.success(t('common.createSuccess'))
+      await ProductionMainApi.createProductionMain(data).then((res) => {
+        // console.log(565,res)
+        if (res.status == '6') {
+          // 生成备料计划
+          tableObject.loading = true
+          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          }).catch(err => {
+            // tableObject.loading = false
+            console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          })
+        }
+      })
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue

@@ -328,29 +328,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -394,23 +404,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -577,8 +597,42 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
-      await ProductionMainApi.createProductionMain(data)
-      message.success(t('common.createSuccess'))
+      await ProductionMainApi.createProductionMain(data).then((res) => {
+        // console.log(565,res)
+        if (res.status == '6') {
+          // 生成备料计划
+          tableObject.loading = true
+          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          }).catch(err => {
+            // tableObject.loading = false
+            console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          })
+        }
+      })
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))

src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue

@@ -328,29 +328,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -394,23 +404,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -578,8 +598,42 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
-      await ProductionMainApi.createProductionMain(data)
-      message.success(t('common.createSuccess'))
+      await ProductionMainApi.createProductionMain(data).then((res) => {
+        // console.log(565,res)
+        if (res.status == '6') {
+          // 生成备料计划
+          tableObject.loading = true
+          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          }).catch(err => {
+            // tableObject.loading = false
+            console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          })
+        }
+      })
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))