浏览代码

半成品入库优化

dengrui 6 月之前
父节点
当前提交
493ece37ac
共有 2 个文件被更改,包括 13 次插入10 次删除
  1. 7 0
      src/views/plan/workOrder/components/work-order-seqNos-page.vue
  2. 6 10
      src/views/storage/semi/index.vue

+ 7 - 0
src/views/plan/workOrder/components/work-order-seqNos-page.vue

@@ -54,6 +54,9 @@ const props = defineProps({
   workOrderCode: {
     type: String,
   },
+  state: {
+    type: String,
+  },
 });
 const selectedRows = ref([]);
 const handleSelectionChange = (selection) => {
@@ -109,11 +112,15 @@ option.value = Object.assign(option.value, {
 
 onMounted(() => {
   search.value.workOrderCode = props.workOrderCode;
+  search.value.state = props.state;
   dataList();
 });
 watch(
   () => props.workOrderCode,
   () => {
+    if (props.state) {
+      search.value.state = props.state;
+    }
     search.value.workOrderCode = props.workOrderCode;
     dataList();
   }

+ 6 - 10
src/views/storage/semi/index.vue

@@ -49,7 +49,10 @@
       @close="dialog2.visible = false"
     >
       <work-order-seqNos-page
-        :workOrderCode="form.workOrderCode"
+        :workOrderCode="
+          form.stockType == '1' ? form.inWorkOrderCode : form.outWorkOrderCode
+        "
+        :state="'2'"
         @order-info="materialInfo2"
       />
     </el-dialog>
@@ -238,6 +241,7 @@ option.value = Object.assign(option.value, {
       change: ({ value, column }) => {
         if (value != form.value.materialCode) {
           dialog1.visible = true;
+          form.value.workOrderSeqNos = null;
         }
       },
     },
@@ -257,6 +261,7 @@ option.value = Object.assign(option.value, {
       click: ({ value, column }) => {
         if (column.boxType) {
           dialog1.visible = true;
+          form.value.workOrderSeqNos = null;
         }
       },
       change: ({ value, column }) => {
@@ -294,15 +299,6 @@ option.value = Object.assign(option.value, {
           dialog2.visible = true;
         }
       },
-      change: ({ value, column }) => {
-        if (
-          form.value.stockType == "1"
-            ? form.value.inWorkOrderCode && dialog1.visible == false
-            : form.value.outWorkOrderCode && dialog1.visible == false
-        ) {
-          dialog2.visible = true;
-        }
-      },
     },
     {
       label: "库位",