报工bug

src/views/MES/productionReport/add.vue

@@ -166,15 +166,21 @@ const onSubmit = () => {
     return showFailToast("报工数量不能为0");
   }
   if (formData.value.reportLock == "1") {
+    return showFailToast("已锁定不可报工!");
+    // if (
+    //   Number(submitData.value.quantity) > Number(formData.value.balanceQuantity)
+    // ) {
+    //   return showFailToast("报工数量不可大于结存数量");
+    // }
+  } else {
+    // if (Number(submitData.value.quantity) > Number(formData.value.quantity)) {
+    //   return showFailToast("报工数量不可大于生产总量");
+    // }
     if (
       Number(submitData.value.quantity) > Number(formData.value.balanceQuantity)
     ) {
       return showFailToast("报工数量不可大于结存数量");
     }
-  } else {
-    if (Number(submitData.value.quantity) > Number(formData.value.quantity)) {
-      return showFailToast("报工数量不可大于生产总量");
-    }
   }
 
   //  Number(formData.value.finishQuantity) + Number(submitData.value.quantity) >
@@ -222,11 +228,18 @@ const getDetail = () => {
         //   productionProcessesId: "",
         //   quantity: "",
         // };
-        columns.value = res.data.productionTaskProgressList.map((x) => ({
-          ...x,
-          text: x.progressName,
-          value: x.processesId,
-        }));
+        if (res.data.productionTaskProgressList) {
+          columns.value = res.data.productionTaskProgressList.map((x) => ({
+            ...x,
+            text: x.progressName,
+            value: x.processesId,
+          }));
+        } else {
+          setTimeout(() => {
+            onClickLeft();
+          }, 2000);
+          return showFailToast("数据异常");
+        }
         formData.value = res.data;
         formData.value.finishQuantity = "";
         formData.value.productSize = `${res.data.productLength} * ${res.data.productWidth} * ${res.data.productHeight}`;

vue.config.js

@@ -30,7 +30,7 @@ module.exports = defineConfig({
 				rewrite: (p) => p.replace(/^\/test-api/, '')
 			},
 			'/prod-api': {
-				target: 'http://139.9.102.170:20011/',
+				target: 'http://175.178.26.5',
 				changeOrigin: true,
 				rewrite: (p) => p.replace(/^\/prod-api/, '')
 			}