From 1604b047f960d586e36fa79f47261e0ce70eaef6 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Sat, 25 Dec 2021 16:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AF=A6=E6=83=85=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=81=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=E6=8A=BD=E5=B1=89=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         |  1 +
 .../pages/creatProcess/bzrk/step2.vue         | 23 ++++++++++++++++++-
 .../components/EnterpriseStandardDatabase.vue |  8 +++----
 .../searchCenter/pages/advancedSearch.vue     |  2 ++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index e64ea2464..60bd786bf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2760,6 +2760,7 @@
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData && checkedData.length != 0) {
+                  console.log(checkedData)
                     if(checkedData.length > 0){
                         this.form.dybxh = checkedData.map(item => item.model).join(",")
                         this.form.dymc = checkedData.map(item => item.name).join(",")
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 6323a4b0f..470c43081 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1111,7 +1111,6 @@
                         if (res) {
                             const processForm = JSON.parse(res.mesg)
 
-                          console.log("processFrom",processForm)
                             this.xgdFileId = processForm.xgd
                             this.fbgbjbdFileId = processForm.fbgbjbd
                             this.bpgFileId = processForm.bpg
@@ -1217,6 +1216,28 @@
                         this.isSubmit = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                      console.log(this.form)
+                        if (this.form.syrz.length === 0) {
+                          this.form.syrz = ''
+                        }
+                        if (this.form.nylx.length === 0) {
+                          this.form.nylx = ''
+                        }
+                        if (this.form.zrbm.length === 0) {
+                          this.form.zrbm = ''
+                        }
+                        if (this.form.qcdw.length === 0) {
+                          this.form.qcdw = ''
+                        }
+                        if (this.form.cllx.length === 0) {
+                          this.form.cllx = ''
+                        }
+                        if (this.form.sycpx.length === 0) {
+                          this.form.sycpx = ''
+                        }
+                        if (this.form.zrgcs.length === 0) {
+                          this.form.zrgcs = ''
+                        }
                         const json = JSON.stringify(this.form);
                         this.$http.post('lawss/activiti/completeTask', {
                             taskIds: this.taskIds,
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d7726bbd4..e1053c5d7 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1173,9 +1173,9 @@
                               <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
                               </el-form-item>
-                              <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
+<!--                              <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,false)"></el-input>
-                              </el-form-item>
+                              </el-form-item>-->
                           </el-col>
                           <el-col :span="12">
                             <el-form-item
@@ -1238,9 +1238,9 @@
 <!--                                      ></el-option>-->
 <!--                                  </el-select>-->
 <!--                              </el-form-item>-->
-                              <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
+<!--                              <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
-                              </el-form-item>
+                              </el-form-item>-->
                           </el-col>
                       </el-row>
                   </div>
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index b9c174ee1..b84453434 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -317,6 +317,7 @@
                               :show-checkBox="showCheckBox"
                               :url="url"
                               :urlChild="urlChild"
+                              @popoverHideCancel = "modalShowFlag2 = false"
                               :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
                               :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
                     </el-form-item>
@@ -342,6 +343,7 @@
                               :drawerTitle="drawerTitle"
                               :show-checkBox="showCheckBox"
                               :url="url"
+                              @popoverHideCancel = "modalShowFlag3 = false"
                               :urlChild="urlChild"
                               :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                               :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>