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/inbound/InboundModel.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/views/tms/modules/inbound/InboundModel.vue b/src/views/tms/modules/inbound/InboundModel.vue
index d4d8ad2..55980de 100644
--- a/src/views/tms/modules/inbound/InboundModel.vue
+++ b/src/views/tms/modules/inbound/InboundModel.vue
@@ -47,7 +47,7 @@
</a-col>
</a-row>
- <a-row style="width: 100%">
+ <!-- <a-row style="width: 100%">
<a-col :span="24 / 2">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搴撲綅鍙�" prop="locationCodeId">
<a-select
@@ -57,7 +57,7 @@
/>
</a-form-model-item>
</a-col>
- </a-row>
+ </a-row> -->
</a-form-model>
</a-spin>
<a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">閫夋嫨鍊熷嚭宸ュ叿</a-button>
@@ -78,7 +78,7 @@
<div :key="col.dataIndex">
<a-input-number
v-if="col.dataIndex == 'inStorageQuantity'"
- :disabled="record.accuracyClass == '1'"
+
:value="text"
@change="(e) => handleChange(e, record, col, index)"
:min="1"
@@ -105,8 +105,9 @@
<div id="printArea" style="display: block;">
<div v-for="(item, index) in qrList" :key="index" class="qrcode-item">
+ <p>{{ item.onlyCode }}</p>
+ <p>{{ item.toolName }}</p>
<img :src="item.base64" alt="QR Code">
- <p>{{ item.content }}</p>
</div>
</div>
</a-modal>
@@ -248,6 +249,12 @@
width: 150,
},
{
+ title: '搴撲綅鍙�',
+ align: 'center',
+ dataIndex: 'goodsShelvesId',
+ width: 150,
+ },
+ {
title: '鍏ュ簱鏁伴噺',
align: 'center',
dataIndex: 'inStorageQuantity',
@@ -341,7 +348,8 @@
if (res.success) {
if(this.model.inStorehouseType === '1'){
this.qrList = res.result.map((content, i) => ({
- content:res.result[i].content,
+ onlyCode:res.result[i].onlyCode,
+ toolName:res.result[i].toolName,
base64: res.result[i].image
}));
this.handleBacthPrint();
@@ -469,7 +477,8 @@
onlyCode:data[i].onlyCode,
inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
quantity:data[i].quantity,
- accuracyClass:data[i].accuracyClass
+ accuracyClass:data[i].accuracyClass,
+ goodsShelvesId:data[i].positionCode
})
}
//this.ipaginationm.total = this.dataSource.length
--
Gitblit v1.9.3