From 6ca4af64eda4d827adbe4cf4b5208b4e844ebddf Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期一, 28 七月 2025 16:19:05 +0800
Subject: [PATCH] 工具入库-选择申请单入库，选择入库单后查寻得却是所有入库单明细
---
src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue | 120 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 66 insertions(+), 54 deletions(-)
diff --git a/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue b/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
index b158f99..c07bfe8 100644
--- a/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
+++ b/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
@@ -17,11 +17,11 @@
:disabled="disableSubmit"></j-dict-select-tag>
</a-form-model-item>
</a-col>
+
+
<a-col :span="12">
- <a-form-model-item v-show="addShow" label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"
- prop="handler">
- <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="璇烽�夋嫨缁忔墜浜�" v-model="model.handler"
- :disabled="disableSubmit" />
+ <a-form-model-item label="鐩樼偣鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
+ <a-input v-model="model.stocktakingName" placeholder="璇疯緭鍏ョ洏鐐瑰悕绉�"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
@@ -31,8 +31,17 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鐩樼偣鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
- <a-input v-model="model.stocktakingName" placeholder="璇疯緭鍏ョ洏鐐瑰悕绉�"></a-input>
+ <a-form-model-item label="鐩樼偣鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
+ <j-date placeholder="璇烽�夋嫨鐩樼偣鏃堕棿" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
+ style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+
+ <a-col :span="12">
+ <a-form-model-item v-show="addShow" label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"
+ prop="handler">
+ <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="璇烽�夋嫨缁忔墜浜�" v-model="model.handler"
+ :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -51,11 +60,12 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鐩樼偣鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
- <j-date placeholder="璇烽�夋嫨鐩樼偣鏃堕棿" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
+ <a-form-model-item v-show="addShow" label="瀹℃牳鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
+ <j-date placeholder="璇烽�夋嫨瀹℃牳鏃堕棿" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.approvalDate"
style="width: 100%" />
</a-form-model-item>
</a-col>
+
<a-col :span="12">
<a-form-model-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
<a-input v-model="model.remark" placeholder="璇疯緭鍏ュ娉�" type="textarea"></a-input>
@@ -159,57 +169,16 @@
},
{
title: '鍒�鍏风紪鍙�',
- dataIndex: 'toolCode',
+ dataIndex: 'toolId',
align: 'center',
- width: 150
+ width: 180
},
{
title: '宸ュ叿绫诲瀷',
- dataIndex: 'applicationType',
+ dataIndex: 'applicationType_dictText',
align: 'center',
width: 150
- },
-
- {
- title: '涓枃鍚嶇О',
- dataIndex: 'chineseName',
- width: 150,
- align: 'center'
- },
-
- {
- title: '鍨嬪彿/鍥惧彿',
- dataIndex: 'toolModel',
- width: 150,
- align: 'center'
- },
-
- {
- title: '鍒�鍏锋潗鏂�',
- width: 150,
- dataIndex: 'toolMaterial',
- align: 'center'
- },
- {
- title: '闆朵欢鏉愭枡',
- width: 150,
- dataIndex: 'partMaterial',
- align: 'center'
- },
- {
- title: '鍘傚',
- width: 150,
- dataIndex: 'supplierId',
- align: 'center'
-
- },
- {
- title: '瀛樺偍浣嶇疆',
- width: 150,
- dataIndex: 'goodsShelvesId',
- align: 'center'
-
},
{
title: '璐﹂潰搴撳瓨',
@@ -262,6 +231,48 @@
align: 'center',
scopedSlots: { customRender: 'remark' }
},
+ {
+ title: '涓枃鍚嶇О',
+ dataIndex: 'chineseName',
+ width: 150,
+ align: 'center'
+ },
+
+ {
+ title: '鍨嬪彿/鍥惧彿',
+ dataIndex: 'toolModel',
+ width: 150,
+ align: 'center'
+ },
+
+ {
+ title: '鍒�鍏锋潗鏂�',
+ width: 150,
+ dataIndex: 'toolMaterial',
+ align: 'center'
+ },
+ {
+ title: '闆朵欢鏉愭枡',
+ width: 150,
+ dataIndex: 'partMaterial',
+ align: 'center'
+ },
+ {
+ title: '鍘傚',
+ width: 150,
+ dataIndex: 'supplierId',
+ align: 'center'
+
+ },
+ {
+ title: '瀛樺偍浣嶇疆',
+ width: 150,
+ dataIndex: 'goodsShelvesId',
+ align: 'center'
+
+ },
+
+
{
title: '鎿嶄綔',
width: 150,
@@ -316,11 +327,12 @@
this.$bus.$on('selectionRows', (data) => {
for (let i = 0; i < data.length; i++) {
this.dataSource.push({
- toolId: data[i].id,
+ toolId: data[i].toolId,
toolCode: data[i].toolCode,
classifyId: data[i].classifyId,
- applicationType: data[i].applicationType_dictText,
+ applicationType_dictText: data[i].applicationType_dictText,
chineseName: data[i].chineseName,
+ availableQuantity:data[i].availableCount,
toolModel: data[i].toolModel,
material: data[i].material,
toolMaterial: data[i].toolMaterial,
--
Gitblit v1.9.3