From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/tms/modules/inboundOrder/InboundOrderModel.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
index 4e1d578..571c99a 100644
--- a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
+++ b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
@@ -143,7 +143,7 @@
         <div :key="col.dataIndex">
           <a-input-number
             v-if="col.dataIndex == 'inStorageQuantity'"
-            :disabled="record.accuracyClass == '1'"
+            
             :value="text"
             @change="(e) => handleChange(e, record.key, col, index)"
             :min="1"
@@ -342,7 +342,6 @@
           title: '搴撲綅鍙�',
           align: 'center',
           dataIndex: 'goodsShelvesId',
-          scopedSlots: { customRender: 'goodsShelvesId' },
         },
         {
           title: '鍏ュ簱鏁伴噺',
@@ -402,7 +401,7 @@
       }
       this.$nextTick(() => {
         this.form.setFieldsValue(
-          pick(this.model, 'inboundNum', 'inStorehouseType', 'inboundTime', 'applicationReason', 'handler','approvalDate','reviewer','approvalOpinion','remark')
+          pick(this.model, 'inboundNum', 'inStorehouseType', 'inboundTime', 'applicationReason', 'handler','approvalDate','reviewer','approvalOpinion','remark','goodsShelvesId')
         )
       })
     },
@@ -575,7 +574,8 @@
           onlyCode:data[i].onlyCode,
           quantity:data[i].quantity,
           inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
-          accuracyClass:data[i].accuracyClass
+          accuracyClass:data[i].accuracyClass,
+          goodsShelvesId:data[i].positionCode
         })
       }
       //this.ipaginationm.total = this.dataSource.length

--
Gitblit v1.9.3