From fa19a8b3cb38e5bc30bdec16c5bf950fe983e5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 1 Mar 2022 14:42:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E6=A0=87=E5=87=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5d8431d5d..2aa61c629 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -213,6 +213,11 @@ @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} + {{ scope.row.standSortShow }} {{ + scope.row.standNumber + }}-{{ scope.row.standYear }} {{ scope.row.standSortShow }} {{ scope.row.standNumber @@ -233,6 +238,10 @@ @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }} + {{ + scope.row.standName + }} {{ scope.row.standName }} @@ -246,6 +255,9 @@ {{ scope.row.issueTime }} + {{ scope.row.issueTime }} {{ scope.row.issueTime }} @@ -258,6 +270,9 @@ {{ scope.row.SSRQ }} + {{ scope.row.SSRQ }} {{ scope.row.SSRQ }} @@ -271,6 +286,9 @@ {{ scope.row.XCXSSRQ }} + {{ scope.row.XCXSSRQ }} {{ scope.row.XCXSSRQ }} @@ -282,6 +300,9 @@ {{ scope.row.ZCCSSRQ }} + {{ scope.row.ZCCSSRQ }} {{ scope.row.ZCCSSRQ }} @@ -289,6 +310,15 @@ prop="dtbzh" width="200" label="代替标准号"> + {{ textStatusMap[scope.row.textStatus] }} + {{ textStatusMap[scope.row.textStatus] }} {{ textStatusMap[scope.row.textStatus] }} From a7bc2764693192c7faf828f56088bdc5f33c3872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 1 Mar 2022 14:58:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=BF=85=E5=A1=ABbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 8efb5eb21..57b666258 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2385,14 +2385,14 @@ export default { {validator: this.verify.testItemCode, trigger: 'change'}, {type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'} ], - standName: [ - {required: true, message: '标准名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'} - ], - standEnName: [ - {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'}, - {validator: this.verify.valiateEnName, trigger: 'blur'} - ], + // standName: [ + // {required: true, message: '标准名称不能为空', trigger: 'change'}, + // {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'} + // ], + // standEnName: [ + // {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'}, + // {validator: this.verify.valiateEnName, trigger: 'blur'} + // ], synopsis: [ {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'} ], From de4406a4c2eb137754de3112ef58e28658fc15e8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 1 Mar 2022 14:59:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=20-=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E6=94=B9=E5=90=8D=E7=A7=B0=20=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/common/formEditList.vue | 2 +- .../pages/creatProcess/qbrk-product/common/formList.vue | 2 +- .../pages/creatProcess/qbrk-product/common/formListIn.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index fa735fc32..4a4626f34 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -106,7 +106,7 @@ value-format="yyyy-MM-dd" > - + - + - + - +