From f2a606efca273d0329c783fd950c417eec6a1798 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 11 六月 2025 14:47:51 +0800
Subject: [PATCH] 请求后端超时时间从50万毫秒（8分半钟）改为180万毫秒（30分钟）
---
src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue | 68 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
index f5ccd67..2b00a89 100644
--- a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
+++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.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'>
@@ -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 }
@@ -181,7 +190,7 @@
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitIdName',
type: JVXETypes.normal,
align:'center',
@@ -190,7 +199,7 @@
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitId',
type: JVXETypes.hidden,
align:'center',
@@ -198,7 +207,7 @@
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- {
+ /* {
title: '杈呭崟浣�',
key: 'auxiliaryUnitIdName',
type: JVXETypes.normal,
@@ -215,16 +224,16 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
key: 'mainQuantity',
type: JVXETypes.normal,
align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
- formatter({ cellValue, row, column }) {
+/* formatter({ cellValue, row, column }) {
if (cellValue != null) {
let conversionRatio = row.conversionRatio
@@ -234,7 +243,7 @@
}
return cellValue
- },
+ }, */
validateRules: [
{
required: true,
@@ -252,7 +261,7 @@
]
},
- {
+ /* {
title: '杈呮暟閲�',
key: 'auxiliaryQuantity',
align:'center',
@@ -260,17 +269,17 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0
- },
+ }, */
{
- title: '棰嗙敤涓绘暟閲�',
+ title: '棰嗙敤鏁伴噺',
key: 'receiveMainQuantity',
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)
@@ -280,7 +289,7 @@
}
return cellValue
- },
+ }, */
validateRules: [
{
required: true,
@@ -299,7 +308,7 @@
}
]
},
- {
+ /* {
title: '棰嗙敤杈呮暟閲�',
align:'center',
key: 'receiveMainQuantity',
@@ -307,7 +316,7 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
@@ -335,6 +344,8 @@
add: '/spare/sparePartReceive/add',
edit: '/spare/sparePartReceive/edit',
getSysDeparts: "/eam/equipment/getSysDeparts",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ getNum: '/eam/sysIdentity/getNumNew',
sparesReceiveDetail: {
list: '/spare/sparePartReceive/querySparePartReceiveDeatilByMainId'
}
@@ -362,13 +373,22 @@
})
},
created() {
- this.getSysDeparts();
+ this.initOptions();
},
methods: {
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
if (res.success) {
this.departs = res.result
+ }
+ })
+ },
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
}
})
},
@@ -404,18 +424,18 @@
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, */
manufactureDate: data[i].manufactureDate,
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
batchNum: data[i].batchNum,
ReceiveReason: data[i].ReceiveReason,
validityPeriod:data[i].validityPeriod,
- conversionRatio:data[i].conversionRatio
+ /* conversionRatio:data[i].conversionRatio */
}
}
addRows.push(sparesReceiveDetail)
@@ -438,6 +458,12 @@
if (this.model.id) {
let params = { id: this.model.id }
this.requestSubTableData(this.url.sparesReceiveDetail.list, params, this.sparesReceiveDetailTable)
+ }else{
+ getAction(this.url.getNum, { type: 'SparePartReceive', length: '4' }).then((res) => {
+ if (res.success) {
+ this.model.num = res.message
+ }
+ })
}
},
//鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
--
Gitblit v1.9.3