From dc9d85c7abf2f940f086ad5e3dcf89e46da7cefd Mon Sep 17 00:00:00 2001 From: water_xu Date: Tue, 9 Jul 2024 15:44:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=89=B9=20-=20=E5=AE=8C=E5=96=84=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86=E6=9C=BA=E5=88=B6=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8F=8B=E5=A5=BD?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow/components/sendUtil.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue index 01ec759..ac30511 100644 --- a/src/views/xgf/flow/components/sendUtil.vue +++ b/src/views/xgf/flow/components/sendUtil.vue @@ -292,7 +292,11 @@ export default { } upload('/xgf/user/approveMax', formData) .then((data) => { - this.$message.success('推送成功') + if (data.errorMessage == ''){ + this.$message.success('推送成功') + }else { + this.$message.error(data.errorMessage) + } this.visible = false this.$emit('refresh', '') this.handleClose() From 2183c0f914517a8d9c15a8cae16797b2a27c63eb Mon Sep 17 00:00:00 2001 From: water_xu Date: Fri, 12 Jul 2024 14:21:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E8=B5=84=E8=B4=A8=E5=9B=BE=E7=89=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../information/qualifications/components/edit.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/corpInfo/information/qualifications/components/edit.vue b/src/views/corpInfo/information/qualifications/components/edit.vue index 8ec6e4c..f17ae67 100644 --- a/src/views/corpInfo/information/qualifications/components/edit.vue +++ b/src/views/corpInfo/information/qualifications/components/edit.vue @@ -86,7 +86,15 @@ export default { NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }], VALIDITYTIME: [{ required: true, message: '证书有效期不能为空', trigger: 'blur' }], NUMBER: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }], - FILE: [{ required: true, message: '图片不能为空', trigger: 'blur' }] + FILE: [ + { validator: (rule, value, callback) => { + if (this.certificate_files.length > 0) { + callback() + } else { + callback(new Error('图片不能为空')) + } + }, trigger: 'blur' } + ] } } }, @@ -191,6 +199,8 @@ export default { if (!isImage) { this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!') fileList.pop() + } else { + this.beforeFileUpload(file) } }, handlePictureCardPreview(file) { From aa8d744fcfb9b106ef3eeba2a7ab4e913b23b6a2 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 15 Jul 2024 16:12:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86=20-=20?= =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=9A=90=E6=82=A3=E5=8F=B0=E8=B4=A6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hiddenApi/publicMethod/list.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue index 6d1ab62..76168b7 100644 --- a/src/views/hiddenApi/publicMethod/list.vue +++ b/src/views/hiddenApi/publicMethod/list.vue @@ -101,6 +101,14 @@ /> + + + + + + + + @@ -271,7 +279,8 @@ export default { state: '', // 隐患状态 hiddenpart: '', // 隐患部位 hiddenType: '', // 隐患类型 - creatorUserDept: ''// 隐患发现部门 + creatorUserDept: '', // 隐患发现部门 + isrelevant: '' // 是否相关方 }, /** 条件中的字段,没有放在form表单中,是因为怕动态加载中出现问题 **/ sourceList: [ @@ -281,6 +290,10 @@ export default { { ID: '5', NAME: '安全环保检查(企业端)' }, { ID: '6', NAME: '消防检查' } ], + isrelevantList: [ + { ID: '1', NAME: '是' }, + { ID: '2', NAME: '否' } + ], statusList: [ { ID: '1', NAME: '未整改' }, { ID: '2', NAME: '已整改' },