From dc5418c91d420608de4305b7fedc9c6dfd6eb322 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Wed, 18 Aug 2021 09:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/wfhxzg/step1.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/wfhxzg/step2.vue  | 10 ++++++----
 .../processCenter/pages/creatProcess/wfhxzg/step3.vue  |  4 ++--
 .../processCenter/pages/creatProcess/wfhxzg/step4.vue  |  4 ++--
 .../processCenter/pages/creatProcess/wfhxzg/step5.vue  |  4 ++--
 .../pages/projectAddEit.vue                            |  2 ++
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index dce75e757..e095c2f12 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -31,7 +31,7 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
               <template slot-scope="scope">
-                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
               </template>
             </el-table-column>
             <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -148,7 +148,7 @@
           <el-form :modal="queryUnqualidiedData" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
               <el-input
-                v-model="queryUnqualidiedData.standId"
+                v-model="queryUnqualidiedData.standSerialNumber"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
@@ -210,9 +210,9 @@
           @selection-change="selectedChange"
         >
         <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
+        <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
           <template slot-scope="scope">
-            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index b52339f31..7337160b7 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -97,9 +97,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -248,6 +248,7 @@ export default {
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       nonSearch: {
+        standSerialNumber: '',
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -457,7 +458,7 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+    /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
         this.realList = this.dataList.filter(item => {
           let matchId = true; // 标准号 筛选
           let matchName = true; // 项目名称 筛选
@@ -479,7 +480,7 @@ export default {
           return matchId && matchName && matchUnit;
         })
         this.dataList = this.realList
-      },
+      },*/
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
@@ -496,6 +497,7 @@ export default {
     clearAllSearch () {
       this.nonSearch = {
         standId: '',
+        standSerialNumber: '',
         productName: '',
         responsibleUnit: ''
       }
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 039a1e43d..0ee390f14 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -99,9 +99,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index ffb4d7f5c..9dacab355 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -87,9 +87,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index b952313b3..6ac35d94c 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -87,9 +87,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 1ebf4635e..a075dfd8f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1048,6 +1048,8 @@ export default {
       this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfo.standName = ''
       this.sarAccessInfo.standNumber = ''
+      this.sarAccessInfo.typeApplicable = ''
+      this.sarAccessInfo.syrz = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.askType = '' // 监管类型
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源