From 1e653db94c24389cc7615fd4a7ef1d63b00af534 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:39:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/inboundOrder/InboundOrderModel.vue | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
index 06333dd..c66d5c8 100644
--- a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
+++ b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
@@ -41,7 +41,23 @@
</a-form-item>
</a-col>
<a-col :span="24 / 2">
+ <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搴撲綅鍙�">
+ <a-select
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-decorator="[ 'locationCodeId', validatorRules.locationCodeId ]"
+ />
+ </a-form-item>
+ </a-col>
+ <!-- <a-col :span="24 / 2">
<a-form-item label="鐢宠鍘熷洜" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input placeholder="璇疯緭鍏ョ敵璇峰師鍥�" :disabled="disableSubmit" v-decorator="['applicationReason', validatorRules.applicationReason]" />
+ </a-form-item>
+ </a-col> -->
+ </a-row>
+ <a-row style="width: 100%">
+ <a-col :span="24">
+ <a-form-item label="鐢宠鍘熷洜" :labelCol="{ span: 3 }" :wrapperCol="{ span: 21 }" >
<a-input placeholder="璇疯緭鍏ョ敵璇峰師鍥�" :disabled="disableSubmit" v-decorator="['applicationReason', validatorRules.applicationReason]" />
</a-form-item>
</a-col>
@@ -324,9 +340,16 @@
scopedSlots: { customRender: 'action' },
},
],
+ locationCodeOptions:[]
}
},
- created() {},
+ created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
+ },
methods: {
modalFormOk() {
},
@@ -531,7 +554,7 @@
applicationType: data[i].applicationTypeName,
onlyCode:data[i].onlyCode,
quantity:data[i].quantity,
- inStorageQuantity:data[i].storageQuantity || data[i].quantity,
+ inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
accuracyClass:data[i].accuracyClass
})
}
--
Gitblit v1.9.3