From 11cd4d30ec099ad6b6be4692d456562c8db90194 Mon Sep 17 00:00:00 2001 From: tianq Date: Wed, 26 Apr 2023 15:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tuceng/anquan/anquanxuncha/addForm.vue | 11 ++++--- .../tuceng/anquan/anquanxuncha/record.vue | 25 ++++++++++------ .../tuceng/anquan/shebei/addForm.vue | 7 +++-- .../tuceng/anquan/shebei/record.vue | 25 ++++++++++------ .../tuceng/anquan/yinhuan/addForm.vue | 5 ++-- .../tuceng/chengshiguanli/addForm.vue | 3 +- .../tuceng/gonggongfuwu/addForm.vue | 3 +- .../tuceng/yingji/changsuo/addForm.vue | 5 ++-- .../shequzhili/tuceng/yingji/wuzi/addForm.vue | 11 ++++--- .../shequzhili/tuceng/yingji/wuzi/index.vue | 1 - .../shequzhili/tuceng/yingji/wuzi/record.vue | 29 ++++++++++++------- .../tuceng/yingji/zizuzhi/addForm.vue | 3 +- .../tuceng/zhonghe/shebei/addForm.vue | 7 +++-- 13 files changed, 84 insertions(+), 51 deletions(-) diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue index 68b19735d..5068f4759 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue @@ -126,7 +126,7 @@ 保 存 -
+
@@ -201,6 +201,7 @@ export default { } }; return { + detailIdcopy:this.detailId, btnDisable: false, user: '', agencyId: '', @@ -241,7 +242,9 @@ export default { searchOptions: [] }; }, - watch: {}, + watch: { + + }, components: { record }, created() {}, async mounted() { @@ -288,7 +291,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/enterprise/detail/${this.detailId}`; + const url = `/actual/base/enterprise/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { this.formData = { ...data }; @@ -336,7 +339,7 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.$message.success('操作成功'); - this.detailId=data.enterpriseId; + this.detailIdcopy=data.enterpriseId; // this.handleCancle(); // // this.resetData(); // this.$emit('handleComfirm'); diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue index 4ff907f1f..7738a9c76 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue @@ -302,16 +302,23 @@ export default { }, async handleEdit(row) { - if (row.result == '0' && row.reviewTime == '') { - this.$message.error('拟复查时间不能为空'); + // if (row.result == '0' && row.reviewTime == '') { + // this.$message.error('拟复查时间不能为空'); + // } else { + // if (this.id) { + // console.log('有id'); + // if (this.btnType == 'add') this.save(row); + // else this.edit(row); + // } else { + // this.$message.error('请先保存上方信息'); + // } + // } + if (this.id) { + console.log('有id'); + if (this.btnType == 'add') this.save(row); + else this.edit(row); } else { - if (this.id) { - console.log('有id'); - if (this.btnType == 'add') this.save(row); - else this.edit(row); - } else { - this.$message.error('请先保存上方信息'); - } + this.$message.error('请先保存上方信息'); } }, diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue index 1419ca3b6..cd6daa4a2 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue @@ -82,7 +82,7 @@ 确 定 -
+
关 闭 @@ -146,6 +146,7 @@ export default { } }; return { + detailIdcopy:this.detailId, btnDisable: false, user: '', agencyId: '', @@ -237,7 +238,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/safetyEquipment/detail/${this.detailId}`; + const url = `/actual/base/safetyEquipment/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); @@ -290,7 +291,7 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.$message.success('操作成功'); - this.detailId=data + this.detailIdcopy=data // this.handleCancle(); } else if (code >= 8000) { this.$message.error(msg); diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue index 6cbc41083..c4c2c85fc 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue @@ -328,16 +328,23 @@ export default { }, async handleEdit(row) { - if (row.result == '0' && row.reviewTime == '') { - this.$message.error('拟复查时间不能为空'); + // if (row.result == '0' && row.reviewTime == '') { + // this.$message.error('拟复查时间不能为空'); + // } else { + // if (this.id) { + // console.log('有id'); + // if (this.btnType == 'add') this.save(row); + // else this.edit(row); + // } else { + // this.$message.error('请先保存上方信息'); + // } + // } + if (this.id) { + console.log('有id'); + if (this.btnType == 'add') this.save(row); + else this.edit(row); } else { - if (this.id) { - console.log('有id'); - if (this.btnType == 'add') this.save(row); - else this.edit(row); - } else { - this.$message.error('请先保存上方信息'); - } + this.$message.error('请先保存上方信息'); } }, diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue index 72d50e646..e1747a001 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue @@ -161,7 +161,7 @@ 确 定 -
+
关 闭 @@ -225,6 +225,7 @@ export default { } }; return { + detailIdcopy:this.detailId, btnDisable: false, user: '', agencyId: '', @@ -296,7 +297,7 @@ export default { }, async getDetail() { - const url = `/actual/base/hiddenDangerRecord/detail/${this.detailId}`; + const url = `/actual/base/hiddenDangerRecord/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue index ecbc096a5..ca38f29ee 100644 --- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue @@ -152,6 +152,7 @@ export default { } }; return { + detailIdcopy:this.detailId, btnDisable: false, user: '', agencyId: '', @@ -239,7 +240,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/cityManagement/detail/${this.detailId}`; + const url = `/actual/base/cityManagement/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue index 3e12ede43..caa8814f3 100644 --- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue @@ -155,6 +155,7 @@ export default { } }; return { + detailIdcopy:this.detailId, btnDisable: false, user: '', agencyId: '', @@ -237,7 +238,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/commonServiceEquipment/detail/${this.detailId}`; + const url = `/actual/base/commonServiceEquipment/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue index 45425d231..fe236aa71 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue @@ -90,7 +90,7 @@ 确 定 - + 关 闭 @@ -154,6 +154,7 @@ export default { } }; return { + detailIdcopy:this.detailId, title: '', btnDisable: false, user: '', @@ -239,7 +240,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/emergencySites/detail/${this.detailId}`; + const url = `/actual/base/emergencySites/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue index 0f328b69e..af371cbbc 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue @@ -90,7 +90,7 @@ 确 定 -
+
关闭 @@ -154,6 +154,7 @@ export default { } }; return { + detailIdcopy:this.detailId, btnDisable: false, user: '', agencyId: '', @@ -255,7 +256,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/emergencyEquipment/detail/${this.detailId}`; + const url = `/actual/base/emergencyEquipment/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); @@ -308,8 +309,10 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.$message.success('添加成功'); - this.resetData(); - this.handleCancle(); + console.log("data",data) + this.detailIdcopy=data; + // this.resetData(); + // this.handleCancle(); } else if (code >= 8000) { this.$message.error(msg); } diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue index b6d262c3c..cb8a1ea85 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue @@ -265,7 +265,6 @@ export default { handleAdd(row, type) { if (row.id) { this.detailId = row.id; - } this.pageType = type; if (type == 'view') { diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue index 0dd7fa1df..f8c0dc951 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue @@ -328,16 +328,23 @@ export default { }, async handleEdit(row) { - if (row.result == '0' && row.reviewTime == '') { - this.$message.error('拟复查时间不能为空'); + // if (row.result == '0' && row.reviewTime == '') { + // this.$message.error('拟复查时间不能为空'); + // } else { + // if (this.id) { + // console.log('有id'); + // if (this.btnType == 'add') this.save(row); + // else this.edit(row); + // } else { + // this.$message.error('请先保存上方信息'); + // } + // } + if (this.id) { + console.log('有id'); + if (this.btnType == 'add') this.save(row); + else this.edit(row); } else { - if (this.id) { - console.log('有id'); - if (this.btnType == 'add') this.save(row); - else this.edit(row); - } else { - this.$message.error('请先保存上方信息'); - } + this.$message.error('请先保存上方信息'); } }, @@ -368,13 +375,13 @@ export default { const url = `/actual/base/emergencyEquipment/inspect-save`; const { data, code, msg } = await requestPost(url, params); if (code === 0) { - return this.$message.error(res.msg); - } else { this.$message.success('保存成功'); row.isEdit = false; this.isEdit = false; this.btnType = 'cancle'; this.getList(); + } else { + return this.$message.error(res.msg); } }, diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index 6259ea889..eeb3e6dba 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -240,6 +240,7 @@ export default { } }; return { + detailIdcopy:this.detailId, title: '', btnDisable: false, user: '', @@ -395,7 +396,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/iccommunityselforganization/community-self-org-detail/${this.detailId}`; + const url = `/actual/base/iccommunityselforganization/community-self-org-detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue index 37755297d..25b3756ab 100644 --- a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue @@ -80,7 +80,7 @@ 确 定 -
+
关 闭 @@ -144,6 +144,7 @@ export default { } }; return { + detailIdcopy:this.detailId, btnDisable: false, user: '', agencyId: '', @@ -235,7 +236,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/monitoringEquipment/detail/${this.detailId}`; + const url = `/actual/base/monitoringEquipment/detail/${this.detailIdcopy}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); @@ -288,7 +289,7 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.$message.success('操作成功'); - this.detailId=data + this.detailIdcopy=data // this.handleCancle(); } else if (code >= 8000) { this.$message.error(msg);