From 1f05451a701130d24cb07da3d45f95007677ab45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 16 Jul 2021 14:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=85=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 114 ++++++++++++++++--
 .../pages/creatProcess/xmpg/step1.vue         |  14 ++-
 .../page/listOfCountries.vue                  |   1 -
 src/sysConfig/index.js                        |   2 +-
 4 files changed, 116 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index b356531af..a3b48f73e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -145,6 +145,7 @@
             prop="code"
             fixed="left"
             width="180px"
+            align="center"
             label="标准号">
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
@@ -157,26 +158,30 @@
           <el-table-column
             prop="standName"
             label="标准名称"
+            align="center"
             width="260px"
           >
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
+            align="center"
             label="发布日期">
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
+            align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="zccssrq"
+            align="center"
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="textStatus"
+            align="center"
             width="120px"
             label="文本状态">
           </el-table-column>
@@ -266,6 +271,50 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+<!--                <el-form-item label="国家/地区" class="search-item search-item-last">-->
+<!--                  <el-select-->
+<!--                    v-model="sarSarAccessEOSearch.countryArea"-->
+<!--                    placeholder="请选择"-->
+<!--                    filterable-->
+<!--                  >-->
+<!--                    <el-option-->
+<!--                      v-for="item in countryOptions"-->
+<!--                      :value="item.value"-->
+<!--                      :key="item.value"-->
+<!--                      :label="item.label"-->
+<!--                    >-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+                <el-form-item label="清单名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="sarSarAccessEOSearch.detailedListName"
+                    placeholder="请输入清单名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="selectionList">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               v-if="listType === 'country'"
               :data="sarAccessListDatas"
@@ -302,8 +351,9 @@
                 label="清单状态"
                 align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -380,8 +430,9 @@
                 label="清单状态"
                 align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -458,8 +509,9 @@
                 label="清单状态"
                 align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -544,6 +596,7 @@
               <el-table-column
                 prop="code"
                 fixed="left"
+                align="center"
                 label="标准号">
                 <template slot-scope="scope">
                   <a v-if="scope.row.standYear" class="table-jump"
@@ -555,25 +608,30 @@
               </el-table-column>
               <el-table-column
                 prop="standName"
+                align="center"
                 label="标准名称"
               >
               </el-table-column>
               <el-table-column
                 prop="issueTime"
+                align="center"
                 label="发布日期">
               </el-table-column>
               <el-table-column
                 prop="xcxssrq"
+                align="center"
                 label="新车型实施日期">
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="zccssrq"
+                align="center"
                 label="在产车实施日期">
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="textStatus"
+                align="center"
                 label="文本状态">
               </el-table-column>
             </el-table>
@@ -670,6 +728,14 @@ export default {
     return {
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
+      searching: false,
+      // 查询相关参数
+      sarSarAccessEOSearch: {
+        countryArea: "",
+        detailedListName: "",
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent
+      },
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -811,10 +877,13 @@ export default {
     },
     // //判断当前选中的是哪个清单
     selectionList(type) {
+      type  = this.listType
+      console.log(type);
       if (type === "project") {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
           pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
           sortKey: 2
         }, {
           _this: this
@@ -827,6 +896,7 @@ export default {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
           pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
           sortKey: 3
         }, {
           _this: this
@@ -835,10 +905,11 @@ export default {
           this.total = res.data.total;
         }, e => {
         });
-      } else {
+      } else if(type === 'country') {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
           pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
           sortKey: 1
         }, {
           _this: this
@@ -849,13 +920,23 @@ export default {
         });
       }
     },
+    clearSearch() {
+      this.sarSarAccessEOSearch = {
+        countryArea: "",
+        detailedListName: ""
+      };
+      this.selectionList();
+    },
     //点击添加事件
     addList() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
         _this: this
       }, res => {
         this.standardData = res.data.list;
-        this.totalNo = res.data.pageCount
+        this.totalNo = res.data.count
       }, e => {
       });
       this.standModel = true;
@@ -960,6 +1041,17 @@ export default {
     fileUpload () {
       this.fileMadel = true
     },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     // 导入标准数据成功后执行
     importFileSuccess (response, file) {
       if (response.ok) {
@@ -1139,7 +1231,7 @@ export default {
       this.selectionList();
     },
     pageChangeNo(page){
-      this.page = page
+      this.pageNo = page
       this.addList()
     },
     pageSizeChangeNo(pageSize){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 4060b6cbf..9fc9873bc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -633,15 +633,19 @@ export default {
     },
     pageChange(page) {
       this.page = page;
+      this.getStandData()
     },
     pageSizeChange(pageSize) {
       this.pageSize = this.$store.getters.userInfo.configContent;
+      this.getStandData()
     },
     pageChangeNo(page) {
       this.pageNO = page;
+      this.getProductData()
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.getProductData()
     },
     //获取产品线数据
     getProductData() {
@@ -659,11 +663,17 @@ export default {
     },
     //获取标准数据
     getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+      console.log(this.page);
+      console.log(this.pageSize);
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        page: this.page,
+        pageSize: this.pageSize,
+      }, {
         _this: this
       }, res => {
+        console.log(res.data);
         this.sarAccessListDatas = res.data.list;
-        this.total = res.pageCount;
+        this.total = res.data.count;
       }, e => {
       });
     }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 98aed73cb..138c08178 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -285,7 +285,6 @@ export default {
         detailedListName: ""
       };
       this.searchSarAccess();
-
     },
     // 新增相关
     openModal(row, optType) {
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 38c17d419..192b22819 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.252'
+const devIp = '192.168.10.254'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'