From 8eee3063a74f702bcc1ff45e0dd539a1fd6bfdc9 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Wed, 13 Dec 2023 14:57:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9A=84=E6=96=B0=E5=A2=9E=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E6=9B=BF=E5=85=B6=E8=A1=A8=E7=BC=96=E5=8F=B7=E7=9A=84=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E4=BB=A5=E5=8F=8A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterpriseStandardPlan/index.vue | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index d516c333c..8dc32af8e 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -559,7 +559,7 @@
-
+
+ + + 数据加载中……
+
+ 取消 + 导入 +
-
- 取消 - 导入 -
+
Date: Wed, 13 Dec 2023 15:54:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/productDetails.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue index 8c14e4c94..9ae10eee6 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue @@ -92,6 +92,16 @@ fixed="left" align="center"> + + + Date: Wed, 13 Dec 2023 16:31:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E6=8E=A7=E7=9A=84=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/businessDetails.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue index 9b59d8d76..07f5ea2a8 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue @@ -109,6 +109,16 @@ fixed="left" align="center"> + + + Date: Wed, 13 Dec 2023 17:04:55 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=9A=84=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/roleManage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 21fad7dce..bfa696419 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -362,7 +362,7 @@ tooltip-effect="dark" style="width: 100%;" border - height="100%" + height="93%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> Date: Wed, 13 Dec 2023 17:18:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feature:=20=E5=8A=A0=E8=BD=BD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/preview/index.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/common/preview/index.js b/src/common/preview/index.js index 626d94777..4176911a2 100644 --- a/src/common/preview/index.js +++ b/src/common/preview/index.js @@ -5,7 +5,14 @@ import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' import { getBusStandFileByAttId } from 'api/process' let Base64 = require('js-base64').Base64; import store from '@/store' +import { Loading } from "element-ui"; + export default attId => { + const loading = Loading.service({ + lock: true, + text: '正在加载文件', + spinner: 'el-icon-loading', + }) getBusStandFileByAttId({ attId }).then(res => { @@ -22,6 +29,7 @@ export default attId => { } } - }).catch(e => { + }).finally(() => { + loading.close() }) } From ea5e6093ab0a36f47c3c13924d9a227904fc7cf4 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 13 Dec 2023 17:41:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E5=85=A5=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=97=B6=E5=8F=82=E6=95=B0=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 794d5afd3..81f855832 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2697,7 +2697,7 @@ // 自动匹配配置标准 this.saveConfStand(res.data) const planForm = {} - planForm.id = this.form.esId + planForm.id = this.form.esId || this.form.nowEsId planForm.planStatus = '4' planForm.reviseStatus = this.form.reviseStatus planForm.standCode = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS : this.form.standCode