From c2a4bfe61d1da484cb86bed756987cbc5b140af5 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 28 Sep 2021 17:18:48 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86->?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/index.vue              | 4 ++++
 .../localTool/standAutoSplit/pages/itemSplitInfo.vue      | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 9846d1ba6..3d807ae23 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -982,8 +982,12 @@ export default {
       }, res => {
         res.data.list.map((item, index) => {
           if (item.collectId != null && item.collectId !== '') {
+            item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
+            item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
             item.collectBtn = false
           } else {
+            item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
+            item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
             item.collectBtn = true
           }
         })
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 236df3463..babea2ac8 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -1036,7 +1036,8 @@ export default {
         return
       }
       const query = this.infoForm
-      this.editForm.id = query.infoId
+      this.editForm.id = this.infoId
+      console.log("hello",this.editForm.id);
       this.editForm.standNumSplit = query.standNumSplit
       this.editForm.standNameSplit = query.standNameSplit
       this.editForm.fileType = query.fileType
@@ -1046,6 +1047,7 @@ export default {
     editFormSave () {
       this.$refs['editForm'].validate(valid => {
         if (valid) {
+
           this.isSubmit = true
           this.$http.postData('lawss/sarFileSplitInfo/updateSarFileSplitInfo', this.editForm, {
             _this: this
@@ -2223,8 +2225,8 @@ export default {
             const query = info[0]
             this.infoForm = {
               id: this.infoId,
-              standNumSplit: query.splitStatus!=='0' ? query.showNumber : query.standNumSplit,
-              standNameSplit: query.splitStatus!=='0' ? query.standName : query.standNameSplit,
+              standNumSplit: query.splitStatus=='0' ? query.showNumber : query.standNumSplit,
+              standNameSplit: query.splitStatus=='0' ? query.standName : query.standNameSplit,
               fileType: query.fileType
             }
             if (query.splitStatus === '0') {

From efc0f3b5b6583f29a7b1e3ec49a6bcf84d1cf921 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 28 Sep 2021 17:46:42 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=20=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step4.vue         | 85 +++++++++++++++++-
 .../pages/creatProcess/xmpg2/step6.vue        | 86 ++++++++++++++++++-
 2 files changed, 163 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 1427aa536..25617f65b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -220,10 +220,20 @@
               label="合规">
               <template slot-scope="scope">
                 <el-input
+                    v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
+                    || dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
+                    || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null"
+                    disabled
                   v-model="dataList[scope.$index].complianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
+                <el-input
+                   v-else
+                    v-model="dataList[scope.$index].complianceReasons"
+                    placeholder="请输入合规原因"
+                >
+                </el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -238,10 +248,18 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                      disabled
                     v-model="dataList[scope.$index].noCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="dataList[scope.$index].noCompliance"
+                      placeholder="请输入不合规项目"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -251,22 +269,40 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                      disabled
                     v-model="dataList[scope.$index].countermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="dataList[scope.$index].countermeasures"
+                      placeholder="请输入应对措施"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
-                width="120"
+                width="140"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
+                      v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                      disabled
                     v-model="dataList[scope.$index].completionTime"
                     type="date"
-                    placeholder="选择日期">
+                    placeholder="请选择日期">
+                  </el-date-picker>
+                  <el-date-picker
+                      v-else
+                      class="datePickLen"
+                      clearable
+                      v-model="dataList[scope.$index].completionTime"
+                      type="date"
+                      placeholder="请选择日期">
                   </el-date-picker>
                 </template>
               </el-table-column>
@@ -282,10 +318,20 @@
               label="合规(具体情况)">
               <template slot-scope="scope">
                 <el-input
+                    v-if="dataList[scope.$index].zcNoCompliance && dataList[scope.$index].zcNoCompliance.length>0
+                    || dataList[scope.$index].zcCountermeasures && dataList[scope.$index].zcCountermeasures>0
+                    || dataList[scope.$index].zcCompletionTime && dataList[scope.$index].zcCompletionTime !== null"
+                    disabled
                   v-model="dataList[scope.$index].zcComplianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
+                <el-input
+                    v-else
+                    v-model="dataList[scope.$index].zcComplianceReasons"
+                    placeholder="请输入合规原因"
+                >
+                </el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -299,10 +345,18 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
+                      disabled
                     v-model="dataList[scope.$index].zcNoCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="dataList[scope.$index].zcNoCompliance"
+                      placeholder="请输入不合规项目"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -312,22 +366,40 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
+                      disabled
                     v-model="dataList[scope.$index].zcCountermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="dataList[scope.$index].zcCountermeasures"
+                      placeholder="请输入应对措施"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
-                width="120"
+                width="140"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
+                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
+                      disabled
                     v-model="dataList[scope.$index].zcCompletionTime"
                     type="date"
-                    placeholder="选择日期">
+                    placeholder="请选择日期">
+                  </el-date-picker>
+                  <el-date-picker
+                      v-else
+                      class="datePickLen"
+                      clearable
+                      v-model="dataList[scope.$index].zcCompletionTime"
+                      type="date"
+                      placeholder="请选择日期">
                   </el-date-picker>
                 </template>
               </el-table-column>
@@ -810,6 +882,11 @@ export default {
         height: 100%;
       }
     }
+    .datePickLen {
+      /deep/ .el-icon-circle-close:before {
+        margin-left: -180px;
+      }
+    }
     .input-jump {
       /deep/.el-input__inner{
         color: #409EFF;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index aa5ffa79c..1d608e3e5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -132,10 +132,20 @@
               label="合规">
               <template slot-scope="scope">
                 <el-input
+                    v-if="scope.row.noCompliance && scope.row.noCompliance.length>0
+                    || scope.row.countermeasures && scope.row.countermeasures.length>0
+                    || scope.row.completionTime && scope.row.completionTime !== null"
+                    disabled
                   v-model="scope.row.complianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
+                <el-input
+                    v-else
+                    v-model="scope.row.complianceReasons"
+                    placeholder="请输入合规原因"
+                >
+                </el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -150,10 +160,18 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
+                      disabled
                     v-model="scope.row.noCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="scope.row.noCompliance"
+                      placeholder="请输入不合规项目"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -163,22 +181,40 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
+                      disabled
                     v-model="scope.row.countermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="scope.row.countermeasures"
+                      placeholder="请输入应对措施"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
-                width="120"
+                width="140"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
+                      v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
+                      disabled
                     v-model="scope.row.completionTime"
                     type="date"
-                    placeholder="选择日期">
+                    placeholder="请选择日期">
+                  </el-date-picker>
+                  <el-date-picker
+                      v-else
+                      class="datePickLen"
+                      clearable
+                      v-model="scope.row.completionTime"
+                      type="date"
+                      placeholder="请选择日期">
                   </el-date-picker>
                 </template>
               </el-table-column>
@@ -194,10 +230,20 @@
               label="合规(具体情况)">
               <template slot-scope="scope">
                 <el-input
+                    v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0
+                    || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0
+                    || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"
+                    disabled
                   v-model="scope.row.zcComplianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
+                <el-input
+                    v-else
+                    v-model="scope.row.zcComplianceReasons"
+                    placeholder="请输入合规原因"
+                >
+                </el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -211,10 +257,18 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
+                      disabled
                     v-model="scope.row.zcNoCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="scope.row.zcNoCompliance"
+                      placeholder="请输入不合规项目"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -224,22 +278,40 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
+                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
+                      disabled
                     v-model="scope.row.zcCountermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
+                  <el-input
+                      v-else
+                      v-model="scope.row.zcCountermeasures"
+                      placeholder="请输入应对措施"
+                  >
+                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
-                width="120"
+                width="140"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
+                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
+                      disabled
                     v-model="scope.row.zcCompletionTime"
                     type="date"
-                    placeholder="选择日期">
+                    placeholder="请选择日期">
+                  </el-date-picker>
+                  <el-date-picker
+                      v-else
+                      class="datePickLen"
+                      clearable
+                      v-model="scope.row.zcCompletionTime"
+                      type="date"
+                      placeholder="请选择日期">
                   </el-date-picker>
                 </template>
               </el-table-column>
@@ -896,6 +968,12 @@ export default {
     .accessStandardsAndRegulations {
       height: 100%;
     }
+
+    .datePickLen {
+      /deep/ .el-icon-circle-close:before {
+        margin-left: -180px;
+      }
+    }
   }
 
   .demo-drawer-content {

From a4cdb602a033f28c1edde385909002a65844ea11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 29 Sep 2021 10:53:52 +0800
Subject: [PATCH 3/9] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 6 +++++-
 src/pages/processCenter/pages/creatProcess/xmpg/step1.vue   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 75aaf9e36..d19b26aaf 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -779,11 +779,15 @@ export default {
       if (this.dataList.length < 1) {
         this.satisfyFlag = false
         this.$message.warning("请添加产品线信息");
+      }else{
+        this.satisfyFlag = true
       }
       this.dataList.forEach(item => {
-        if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+        if (!item.distributePerson) {
           this.satisfyFlag = false
           this.$message.warning("请选择分发责任人");
+        }else{
+          this.satisfyFlag = true
         }
       });
       if(this.satisfyFlag){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 9d5bbc2ab..46e7792e5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -752,11 +752,15 @@ export default {
       if (this.dataList.length < 1) {
         this.satisfyFlag = false
         this.$message.warning("请添加产品线信息");
+      }else {
+        this.satisfyFlag = true
       }
       this.dataList.forEach(item => {
-        if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+        if (!item.distributePerson) {
           this.satisfyFlag = false
           this.$message.warning("请选择分发责任人");
+        }else {
+          this.satisfyFlag = true
         }
       });
       if(this.satisfyFlag){

From 5dd1ab5b7a99035a8a480be82a9d9017bd718f17 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 29 Sep 2021 11:12:46 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=B1=9E=E6=80=A7=E8=8F=9C=E5=8D=95=E4=BE=9D=E7=84=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 6ecccb894..d351f035e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2872,12 +2872,14 @@ export default {
       this.$set(data, 'showDel', false)
     },
     treeClick(treeNode) {
+      console.log("hello")
       this.selectSarMenu = treeNode
       this.standCommonlySearch.menuId = treeNode.id
       this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
       this.sarStandardsSearch.page = 1
       this.standCommonlySearch.page = 1
-      this.getDomesticStandardTable(this.tableFlag)
+      //搜索后点击属性菜单依然显示搜索条件的数据
+      this.getDomesticStandardTable(this.standCommonlySearch)
     },
     // 点击搜索按钮
     searchBtnClick(standCommonlySearch) {

From 653abf122048392c55083f4008c0980c9acb75d5 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 29 Sep 2021 11:29:19 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6-?=
 =?UTF-8?q?=E6=96=B0=E8=BD=A6=E5=9E=8B=E6=9D=A1=E6=AC=BE=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=20=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD=E6=97=A0=E4=BD=9C?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardWarning.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 85c93ef7a..43c1a6c3b 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -261,8 +261,8 @@
                 :pageSize="pageConfig.newStandPageSize"
                 :total="pageConfig.count3"
                 autoSize
-                @pageChange="page => handlePageChange('newItems', page)"
-                @pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
+                @pageChange="page => handlePageChange('newStand', page)"
+                @pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>
               <el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>
               <el-table
                 :data="oldStand"

From 41bcf30fed0124112b20efc24e566b7084a90549 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 29 Sep 2021 15:58:20 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E6=AD=A5=E7=9A=84=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step1-1.vue       | 16 ++++++++++++++
 .../pages/creatProcess/xmpg/step1.vue         | 22 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index d19b26aaf..413482154 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -29,21 +29,37 @@
               </el-form-item>
               <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                 <el-input
+                    v-if="listForm.standNumber && listForm.standNumber.length>0"
                   class="input-jump"
                   @click.native="handlePreview(listForm)"
                   readonly
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
                 ></el-input>
+                <el-input
+                    v-else
+                    class="input-jump"
+                    readonly
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
+                    v-if="listForm.standName && listForm.standName.length>0"
                   class="input-jump"
                   @click.native="handlePreview(listForm)"
                   readonly
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
                 ></el-input>
+                <el-input
+                    v-else
+                    class="input-jump"
+                    readonly
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 46e7792e5..be8b531a8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -29,21 +29,37 @@
               </el-form-item>
               <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                 <el-input
+                    v-if="listForm.standNumber && listForm.standNumber.length>0"
                   class="input-jump"
                   @click.native="handlePreview(listForm)"
                   readonly
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
                 ></el-input>
+                <el-input
+                    v-else
+                    class="input-jump"
+                    readonly
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
+                    v-if="listForm.standName && listForm.standName.length>0"
                   class="input-jump"
                   @click.native="handlePreview(listForm)"
                   readonly
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
                 ></el-input>
+                <el-input
+                    v-else
+                    class="input-jump"
+                    readonly
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
@@ -87,6 +103,12 @@
                     v-model="listForm.standNumber"
                     placeholder="请输入标准编号"
                 ></el-input>
+                <el-input
+                    @click.native="handlePreview(listForm)"
+                    readonly
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input

From a1fff9409953974a6ac76ec415d56fc98df2bda8 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 29 Sep 2021 16:19:39 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 062ed60e8..ed0c61793 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -101,7 +101,7 @@
                 <el-popover trigger="hover" placement="top">
                   {{scope.row.institutionName}}
                     <div slot="reference" class="name-wrapper">
-                          <p v-if="scope.row.institutionName.length<15">
+                          <p v-if="scope.row.institutionName ==null || scope.row.institutionName.length<15">
                             {{scope.row.institutionName}}
                           </p>
                          <p v-else> {{scope.row.institutionName.substring(0,15)}}...</p>
@@ -116,7 +116,7 @@
               <el-popover trigger="hover" placement="top">
                 {{scope.row.NameList}}
                 <div slot="reference" class="name-wrapper">
-                  <p v-if="scope.row.NameList.length<15">
+                  <p v-if="scope.row.institutionName ==null ||scope.row.NameList.length<15">
                     {{scope.row.NameList}}
                   </p>
                   <p v-else> {{scope.row.NameList.substring(0,15)}}...</p>
@@ -334,7 +334,7 @@ export default {
       }, res => {
         console.log(res.data)
         res.data.records.forEach((item) => {
-          var NameList = ''
+          let NameList = ''
           item.positions.forEach((items) => {
             if (NameList.length > 0) {
               NameList += ','

From b5be4a9b921e645b88865376bd4fb64b7d69030d Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 29 Sep 2021 16:40:13 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index ed0c61793..535421bfe 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -101,7 +101,7 @@
                 <el-popover trigger="hover" placement="top">
                   {{scope.row.institutionName}}
                     <div slot="reference" class="name-wrapper">
-                          <p v-if="scope.row.institutionName ==null || scope.row.institutionName.length<15">
+                          <p v-if="!scope.row.institutionName || scope.row.institutionName.length<15">
                             {{scope.row.institutionName}}
                           </p>
                          <p v-else> {{scope.row.institutionName.substring(0,15)}}...</p>
@@ -116,7 +116,7 @@
               <el-popover trigger="hover" placement="top">
                 {{scope.row.NameList}}
                 <div slot="reference" class="name-wrapper">
-                  <p v-if="scope.row.institutionName ==null ||scope.row.NameList.length<15">
+                  <p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
                     {{scope.row.NameList}}
                   </p>
                   <p v-else> {{scope.row.NameList.substring(0,15)}}...</p>

From d9ff2f9cca806fb62d1f3b61770424e60b1c9432 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 29 Sep 2021 17:19:38 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9D=A1=E6=AC=BE,?=
 =?UTF-8?q?=E6=9C=AA=E9=80=89=E6=8B=A9=E6=9D=A1=E6=AC=BE=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue b/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
index d5267b384..d7ea0fe8e 100644
--- a/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
+++ b/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
@@ -210,20 +210,28 @@ export default {
 
     handleSubmit(callback) {
       const selection = this.$refs['selection'].selection
-      console.log(selection)
-      return new Promise((resolve, reject) => {
-        this.postListToServer(selection).then(res => {
-          // 关闭当前区域
-          this.handleCancel()
-          callback && callback()
-          resolve(res)
-        }).catch((err) => {
-          // 关闭当前区域
-          this.handleCancel()
-          callback && callback()
-          reject(err)
+      if (selection.length>0){
+        return new Promise((resolve, reject) => {
+          this.postListToServer(selection).then(res => {
+            // 关闭当前区域
+            this.handleCancel()
+            callback && callback()
+            resolve(res)
+          }).catch((err) => {
+            // 关闭当前区域
+            this.handleCancel()
+            callback && callback()
+            reject(err)
+          })
         })
-      })
+      }else {
+        return new Promise(() => {
+          // 关闭当前区域
+          this.handleCancel()
+          callback && callback()
+        })
+      }
+
     },
 
     handleCancel() {