@@ -193,6 +198,7 @@ import chexinglook from './chexinglook'
import chexingpeizhi from './relation/chexingguanlianchangyong'
import chexinggonggaoxingao from './relation/chexinggonggaoxingao'
import upload from '../../../components/uploadFile/upload_chexing'
+import { getListOrg } from '@/api/cheliang/dictcommons'
export default {
name: 'chexing',
@@ -268,6 +274,7 @@ export default {
tableKey: 0,
list: [],
srcList: [],
+ org_list: [],
carBrand_list: [], // 品牌
vehicleFunction_list: [], // 功能
productLine_list: [], // 系列
@@ -295,7 +302,8 @@ export default {
emissionStandard: '',
engineType: '',
marketSegments: '',
- specifications: ''
+ specifications: '',
+ orgSid: ''
},
current: 1,
size: 5,
@@ -376,6 +384,11 @@ export default {
})
},
init() {
+ getListOrg().then((resp) => {
+ if (resp.success) {
+ this.org_list = resp.data
+ }
+ })
// 下拉框-功能
pullDown({
type: 'vehicleFunction'
@@ -521,7 +534,8 @@ export default {
emissionStandard: '',
engineType: '',
marketSegments: '',
- specifications: ''
+ specifications: '',
+ orgSid: ''
},
current: 1,
size: 5,
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
index fd84770d88..cea9f1e9a8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
@@ -114,6 +114,11 @@
查询
@@ -264,6 +269,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import changyongpeizhiAdd from '../../chexingpeizhi/changyongpeizhiAdd'
import ChangyongpeizhiInfo from '@/views/cheliang/chexingpeizhi/changyongpeizhiInfo'
+import { getListOrg } from '@/api/cheliang/dictcommons'
export default {
name: 'changyongpeizhiguanlian',
@@ -307,7 +313,8 @@ export default {
tireCoverKey: '',
tireSizeKey: '',
useOrgSid: '',
- wheelbaseKey: ''
+ wheelbaseKey: '',
+ orgSid: ''
},
current: 1,
size: 10,
@@ -320,6 +327,7 @@ export default {
configurationItemsSids: [],
sids: [],
chesid: '',
+ org_list: [],
carColor_list: [], // 车身颜色
slowMachine_list: [], // 缓速器
rearViewMirror_list: [], // 后视镜
@@ -353,6 +361,11 @@ export default {
}
},
getType() {
+ getListOrg().then((res) => {
+ if (res.success) {
+ this.org_list = res.data
+ }
+ })
// 下拉框-车身颜色
pullDown({
type: 'bodyColor'
@@ -622,7 +635,8 @@ export default {
tireCoverKey: '',
tireSizeKey: '',
useOrgSid: '',
- wheelbaseKey: ''
+ wheelbaseKey: '',
+ orgSid: ''
},
current: 1,
size: 10,
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
index 6e63dbb7e8..00e0e77659 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
@@ -106,6 +106,11 @@
+
+
+
+
+
查询
@@ -269,6 +274,7 @@ import ButtonBar from '@/components/ButtonBar'
import changyongpeizhiAdd from './changyongpeizhiAdd'
import changyongpeizhiInfo from './changyongpeizhiInfo'
import changyongpeizhiRel from './ohter/changyongpeizhiRel'
+import { getListOrg } from '@/api/cheliang/dictcommons'
export default {
name: 'chexingpeizhi',
@@ -388,22 +394,16 @@ export default {
suspensionKey: '',
tireCoverKey: '',
tireSizeKey: '',
- wheelbaseKey: ''
+ wheelbaseKey: '',
+ orgSid: ''
},
current: 1,
total: 0,
size: 5
},
- selectDate: undefined,
- temp: {}, // 添加和修改
- templook: {}, // 查看实体
- textMap: {
- update: '编辑',
- create: '创建'
- },
+ org_list: [],
sids: [],
names: '', // [ {{names}} ]
- chesid: '',
dialogFormVisible: false, // 添加修改对话框状态
dialogFormShowVisible: false, // 查看对话框默认关闭状态
dialogStatus: '', // 对话框状态
@@ -476,6 +476,11 @@ export default {
}
},
getType() {
+ getListOrg().then((resp) => {
+ if (resp.success) {
+ this.org_list = resp.data
+ }
+ })
// 下拉框-车身颜色
pullDown({
type: 'bodyColor'
From fc8d932a81c97cbacd3ac0c41e8c11aaa540488c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 24 Nov 2022 11:31:41 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=88=E6=A0=BC?=
=?UTF-8?q?=E8=AF=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
index 49f5a1ed58..b1ba8db1ca 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
@@ -378,7 +378,8 @@ export default {
certificateState: '004', // 合格证状态key
certificateStateValue: '正式', // 合格证状态value
noticeModel: '', // 公告型号
- smRemarks: ''
+ smRemarks: '',
+ carModel: '',
}, // 添加和修改
templook: {}, // 查看实体
Situation: [],
@@ -711,6 +712,10 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为8位或17位' })
return
}
+ if (this.temp.certificateSituationValue === '正式' && this.temp.carModel === '') {
+ this.$message({ showClose: true, type: 'error', message: '因合格证状态为正式,则车辆型号不能为空' })
+ return
+ }
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.FormLoading = true
From 1a2004899f6212f77bdb4890f7e74a7020abed24 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 24 Nov 2022 15:20:45 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E5=85=AC?=
=?UTF-8?q?=E5=8F=B8=E8=B0=83=E8=BD=A6--=E9=87=8D=E5=A4=8D=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4=E5=8F=8A=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=90=8C?=
=?UTF-8?q?=E6=84=8F=E5=8F=82=E6=95=B0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cheliangneigou/cheliangneigouAdd.vue | 37 ++++++++------
.../neigouDaiBanByShunTingTypeValueInfo.vue | 4 +-
.../neigouguanli/neigouEdit.vue | 48 +++++++++++--------
3 files changed, 52 insertions(+), 37 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
index 555fc5633f..e4c10f5fc2 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
@@ -9,7 +9,7 @@
保存
- 提交
+ 提交
关闭
@@ -371,7 +371,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
- this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
@@ -389,19 +388,26 @@ export default {
})
},
submitVehicleApply() {
- req.submitVehicleApply(this.formobj).then((res) => {
- if (res.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: '提交成功'
- })
- this.handleReturn('true')
- } else {
- this.$message({
- showClose: true,
- type: 'error',
- message: '提交失败'
+ this.$refs['form_obj'].validate((valid) => {
+ if (valid) {
+ this.submitdisabled = true
+ req.submitVehicleApply(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: '提交成功'
+ })
+ this.handleReturn('true')
+ } else {
+ this.$message({
+ showClose: true,
+ type: 'error',
+ message: '提交失败'
+ })
+ }
+ }).catch(() => {
+ this.submitdisabled = false
})
}
})
@@ -432,6 +438,7 @@ export default {
callInBuyerOrgSid: '',
baseInternalPurchaseVehicles: []
}
+ this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
index 360803601a..1f83225534 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
@@ -171,7 +171,8 @@ export default {
taskId: '',
orgSidPath: '',
taskDefKey: '',
- userSid: ''
+ userSid: '',
+ id: ''
},
rules: {}
}
@@ -267,6 +268,7 @@ export default {
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
+ this.linkByParameter.id = this.nextNode.id
req.InitiatorToAnswer(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
index 4d90270245..ddf2e51486 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
@@ -9,7 +9,7 @@
保存
- 提交
+ 提交
@@ -355,7 +355,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
- this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
@@ -380,26 +379,33 @@ export default {
})
},
submitVehicleApply() {
- req.submitVehicleApply(this.formobj).then((res) => {
- if (res.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: '提交成功'
- })
- // 子页面向父级页面传递值
- window.parent.postMessage({
- cmd: 'returnHeight',
- params: {
- // 操作成功，告诉父级页面关闭弹框
- code: 1
+ this.$refs['form_obj'].validate((valid) => {
+ if (valid) {
+ this.submitdisabled = true
+ req.submitVehicleApply(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: '提交成功'
+ })
+ // 子页面向父级页面传递值
+ window.parent.postMessage({
+ cmd: 'returnHeight',
+ params: {
+ // 操作成功，告诉父级页面关闭弹框
+ code: 1
+ }
+ }, '*')
+ } else {
+ this.$message({
+ showClose: true,
+ type: 'error',
+ message: '提交失败'
+ })
}
- }, '*')
- } else {
- this.$message({
- showClose: true,
- type: 'error',
- message: '提交失败'
+ }).catch(() => {
+ this.submitdisabled = false
})
}
})
From 611ccf237db91f7435164b2a037ad4563b042ede Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 24 Nov 2022 15:21:54 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E5=85=AC?=
=?UTF-8?q?=E5=8F=B8=E8=B0=83=E8=BD=A6=E5=BC=80=E7=A5=A8--=E9=87=8D?=
=?UTF-8?q?=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../diaocheshenqingAdd.vue | 19 +++-----
.../tiaochekaipiaoshenqingEdit.vue | 46 ++++++++-----------
2 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
index ca3b4da68a..c630662fff 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
@@ -19,11 +19,11 @@
-
调车开票申请
+
调车开票申请
-
+
调入
@@ -400,12 +400,9 @@ export default {
if (this.list.length > 0) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
- save(this.temp).then(resp => {
- this.submitdisabled = false
+ save(this.temp).then((resp) => {
if (resp.success) {
- if (resp.success) {
- _this.handleReturn('true')
- }
+ _this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
@@ -446,6 +443,7 @@ export default {
this.list = []
this.useOrg = []
this.useOrgName = ''
+ this.submitdisabled = false
this.$refs['dataForm'].resetFields()
this.$emit('doback')
},
@@ -468,12 +466,9 @@ export default {
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
- submitSunInv(this.temp).then(resp => {
- this.submitdisabled = false
+ submitSunInv(this.temp).then((resp) => {
if (resp.success) {
- if (resp.success) {
- _this.handleReturn('true')
- }
+ _this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
index 99dd7f6366..9bf54c68d7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
@@ -7,11 +7,7 @@
{{ viewTitle }}
-
保存
提交
@@ -422,19 +418,16 @@ export default {
if (this.list.length > 0) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
- save(this.temp).then(resp => {
- this.submitdisabled = false
+ save(this.temp).then((resp) => {
if (resp.success) {
- if (resp.success) {
- window.parent.postMessage({
- cmd: 'returnHeight',
- params: {
- // 操作成功，告诉父级页面关闭弹框
- code: 1
- }
- }, '*')
- // _this.handleReturn('true')
- }
+ window.parent.postMessage({
+ cmd: 'returnHeight',
+ params: {
+ // 操作成功，告诉父级页面关闭弹框
+ code: 1
+ }
+ }, '*')
+ // _this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
@@ -470,18 +463,15 @@ export default {
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
- submitSunInv(this.temp).then(resp => {
- this.submitdisabled = false
+ submitSunInv(this.temp).then((resp) => {
if (resp.success) {
- if (resp.success) {
- window.parent.postMessage({
- cmd: 'returnHeight',
- params: {
- // 操作成功，告诉父级页面关闭弹框
- code: 1
- }
- }, '*')
- }
+ window.parent.postMessage({
+ cmd: 'returnHeight',
+ params: {
+ // 操作成功，告诉父级页面关闭弹框
+ code: 1
+ }
+ }, '*')
}
}).catch(() => {
this.submitdisabled = false
From 861e35905708580482a85ae08fd414ec91bc9989 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 24 Nov 2022 15:22:35 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E5=9E=8B?=
=?UTF-8?q?=E8=B0=83=E4=BB=B7--=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../kucunguanli/tiaojiaguanli/priceAdd.vue | 31 +++++++-------
.../tiaojiaguanli/tiaojiaEdit.vue | 42 +++++++++----------
2 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
index b9d77864d4..8b422b47d3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
@@ -9,7 +9,7 @@
保存
- 提交
+ 提交
关闭
@@ -210,7 +210,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
- this.submitdisabled = false
this.$message({
showClose: true,
type: 'success',
@@ -226,19 +225,20 @@ export default {
})
},
submitVehicleApply() {
- req.submitVehicleApply(this.formobj).then((res) => {
- if (res.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: '提交成功'
- })
- this.handleReturn('true')
- } else {
- this.$message({
- showClose: true,
- type: 'error',
- message: '提交失败'
+ this.$refs['form_obj'].validate((valid) => {
+ if (valid) {
+ this.submitdisabled = true
+ req.submitVehicleApply(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: '提交成功'
+ })
+ this.handleReturn('true')
+ }
+ }).catch(() => {
+ this.submitdisabled = false
})
}
})
@@ -258,6 +258,7 @@ export default {
createBySid: '',
baseModelModpriceModels: []
}
+ this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
index bf510fb0d1..0142bee632 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
@@ -9,7 +9,7 @@
保存
- 提交
+ 提交
{{ viewTitle }}
保存
- 提交
+ 提交
关闭
@@ -743,7 +743,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
- this.submitdisabled = false
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
@@ -812,28 +811,42 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- req.submitVehicleApply(this.formobj).then((res) => {
- if (res.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: '提交成功'
+ this.$refs['form_obj'].validate(valid => {
+ if (valid) {
+ this.submitdisabled = true
+ req.submitVehicleApply(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: '提交成功'
+ })
+ this.handleReturn('true')
+ }
+ }).catch(() => {
+ this.submitdisabled = false
})
- this.handleReturn('true')
}
})
}).catch(() => {
hint = 0
})
} else {
- req.submitVehicleApply(this.formobj).then((res) => {
- if (res.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: '提交成功'
+ this.$refs['form_obj'].validate(valid => {
+ if (valid) {
+ this.submitdisabled = true
+ req.submitVehicleApply(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: '提交成功'
+ })
+ this.handleReturn('true')
+ }
+ }).catch(() => {
+ this.submitdisabled = false
})
- this.handleReturn('true')
}
})
}
@@ -843,6 +856,7 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
this.$refs['form_obj'].resetFields()
this.imgList = []
+ this.submitdisabled = false
this.$emit('doback')
}
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
index f3810a9c41..e388e3c89c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
@@ -5,7 +5,7 @@
{{ viewTitle }}
保存
- 提交
+ 提交
@@ -757,7 +757,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
- this.submitdisabled = false
/* this.$message({
showClose: true,
type: 'success',
@@ -838,42 +837,56 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- req.submitVehicleApply(this.formobj).then((res) => {
- if (res.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: '提交成功'
- })
- // 子页面向父级页面传递值(关闭弹框)
- window.parent.postMessage({
- cmd: 'returnHeight',
- params: {
- // 操作成功，告诉父级页面关闭弹框
- code: 1
+ this.$refs['form_obj'].validate(valid => {
+ if (valid) {
+ this.submitdisabled = true
+ req.submitVehicleApply(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: '提交成功'
+ })
+ // 子页面向父级页面传递值(关闭弹框)
+ window.parent.postMessage({
+ cmd: 'returnHeight',
+ params: {
+ // 操作成功，告诉父级页面关闭弹框
+ code: 1
+ }
+ }, '*')
}
- }, '*')
+ }).catch(() => {
+ this.submitdisabled = false
+ })
}
})
}).catch(() => {
hint = 0
})
} else {
- req.submitVehicleApply(this.formobj).then((res) => {
- if (res.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: '提交成功'
- })
- // 子页面向父级页面传递值(关闭弹框)
- window.parent.postMessage({
- cmd: 'returnHeight',
- params: {
- // 操作成功，告诉父级页面关闭弹框
- code: 1
+ this.$refs['form_obj'].validate(valid => {
+ if (valid) {
+ this.submitdisabled = true
+ req.submitVehicleApply(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: '提交成功'
+ })
+ // 子页面向父级页面传递值(关闭弹框)
+ window.parent.postMessage({
+ cmd: 'returnHeight',
+ params: {
+ // 操作成功，告诉父级页面关闭弹框
+ code: 1
+ }
+ }, '*')
}
- }, '*')
+ }).catch(() => {
+ this.submitdisabled = false
+ })
}
})
}
From 1a36656584100441d8dbfb6858935782371cf27a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 24 Nov 2022 15:24:21 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E5=85=AC?=
=?UTF-8?q?=E5=8F=B8=E9=97=B4=E8=B0=83=E8=BD=A6=E8=B0=83=E8=B4=A6--?=
=?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tiaozhangshenqingguanliAdd.vue | 44 ++---------------
.../tiaozhangshenqingguanliInfo.vue | 6 +--
.../tiaozhangshenqingEdit.vue | 47 +++++++------------
3 files changed, 24 insertions(+), 73 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
index e2faedcf43..9506d2872e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
@@ -17,7 +17,7 @@
-
分公司间调账申请
+
分公司间调账申请
@@ -347,6 +347,7 @@ export default {
this.list = []
this.useOrg = ''
this.useOrgName = ''
+ this.submitdisabled = false
this.$refs['dataForm'].resetFields()
this.$emit('doback')
},
@@ -355,15 +356,7 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
- // this.temp.name = window.sessionStorage.getItem('name')
this.temp.createBySid = window.sessionStorage.getItem('userSid')
- // req.detailsInfo(this.temp.sid).then(resp => {
- // const data = resp.data
- // this.temp.applicationCode = data.applicationCode
- // this.temp.createTime = data.createTime
- // }).catch(e => {
- // this.submitdisabled = false
- // })
this.dialogStatus = 'add'
this.viewTitle = '【新增】分公司间调账申请'
this.getPathSid()
@@ -376,7 +369,7 @@ export default {
})
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】分公司间调账申请'
- fetchDetailsBySid(row.sid).then(resp => {
+ fetchDetailsBySid(row.sid).then((resp) => {
if (resp.success) {
const data = resp.data
this.temp = data
@@ -385,8 +378,6 @@ export default {
this.temp.accSids = []
console.log('编辑初始化', this.temp)
}
- }).catch(e => {
- this.submitdisabled = false
})
this.getPathSid()
this.getType()
@@ -400,8 +391,7 @@ export default {
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
- save(this.temp).then(resp => {
- this.submitdisabled = false
+ save(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
_this.handleReturn('true')
@@ -423,26 +413,6 @@ export default {
}
})
},
- // saveEdit() {
- // const _this = this
- // this.$refs['dataForm'].validate(valid => {
- // if (valid) {
- // this.submitdisabled = true
- // req.save(this.temp).then(resp => {
- // this.submitdisabled = false
- // if (resp.success) {
- // if (resp.success) {
- // _this.handleReturn('true')
- // }
- // }
- // }).catch(() => {
- // this.submitdisabled = false
- // })
- // } else {
- // return false
- // }
- // })
- // },
handleSubmit() {
const _this = this
this.$refs['dataForm'].validate(valid => {
@@ -458,8 +428,7 @@ export default {
}).then(() => {
this.submitdisabled = true
this.temp.detailsList = this.list
- submitAccAdjApply(this.temp).then(resp => {
- this.submitdisabled = false
+ submitAccAdjApply(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
_this.handleReturn('true')
@@ -487,9 +456,6 @@ export default {