From 1ec4da063b3195f4f46af969a9d170bda2df7c2a Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期三, 23 八月 2023 17:36:08 +0800
Subject: [PATCH] 计量单位：重构， 备件相关功能页面调整
---
src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue b/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
index 16740e3..65cdd60 100644
--- a/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
+++ b/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
@@ -39,21 +39,6 @@
tree-default-expand-all
v-decorator="['departId', validatorRules.departId]"
/>
-<!-- <a-select
- :placeholder="'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
- :disabled="disableSubmit"
- :options="this.departs"
- style="width: 100%"
- v-decorator="['departId', validatorRules.departId]"
- />-->
-<!-- <j-dict-select-tag
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
- :triggerChange="true"
- dictCode="sys_depart,depart_name,id,del_flag!='1'"
- v-decorator="['departId', validatorRules.departId]"
- />-->
</a-form-item>
</a-col>
</a-row>
@@ -244,16 +229,16 @@
dataIndex: 'warehouseLocationNum'
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitName'
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
@@ -262,9 +247,9 @@
title: '杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity'
- },
+ }, */
{
- title: '鍑哄簱涓绘暟閲�',
+ title: '鍑哄簱鏁伴噺',
align: 'center',
dataIndex: 'outboundMainQuantity',
scopedSlots: { customRender: 'outboundMainQuantity' }
@@ -351,10 +336,10 @@
mainQuantity: data[i].mainQuantity,
mainUnitId: data[i].mainUnitId,
mainUnitName: data[i].mainUnitName,
- auxiliaryQuantity: data[i].auxiliaryQuantity,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
- auxiliaryUnitName: data[i].auxiliaryUnitName,
- conversionRatio: data[i].conversionRatio,
+ /* auxiliaryQuantity: data[i].auxiliaryQuantity, */
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId,
+ auxiliaryUnitName: data[i].auxiliaryUnitName, */
+ /* conversionRatio: data[i].conversionRatio, */
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
supplierId: data[i].supplierId,
@@ -482,7 +467,7 @@
if (target) {
if (column.dataIndex == 'outboundMainQuantity') {
target[column.dataIndex] = value;
- target["outboundAuxiliaryQuantity"] = value * target.conversionRatio
+ /* target["outboundAuxiliaryQuantity"] = value * target.conversionRatio */
}
//鏄剧ず甯﹁繃鏉ョ殑鏁版嵁
that.dataSource = temp;
--
Gitblit v1.9.3