From c2ba0d418a2d33043e396d385dc73664737686e0 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 22 十一月 2023 19:07:59 +0800
Subject: [PATCH] 系统签审
---
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue | 99 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 79 insertions(+), 20 deletions(-)
diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index 6d799f3..90927e1 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -6,7 +6,7 @@
<a-row>
<a-col :span='12'>
<a-form-model-item label='鍗曟嵁鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'>
- <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿'></a-input>
+ <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿' :disabled="true"></a-input>
</a-form-model-item>
</a-col>
<a-col :span='12'>
@@ -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,6 +64,8 @@
<j-vxe-table
keep-source
:ref='refKeys[0]'
+ :bordered='bordered'
+ :alwaysEdit='true'
:loading='sparesScrapDetailTable.loading'
:columns='sparesScrapDetailTable.columns'
:dataSource='sparesScrapDetailTable.dataSource'
@@ -95,7 +105,9 @@
},
data() {
return {
+ treeData:[],
departs:[],
+ bordered:true,
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
@@ -137,6 +149,7 @@
key: 'spareNum',
fixed: 'left',
type: JVXETypes.normal,
+ align:'center',
width: '150px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -144,6 +157,7 @@
{
title: '澶囦欢鍚嶇О',
key: 'spareName',
+ align:'center',
type: JVXETypes.normal,
fixed: 'left',
width: '150px',
@@ -153,6 +167,7 @@
{
title: '鍨嬪彿',
key: 'model',
+ align:'center',
type: JVXETypes.normal,
width: '150px',
placeholder: '璇疯緭鍏�${title}',
@@ -162,6 +177,7 @@
title: '瑙勬牸',
key: 'specification',
type: JVXETypes.normal,
+ align:'center',
width: '150px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -171,6 +187,7 @@
key: 'batchNum',
type: JVXETypes.normal,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
@@ -178,6 +195,7 @@
title: '鍒堕�犲晢',
key: 'constructorName',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -186,6 +204,7 @@
title: '鍑哄巶鏃ユ湡',
key: 'manufactureDate',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -195,6 +214,7 @@
title: '鏈夋晥鏃ユ湡',
key: 'validityPeriod',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -204,6 +224,7 @@
key: 'scrapReason',
type: JVXETypes.textarea,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: '',
validateRules: [
@@ -214,25 +235,28 @@
]
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitIdName',
type: JVXETypes.normal,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitId',
type: JVXETypes.hidden,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- {
+ /* {
title: '杈呭崟浣�',
key: 'auxiliaryUnitIdName',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -240,32 +264,36 @@
{
title: '杈呭崟浣�',
key: 'auxiliaryUnitId',
+ align:'center',
type: JVXETypes.hidden,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
key: 'mainQuantity',
+ align:'center',
type: JVXETypes.normal,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- {
+ /* {
title: '杈呮暟閲�',
key: 'auxiliaryQuantity',
type: JVXETypes.normal,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
title: '澶囦欢id',
key: 'sparePartId',
type: JVXETypes.hidden,
+ align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
@@ -275,17 +303,19 @@
key: 'sparePartInventoryId',
type: JVXETypes.hidden,
width: '200px',
+ align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
{
- title: '鎶ュ簾涓绘暟閲�',
+ title: '鎶ュ簾鏁伴噺',
key: 'scrapMainQuantity',
+ align:'center',
type: JVXETypes.inputNumber,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
- formatter({ cellValue, row, column }) {
+ /* formatter({ cellValue, row, column }) {
if (cellValue != null) {
let conversionRatio = row.conversionRatio
console.log(conversionRatio)
@@ -295,7 +325,7 @@
}
return cellValue
- },
+ }, */
validateRules: [
{
required: true,
@@ -314,16 +344,18 @@
}
]
},
- {
+ /* {
title: '鎶ュ簾杈呮暟閲�',
+ align:'center',
key: 'scrapAuxiliaryQuantity',
type: JVXETypes.normal,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
title: '搴撳尯',
+ align:'center',
key: 'warehouseAreaIdName',
type: JVXETypes.normal,
width: '200px',
@@ -332,6 +364,7 @@
},
{
title: '搴撳尯id',
+ align:'center',
key: 'warehouseAreaId',
type: JVXETypes.hidden,
width: '200px',
@@ -340,6 +373,7 @@
},
{
title: '搴撲綅',
+ align:'center',
key: 'warehouseLocationIdName',
type: JVXETypes.normal,
width: '200px',
@@ -348,6 +382,7 @@
},
{
title: '搴撲綅id',
+ align:'center',
key: 'warehouseLocationId',
type: JVXETypes.hidden,
width: '200px',
@@ -360,7 +395,9 @@
add: '/spare/sparePartScrap/add',
edit: '/spare/sparePartScrap/edit',
getSysDeparts: "/eam/equipment/getSysDeparts",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
queryById: '/spare/sparePartScrap/queryById',
+ getNum: '/eam/sysIdentity/getNumNew',
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) {
@@ -428,13 +474,13 @@
model: data[i].model,
specification: data[i].specification,
mainUnitId: data[i].mainUnitId,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId, */
mainUnitIdName: data[i].mainUnitId_dictText,
- auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText,
+ /* auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText, */
mainQuantity: data[i].mainQuantity,
- auxiliaryQuantity: data[i].auxiliaryQuantity,
+ /* auxiliaryQuantity: data[i].auxiliaryQuantity, */
scrapMainQuantity: data[i].scrapMainQuantity,
- scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity,
+ /* scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity, */
manufactureDate: data[i].manufactureDate,
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
@@ -469,6 +515,12 @@
if (this.model.id) {
let params = { id: this.model.id }
this.requestSubTableData(this.url.sparesScrapDetail.list, params, this.sparesScrapDetailTable)
+ }else{
+ getAction(this.url.getNum, { type: 'SparePartScrap', length: '4' }).then((res) => {
+ if (res.success) {
+ this.model.num = res.message
+ }
+ })
}
},
//鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
@@ -506,7 +558,14 @@
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)
+ }
+ } */
}
}
</script>
--
Gitblit v1.9.3