From a01a0b502447a0ca0a45f1849cde4f0bed1ef1f8 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期六, 19 八月 2023 18:03:34 +0800
Subject: [PATCH] 备品备件：调整 部门
---
src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue | 23 +++++++
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue | 25 +++++++-
src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue | 26 +++++++-
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue | 23 +++++++
src/views/spare/SparePartReceiveList.vue | 7 ++
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue | 23 +++++++
src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue | 29 +++++++--
7 files changed, 136 insertions(+), 20 deletions(-)
diff --git a/src/views/spare/SparePartReceiveList.vue b/src/views/spare/SparePartReceiveList.vue
index 8a07acd..c5b9b2a 100644
--- a/src/views/spare/SparePartReceiveList.vue
+++ b/src/views/spare/SparePartReceiveList.vue
@@ -137,7 +137,12 @@
</div>
<a-tabs defaultActiveKey='1'>
<a-tab-pane tab='棰嗙敤鐢宠鏄庣粏鍗�' key='1'>
- <spare-part-receive-deatil-list :mainId='sparesScrapDetailMainId' />
+ <div
+ class='table-operator'
+ style='margin:-20px'>
+ <spare-part-receive-deatil-list :mainId='sparesScrapDetailMainId' />
+ </div>
+
</a-tab-pane>
</a-tabs>
<spare-part-receive-modal ref='modalForm' @ok='modalFormOk' />
diff --git a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
index 9dd0fa8..d9abc99 100644
--- a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
+++ b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
@@ -39,11 +39,19 @@
dictCode="sys_depart,depart_name,id,del_flag!='1'"
v-decorator="['departId', validatorRules.departId]"
/>-->
- <a-select
+<!-- <a-select
:placeholder="'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
:options="this.departs"
:disabled="disableSubmit"
style="width: 100%"
+ v-model='model.departId'
+ />-->
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨棰嗙敤閮ㄩ棬"
+ tree-default-expand-all
v-model='model.departId'
/>
</a-form-item>
@@ -172,6 +180,7 @@
data() {
return {
departId:[],
+ treeData:[],
columns: [
{
title: '#',
@@ -310,6 +319,7 @@
url: {
add: '/spare/sparePartCancellingStocks/add',
getSysDeparts: "/eam/equipment/getSysDeparts",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
edit: '/spare/sparePartCancellingStocks/edit'
},
@@ -350,10 +360,18 @@
})
},
created() {
- this.getSysDeparts()
},
methods: {
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
if (res.success) {
@@ -387,6 +405,7 @@
that.form.resetFields()
that.model = Object.assign({}, record)
that.visible = true
+ that.initOptions()
that.warehouseId = record.warehouseId
if (record.sparePartCancellingStocksDetailList != undefined) {
const temp = [...record.sparePartCancellingStocksDetailList]
diff --git a/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue b/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
index fbf8fa2..16740e3 100644
--- a/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
+++ b/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
@@ -31,13 +31,21 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <a-select
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨棰嗙敤閮ㄩ棬"
+ 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"
@@ -172,6 +180,7 @@
data() {
return {
disabled:false,
+ treeData:[],
departs: [],
columns: [
{
@@ -317,6 +326,7 @@
},
url: {
add: "/spare/sparePartOutbound/add",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
getSysDeparts: "/eam/equipment/getSysDeparts",
edit: "/spare/sparePartOutbound/edit",
},
@@ -358,7 +368,6 @@
},
created() {
- this.getSysDeparts();
},
methods: {
getSysDeparts() {
@@ -394,6 +403,7 @@
that.form.resetFields();
that.model = Object.assign({}, record);
that.visible = true;
+ that.initOptions()
that.warehouseId = record.warehouseId
if (record.sparePartOutboundDetailList != undefined) {
const temp = [...record.sparePartOutboundDetailList];
@@ -408,7 +418,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;
diff --git a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
index 8bbd37e..f85039d 100644
--- a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
+++ b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
@@ -39,13 +39,21 @@
dictCode="sys_depart,depart_name,id,del_flag!='1'"
v-decorator="['departId', validatorRules.departId]"
/>-->
- <a-select
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬"
+ tree-default-expand-all
+ v-decorator="['departId', validatorRules.departId]"
+ />
+<!-- <a-select
:placeholder="'璇烽�夋嫨閲囪喘閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
:disabled="disableSubmit"
v-decorator="['departId', validatorRules.departId]"
- />
+ />-->
</a-form-item>
</a-col>
</a-row>
@@ -214,6 +222,7 @@
},
data() {
return {
+ treeData:[],
departs: [],
columns: [
{
@@ -354,6 +363,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',
@@ -390,9 +400,7 @@
})
},
- created() {
- this.getSysDeparts();
- },
+ created() {},
methods: {
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
@@ -424,6 +432,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 +446,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
diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
index f5ccd67..9184f06 100644
--- a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
+++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
@@ -23,10 +23,18 @@
</a-col>
<a-col :span='12'>
<a-form-model-item label='棰嗙敤閮ㄩ棬' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='departId'>
- <a-select
+<!-- <a-select
:placeholder="'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
+ v-model='model.departId'
+ />-->
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨棰嗙敤閮ㄩ棬"
+ tree-default-expand-all
v-model='model.departId'
/>
</a-form-model-item>
@@ -103,6 +111,7 @@
return {
bordered:true,
departs: [],
+ treeData:[],
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
@@ -335,6 +344,7 @@
add: '/spare/sparePartReceive/add',
edit: '/spare/sparePartReceive/edit',
getSysDeparts: "/eam/equipment/getSysDeparts",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
sparesReceiveDetail: {
list: '/spare/sparePartReceive/querySparePartReceiveDeatilByMainId'
}
@@ -362,7 +372,7 @@
})
},
created() {
- this.getSysDeparts();
+ this.initOptions();
},
methods: {
getSysDeparts() {
@@ -372,6 +382,15 @@
}
})
},
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
selectEquipmentList() {
let ids = []
debugger
diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index bf9e454..b4b0363 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -18,10 +18,18 @@
v-model='model.departId'
dictCode="sys_depart,depart_name,id,del_flag!='1'"
/>-->
- <a-select
+<!-- <a-select
:placeholder="'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
+ v-model='model.departId'
+ />-->
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨棰嗙敤閮ㄩ棬"
+ tree-default-expand-all
v-model='model.departId'
/>
</a-form-model-item>
@@ -97,6 +105,7 @@
},
data() {
return {
+ treeData:[],
departs:[],
bordered:true,
labelCol: {
@@ -386,6 +395,7 @@
add: '/spare/sparePartScrap/add',
edit: '/spare/sparePartScrap/edit',
getSysDeparts: "/eam/equipment/getSysDeparts",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
queryById: '/spare/sparePartScrap/queryById',
sparesScrapDetail: {
list: '/spare/sparePartScrap/querySparesScrapDetailByMainId'
@@ -414,9 +424,18 @@
})
},
created() {
- this.getSysDeparts()
+ this.initOptions()
},
methods: {
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
if (res.success) {
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
index 798b1a2..1e8fda8 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
@@ -18,12 +18,20 @@
v-model='model.departId'
dictCode="sys_depart,depart_name,id,del_flag!='1'"
/>-->
- <a-select
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨鐢宠閮ㄩ棬"
+ tree-default-expand-all
+ v-model='model.departId'
+ />
+<!-- <a-select
:placeholder="'璇烽�夋嫨鐢宠閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
v-model='model.departId'
- />
+ />-->
</a-form-model-item>
</a-col>
<a-col :span='12'>
@@ -94,6 +102,7 @@
},
data() {
return {
+ treeData:[],
bordered:true,
departs: [],
labelCol: {
@@ -293,6 +302,7 @@
add: '/spare/sparePartRequirement/add',
edit: '/spare/sparePartRequirement/edit',
queryById: '/spare/sparePartRequirement/queryById',
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
getSysDeparts: "/eam/equipment/getSysDeparts",
sparesScrapRequirementDetail: {
list: '/spare/sparePartRequirement/querySparesScrapRequirementDetailByMainId'
@@ -326,9 +336,18 @@
})
},
created() {
- this.getSysDeparts()
+ this.initOptions()
},
methods: {
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
if (res.success) {
--
Gitblit v1.9.3