From 185abfacfe79bd4a9c8e455512e3491aa41fbd88 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期一, 21 八月 2023 17:42:25 +0800
Subject: [PATCH] 备品备件：调整/ 基础数据修改（取消 保存并继续添加 ， 左树右表结构 布局调整，异常处理）
---
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index 6d799f3..f422f8c 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>
@@ -56,10 +64,13 @@
<j-vxe-table
keep-source
:ref='refKeys[0]'
+ :bordered='bordered'
+ :alwaysEdit='true'
:loading='sparesScrapDetailTable.loading'
:columns='sparesScrapDetailTable.columns'
:dataSource='sparesScrapDetailTable.dataSource'
:maxHeight='300'
+ @valueChange="changeAuxiliaryQuantity"
:disabled='formDisabled'
:rowNumber='true'
:rowSelection='true'
@@ -95,7 +106,9 @@
},
data() {
return {
+ treeData:[],
departs:[],
+ bordered:true,
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
@@ -137,6 +150,7 @@
key: 'spareNum',
fixed: 'left',
type: JVXETypes.normal,
+ align:'center',
width: '150px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -144,6 +158,7 @@
{
title: '澶囦欢鍚嶇О',
key: 'spareName',
+ align:'center',
type: JVXETypes.normal,
fixed: 'left',
width: '150px',
@@ -153,6 +168,7 @@
{
title: '鍨嬪彿',
key: 'model',
+ align:'center',
type: JVXETypes.normal,
width: '150px',
placeholder: '璇疯緭鍏�${title}',
@@ -162,6 +178,7 @@
title: '瑙勬牸',
key: 'specification',
type: JVXETypes.normal,
+ align:'center',
width: '150px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -171,6 +188,7 @@
key: 'batchNum',
type: JVXETypes.normal,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
@@ -178,6 +196,7 @@
title: '鍒堕�犲晢',
key: 'constructorName',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -186,6 +205,7 @@
title: '鍑哄巶鏃ユ湡',
key: 'manufactureDate',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -195,6 +215,7 @@
title: '鏈夋晥鏃ユ湡',
key: 'validityPeriod',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -204,6 +225,7 @@
key: 'scrapReason',
type: JVXETypes.textarea,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: '',
validateRules: [
@@ -218,6 +240,7 @@
key: 'mainUnitIdName',
type: JVXETypes.normal,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
@@ -225,6 +248,7 @@
title: '涓诲崟浣�',
key: 'mainUnitId',
type: JVXETypes.hidden,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -233,6 +257,7 @@
title: '杈呭崟浣�',
key: 'auxiliaryUnitIdName',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -240,6 +265,7 @@
{
title: '杈呭崟浣�',
key: 'auxiliaryUnitId',
+ align:'center',
type: JVXETypes.hidden,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
@@ -248,6 +274,7 @@
{
title: '涓绘暟閲�',
key: 'mainQuantity',
+ align:'center',
type: JVXETypes.normal,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
@@ -258,6 +285,7 @@
title: '杈呮暟閲�',
key: 'auxiliaryQuantity',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -266,6 +294,7 @@
title: '澶囦欢id',
key: 'sparePartId',
type: JVXETypes.hidden,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -275,12 +304,14 @@
key: 'sparePartInventoryId',
type: JVXETypes.hidden,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
{
title: '鎶ュ簾涓绘暟閲�',
key: 'scrapMainQuantity',
+ align:'center',
type: JVXETypes.inputNumber,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
@@ -316,6 +347,7 @@
},
{
title: '鎶ュ簾杈呮暟閲�',
+ align:'center',
key: 'scrapAuxiliaryQuantity',
type: JVXETypes.normal,
width: '200px',
@@ -324,6 +356,7 @@
},
{
title: '搴撳尯',
+ align:'center',
key: 'warehouseAreaIdName',
type: JVXETypes.normal,
width: '200px',
@@ -332,6 +365,7 @@
},
{
title: '搴撳尯id',
+ align:'center',
key: 'warehouseAreaId',
type: JVXETypes.hidden,
width: '200px',
@@ -340,6 +374,7 @@
},
{
title: '搴撲綅',
+ align:'center',
key: 'warehouseLocationIdName',
type: JVXETypes.normal,
width: '200px',
@@ -348,6 +383,7 @@
},
{
title: '搴撲綅id',
+ align:'center',
key: 'warehouseLocationId',
type: JVXETypes.hidden,
width: '200px',
@@ -360,6 +396,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'
@@ -388,9 +425,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) {
@@ -506,6 +552,13 @@
this.visible = false
this.$emit('close')
this.$refs.form.clearValidate()
+ },
+ changeAuxiliaryQuantity(target){
+ console.log(target.columnIndex)
+ let num=target.columnIndex
+ if (target.columnIndex ===num){
+ target.row.scrapAuxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.scrapMainQuantity)
+ }
}
}
}
--
Gitblit v1.9.3