Merge remote-tracking branch 'origin/develop' into develop

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);
           }
         });

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 = []

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -24,20 +24,60 @@
           <el-option label="完成" value="完成"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
         <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
           <el-option label="制定完成" value="制定完成"></el-option>
           <el-option label="制定中" value="制定中"></el-option>
           <el-option label="未制定" value="未制定"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+      <el-form-item prop="standScope" label="标准范围" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.standScope" placeholder="请选择标准范围">
+          <el-option label="N1" value="N1"></el-option>
+          <el-option label="N2" value="N2"></el-option>
+          <el-option label="N3" value="N3"></el-option>
+          <el-option label="M1" value="M1"></el-option>
+          <el-option label="M2" value="M2"></el-option>
+          <el-option label="M3" value="M3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="useStand" label="是否采用标准" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select @change="useStandChange"  v-model="qbfsForm.useStand" placeholder="请选择是否采用标准">
+          <el-option label="是" value="yes"></el-option>
+          <el-option label="否" value="no"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="!useShow" prop="indexBasis" label="简述指标依据" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-input
+          type="textarea"
+          v-model="qbfsForm.indexBasis"
+          placeholder="请输入指标依据"
+          :maxlength="500"/>
+      </el-form-item>
+<!--      <el-form-item prop="useStand" label="采用何种标准" style="width: 100%; margin-right:10px"-->
+<!--                    class="add-form-item form-item-disabled">-->
+<!--        <el-select v-model="qbfsForm.useStand" placeholder="请选择采用何种标准">-->
+<!--          <el-option-->
+<!--            v-for="item in useOptions"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
         <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人" readonly
                   @click.native="choiceZRRS('1')">
         </el-input>
       </el-form-item>
-      <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
         <el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
                   @click.native="choiceZRRS('2')">
@@ -109,7 +149,7 @@
 
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
-import MechanismTree from '@/components/mechanismTree'
+import MechanismTree from "@/components/mechanismTree";
 
 export default {
   name: "establish",
@@ -120,6 +160,7 @@ export default {
   props: ['message'],
   data(){
     return {
+      useShow: false,
       modalshowflagZRBM: false,
       nodeListZRBM: [],
       drawerTitle2: '',
@@ -131,44 +172,92 @@ export default {
       nodeList: [],
       qcdwOptions: [],
       qbfsForm: {
-        type: '5',
+        type: "5",
-        unit: '', // 单位
+        unit: "", // 单位
-        unitName: '',
+        unitName: "",
-        esName: '', // 企标名称
+        esName: "", // 企标名称
-        planStatus: '', // 计划状态
+        planStatus: "", // 计划状态
-        reviseStatus: '', // 制修订状态
+        reviseStatus: "", // 制修订状态
-        resPerson: '', // 评审责任人
+        standScope: "", //标准范围
-        resPersonName: '',
+        useStand: "", //采用何种标准
-        wgLeader: '', // 工作组组长
+        indexBasis: '',  //指标依据
-        wgLeaderName: '',
+        resPerson: "", // 评审责任人
-        draftTime: '', // 计划标准初稿完成时间
+        resPersonName: "",
-        releaseTime: '', // 计划标准发布时间
+        wgLeader: "", // 工作组组长
-        drafter: '', // 起草人
+        wgLeaderName: "",
-        drafterName: '',
+        draftTime: "", // 计划标准初稿完成时间
-        newReason: '', //新增原因
+        releaseTime: "", // 计划标准发布时间
+        drafter: "", // 起草人
+        drafterName: "",
+        newReason: "" //新增原因
         // remarks: '', // 备注
       },
+      useOptions: [
+        {
+          value: "ISO",
+          label: "ISO"
+        }, {
+          value: "ESE",
+          label: "ESE"
+        }, {
+          value: "EC/EEC",
+          label: "EC/EEC"
+        }, {
+          value: "IEC",
+          label: "IEC"
+        }, {
+          value: "GB",
+          label: "GB"
+        }, {
+          value: "GB/T",
+          label: "GB/T"
+        }, {
+          value: "QC/T",
+          label: "QC/T"
+        }, {
+          value: "JT/T",
+          label: "JT/T"
+        }, {
+          value: "HJ",
+          label: "HJ"
+        }, {
+          value: "TB",
+          label: "团标"
+        },{
+          value: "QT",
+          label: "其他"
+        },
+        ],
       qbfsFormRules: {
         unit: [
-          {required: true, message: '请选择起草单位', trigger: 'change'},
+          { required: true, message: "请选择起草单位", trigger: "change" }
         ],
         esName: [
-          {required: true, message: '请输入企标名称', trigger: 'blur'},
+          { required: true, message: "请输入企标名称", trigger: "blur" }
         ],
         planStatus: [
-          {required: true, message: '请选择计划状态', trigger: 'blur'},
+          { required: true, message: "请选择计划状态", trigger: "blur" }
         ],
         reviseStatus: [
-          {required: true, message: '请选择制修订状态', trigger: 'blur'},
+          { required: true, message: "请选择制修订状态", trigger: "blur" }
+        ],
+        standScope: [
+          { required: true, message: "请选择标准范围", trigger: "blur" }
+        ],
+        useStand: [
+          { required: true, message: "请选择采用何种标准", trigger: "blur" }
+        ],
+        indexBasis: [
+          { required: true, message: "请输入指标依据", trigger: "blur" }
         ],
         resPersonName: [
-          {required: true, message: '请输入评审责任人', trigger: 'blur'},
+          { required: true, message: "请输入评审责任人", trigger: "blur" }
         ],
         wgLeaderName: [
-          {required: true, message: '请输入工作组组长', trigger: 'blur'},
+          { required: true, message: "请输入工作组组长", trigger: "blur" }
         ],
         draftTime: [
-          {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
+          { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
         ],
         releaseTime: [
           {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
@@ -205,6 +294,9 @@ export default {
      })
   },
   methods: {
+    useStandChange(){
+       this.useShow = !this.useShow
+    },
     choiceZRBM(type, title, id) {
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)

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"

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,6 +604,21 @@ export default {
     // 导出确定功能
     //确认导出
     exportTestItem() {
+      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?" +
@@ -623,6 +632,7 @@ export default {
           window.open(exportURL);
           this.$message.success("导出信息成功");
         }
+      }
       this.exportModelFlag = false;
       this.selectedList = [];
     },

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 devInterfacePORT = '8038'
-const devIp = '10.19.11.243'
-const devInterfacePORT = '4304'
 // 配置 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'
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
-
-// 配置 kkFileView 前端服务
-const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -46,10 +44,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-// const prodIp = '62.234.136.153'
+const prodIp = '62.234.136.153'
-// const prodInterfacePORT = '8033'
+const prodInterfacePORT = '8033'
-const prodIp = 'srms.foton.com.cn'
+// const prodIp = 'slrs.foton.com.cn'
-const prodInterfacePORT = ''
+// 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/', // 服务器端接口访问地址,