From 156a0e5899abfc78c8ed84e49593175659d02008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 27 Jul 2021 19:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 23 ++++--
 .../pages/creatProcess/bzqdfb/step2.vue       | 20 +-----
 .../nonConfomity/pages/historicalData.vue     | 70 ++++++++++++-------
 .../pages/rectificationDatabase.vue           | 70 ++++++++++++-------
 4 files changed, 107 insertions(+), 76 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 302272626..872b4bef9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1066,8 +1066,10 @@ export default {
         middle.push(item.name);
         files.push(item.response.data.id);
       });
-      this.fileListName = middle;
-      this.fileIds = files;
+      this.listForm.fileName = middle.join(',');
+      this.listForm.fileId = files.join(',');
+      // this.fileListName = middle;
+      // this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1081,12 +1083,17 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        if(this.listForm.fileName === null ){
+        if(this.listForm.fileName === null || this.listForm.fileName == undefined){
           this.listForm.fileName = this.fileListName.join(',')
-        }else {
+        } else {
           this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
         }
-        this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
+        if(this.listForm.fileId === null || this.listForm.fileId === undefined){
+          this.listForm.fileId = this.fileIds.join(',')
+        }else {
+          this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
+        }
+        console.log(this.listForm);
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1205,7 +1212,11 @@ export default {
             exits.push(item.id)
           }
         });
-        this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+        if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
+          this.listForm.inforlist = exits.join(',')
+        } else {
+          this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+        }
         this.standardData = [];
         this.standModel = false;
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 617b6018c..976a14cda 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -78,13 +78,8 @@
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump"
-                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                  scope.row.standNumber
-                }}-{{ scope.row.standYear }}</a>
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                  scope.row.standSortShow }}
-                {{ scope.row.standNumber }}</a>
+              <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+              <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
             </template>
           </el-table-column>
           <el-table-column
@@ -412,17 +407,6 @@ export default {
     },
     selectThree() {
 
-    },
-    // 点击查看
-    handlePreview(item) {
-      let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
-        params: {
-          id: item.id,
-          pageType: "INLAND_STAND"
-        }
-      });
-      window.open(routeUrl.href, "_blank");
     },
     pageChange(page) {
       this.page = page;
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index d79752675..e1715915f 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -25,33 +25,39 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="historySearch.responseUnitShow" v-show="false" />
-            <el-popover
-              placement="bottom"
-              popper-class="user-dept-popper"
-              trigger="click"
-              :value="false"
-            >
-              <el-input
-                slot="reference"
-                v-model="historySearch.responseUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
+            <el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                {{ opt.label}}</el-option>
+            </el-select>
           </el-form-item>
+<!--          <el-form-item label="责任部门" class="search-item">-->
+<!--            <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
+<!--            <el-popover-->
+<!--              placement="bottom"-->
+<!--              popper-class="user-dept-popper"-->
+<!--              trigger="click"-->
+<!--              :value="false"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                slot="reference"-->
+<!--                v-model="historySearch.responseUnitShow"-->
+<!--                placeholder="根据责任部门查找"-->
+<!--                readonly-->
+<!--                clearable-->
+<!--                id="searchResp"-->
+<!--              />-->
+<!--              <div class="api">-->
+<!--                <laws-tree-->
+<!--                  :zNodes="zNodesSItem"-->
+<!--                  treeDivId="zNodesSItemSearch"-->
+<!--                  deptSelect-->
+<!--                  showRMenu-->
+<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+<!--                </laws-tree>-->
+<!--              </div>-->
+<!--            </el-popover>-->
+<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -374,6 +380,7 @@ export default {
       total: 0,
       // 当前页数
       pageNo: 1,
+      zrbmOptions:[],
       // 单页数量
       pageSize: this.$store.getters.userInfo.configContent,
       // 历史数据查看
@@ -652,6 +659,17 @@ export default {
     }
   },
   mounted () {
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.allSelectOptions = res.data || {}
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.getGzzOption()
+      this.setMap(this.standStateOptions)
+    }, e => {
+    })
     this.getTableBtn()
     this.getOrgTreeSource()
   }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 38daf3d9b..0dfe97778 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -17,33 +17,39 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />
-            <el-popover
-              placement="bottom"
-              popper-class="user-dept-popper"
-              trigger="click"
-              :value="false"
-            >
-              <el-input
-                slot="reference"
-                v-model="nonConformitySearch.responsibleUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
+            <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                {{ opt.label}}</el-option>
+            </el-select>
           </el-form-item>
+<!--          <el-form-item label="责任部门" class="search-item">-->
+<!--            <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
+<!--            <el-popover-->
+<!--              placement="bottom"-->
+<!--              popper-class="user-dept-popper"-->
+<!--              trigger="click"-->
+<!--              :value="false"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                slot="reference"-->
+<!--                v-model="nonConformitySearch.responsibleUnitShow"-->
+<!--                placeholder="根据责任部门查找"-->
+<!--                readonly-->
+<!--                clearable-->
+<!--                id="searchResp"-->
+<!--              />-->
+<!--              <div class="api">-->
+<!--                <laws-tree-->
+<!--                  :zNodes="zNodesSItem"-->
+<!--                  treeDivId="zNodesSItemSearch"-->
+<!--                  deptSelect-->
+<!--                  showRMenu-->
+<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+<!--                </laws-tree>-->
+<!--              </div>-->
+<!--            </el-popover>-->
+<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -427,6 +433,7 @@ export default {
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
       },
+      zrbmOptions: [], // 责任部门下拉框
       // 责任部门
       zNodesSItem: [],
       myLoading: {
@@ -654,6 +661,17 @@ export default {
     },
   },
   mounted () {
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.allSelectOptions = res.data || {}
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.getGzzOption()
+      this.setMap(this.standStateOptions)
+    }, e => {
+    })
     this.getTableByPage()
     // 加载所有的部门
     this.getOrgTreeSource()