From 73c1c23f10bda87d4bc76f6fc3280e9a1e21e1a4 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 14:09:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E8=A2=AB=E4=BB=A3=E6=9B=BF?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 3fdf0f328..8e20e6439 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1841,17 +1841,17 @@
                     <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
-                  <!--            引用标准-->
-                  <el-form-item label="引用标准" class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                  </el-form-item>
 
                 </el-col>
                 <el-col :span="12">
                   <!--            被代替标准号-->
-                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
-                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+<!--                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
+<!--                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
+<!--                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--                  </el-form-item>-->
+                  <!--            引用标准-->
+                  <el-form-item label="引用标准" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
                   <!--            被引用标准-->

From 92bfe58788a9ed63bf8151515e38cc1b7a661198 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 14:12:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E4=BD=93=E7=B3=BB=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E6=94=B9=E6=88=90=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 8e20e6439..acbf66a62 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1545,8 +1545,8 @@
                     </el-select>
                   </el-form-item>
                   <!--            体系类别-->
-                  <el-form-item label="体系类别" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
+                  <el-form-item label="标准体系" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                       <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="opt.value"

From e53f550e2f19c8b8a73e91237e2ea7681e6a5369 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 14:13:10 +0800
Subject: [PATCH 3/5] commit

---
 .../pags/consultationDetails.vue              | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index def0339eb..2dc31a08e 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -475,19 +475,27 @@ export default {
     }
   },
   mounted() {
-    this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
-    let json = JSON.parse(this.$route.query.item.files)[0]
-    this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
-      standId: json.standId,
-      fileType: json.standFileClassify,
-      pageSize: 9999,
-      page: 1
-    }, {}, res => {
-      if (res.ok) {
-        this.options = res.data.list
-      }
-    }, e => {
-    })
+    if (JSON.parse(this.$route.query.item.wkfiles).length) {
+      this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
+    } else {
+      this.fileInfoLists = []
+    }
+    if (JSON.parse(this.$route.query.item.files).length) {
+      let json = JSON.parse(this.$route.query.item.files)[0]
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+        standId: json.standId,
+        fileType: json.standFileClassify,
+        pageSize: 9999,
+        page: 1
+      }, {}, res => {
+        if (res.ok) {
+          this.options = res.data.list
+        }
+      }, e => {
+      })
+    } else {
+      this.options = []
+    }
     this.getList()
     this.getIdeaKey()
     this.getFileInfo()

From cd1c6ccd24f57b5970adb78d9e0e0eb00aa435fa Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 21 Dec 2021 14:32:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzhHd-rh/step1.vue   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 42041d108..c7d65f6e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -348,7 +348,7 @@
             </el-timeline-item>
             <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="totalLeader" style="margin-bottom: 0">
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
                   <h4>总院技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -749,8 +749,8 @@ export default {
       } else {
         this.roleForm.dockUser = idList
         this.roleForm.dockUserName = nameList
-        this.rh_pageData.comityInRole = nameList
-        this.rh_pageData.comityInRoleId = idList
+        // this.rh_pageData.comityInRole = nameList
+        // this.rh_pageData.comityInRoleId = idList
       }
       this.roleShowflag = false
     },
@@ -810,7 +810,7 @@ export default {
         roleList: this.roleForm,
         rh_pageData: this.rh_pageData,
         commentText: this.commentText,
-        directorList: this.rh_pageData.comityInRoleId,
+        directorList: this.roleForm.dockUser,
       }
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {

From f7508177b187d4f58c3298e5d456dd8c07a4b1f7 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 14:32:58 +0800
Subject: [PATCH 5/5] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step2.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index c351aff6b..e32405d1f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -84,7 +84,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
+                <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
                     批量编辑
                 </el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 5efe18811..9c2a0a4c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -85,7 +85,7 @@
         <template slot="title">拆分信息</template>
       </ProcessTitle>
       <div class="action-bar">
-        <el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
+        <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
           批量编辑
         </el-button>
       </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 3cfe97df7..ee3227eb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+                <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
             </div>
             <el-table border
                       ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 707111fcd..6670afe1d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
+                <el-button  type="primary" :disabled="acceptShow && !itemList.length" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
             </div>
             <el-table border
                       ref="selection"