From 5b0263cd37fa14fcd2d7d628687dc96ac43f161e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 7 Nov 2022 14:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step1.vue         |  5 ++
 .../pages/creatProcess/bzpg/step3.vue         |  5 ++
 .../pages/creatProcess/xmpg/step3.vue         |  7 +++
 .../pages/creatProcess/xmpg2/step1.vue        |  2 +-
 .../pages/creatProcess/xmqdqr/step1.vue       |  3 +-
 .../pages/creatProcess/xmqdqr/step2.vue       |  7 ++-
 .../pages/addEdit.vue                         | 10 +++-
 .../pages/details.vue                         | 57 +++++++++++++------
 8 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index 0d77aad55..cd4aa3cab 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -412,6 +412,11 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item label="项目群" class="search-item search-item-last">
+                  <el-input v-model="projectSearch.projectGroup"
+                            placeholder="请输入项目群"
+                  ></el-input>
+                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button :disabled="disabledXX"
                     :loading="searching"
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index 2152d9f46..b3c58022c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -276,6 +276,11 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="项目名称" class="search-item search-item-last">
+                <el-input v-model="projectSearch.projectName"
+                          placeholder="请输入项目名称"
+                ></el-input>
+              </el-form-item>
               <el-form-item class="search-item btn-box">
                 <el-button
                         type="primary"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index ff9c46b06..80f1b663c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -528,6 +528,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
       comFlag: 0,
       total: 0,
       currentPage: 1,
@@ -661,6 +666,8 @@ export default {
           }
         });
       });
+      console.log(this.dataList)
+      this.dataList = [...this.dataList]
       this.modalShowFlag = false;
     },
     cancelBatchEditForm() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index d1ad211be..3fbf3e7f6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -617,7 +617,7 @@ export default {
     },
     //查询项目下的标准
     getStandData() {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
+      this.$http.get("sarStandProjectLibrary/queryStandInfoNew", { id: this.projectId }, {
         _this: this
       }, res => {
         res.data.records.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index bdb737e92..e6362a3d6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -90,8 +90,7 @@
           label="标准号"
         >
           <template slot-scope="scope">
-            <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
-              }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+            <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort + scope.row.standNumber}}-{{ scope.row.standYear}}</a>
             <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
               {{ scope.row.standNumber }}</a>
           </template>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index fafee10a2..546fb5a7d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -759,7 +759,7 @@ export default {
     }, res => {
       this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
       this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
-      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.setMap(res.data.WBZTCLASS,res.data.TEXTSTATUSBUSS);// 文本状态
       this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
       this.textState = res.data.WBZTCLASS // 文本状态
       this.showLocalProductData(this.getLocalPro);
@@ -821,8 +821,9 @@ export default {
       this.selectPeople = row
     },
     // 将文本状态的id与name对应
-    setMap(data) {
-      data.forEach(item => {
+    setMap(data,res) {
+      var arr = data.concat(res)
+      arr.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index d21449729..4e168f8a9 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -293,6 +293,7 @@
         </el-table-column>
         <el-table-column
           prop="standName"
+          show-overflow-tooltip
           :label="standLabelName"
           align="center"
           width="260px"
@@ -305,6 +306,7 @@
           prop="standEnName"
           align="center"
           width="180px"
+          show-overflow-tooltip
           label="英文名称">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
@@ -314,30 +316,35 @@
           prop="typeApplicable"
           align="center"
           width="180px"
+          show-overflow-tooltip
           label="适用车型">
         </el-table-column>
         <el-table-column
           prop="nylx"
           align="center"
           width="180px"
+          show-overflow-tooltip
           label="能源类型">
         </el-table-column>
         <el-table-column
           prop="syrz"
           align="center"
           width="180px"
+          show-overflow-tooltip
           label="适用认证">
         </el-table-column>
         <el-table-column
           prop="ssrq"
           align="center"
           width="210px"
+          show-overflow-tooltip
           label="标准实施日期">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="zccssrqgj"
           width="210px"
+          show-overflow-tooltip
           align="center"
           label="在产车实施日期">
         </el-table-column>
@@ -345,12 +352,13 @@
           prop="xcxssrqgj"
           align="center"
           width="210px"
+          show-overflow-tooltip
           label="新车型实施日期">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
           prop="zrbm"
           width="210px"
+          show-overflow-tooltip
           align="center"
           label="责任部门">
         </el-table-column>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 29b43fe7a..b533446ae 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -89,14 +89,9 @@
             width="190px"
           >
             <template slot-scope="scope">
-              <span v-if="scope.row.standSortShow === undefined"
-                    style="margin-left: 10px">{{
-                  scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
-                }}</span>
-              <span v-else
-                    style="margin-left: 10px">{{
-                  scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear
-                }}</span>
+              <a class="table-jump" style="margin-left: 10px"
+                    @click="handlePreview(scope.row)" v-if="scope.row.standSortShow === undefined" >{{scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</a>
+              <a class="table-jump" style="margin-left: 10px" @click="handlePreview(scope.row)" v-else >{{scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -105,6 +100,9 @@
             min-width="300"
             show-overflow-tooltip
           >
+            <template slot-scope="scope">
+              <a class="table-jump" style="margin-left: 10px" @click="handlePreview(scope.row)">{{scope.row.standName}}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="standEnName"
@@ -112,6 +110,9 @@
             min-width="300"
             show-overflow-tooltip
           >
+            <template slot-scope="scope">
+              <a class="table-jump" style="margin-left: 10px" @click="handlePreview(scope.row)">{{scope.row.standEnName}}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="ssrq"
@@ -823,14 +824,38 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
-        params: {
-          id: item.id,
-          pageType: 'INLAND_STAND'
-        }
-      })
-      window.open(routeUrl.href, '_blank')
+      switch (item.standType) {
+        case 'FOREIGN':
+          let routeUrl = this.$router.resolve({
+            name: 'OtherStandardDetails',
+            params: {
+              id: item.standId,
+              pageType: 'FOREIGN_STAND'
+            }
+          })
+          window.open(routeUrl.href, '_blank')
+          break;
+        case 'INLAND':
+          let routeUrl1 = this.$router.resolve({
+            name: 'OtherStandardDetails',
+            params: {
+              id: item.standId,
+              pageType: 'INLAND_STAND'
+            }
+          })
+          window.open(routeUrl1.href, '_blank')
+          break;
+        case 'BUSINESS_STAND':
+          let routeUrl2 = this.$router.resolve({
+            name: 'OtherBussStandardDetails',
+            params: {
+              id: item.standId,
+              pageType: 'BUSINESS_STAND'
+            }
+          })
+          window.open(routeUrl2.href, '_blank')
+          break;
+      }
     },
     back() {
       this.$router.push({