From 95badff27bc02e9d61d3651f5bb327074f8568ba 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, 27 Dec 2021 10:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 12 +++++-
 .../pages/creatProcess/bzqdfb/step3.vue       |  8 ++++
 .../pages/addEdit.vue                         |  1 +
 .../pages/details.vue                         | 38 ++++++++++++-------
 src/sysConfig/index.js                        | 23 +++++------
 5 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index f29da4ab8..61f2e77f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1057,7 +1057,7 @@ export default {
         this.listForm.commentText = this.commentText
         this.listForm.fileName = this.fileInfoList
         this.listForm.dataList = this.dataList
-        var json = Object.assign(this.listForm, this.roleForm);
+        let json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
@@ -1237,7 +1237,7 @@ export default {
         this.standList.map(item => {
           let newStand = false;
           for (let itemKey of this.dataList) {
-            if (item.id == itemKey.id) {
+            if (item.id === itemKey.id) {
               newStand = true;
               break;
             }
@@ -1246,6 +1246,14 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
             exits.push(item.id);
           }
         });
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 6e7bdb10f..9fd6c6eb4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -616,6 +616,14 @@ export default {
             _this.$message.warning("请勿重复添加数据");
           } else {
             _this.dataList.push(item);
+            _this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
           }
         });
         this.standardData = []
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 68685d1fc..195afb22c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -445,6 +445,7 @@
         </el-form-item>
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
+              clearable
               v-model.trim="editRowData.ssrq"
               type="dates"
               value-format="yyyy-MM-dd"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index e7dc5fc86..a1ba62a88 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -172,12 +172,6 @@
             align="center"
             width="210px"
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.ssrq === null">
-                {{ scope.row.ssrq }}
-              </span>
-              <span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -610,18 +604,34 @@ export default {
     // 导出确定功能
     //确认导出
     exportTestItem() {
-      if (this.saveExportType === "apart") {
-        if (this.selectedList != null && this.selectedList != "") {
+      if(this.sarAccessEO.sortKey === '1'){
+        if (this.saveExportType === "apart") {
+          if (this.selectedList != null && this.selectedList != "") {
+            const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
+              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            window.open(exportURL);
+            this.$message.success("导出信息成功");
+          }
+        } else if (this.saveExportType === "all") {
+          const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
+            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
+          window.open(exportURL);
+          this.$message.success("导出信息成功");
+        }
+      }else{
+        if (this.saveExportType === "apart") {
+          if (this.selectedList != null && this.selectedList != "") {
+            const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
+              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            window.open(exportURL);
+            this.$message.success("导出信息成功");
+          }
+        } else if (this.saveExportType === "all") {
           const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
-            "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
           window.open(exportURL);
           this.$message.success("导出信息成功");
         }
-      } else if (this.saveExportType === "all") {
-        const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
-          "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
-        window.open(exportURL);
-        this.$message.success("导出信息成功");
       }
       this.exportModelFlag = false;
       this.selectedList = [];
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 1ba8b30d7..8c83dc101 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,22 +7,20 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
+// const devInterfacePORT = '9999'
+const devIp = '192.168.10.70'
+const devInterfacePORT = '4202'
 // const devIp = '62.234.136.153'
-// const devInterfacePORT = '8033'
-const devIp = '10.19.11.243'
-const devInterfacePORT = '4304'
+// const devInterfacePORT = '8038'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
-const devWebUrl = 'https://srms.foton.com.cn/#/'
+const devWebUrl = 'http://62.234.136.153:8038/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-const onlyOfficeUrl = 'http://10.100.5.116:8088'
-
-// 配置 kkFileView 前端服务
-const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -46,10 +44,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-// const prodIp = '62.234.136.153'
-// const prodInterfacePORT = '8033'
-const prodIp = 'srms.foton.com.cn'
-const prodInterfacePORT = ''
+const prodIp = '62.234.136.153'
+const prodInterfacePORT = '8033'
+// const prodIp = 'slrs.foton.com.cn'
+// const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -62,7 +60,6 @@ module.exports = {
     ssoLoginUrlDev: ssoLogin + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
-    kkFileViewUrl: kkFileViewUrl,
     devWebUrl: devWebUrl,
     serverUrl: 'http://' + serverIP, // 服务器IP地址
     interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,