半成品入库更改

src/views/base/craftManagement/route/bindConfig.ts

@@ -188,6 +188,14 @@ export const formOption = {
       value: 0,
     },
     {
+      label: "是否关键工序",
+      prop: "keyProcesses",
+      span: 24,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+    },
+    {
       label: "工艺条件",
       prop: "processAsk",
       span: 24,

src/views/storage/semi/index.vue

@@ -108,10 +108,10 @@ const dialog3 = reactive({
 const selectId = ref(null);
 const materialInfo1 = (value) => {
   if (form.value.stockType == "1") {
-    form.value.inWorkOrderId = value.workOrderCode;
-    form.value.outWorkOrderId = null;
+    form.value.inWorkOrderCode = value.workOrderCode;
+    form.value.outWorkOrderCode = null;
   } else if (form.value.stockType == "2") {
-    form.value.outWorkOrderId = value.workOrderCode;
+    form.value.outWorkOrderCode = value.workOrderCode;
   }
   form.value.workOrderId = value.id;
   form.value.workOrderSeqNos = [];
@@ -219,7 +219,7 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "入库工单",
-      prop: "inWorkOrderId",
+      prop: "inWorkOrderCode",
       editDisabled: true,
       addDisplay: displayShowIn,
       disabled: displayIn,
@@ -243,7 +243,7 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "出库工单",
-      prop: "outWorkOrderId",
+      prop: "outWorkOrderCode",
       editDisabled: true,
       addDisplay: displayShowOut,
       disabled: displayOut,
@@ -265,7 +265,14 @@ option.value = Object.assign(option.value, {
         }
       },
       render: ({ row }) => {
-        return h("p", row.outWorkOrderId ? row.outWorkOrderId : "-");
+        return h(
+          "p",
+          row.stockType == "1"
+            ? row.outWorkOrderCode
+              ? row.outWorkOrderCode
+              : "-"
+            : ""
+        );
       },
     },
     {
@@ -290,8 +297,8 @@ option.value = Object.assign(option.value, {
       change: ({ value, column }) => {
         if (
           form.value.stockType == "1"
-            ? form.value.inWorkOrderId && dialog1.visible == false
-            : form.value.outWorkOrderId && dialog1.visible == false
+            ? form.value.inWorkOrderCode && dialog1.visible == false
+            : form.value.outWorkOrderCode && dialog1.visible == false
         ) {
           dialog2.visible = true;
         }