From ff9ebdabeb394a478b4b59b969c461f417422910 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 25 Jul 2021 20:41:47 +0800
Subject: [PATCH 01/21] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=BA=93=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index be7ea2547..2cdf2e30f 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -188,7 +188,7 @@
                     round
                     @click="clearAllSearch('sarBussionessSearch')"
                   ></el-button>
-                  <el-button type="primary" class="common-button-primary" round  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>
+<!--                  <el-button type="primary" class="common-button-primary" round  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>-->
                 </el-form-item>
               </el-form>
             </div>
@@ -218,7 +218,7 @@
           round
           @click="exportStandard"
           title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-          v-btn-permission="'UFIZU4O3AH'"
+          v-btn-permission="'784d26f527a659eefe84d5e5a53deb96'"
         ><i class="iconfont">&#xe6e9;</i>导出</el-button>
 <!--        <el-button-->
 <!--          class="common-button-default"-->
@@ -227,23 +227,23 @@
 <!--          @click="uploadImportModal(1)"-->
 <!--          v-btn-permission="'afX1p2gh3c'"-->
 <!--        ><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
-<!--        <el-button-->
-<!--          class="common-button-default delete-button"-->
-<!--          round-->
-<!--          @click="deleteStand(2)"-->
-<!--          v-btn-permission="'EKTB87NTEE'"-->
-<!--        ><i class="iconfont">&#xe61b;</i>批量删除</el-button>-->
+        <el-button
+          class="common-button-default delete-button"
+          round
+          @click="deleteStand(2)"
+          v-btn-permission="'374205ce36a859a158ca4db196d151b7'"
+        ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
         <el-button
           class="common-button-default"
           round
           @click="configurationStandard"
-          v-btn-permission="'PF56TFSV7C'"
+          v-btn-permission="'381d34443196ca840118ae577ff30d5e'"
         ><i class="iconfont">&#xe669;</i>配置标准</el-button>
         <el-button
           class="common-button-default"
           round
           @click="deleteEnterStandFromKind(2)"
-          v-btn-permission="'UQCAPM93Q0'"
+          v-btn-permission="'2d41ebdb6150ba1af52fd753086d77dc'"
         ><i class="iconfont">&#xe611;</i>移除标准</el-button>
       </div>
         <!--表格-->
@@ -382,20 +382,20 @@
                     <el-dropdown-item
                       v-if="scope.row.collectBtn"
                       :command="[scope.row, '收藏']"
-                      v-btn-permission="'H6J6YAB9FQ'"
+                      v-btn-permission="'d9730d984627af948053df56a2db7997'"
                     >
                       收藏
                     </el-dropdown-item>
                     <el-dropdown-item
                       v-else
                       :command="[scope.row, '取消收藏']"
-                      v-btn-permission="'H6J6YAB9FQ'"
+                      v-btn-permission="'d96e086ce3dfa75201bdf8e67cd9fe6d'"
                     >
                       取消收藏
                     </el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'VL3HVS74DU'">编辑</el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item>
+<!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>-->
+<!--                    <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>-->
 <!--                    <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>-->
                     <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
                   </el-dropdown-menu>
@@ -757,7 +757,8 @@
             @click="saveConfigStand"
             :loading="isSubmit"
           >提交</el-button>
-          <el-button class="common-button-default" icon="el-icon-close" @click="cancelConfigStand">取消</el-button>
+          <el-button class="common-button-default" style="padding: 7px 12px;" icon="el-icon-close" type="primary"
+                     round  @click="cancelConfigStand">取消</el-button>
         </div>
       </el-drawer>
       <!--                树---新增二级菜单模态窗                 -->

From dc836ba7c53d85093aa53bdc8b7e19773b60c839 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 09:00:06 +0800
Subject: [PATCH 02/21] =?UTF-8?q?bug:=20=E5=8F=AA=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97=EF=BC=8C=E5=90=A6=E5=88=99?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/verify/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/verify/index.js b/src/common/verify/index.js
index 2f030082a..6692dd5b2 100644
--- a/src/common/verify/index.js
+++ b/src/common/verify/index.js
@@ -457,9 +457,9 @@ export default {
       callback()
     }
   },
-  // 验证输入数字和英文
+  // 验证输入数字
   testNumberCode (rule, value, callback) {
-    let reg = /[0-9\-]/
+    let reg = /^[0-9]*$/
     if (value !== '' && !value.match(reg)) {
       return callback(new Error('只能输入数字'))
     } else {

From 13b861954550d1ff94168b7ef108a6272966c3fc Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 09:37:19 +0800
Subject: [PATCH 03/21] =?UTF-8?q?bug=EF=BC=9A=20=E5=8F=AA=E8=A6=81?=
 =?UTF-8?q?=E6=98=AF=E8=BE=93=E5=85=A5=E4=BA=86@=E5=B0=B1=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/verify/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/verify/index.js b/src/common/verify/index.js
index 6692dd5b2..b217a4af9 100644
--- a/src/common/verify/index.js
+++ b/src/common/verify/index.js
@@ -24,8 +24,9 @@ export default {
    * */
   validateStandardItem (rule, value, callback) {
     // return callback()
-    let testval = /^[A-Za-z0-9/ ,.-\\-（）()]+$/
-    if (value && !value.match(testval)) {
+    let testval = /^[A-Za-z0-9/]+$/
+    let testval1 = /[.-]+/
+    if (value && !value.match(testval) && !value.match(testval1)) {
       return callback(new Error('只能为（字母、数字、.、-）'))
     } else {
       callback()

From b805b85c7540111687d87d926ba6018fc17b0de5 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 26 Jul 2021 10:10:39 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listOfCountries.vue                  |  6 +--
 .../page/listOther.vue                        | 13 +++---
 .../page/listProject.vue                      | 13 +++---
 .../pages/addEdit.vue                         |  6 +--
 .../pages/details.vue                         | 44 +++++++++++++++----
 .../pages/otherAddEit.vue                     |  2 +-
 .../pages/projectAddEit.vue                   |  2 +-
 7 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index d1758b600..cc10b90c5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -289,10 +289,8 @@ export default {
       this.searchSarAccess();
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
-        countryArea: "",
-        detailedListName: ""
-      };
+      this.sarSarAccessEOSearch.countryArea = ''
+      this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess();
     },
     // 新增相关
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index e9e38173a..36b0a7b56 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -165,12 +165,11 @@ export default {
       total: 0,
       page: 1,
       rows: 10,
+      pageSize: this.$store.getters.userInfo.configContent,
       // 查询相关参数
       sarSarAccessEOSearch: {
         detailedList: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -267,9 +266,9 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
-        ...this.sarSarAccessEOSearch,
         page: 1,
-        pageSize: 10,
+        pageSize: this.pageSize,
+        ...this.sarSarAccessEOSearch,
         sortKey: 3
       }, {
         _this: this
@@ -289,10 +288,8 @@ export default {
       this.searchSarAccess();
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
-        detailedList: "",
-        detailedListName: ""
-      };
+      this.sarSarAccessEOSearch.detailedList = ''
+      this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess();
     },
     // 新增相关
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 29a9da82b..d90958400 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -165,13 +165,12 @@ export default {
       searching: false,
       total: 0,
       page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
         projectName: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -268,9 +267,9 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        page: this.page,
+        pageSize: this.pageSize,
         ...this.sarSarAccessEOSearch,
-        page: 1,
-        pageSize: 10,
         sortKey: 2
       }, {
         _this: this
@@ -291,10 +290,8 @@ export default {
     },
     //清空
     clearSearch() {
-      this.sarSarAccessEOSearch = {
-        projectName: "",
-        detailedListName: "",
-      };
+      this.sarSarAccessEOSearch.projectName = ''
+      this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess()
 
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 9300400fc..96f578574 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1376,9 +1376,9 @@ export default {
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
       this.sarAccessInfoListArry = selectData
-      let sarAccessInfoListArryId =  []
+     /* let sarAccessInfoListArryId =  []
       for(let i=0; i<this.selectData.length; i++){
-      }
+      }*/
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1580,7 +1580,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index a238ff300..3d3213f1e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -57,7 +57,21 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item" prop="responseUnit">
-            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
+            <el-select
+              class="showBox"
+              v-model="standardForm.zrbm"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in zrbmOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+<!--            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
             <el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
               <el-input
                 v-model="standardForm.responseUnit"
@@ -76,7 +90,7 @@
                            class="ztree" style="height: 300px;overflow: auto">
                 </laws-tree>
               </div>
-            </el-popover>
+            </el-popover>-->
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -106,7 +120,7 @@
           <el-form  :model="standardForm" class="label-input-form" label-width="108px" inline>
             <el-form-item label="英文名称"  class="search-item">
               <el-input
-                v-model="standardForm.standEnName"
+                v-model="standardForm.standName"
                 placeholder="请输入"
                 :maxlength="100"
                 size="small"
@@ -144,6 +158,22 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="责任部门"  >
+              <el-select
+                class="showBox"
+                v-model="standardForm.zrbm"
+                placeholder="请选择"
+                filterable
+                size="small"
+              >
+                <el-option
+                  v-for="item in zrbmOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="适用产品线"  >
               <el-select
                 class="showBox"
@@ -490,11 +520,9 @@ export default {
     },
     // 重置搜索
     resetSelect() {
-      this.standardForm = {
-        standName: "",
-        responseUnit: ""
-      };
-      this.selectInfobyAccid();
+      this.standardForm.standName = ''
+      this.standardForm.responseUnit = ''
+      this.selectInfobyAccid()
     },
     exportStandard() {
       if (this.selectedList.length > 0) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 351a42d50..f8c391e79 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1392,7 +1392,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index ad7f9a9fe..3c8704868 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1390,7 +1390,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')

From b529a40fca0cad187899b1abaf3de509044ebe9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 26 Jul 2021 10:15:52 +0800
Subject: [PATCH 05/21] commit

---
 src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 2 +-
 src/sysConfig/index.js                                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 6bf257c8a..6d9762ffe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1256,7 +1256,7 @@ export default {
         this.listForm.standId = bringData[0].id;
         this.listForm.listName = bringData[0].detailedListName;
         this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.fileId = bringData[0].fileId;
+        this.listForm.fileId = bringData[0].fileIds;
         this.ListModel = false;
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
           { id: bringData[0].id, page: this.page, Size:this.pageSize}, {
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 9dc9abba8..b129240b6 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,8 +7,8 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '10.96.170.173'
-const devInterfacePORT = '9999'
+const devIp = '101.36.227.25'
+const devInterfacePORT = '8038'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'

From 298aca22b79a2ed3d5e74746f2df104726f560d1 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 10:54:37 +0800
Subject: [PATCH 06/21] bug

---
 src/pages/details/otherStandardDetails/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index ec83598da..4b5640250 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -38,13 +38,13 @@
           <template v-if="item.label === '基础信息'" >
             <div class="details-content-modular basic-information" style="border-top:none">
               <div class="basic-information-content">
-                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>
+<!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                 <p style="color: #C42626;">
                   <label style=" margin-right: 150px;">标准编号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
                   <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                 </p>
-                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
+<!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
                 <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                 <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
                 <p><label style=" margin-right: 150px;">标准性质</label><span>{{ standMap[sarStandardsInfoEO.standNature] || '-' }}</span></p>

From 20201b1c058a7f75f0bec9cc914092413b8e31fe Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 11:04:09 +0800
Subject: [PATCH 07/21] =?UTF-8?q?bug=EF=BC=9A=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=94=B9=E6=88=90=E5=BC=B9=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 297 +++++++++++++++---
 1 file changed, 259 insertions(+), 38 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 8deefea47..e1ea33eb6 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1024,47 +1024,257 @@
           <el-button size="mini" type="primary"  class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
         </div>
       </el-dialog>
-      <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
-                       @reset="clearAllSearch('sarStandardsSearch')" >
-        <div slot="content">
+<!--      <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
+<!--                       @reset="clearAllSearch('sarStandardsSearch')" >-->
+<!--        <div slot="content">-->
+<!--          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
+<!--&lt;!&ndash;            标准号&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            标准名称&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            标准英文名称&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            标准类别&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">-->
+<!--              <search-select-->
+<!--                v-model="sarStandardsSearch.standSort"-->
+<!--                :placeholder="$t('m.standardCategoryTips')"-->
+<!--                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
+<!--                :options="standSortOptions"-->
+<!--                clearable/>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            文本状态&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            代替标准号&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            标准年份&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.standYear"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据标准年份查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            标准发布日期&ndash;&gt;-->
+<!--            <el-form-item label="标准发布日期"  class="serch-form-item">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.issueTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据标准发布日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            标准性质&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            是否纳入标准清单&ndash;&gt;-->
+<!--            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">-->
+<!--              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">-->
+<!--                <el-option value="yes" label="是"></el-option>-->
+<!--                <el-option value="no" label="否"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            实施日期&ndash;&gt;-->
+<!--            <el-form-item label="实施日期">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.putTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据实施日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            新车型实施日期&ndash;&gt;-->
+<!--            <el-form-item title="新车型实施日期" label="新车型实施日期">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.XCXTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据新车型实施日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            在产车实施日期&ndash;&gt;-->
+<!--            <el-form-item title="在产车实施日期" label="在产车实施日期">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.ZCCTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据在产车实施日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            归口管理部门&ndash;&gt;-->
+<!--            <el-form-item label="归口管理部门">-->
+<!--              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            起草单位&ndash;&gt;-->
+<!--            <el-form-item label="起草单位">-->
+<!--              <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            我司参与深度&ndash;&gt;-->
+<!--            <el-form-item label="我司参与深度">-->
+<!--              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+
+<!--&lt;!&ndash;            能源类型&ndash;&gt;-->
+<!--            <el-form-item label="能源类型">-->
+<!--              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            适用车型&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            适用认证&ndash;&gt;-->
+<!--            <el-form-item label="适用认证">-->
+<!--              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            责任部门&ndash;&gt;-->
+<!--            <el-form-item label="责任部门">-->
+<!--              <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <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>-->
+<!--&lt;!&ndash;            责任工程师&ndash;&gt;-->
+<!--            <el-form-item label="责任工程师">-->
+<!--              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            关联模块-VPPS编码&ndash;&gt;-->
+<!--            <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">-->
+<!--              <el-input v-model="sarStandardsSearch.svpps" clearable-->
+<!--                        placeholder="根据关联模块-VPPS编码查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            代替标准号&ndash;&gt;-->
+<!--            <el-form-item label="代替标准号">-->
+<!--              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            关联模块-中文名称&ndash;&gt;-->
+<!--            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">-->
+<!--              <el-input v-model="sarStandardsSearch.standNumber" clearable-->
+<!--                        placeholder="根据关联模块-中文名称"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            采标编号&ndash;&gt;-->
+<!--            <el-form-item label="采标编号" prop="nameShow">-->
+<!--              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            采标程度&ndash;&gt;-->
+<!--            <el-form-item label="采标程度" prop="standNumber">-->
+<!--              <el-input v-model="sarStandardsSearch.standNumber" clearable-->
+<!--                        placeholder="根据采标程度查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            引用标准&ndash;&gt;-->
+<!--            <el-form-item label="引用标准">-->
+<!--              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            被引用标准&ndash;&gt;-->
+<!--            <el-form-item label="被引用标准">-->
+<!--              <el-input v-model="sarStandardsSearch.citedStand" clearable-->
+<!--                        placeholder="根据被引用标准查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            关联模块（新增字段）&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </div>-->
+<!--      </table-tools-bar>-->
+<!--    高级筛选-->
+      <el-drawer
+          title="高级搜索"
+          size="700px"
+          :wrapperClosable="false"
+          :visible.sync="isAdvancedSearch">
+        <div class="demo-drawer-content">
           <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
-<!--            标准号-->
+            <!--            标准号-->
             <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
               <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
-<!--            标准名称-->
+            <!--            标准名称-->
             <el-form-item :label="$t('m.standName')" class="serch-form-item">
               <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
-<!--            标准英文名称-->
+            <!--            标准英文名称-->
             <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
               <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
-<!--            标准类别-->
+            <!--            标准类别-->
             <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
               <search-select
-                v-model="sarStandardsSearch.standSort"
-                :placeholder="$t('m.standardCategoryTips')"
-                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
-                :options="standSortOptions"
-                clearable/>
+                  v-model="sarStandardsSearch.standSort"
+                  :placeholder="$t('m.standardCategoryTips')"
+                  @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                  :options="standSortOptions"
+                  clearable/>
             </el-form-item>
-<!--            文本状态-->
+            <!--            文本状态-->
             <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
               <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in standStateOptions" :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="$t('m.substituteStandardNumber')"  class="serch-form-item">
               <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
-<!--            标准年份-->
+            <!--            标准年份-->
             <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
               <el-date-picker
                   v-model="sarStandardsSearch.standYear"
@@ -1080,21 +1290,21 @@
                   placeholder="根据标准发布日期查找">
               </el-date-picker>
             </el-form-item>
-<!--            标准性质-->
+            <!--            标准性质-->
             <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
               <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
-<!--            是否纳入标准清单-->
+            <!--            是否纳入标准清单-->
             <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
               <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
                 <el-option value="yes" label="是"></el-option>
                 <el-option value="no" label="否"></el-option>
               </el-select>
             </el-form-item>
-<!--            实施日期-->
+            <!--            实施日期-->
             <el-form-item label="实施日期">
               <el-date-picker
                   v-model="sarStandardsSearch.putTime"
@@ -1102,7 +1312,7 @@
                   placeholder="根据实施日期查找">
               </el-date-picker>
             </el-form-item>
-<!--            新车型实施日期-->
+            <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
                   v-model="sarStandardsSearch.XCXTime"
@@ -1110,7 +1320,7 @@
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
             </el-form-item>
-<!--            在产车实施日期-->
+            <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
                   v-model="sarStandardsSearch.ZCCTime"
@@ -1118,19 +1328,19 @@
                   placeholder="根据在产车实施日期查找">
               </el-date-picker>
             </el-form-item>
-<!--            归口管理部门-->
+            <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
               <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            起草单位-->
+            <!--            起草单位-->
             <el-form-item label="起草单位">
               <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in qcdwOptions" :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="我司参与深度">
               <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
@@ -1138,88 +1348,88 @@
               </el-select>
             </el-form-item>
 
-<!--            能源类型-->
+            <!--            能源类型-->
             <el-form-item label="能源类型">
               <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in nylxOptions" :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="$t('m.applicableModels')"  class="serch-form-item">
               <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :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="$t('m.applicableProductLine')"  class="serch-form-item">
               <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in sycpxOptions" :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="适用认证">
               <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in syzrOptions" :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="责任部门">
               <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <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="责任工程师">
               <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
-<!--            关联模块-VPPS编码-->
+            <!--            关联模块-VPPS编码-->
             <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
               <el-input v-model="sarStandardsSearch.svpps" clearable
                         placeholder="根据关联模块-VPPS编码查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            代替标准号-->
+            <!--            代替标准号-->
             <el-form-item label="代替标准号">
               <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            关联模块-中文名称-->
+            <!--            关联模块-中文名称-->
             <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
               <el-input v-model="sarStandardsSearch.standNumber" clearable
                         placeholder="根据关联模块-中文名称"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            采标编号-->
+            <!--            采标编号-->
             <el-form-item label="采标编号" prop="nameShow">
               <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            采标程度-->
+            <!--            采标程度-->
             <el-form-item label="采标程度" prop="standNumber">
               <el-input v-model="sarStandardsSearch.standNumber" clearable
                         placeholder="根据采标程度查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            引用标准-->
+            <!--            引用标准-->
             <el-form-item label="引用标准">
               <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            被引用标准-->
+            <!--            被引用标准-->
             <el-form-item label="被引用标准">
               <el-input v-model="sarStandardsSearch.citedStand" clearable
                         placeholder="根据被引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-<!--            关联模块（新增字段）-->
+            <!--            关联模块（新增字段）-->
             <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
               <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
@@ -1229,7 +1439,18 @@
             </el-form-item>
           </el-form>
         </div>
-      </table-tools-bar>
+        <div class="demo-drawer-footer">
+          <el-button
+              class="common-button-primary"
+              icon="el-icon-check"
+              type="primary"
+              @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
+          <el-button
+              class="common-button-default"
+              icon="el-icon-close"
+              @click="clearAllSearch('sarStandardsSearch')">取消</el-button>
+        </div>
+      </el-drawer>
     </div>
 <!--    分享 全部选人 -->
     <org-table

From b25dafdd5e382ee52215b8b3de570939c42449ea Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 11:16:27 +0800
Subject: [PATCH 08/21] =?UTF-8?q?bug=EF=BC=9A=20=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=B9=E5=AE=8C=E6=A0=87=E5=87=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 4b5640250..ac24b9540 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -40,7 +40,7 @@
               <div class="basic-information-content">
 <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                 <p style="color: #C42626;">
-                  <label style=" margin-right: 150px;">标准编号</label>
+                  <label style=" margin-right: 150px;">标准号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
                   <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                 </p>

From 735be50bcb34de3d25c766e29f734dc2fc7d9b82 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 26 Jul 2021 11:29:18 +0800
Subject: [PATCH 09/21] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=20=E6=97=A5=E6=9C=9F=20=E5=9B=BD=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 54 ++++++++---------
 .../pages/creatProcess/bzrk/step2.vue         | 60 +++++++++----------
 .../pages/creatProcess/bzrk/step3.vue         | 58 +++++++++---------
 .../pages/creatProcess/bzrk/step4.vue         | 50 ++++++++--------
 .../domesticStandardsAndRegulations/index.vue |  1 +
 .../foreignStandardsAndRegulations/index.vue  |  1 +
 6 files changed, 113 insertions(+), 111 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 3f8d70f52..6e3df92b6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -158,14 +158,6 @@
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
-                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.xcxssrq"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(标准文本"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
                                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="form.zccssrq"
@@ -176,30 +168,38 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
-                                            v-model="form.ssrqgj"
+                                            v-model="form.xcxssrq"
                                             type="date"
-                                            placeholder="请选择实施日期(国际)"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.xcxssrqgj"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(国家)"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.zccssrqgj"
-                                            type="date"
-                                            placeholder="请选择在产车实施日期(国家)"
+                                            placeholder="请选择新车型实施日期(标准文本"
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
+<!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="form.ssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择实施日期(国际)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="form.xcxssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择新车型实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="form.zccssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择在产车实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 02be6a045..89cf5239d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -147,15 +147,6 @@
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
-                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.xcxssrq"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(标准文本"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
                                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             disabled
@@ -167,33 +158,42 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             disabled
-                                            v-model="form.ssrqgj"
+                                            v-model="form.xcxssrq"
                                             type="date"
-                                            placeholder="请选择实施日期(国际)"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.xcxssrqgj"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(国家)"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.zccssrqgj"
-                                            type="date"
-                                            placeholder="请选择在产车实施日期(国家)"
+                                            placeholder="请选择新车型实施日期(标准文本"
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
+<!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            disabled-->
+<!--                                            v-model="form.ssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择实施日期(国际)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            disabled-->
+<!--                                            v-model="form.xcxssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择新车型实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            disabled-->
+<!--                                            v-model="form.zccssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择在产车实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 27cbe6975..f15c752aa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -145,14 +145,6 @@
                       placeholder="请选择标准实施日期(标准文本)">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      disabled
-                      v-model="form.xcxssrq"
-                      type="date"
-                      placeholder="请选择新车型实施日期(标准文本">
-                  </el-date-picker>
-                </el-form-item>
                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
                       disabled
@@ -163,30 +155,38 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
-                      v-model="form.ssrqgj"
-                      type="date"
-                      placeholder="请选择实施日期(国际)">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      disabled
-                      v-model="form.xcxssrqgj"
-                      type="date"
-                      placeholder="请选择新车型实施日期(国家)">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      disabled
-                      v-model="form.zccssrqgj"
-                      type="date"
-                      placeholder="请选择在产车实施日期(国家)">
+                          disabled
+                          v-model="form.xcxssrq"
+                          type="date"
+                          placeholder="请选择新车型实施日期(标准文本">
                   </el-date-picker>
                 </el-form-item>
+<!--                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      disabled-->
+<!--                      v-model="form.ssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择实施日期(国际)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      disabled-->
+<!--                      v-model="form.xcxssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择新车型实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      disabled-->
+<!--                      v-model="form.zccssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择在产车实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
               </el-col>
             </el-row>
           </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 392f83413..4dde65c7c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -149,13 +149,6 @@
                       placeholder="请选择标准实施日期(标准文本)">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.xcxssrq"
-                      type="date"
-                      placeholder="请选择新车型实施日期(标准文本">
-                  </el-date-picker>
-                </el-form-item>
                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
                       v-model="form.zccssrq"
@@ -165,27 +158,34 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      v-model="form.ssrqgj"
-                      type="date"
-                      placeholder="请选择实施日期(国际)">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.xcxssrqgj"
-                      type="date"
-                      placeholder="请选择新车型实施日期(国家)">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.zccssrqgj"
-                      type="date"
-                      placeholder="请选择在产车实施日期(国家)">
+                          v-model="form.xcxssrq"
+                          type="date"
+                          placeholder="请选择新车型实施日期(标准文本">
                   </el-date-picker>
                 </el-form-item>
+<!--                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      v-model="form.ssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择实施日期(国际)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      v-model="form.xcxssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择新车型实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      v-model="form.zccssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择在产车实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
               </el-col>
             </el-row>
           </div>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 8deefea47..cd4fc4fdc 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -524,6 +524,7 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
+                    v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index d7acd19ee..59181280b 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -483,6 +483,7 @@
                 </template>
                 <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
                   <custom-date-pick
+                    v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"

From f65a63bfb1d1bc31f3420c0282912fa79c81facd Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Mon, 26 Jul 2021 13:37:08 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/index.vue   |  3 +-
 .../pages/details.vue                         | 42 ++++++++++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 8fe0f3fb0..1b966f002 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1278,13 +1278,14 @@ export default {
       }, res => {
         if (this.localProTableSearch.prodectCode === 'Maintenance') {
           this.localProTableList = res.data.Maintenance.records
+          this.total = res.data.Maintenance.total
         }
         else if (this.localProTableSearch.prodectCode === 'notMaintenance')
         {
           this.localProTableList = res.data.notMaintenance.records
+          this.total = res.data.notMaintenance.total
 
         }
-        this.total = res.data.count
         // this.localProTableList.map((item) => {
         //   this.xmztOptions.map((opr) => {
         //     if (item.productBrand === opr.value) {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index d50c934ca..9cf6991c4 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -78,47 +78,56 @@
           >
           </el-table-column>
           <el-table-column
-              prop="SSRQ"
+              prop="ssrq"
               width="190px"
               sortable
               label="标准实施日期">
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-              prop="XCXSSRQGJ"
+              prop="xcxssrqgj"
               width="190px"
               label="新车型实施日期">
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">{{scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '-' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-              prop="ZCCSSRQGJ"
+              prop="zccssrqgj"
               sortable
               width="190px"
               label="在产车实施日期">
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '-' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-              prop="ZRBM"
+              prop="zrbm"
               label="责任部门"
               width="180px"
           >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="KCCVPPSBM"
+              prop="kccvppsbm"
               width="180px"
               label="卡车VPPS编码">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="KCCVPPSCN"
+              prop="cycvppscn"
               width="180px"
               label="卡车vpps中文名称">
           </el-table-column>
           <el-table-column
-              prop="CYCVPPSBM"
+              prop="cycvppsbm"
               width="180px"
               label="乘车VPPS编码">
           </el-table-column>
           <el-table-column
-              prop="CYCVPPSBM"
+              prop="cycvppscn"
               width="180px"
               label="乘车vpps中文名称">
           </el-table-column>
@@ -451,10 +460,8 @@ export default {
             _this: this
           }, res => {
             if (res.ok) {
-              this.$message.success(res.message)
+              // this.$message.success(res.message)
               this.getDataList()
-            }else {
-              this.$message.warning(res.message)
             }
           }, e => {
           });
@@ -502,6 +509,17 @@ export default {
         this.$message.warning("请选择一条数据进行带入");
       }
     },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     back () {
       this.$router.push(this.$store.state.detailMap)
       this.$store.commit('setDetailMap', '')
@@ -568,6 +586,7 @@ export default {
           }
           const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
               'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
+          console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
           window.open(exportURL)
           this.$message.success('导出信息成功')
         }
@@ -575,6 +594,7 @@ export default {
         console.log(this.selectList);
         const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
             'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
+        console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }

From f68f9d140f6dc0c7931a3033714484960257dc59 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 13:58:43 +0800
Subject: [PATCH 11/21] =?UTF-8?q?bug:=20=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         |  6 ++---
 .../pages/creatProcess/bzrk/step2.vue         | 22 ++++++++++++++++++-
 .../pages/creatProcess/bzrk/step3.vue         | 22 ++++++++++++++++++-
 .../pages/creatProcess/bzrk/step4.vue         |  6 ++---
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 3f8d70f52..e0648a250 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -835,7 +835,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
+                    accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
                     :show-file-list="false"
@@ -1888,11 +1888,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PDF/PPT/PPTX/DOC/DOCX或XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 02be6a045..2b9d8cacf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -928,7 +928,27 @@
                 this.active = name
             },
             handleSave() {
-              this.$message.success('保存成功')
+              this.saveLoading = true
+              let _formData = new FormData()
+              // _formData.append('id', this.bpnId)
+              _formData.append('createUser', this.$store.getters.userInfo.userId)
+              _formData.append('createUserName', this.$store.getters.userInfo.uName)
+              _formData.append('prcType', this.$route.query.type)
+              _formData.append('json', JSON.stringify({
+                prcForm: this.prcForm,
+                sarAccessInfoList: this.sarAccessInfoList,
+                sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+                bzqdForm: this.bzqdForm,
+                listInfo: this.listInfo,
+                id: this.id
+              }))
+              saveTaskFirst(_formData).then(res => {
+                this.saveLoading = false
+                this.$message.success('保存成功')
+                // this.bpnId = res.result
+              }).catch(e => {
+                this.saveLoading = false
+              })
             },
             handleSubmit() {
                 this.isSubmit = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 27cbe6975..a73467162 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -921,7 +921,27 @@ export default {
       this.active = name
     },
     handleSave() {
-      this.$message.success('保存成功')
+      this.saveLoading = true
+      let _formData = new FormData()
+      // _formData.append('id', this.bpnId)
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', this.$route.query.type)
+      _formData.append('json', JSON.stringify({
+        prcForm: this.prcForm,
+        sarAccessInfoList: this.sarAccessInfoList,
+        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+        bzqdForm: this.bzqdForm,
+        listInfo: this.listInfo,
+        id: this.id
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        // this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
     },
     handleSubmit() {
       this.isSubmit = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 392f83413..692d8c298 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -896,7 +896,7 @@
               :action="fileUrl"
               ref="importfile"
               name="file"
-              accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
+              accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
               :show-file-list="false"
@@ -1463,11 +1463,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PDF/PPT/PPTX/DOC/DOCX或XLS文件')
         return false
       }
       // 判断文件上传大小

From a8483e0c9b77d7b6643278d5032be39ded12cba7 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 14:06:39 +0800
Subject: [PATCH 12/21] =?UTF-8?q?bug=EF=BC=9A=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=A0=87=E5=87=86=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=94=B9=E6=88=90=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E7=9A=84=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=9B=9E=E6=98=BE=E7=9A=84=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue            | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 2a47919d2..d4b576538 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1076,9 +1076,12 @@
                                     align="center">
                             </el-table-column>
                             <el-table-column
-                                    prop="standStateShow"
-                                    label="标准状态"
+                                    prop="textStatus"
+                                    label="文本状态"
                                     align="center">
+                              <template slot-scope="scope">
+                                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                              </template>
                             </el-table-column>
                             <el-table-column label="操作" align="center" width="80">
                                 <template slot-scope="scope">
@@ -1142,6 +1145,7 @@
         },
         data () {
             return {
+              textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
                 loadSarStandard: false,
                 verifySarStandard: false,
@@ -1440,6 +1444,13 @@
             },
         },
         methods: {
+          // 将文本状态的id与name对应
+          setMap(data){
+            data.forEach(item => {
+              this.$set(this.textStatusMap, item.value, item.label)
+            })
+            console.log(this.textStatusMap, '文本状态的值')
+          },
             clearFormData(data){
                 this.form = {
                     // 基础信息
@@ -2129,6 +2140,7 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.qcdwOption = res.data.QCDW // 体系类别
+              this.setMap(this.standStateOptions)
             })
             this.busVsFunc()
             this.modelFunc()

From 662d241358174e91590d4729ca5224656bf65207 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 26 Jul 2021 14:21:29 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         | 36 ++++++++++------
 .../pages/details.vue                         | 42 +++++++++++++++----
 .../pages/otherAddEit.vue                     | 36 ++++++++++------
 .../pages/projectAddEit.vue                   | 36 ++++++++++------
 4 files changed, 102 insertions(+), 48 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 96f578574..77f06915a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -237,13 +237,13 @@
           >
           </el-table-column>
           <el-table-column
-              prop="code"
+              prop="standNumber"
+              show-overflow-tooltip
               fixed="left"
               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>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -370,12 +370,13 @@
             align="center">
         </el-table-column>
         <el-table-column
+            prop="standNumber"
+            show-overflow-tooltip
             width="180px"
             fixed="left"
             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>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -1357,15 +1358,17 @@ export default {
           roundButton: true,
           type: 'warning'
         }).then(() => {
-          // i   全部对象数组的下标
-          // s   选中对象数组的下标
-          for (var s in this.sarAccessInfoListArry) {
-            for (var i in this.sarAccessInfoList) {
-              if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
-                this.sarAccessInfoList.splice(i, 1)
-              }
+          let exits = []
+          this.sarAccessInfoListArry.map(item => {
+            let index
+            index = this.sarAccessInfoList.findIndex(items => {
+              return items.id = item
+            })
+            if (index > -1) {
+              this.sarAccessInfoList.splice(index, 1)
             }
-          }
+            exits.push(item)
+          })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
         }).catch(() => {})
@@ -1467,6 +1470,13 @@ export default {
     selectLawsStands () {
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 3d3213f1e..32b738445 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -117,10 +117,10 @@
           </el-button>
         </el-form>
         <div v-if="!showSelectBox">
-          <el-form  :model="standardForm" class="label-input-form" label-width="108px" inline>
-            <el-form-item label="英文名称"  class="search-item">
+          <el-form  :model="standardFormList" class="label-input-form" label-width="108px" inline>
+            <el-form-item label="中文名称"  class="search-item">
               <el-input
-                v-model="standardForm.standName"
+                v-model="standardFormList.standName"
                 placeholder="请输入"
                 :maxlength="100"
                 size="small"
@@ -129,7 +129,7 @@
             <el-form-item label="适用车型" class="labelBox"  label-width="61px">
               <el-select
                 class="showBox"
-                v-model="standardForm.typeApplicable"
+                v-model="standardFormList.typeApplicable"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -145,7 +145,7 @@
             <el-form-item label="能源类型"  >
               <el-select
                 class="showBox"
-                v-model="standardForm.nylx"
+                v-model="standardFormList.nylx"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -161,7 +161,7 @@
             <el-form-item label="责任部门"  >
               <el-select
                 class="showBox"
-                v-model="standardForm.zrbm"
+                v-model="standardFormList.zrbm"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -177,7 +177,7 @@
             <el-form-item label="适用产品线"  >
               <el-select
                 class="showBox"
-                v-model="standardForm.sycpx"
+                v-model="standardFormList.sycpx"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -428,6 +428,13 @@ export default {
         page: 1,
         Size: this.$store.getters.userInfo.configContent
       },
+      standardFormList: {
+        standNumber: '',
+        standName: '',
+        responseUnit: '',
+        page: 1,
+        Size: this.$store.getters.userInfo.configContent
+      },
       page: 1,
       // pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -493,6 +500,7 @@ export default {
     // 根据准入id查询标准法规详情
     selectInfobyAccid() {
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+        ...this.standardFormList,
         ...this.standardForm,
         id: this.pageId,
       }, {
@@ -507,8 +515,24 @@ export default {
 
     back() {
       this.$router.push({
-        name: "AccessStandardsAndRegulations"
-      });
+        name: 'AccessStandardsAndRegulations',
+      })
+     /* if (this.sarAccessEO.sortKey === '1') {
+        this.$router.push({
+          name: 'AccessStandardsAndRegulations',
+          menuName: '国家/地区清单'
+        })
+      } else if(this.sarAccessEO.sortKey === '2') {
+        this.$router.push({
+          name: 'AccessStandardsAndRegulations',
+          menuName: '项目类清单'
+        })
+      } else {
+        this.$router.push({
+          name: 'AccessStandardsAndRegulations',
+          menuName: '其他清单'
+        })
+      }*/
       // this.$router.push(this.$store.state.detailMap)
       // this.$store.commit('setDetailMap', '')
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index f8c391e79..0677f2e9d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -211,13 +211,13 @@
           >
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
+            show-overflow-tooltip
             fixed="left"
             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>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -338,12 +338,13 @@
           align="center">
         </el-table-column>
         <el-table-column
+          prop="standNumber"
+          show-overflow-tooltip
           width="180px"
           fixed="left"
           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>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -1187,15 +1188,17 @@ export default {
           roundButton: true,
           type: 'warning'
         }).then(() => {
-          // i   全部对象数组的下标
-          // s   选中对象数组的下标
-          for (var s in this.sarAccessInfoListArry) {
-            for (var i in this.sarAccessInfoList) {
-              if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
-                this.sarAccessInfoList.splice(i, 1)
-              }
+          let exits = []
+          this.sarAccessInfoListArry.map(item => {
+            let index
+            index = this.sarAccessInfoList.findIndex(items => {
+              return items.id = item
+            })
+            if (index > -1) {
+              this.sarAccessInfoList.splice(index, 1)
             }
-          }
+            exits.push(item)
+          })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
         }).catch(() => {})
@@ -1278,6 +1281,13 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 3c8704868..d636411a5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -215,13 +215,13 @@
           >
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
+            show-overflow-tooltip
             fixed="left"
             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>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -342,12 +342,13 @@
           align="center">
         </el-table-column>
         <el-table-column
+          prop="standNumber"
+          show-overflow-tooltip
           width="180px"
           fixed="left"
           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>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -1185,15 +1186,17 @@ export default {
           roundButton: true,
           type: 'warning'
         }).then(() => {
-          // i   全部对象数组的下标
-          // s   选中对象数组的下标
-          for (var s in this.sarAccessInfoListArry) {
-            for (var i in this.sarAccessInfoList) {
-              if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
-                this.sarAccessInfoList.splice(i, 1)
-              }
+          let exits = []
+          this.sarAccessInfoListArry.map(item => {
+            let index
+            index = this.sarAccessInfoList.findIndex(items => {
+              return items.id = item
+            })
+            if (index > -1) {
+              this.sarAccessInfoList.splice(index, 1)
             }
-          }
+            exits.push(item)
+          })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
         }).catch(() => {})
@@ -1276,6 +1279,13 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
 

From 1aedcffb5bca2b2bce6a184d1b0376b67918b65b Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 15:21:53 +0800
Subject: [PATCH 14/21] =?UTF-8?q?bug=EF=BC=9A=20=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=AC=A1=E7=BC=96=E8=BE=91=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E9=83=BD?=
 =?UTF-8?q?=E5=8F=98=E6=88=90=E4=BA=861910-01-01=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 59181280b..e14017cc7 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -2756,7 +2756,7 @@ export default {
                               const value = nowstandinfo[item.attrField]
                               // 时间格式处理
                               if (item.attrType === 'DATE_PICKER' && value) {
-                                  nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
+                                  nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField]
                               }
                               // 数组处理
                               if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {

From 6f0f26497a1a07f2177f9ee6337b3097d955d6b9 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 26 Jul 2021 15:40:02 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listOfCountries.vue                  |  6 ------
 .../pages/addEdit.vue                         | 19 ++++++++++++++++++
 .../pages/details.vue                         |  4 ++--
 .../pages/otherAddEit.vue                     | 20 +++++++++++++++++++
 .../pages/projectAddEit.vue                   | 20 +++++++++++++++++++
 5 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index cc10b90c5..60757cd0d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -86,12 +86,6 @@
           prop="countryArea"
           label="国家/地区"
           align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',')  > 0">
-              <span>{{ scope.row.countryArea }}</span>
-            </span>
-            <span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="detailedListName"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 77f06915a..4fcd9526c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1477,6 +1477,18 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
       })
@@ -2004,6 +2016,13 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
       }, e => {
       })
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 32b738445..2e6ab6b5b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -151,7 +151,7 @@
                 size="small"
               >
                 <el-option
-                  v-for="item in energyKindOptions"
+                  v-for="item in categoryOptions"
                   :value="item.value"
                   :key="item.value"
                   :label="item.label"
@@ -409,7 +409,7 @@ export default {
       // 适用车型
       applyArcticOptions: [],
       // 能源类型
-      energyKindOptions: [],
+      categoryOptions: [],
       // 责任部门
       zrbmOptions: [],
       // 适用产品线
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0677f2e9d..cc3b1fc61 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -944,6 +944,7 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
+      this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.applyArctic = '' // 能源种类
       this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1288,6 +1289,18 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
 
@@ -1818,6 +1831,13 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
       }, e => {
 
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index d636411a5..07272fbed 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -942,6 +942,7 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
+      this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.applyArctic = '' // 能源种类
       this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1818,6 +1819,25 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
       }, e => {
 
       })

From f285283e29a1efc464f8e3afc55048c23810bd8f Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 16:00:32 +0800
Subject: [PATCH 16/21] =?UTF-8?q?bug=EF=BC=9A=E6=B5=B7=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=A0=87=E5=87=86=E5=B9=B4=E4=BB=BD=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E9=AA=8C=E8=AF=81=E9=94=99=E8=AF=AF=EF=BC=8C=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index e14017cc7..efcff8c9b 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1573,9 +1573,9 @@ export default {
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
         ],
         standYear: [
-          // {required: true, message: '标准年份/系列不能为空', trigger: 'change'},
-          {validator: this.verify.testItemCode, trigger: 'change'},
-          {type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'}
+          {required: true, message: '标准年份不能为空', trigger: 'change'},
+          {validator: this.verify.testNumberCode, trigger: 'change'},
+          {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
         ],
         standName: [
           {required: true, message: '中文名称不能为空', trigger: 'change'},
@@ -1583,7 +1583,7 @@ export default {
         ],
         standEnName: [
           {required: true, message: '英文名称不能为空', trigger: 'change'},
-          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
+          {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
           // {validator: this.verify.valiateEnName, trigger: 'blur'}
         ],
         // standState: [

From 2dd4b3e8636539e3606bf32e260409153dcb860a Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 16:06:45 +0800
Subject: [PATCH 17/21] =?UTF-8?q?bug=EF=BC=9A=20=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E4=BF=A1=E6=81=AF=E5=9B=9E=E6=98=BE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=BA=94=E5=9B=9E=E6=98=BE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index efcff8c9b..c41279e7b 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -2074,7 +2074,7 @@ export default {
           Object.keys(item.attrInfoMap || {}).forEach((key) => {
             item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key]
             if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') {
-              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key])
+              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
             }
           })
           const dynamicFormField = this.sarStandardsInfoEO

From 932a286b2a8a85ff6649aa7cd41fc341242c4d29 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Mon, 26 Jul 2021 16:56:04 +0800
Subject: [PATCH 18/21] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomFormComponents/InputForStandards.vue           | 7 +++++--
 .../CustomFormComponents/InputForStandardsForForeign.vue | 9 ++++++---
 .../foreignStandardsAndRegulations/index.vue             | 2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 2ce3f679f..0afef8433 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -59,7 +59,7 @@
                 type="primary"
                 class="common-button-primary"
                 round
-                @click="getReplaceLawsNumRowFirst">
+                @click="getReplaceLawsNumRowFirst(true)">
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
@@ -217,7 +217,10 @@ export default {
       this.getReplaceLawsNumRow()
     },
     // 代替政策号 请求数据
-    getReplaceLawsNumRowFirst () {
+    getReplaceLawsNumRowFirst (val) {
+      if (val) {
+        this.replaceLawsNumForm.page = '1'
+      }
       if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
         this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
       } else {
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index 31d90ad21..08d4408ee 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -53,7 +53,7 @@
                 type="primary"
                 class="common-button-primary"
                 round
-                @click="getReplaceLawsNumRow">
+                @click="getReplaceLawsNumRow(true)">
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
@@ -126,7 +126,7 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
         <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
@@ -227,7 +227,10 @@ export default {
       this.getReplaceLawsNumRow()
     },
     // 代替政策号 请求数据
-    getReplaceLawsNumRow () {
+    getReplaceLawsNumRow (val) {
+      if (val) {
+        this.replaceLawsNumForm.page = '1'
+      }
       if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
         this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
       } else {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c41279e7b..e9d5466b6 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -2005,7 +2005,7 @@ export default {
           item.collectBtn = !item.collectBtn
           item.cancelCollectBtn = !item.cancelCollectBtn
           item.collectId = res.data.id
-          this.$message.success(res.message)
+          // this.$message.success(res.message)
         } else {
           this.$message.warning(res.message)
         }

From de0f4a2bc3d1417212e599f135be55ad780a8bc1 Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Mon, 26 Jul 2021 17:03:54 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/details.vue                             | 15 +++++++++++----
 .../nonConfomity/pages/rectificationDatabase.vue  |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 9cf6991c4..f73e7aa91 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -585,16 +585,23 @@ export default {
             ids+=',\''+this.selectList[i].standId+'\''
           }
           const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
-          console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
+              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+          console.log(exportURL)
           window.open(exportURL)
           this.$message.success('导出信息成功')
         }
       } else if (this.saveExportType === 'all') {
         console.log(this.selectList);
+        let ids = ''
+        if (this.selectList.length === 0) {
+          ids='\''+this.dataList[0].standId+'\''
+          for(let i=1;i<this.dataList.length;i++){
+            ids+=',\''+this.dataList[i].standId+'\''
+          }
+        }
         const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-            'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
-        console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
+            'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+        console.log(exportURL)
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 3ef6e2189..38daf3d9b 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -116,7 +116,7 @@
               prop="standId"
               fixed="left"
               width="180"
-              label="标准编号">
+              label="标准号">
 <!--              <template slot-scope="scope">-->
 <!--                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
 <!--&lt;!&ndash;                {{ scope.row.standId }}&ndash;&gt;-->
@@ -229,7 +229,7 @@
                 style="width: 100%;"
                 :model="historySeeForm"
               >
-                <el-form-item class="add-form-item" label="标准编号:">
+                <el-form-item class="add-form-item" label="标准号:">
                   <div class="seeItem">{{historySeeForm.standId}}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="标准名称:">

From a4c3a759dbc1d737e416e49d838440ac4fe303d0 Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Mon, 26 Jul 2021 17:04:14 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         | 25 +++++++++++--------
 .../pages/details.vue                         | 18 ++++++++-----
 .../pages/otherAddEit.vue                     |  2 +-
 .../pages/projectAddEit.vue                   |  4 +--
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 77f06915a..cd7aa0210 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -237,13 +237,13 @@
           >
           </el-table-column>
           <el-table-column
-              prop="standNumber"
+              prop="code"
               show-overflow-tooltip
               fixed="left"
               width="180px"
               label="标准号">
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standSortShow}} {{ scope.row.standNumber }}-{{scope.row.standYear}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -370,13 +370,13 @@
             align="center">
         </el-table-column>
         <el-table-column
-            prop="standNumber"
+            prop="code"
             show-overflow-tooltip
             width="180px"
             fixed="left"
             label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+            <a  @click="handlePreview(scope.row)">{{scope.row.standSortShow}} {{ scope.row.standNumber }}-{{scope.row.standYear}}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -676,6 +676,7 @@ export default {
       editRowData: {
         id: '',
         standName: '',
+        standSortShow:'',
         standEnName: '',
         typeApplicable: '',
         nylx: '',
@@ -715,7 +716,7 @@ export default {
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,
@@ -740,7 +741,7 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        //{value: 'FOREIGN_LAWS', label: '国内外政策'},
         // {value: 'BUSINESS', label: '企业标准 '},
         {value: 'TEMP', label: '标准法规清单 '}
       ],
@@ -877,6 +878,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -897,6 +899,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -1322,7 +1325,7 @@ export default {
     editTghisRow(row) {
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
+      this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber + '-' + this.rowList.standYear
       this.drawerEdit = true
     },
     // 抽屉取消按钮
@@ -1452,7 +1455,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
+                //this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1896,12 +1899,12 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+    handlePreview (data) {
+      let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
+          id: data.id,
           pageType: this.sarAccessInfoSearch.dataSource
         }
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 32b738445..5ed5e64f2 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -212,14 +212,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
+            prop="code"
             fixed="left"
             width="180px"
             align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
-              <span v-else>{{ scope.row.standNumber }}</span>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -227,12 +226,18 @@
             label="中文名称"
             width="180px"
           >
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="standEnName"
             align="center"
             width="180px"
             label="英文名称">
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="typeApplicable"
@@ -656,12 +661,13 @@ export default {
       window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
     },
     // 点击查看
-    handlePreview(item) {
+    handlePreview(data) {
+      debugger
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.resId,
-          pageType: item.sarType
+          id: data.id,
+          pageType: data.sarType
         }
       });
       window.open(routeUrl.href, "_blank");
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0677f2e9d..ecc960290 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -577,7 +577,7 @@ export default {
           {required: true, message: '国内/海外不能为空', trigger: 'change'}
         ],
         detailedList: [
-          {required: true, message: '清单类别不能为空', trigger: 'change'}
+          {required: true, message: '清单类别不能为空', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index d636411a5..3f0e84dbf 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -572,11 +572,11 @@ export default {
         ],
         projectName: [
           {required: true, message: '项目名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '项目名称不能超过100个字符', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,

From fb2c61e93a26f80f195a229c816a87a24bf2ea9b Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Mon, 26 Jul 2021 17:10:33 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/otherAddEit.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 5f6fb4930..8cfff16a1 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -581,7 +581,7 @@ export default {
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,