From ee79f53fd9385b087ebd7a93af638d91a9825d10 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 23 八月 2023 18:04:35 +0800
Subject: [PATCH] lnl，设备台账导入功能+页面字段调整
---
src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
index 8bbd37e..930239a 100644
--- a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
+++ b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
@@ -31,19 +31,13 @@
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
-<!-- <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-select
- :placeholder="'璇烽�夋嫨閲囪喘閮ㄩ棬'"
- :options="this.departs"
+
+ <a-tree-select
style="width: 100%"
- :disabled="disableSubmit"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬"
+ tree-default-expand-all
v-decorator="['departId', validatorRules.departId]"
/>
</a-form-item>
@@ -214,6 +208,7 @@
},
data() {
return {
+ treeData:[],
departs: [],
columns: [
{
@@ -282,17 +277,17 @@
scopedSlots: { customRender: 'manufactureDate' }
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitName'
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
scopedSlots: { customRender: 'mainQuantity' }
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
@@ -301,7 +296,7 @@
title: '杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity'
- },
+ }, */
{
title: '鎿嶄綔',
align: 'center',
@@ -354,6 +349,7 @@
getSysDeparts: "/eam/equipment/getSysDeparts",
add: '/spare/sparePartPurchaseStorage/add',
edit: '/spare/sparePartPurchaseStorage/edit',
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
getSuppliers: '/spare/sparePartPurchaseStorageDeatil/getSuppliers',
getWarehouseAreas: '/spare/sparePartPurchaseStorageDeatil/getWarehouseAreas',
getWarehouseLocations: '/spare/sparePartPurchaseStorageDeatil/getWarehouseLocations',
@@ -377,9 +373,9 @@
model: data[i].model,
mainUnitId: data[i].mainUnitId,
mainUnitName: data[i].mainUnitId_dictText,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId,
auxiliaryUnitName: data[i].auxiliaryUnitId_dictText,
- conversionRatio: data[i].conversionRatio,
+ conversionRatio: data[i].conversionRatio, */
constructorId: data[i].constructorId,
constructorName: data[i].constructorId_dictText,
suppliers: this.suppliers,
@@ -390,9 +386,7 @@
})
},
- created() {
- this.getSysDeparts();
- },
+ created() {},
methods: {
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
@@ -424,6 +418,7 @@
that.form.resetFields()
that.model = Object.assign({}, record)
that.visible = true
+ that.initOptions();
if (record.sparePartPurchaseStorageDeatilList != undefined) {
const temp = [...record.sparePartPurchaseStorageDeatilList]
that.dataSource = temp
@@ -437,7 +432,15 @@
this.codeDisable = false
}
},
-
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
close() {
this.$emit('close')
this.visible = false
--
Gitblit v1.9.3