From 89d2f2b4c7a3728aaafd9a80661105d8410ae4c5 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 27 Mar 2024 11:18:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E9=99=A4=E5=8E=86=E5=8F=B2=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=96=E5=BC=80=E6=94=BE=E4=B8=8B=E8=BD=BD=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbrk/common/formEditList.vue | 36 ++++++++-------- .../qbrk/common/formEditListFb.vue | 42 +++++++++---------- .../creatProcess/qbrk/common/formList-1.vue | 30 ++++++------- .../creatProcess/qbrk/common/formList.vue | 36 ++++++++-------- .../creatProcess/qbrk/common/formListIn.vue | 24 +++++------ 5 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 4ec906e85..5872e9457 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -186,9 +186,9 @@
{{ item.name }} - - - + + +
@@ -256,9 +256,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -290,9 +290,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -577,9 +577,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -745,9 +745,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -775,9 +775,9 @@ class="fileClass" > {{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index ad010ad0a..3b0979e14 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -184,9 +184,9 @@ @click="handleFilePreviewOne(item,'onlineEdit')" /> - - - + + +
@@ -203,9 +203,9 @@ > {{ item.name }} - - - + + +
@@ -263,9 +263,9 @@
{{ item.name }} - - - + + +
@@ -292,9 +292,9 @@
{{ item.name }} - - - + + +
@@ -547,9 +547,9 @@
{{ item.name }} - - - + + +
@@ -715,9 +715,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -740,9 +740,9 @@
{{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue index 97cc2180d..8667e474f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue @@ -104,9 +104,9 @@
{{ item.name }} - - - + + +
@@ -130,9 +130,9 @@
{{ item.name }} - - - + + +
@@ -142,9 +142,9 @@
{{ item.name }} - - - + + +
@@ -288,9 +288,9 @@
{{ item.name }} - - - + + +
@@ -436,9 +436,9 @@
{{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 7d7077cd6..788441b95 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -146,9 +146,9 @@ @click="handleFilePreviewOne(item,'onlineEdit')" /> - - - + + +
@@ -161,9 +161,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -201,9 +201,9 @@ class="fileClass" > {{ item.name }} - - - + + + @@ -219,9 +219,9 @@ class="fileClass" > {{ item.name }} - - - + + + @@ -421,9 +421,9 @@ class="fileClass" > {{ item.name }} - - - + + + @@ -583,9 +583,9 @@ class="fileClass" > {{ item.name }} - - - + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue index 2d0e079bd..3a18a07c7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue @@ -115,9 +115,9 @@
{{ item.name }} - - - + + +
@@ -141,9 +141,9 @@
{{ item.name }} - - - + + +
@@ -153,9 +153,9 @@
{{ item.name }} - - - + + +
@@ -298,9 +298,9 @@
{{ item.name }} - - - + + +
From 8d473b0c76a44a857716dfd272bdd27f24b8a329 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 29 Mar 2024 15:51:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E8=AF=84=E5=88=86=E8=AE=A1=E7=AE=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherBussStandardDetails/index.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index aec5c3d5a..612a5bd51 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1373,6 +1373,7 @@ export default { data () { return { score: 0, + XGLC:'', externalStatus:'', QFTP: false, textOptions: [], @@ -1672,7 +1673,7 @@ export default { getScore () { //查询动态评价总平均分和质量评价总平均分 let standId = this.$route.params.id - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId,prcNum:this.XGLC}, { _this: this }, res => { if (res.ok) { @@ -2490,6 +2491,12 @@ export default { _this: this }, res => { this.sarStandardsInfoEO = res.data || {} + if (res.data.attrInfoMap && res.data.attrInfoMap.XGLC){ + let XGLCData = res.data.attrInfoMap.XGLC.split(',') + this.XGLC = XGLCData[XGLCData.length - 1] + }else{ + this.XGLC = '' + } if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/QCBFC') !== -1) { this.QFTP = true } @@ -3395,7 +3402,7 @@ export default { this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION }, e => { }) - this.getScore() + /* this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { _this: this @@ -3448,6 +3455,7 @@ export default { this.getOrgTreeSource() this.standItemEO.standId = this.$route.params.id Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => { + this.getScore() const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values // const relatedPlansRes = await this.queryRelatedPlans() // const relatedPlans = relatedPlansRes.list From 3948ae08837c49094d7c2d6121a581839e3d49f7 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 29 Mar 2024 16:20:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=E5=9C=A8=E8=A1=A8=E5=8D=95=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/bussLibraryProduct.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue index 044811b72..abf2fa549 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue @@ -1021,7 +1021,7 @@ export default { } this.footerLoading = true - + this.form.prcNum = this.$route.query.prcNum const json = JSON.stringify({ form: this.form, roleForm: this.roleForm From b4ec5ea39787125938caee6bfa502cca32acbfdc Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 29 Mar 2024 17:46:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=EF=BC=8C=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=A5=E6=9C=9F=E5=89=8D=E7=9A=84=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index b43771073..05a20a630 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -97,6 +97,7 @@
@@ -544,6 +545,10 @@ export default { } }, methods: { + disabledPastDate(time) { + // 禁用今天之前的日期 + return time.getTime() < Date.now() - 8.64e7; + }, getTaskId() { this.ccc = true queryTaskFirst({