From c0945b66e3ace9f4a631c48f785ec81ed2d30e9d Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 31 Jan 2023 17:57:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E8=8A=82=E7=82=B9=E4=BB=A3=E6=9B=BF=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E7=BC=96=E5=8F=B7=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index d39096a8e..107e91e89 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -3264,6 +3264,10 @@ export default {
                 this.esId2 = processForm.esId2
               }
               this.taskType = processForm.type
+              this.form.DTQBBHBUSS = processForm.rqbName
+              this.form.CYBZ = processForm.esStandRelations
+              this.form.YYBZ = processForm.esMatingRelations
+              this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用': 'MOD修改采用'
               this.$http.get('lawss/activiti/judgeAcceptTack', {
                 nowEsId: this.nowEsId,
                 oaFlag:'1',

From 3329668fce38799cd6f3f2c2909ac6cadbc9a004 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Wed, 1 Feb 2023 09:36:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86-?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5(2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 88cfe11c8..a5af95b7b 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1176,7 +1176,7 @@
 <!--                    </el-form-item>-->
 <!--                  </template>-->
                   <!-- 去掉模块结构单元 -->
-                  <template v-else-if="['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].includes(field.attrField)">
+                  <template v-else-if="!['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].includes(field.attrField)">
                     <custom-input
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"

From 4236ebf1040bd178916184d6109ae4495e7a5aa7 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 2 Feb 2023 15:46:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=BD=E5=86=85/=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 21 ++++++++++++-------
 .../foreignStandardsAndRegulations/index.vue  |  9 +++++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 3fc61e11d..663ce6f34 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -128,13 +128,20 @@
         <div slot="right" class="right shaixuan-button">
         </div>
       </table-tools-bar>
-      <div class="action-bar">
-        <!--        <el-button type="primary"-->
-        <!--                   class="common-button-primary add-button"-->
-        <!--                   @click="addModal"-->
-        <!--                   size="mini"-->
-        <!--                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
-        <!--                   :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button>-->
+<!--      <div class="action-bar">-->
+<!--                <el-button type="primary"-->
+<!--                           class="common-button-primary add-button"-->
+<!--                           @click="addModal"-->
+<!--                           size="mini"-->
+<!--                           v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
+<!--                           :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button> -->
+        <div class="action-bar">
+                <el-button type="primary"
+                           class="common-button-primary add-button"
+                           @click="addModal"
+                           size="mini"
+                           v-btn-permission="'5ef028cb91c9d7376f8b6e0b18d0f879'"
+                           :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button>
         <el-button class="common-button-default in-button"
                    :loading="searching"
                    size="mini"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index a5af95b7b..9cbf310f6 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -127,11 +127,18 @@
         </div>
       </table-tools-bar>
       <div class="action-bar">
+<!--        <el-button type="primary"-->
+<!--                   class="common-button-primary add-button"-->
+<!--                   size="mini"-->
+<!--                   @click="addModal"-->
+<!--                   v-btn-permission="'ceb5fb1e00'"-->
+<!--                   :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增-->
+<!--        </el-button>-->
         <el-button type="primary"
                    class="common-button-primary add-button"
                    size="mini"
                    @click="addModal"
-                   v-btn-permission="'ceb5fb1e00'"
+                   v-btn-permission="'06072e03642198d3ffeec6fad79061dd'"
                    :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增
         </el-button>
         <el-button class="common-button-default in-button"

From 4d199c56719ae854bf98e8f35c690ded2e4cd87f Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 2 Feb 2023 16:17:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
index fd5c68d68..1e1548d27 100644
--- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
@@ -35,7 +35,7 @@
                   title="下载"
                   @click="downloadFile(item.id)"
                   class="icon-download"
-                  v-btn-permission="''"
+                  v-btn-permission="'85f32cb652c38e39c84e4507cc2955c2'"
               />
 <!--              <i-->
 <!--                  title="下载带水印"-->