From 34dd9a13b2a50342209b320f43b0d0b8de7a4716 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, 23 Mar 2022 16:26:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/cancel.vue             | 18 +++++++++++++++---
 .../creatProcess/qbzxdjhgk/component/delay.vue | 13 +++++++++++++
 .../creatProcess/qbzxdjhgk/component/merge.vue | 13 +++++++++++++
 .../qbzxdjhgk/component/rename.vue             | 13 +++++++++++++
 .../pages/creatProcess/qbzxdlx/step1.vue       | 13 +++++++++++--
 .../pages/creatProcess/qbzxdlx/step2.vue       |  2 +-
 6 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 7b9baad49..31c0d3706 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -42,11 +42,23 @@
             </el-form-item>
             <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
-                <el-option label="制定完成" value="制定完成"></el-option>
-                <el-option label="制定中" value="制定中"></el-option>
-                <el-option label="未制定" value="未制定"></el-option>
+                <el-option label="制定" value="制定"></el-option>
+                <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 40f863469..a23755792 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -46,6 +46,19 @@
                <el-option label="修订" value="2"></el-option>
              </el-select>
            </el-form-item>
+           <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+             <el-input
+               style="display: none;"
+               v-model="qbfsForm.rqbJson">
+             </el-input>
+             <el-input
+               clearable
+               v-model="qbfsForm.rqbName"
+               placeholder="请选择代替企标编号"
+               readonly
+               @click.native="choiceQYBZ">
+             </el-input>
+           </el-form-item>
            <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                          class="add-form-item form-item-disabled">
              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index f41b18984..846b4c546 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -70,6 +70,19 @@
                 <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 66cb24c1f..cfdcc286a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -46,6 +46,19 @@
                 <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index 500446124..5f6332d45 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -229,6 +229,7 @@
       title="选择工作组组长"
       :visible.sync="workModel"
       size="900px"
+      @close="closeWorkDrawer"
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
@@ -261,14 +262,14 @@
                 </el-form-item>
               </el-form>
             </div>
+            <loading :loading="tableLoading">数据加载中...</loading>
             <el-table
               ref="workGroup"
               :data="workData"
               tooltip-effect="dark"
               border
               style="width: 100%; flex: auto;"
-              class="drag-table"
-              height="100%"
+              class="table-height"
               @selection-change="workChange"
               :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
@@ -380,6 +381,7 @@ export default {
   name: "qbzxdlxStep1",
   data() {
     return {
+      tableLoading: false,
       importModalshowflag: false,  //导入弹窗
       showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
       importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
@@ -594,6 +596,7 @@ export default {
     closeWorkDrawer(){
       this.workModel = false
       this.workSearch.workGroupName = ''
+      this.getWorkData()
       this.$refs.workGroup.clearSelection()
     },
     OkWork(){
@@ -622,10 +625,12 @@ export default {
       }, res => {
         this.workData = res.data.records;
         this.total = res.data.total;
+        this.tableLoading = false
       }, e => {
       });
     },
     choiceLeader(){
+      this.getWorkData()
       this.workModel = true
     },
     choiceZRBM(type, title, id) {
@@ -1114,6 +1119,10 @@ export default {
       border: 0;
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index ec89346b1..a5acf3841 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -174,7 +174,7 @@
             <custom-input-for-all-standards2
               class="classDisplay"
               :config="{attrName: '采用标准'}"
-              :labelWidth="'180px'"
+              :labelWidth="'150px'"
               v-model="qbfsForm.esStandRelations"
             ></custom-input-for-all-standards2>
           </template>

From 0aed7f530766ec4cf705782616757e4302db6656 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, 23 Mar 2022 16:59:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A6=85=E9=81=93bug=2052050=20=20?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A9=B3=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=9C=AA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creatProcess/qbzxdjhgk/component/cancel.vue   |  6 +++---
 .../creatProcess/qbzxdjhgk/component/delay.vue    |  6 +++---
 .../qbzxdjhgk/component/establish.vue             |  6 +++---
 .../creatProcess/qbzxdjhgk/component/merge.vue    | 15 +++++++++++----
 .../creatProcess/qbzxdjhgk/component/rename.vue   |  6 +++---
 .../pages/creatProcess/qbzxdlx/step1.vue          |  2 +-
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 31c0d3706..95540b7e1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -392,9 +392,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index a23755792..4bfe6e648 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -414,9 +414,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 3b5e60f54..33ebc9065 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -550,9 +550,9 @@ export default {
   },
   mounted(){
     this.getWorkData()
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
      this.$http.get('sys/dictype/getDicTypeListCode', '',{
        _this: this
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 846b4c546..186d5cb50 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -114,7 +114,7 @@
                 :enterpriseStandard="true"
                 :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                 :config="{attrName: '引用标准'}"
-                :labelWidth="'180px'"
+                :labelWidth="'150px'"
                 v-model="qbfsForm.esMatingRelations"
               ></custom-input-for-all-standards2>
             </template>
@@ -725,9 +725,9 @@ export default {
     }
   },
   mounted() {
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
@@ -814,6 +814,13 @@ export default {
     },
     TXJGenterDrawer () {
       let list = this.$refs.TXJGTree.getCheckedNodes()
+      if(list.length > 0){
+        let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
+        if (parenList.length > 0) {
+          this.$message.error('请选择二级及以下目录')
+          return
+        }
+      }
       let id = ''
       let name = ''
       list.map(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index cfdcc286a..8ad9539c2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -402,9 +402,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index 5f6332d45..5a4484d35 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -352,7 +352,7 @@
         :before-upload="beforeUpload"
         :action="importExcelUrl"
         :file-list="defaultFileList"
-        accept=".xlsx"
+        accept=".xls"
         name="file"
         ref="importFileAboutStand">
         <div style="padding: 20px 0">