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

src/common/axios/index.js

@@ -7,11 +7,11 @@ import axios from 'axios'
 import router from '@/router'
 import store from '@/store'
 import {Message} from 'element-ui'
-import { serverUrl } from '@/sysConfig'
+import { baseUrl } from '@/sysConfig'
 export const CancelToken = axios.CancelToken
 // import 'element-ui/lib/theme-chalk/index.css'
 const _axios = axios.create({
-  baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/'
+  baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/'
 })
 
 /**

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -1,51 +1,56 @@
 <!-- 流程组件公共数据 -->
 <script>
-import { changeAssigneeNew } from 'api/process'
+import { changeAssigneeNew } from "api/process";
+
 export default {
-  name: 'ProcessMixins',
+  name: "ProcessMixins",
   mixins: [],
   components: {},
-  data () {
+  data() {
-      return {
+    return {
-          processTypeList: [
+      processTypeList: [
-              {
+        {
-                  label: '标准调研流程',
+          label: "标准调研流程",
-                  value: '2'
+          value: "2"
-              },
+        },
-              {
+        {
-                  label:'标准入库流程',
+          label: "标准入库流程",
-                  value: '1'
+          value: "1"
-              },
+        },
-              {
+        {
-                  label:'标准征求意见流程',
+          label: "标准征求意见流程",
-                  value: '3'
+          value: "3"
-              },
+        },
-              {
+        {
-                  label:'标准清单发布/更新流程',
+          label: "标准清单发布/更新流程",
-                  value: '4'
+          value: "4"
-              },
+        },
-              {
+        {
-                  label: '项目合规评估流程',
+          label: "项目合规评估流程-标准",
-                  value: '5'
+          value: "5"
-              },
+        },
-              {
+        {
-                  label: '未符合项整改流程',
+          label: "项目合规评估流程-项目",
-                  value: '8'
+          value: "6"
-              },
+        },
-              {
+        {
-                  label: '标准解读流程',
+          label: "未符合项整改流程",
-                  value: '9'
+          value: "8"
-              },
+        },
-          ],
+        {
-          formDisableFlag: false,
+          label: "标准解读流程",
-          pickerOptions: {
+          value: "9"
-              disabledDate(time) {
+        }
-                  const start = new Date(new Date().toLocaleDateString());
+      ],
-                  start.setTime(start.getTime());
+      formDisableFlag: false,
-                  return time.getTime() < start
+      pickerOptions: {
-              }
+        disabledDate(time) {
-          }
+          const start = new Date(new Date().toLocaleDateString());
+          start.setTime(start.getTime());
+          return time.getTime() < start;
+        }
       }
+    };
   },
   methods: {
     /**
@@ -54,13 +59,13 @@ export default {
      * @auth: chenxiaoxi
      */
     getPrcName(prcType) {
-      let prcName = ''
+      let prcName = "";
       this.processTypeList.map(item => {
         if (item.value === prcType) {
-          prcName = item.label
+          prcName = item.label;
         }
-      })
+      });
-      return prcName
+      return prcName;
     },
 
     /**
@@ -76,15 +81,15 @@ export default {
         pId: this.$store.getters.getHandleInfo.prcId // 流程实例
       }).then(res => {
         if (res.success) {
-          this.$message.success('委托成功')
+          this.$message.success("委托成功");
           setTimeout(() => {
-            this.$router.push('/processCenter')
+            this.$router.push("/processCenter");
-          }, 100)
+          }, 100);
-          this.visibleTree = false
+          this.visibleTree = false;
         } else {
-          this.$message.warning(res.message)
+          this.$message.warning(res.message);
         }
-      })
+      });
     },
 
     /**
@@ -93,7 +98,7 @@ export default {
      * @auth: chenxiaoxi
      */
     handleValidField(field) {
-      this.$refs['prcForm'].validateField(field)
+      this.$refs["prcForm"].validateField(field);
     },
 
     /**
@@ -104,20 +109,21 @@ export default {
     getResByCurrentRoleId(roleIds, roleName, callback) {
       // 获取当前 foRoleId  有 otherFORoleId 就一定是 其他起草人填写的 FO
       // 否则一定是主起草人填写的 FO
-      this.$http.get('sys/role/getParentsByFOs', {
+      this.$http.get("sys/role/getParentsByFOs", {
         ids: roleIds, // 当前登录人的角色
         roleHierarchyName: roleName // 上级角色
       }, {}, res => {
         if (res.ok) {
-          callback.call(this, res.data)
+          callback.call(this, res.data);
         } else {
-          this.$message.warning(res.message)
+          this.$message.warning(res.message);
         }
-      })
+      });
-    },
+    }
   },
   computed: {},
   watch: {},
-  mounted () {}
+  mounted() {
-}
+  }
+};
 </script>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -189,6 +189,16 @@
                 {{ formatIssueDate(scope.row.issueTime) }}
               </template>
             </el-table-column>
+            <el-table-column
+                prop="XCXSSRQ"
+                sortable="putTime"
+                width="150px"
+                label="实施日期">
+              <template slot-scope="scope">
+                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+              </template>
+            </el-table-column>
+
             <el-table-column
               prop="XCXSSRQ"
               sortable="custom"

src/sysConfig/index.js

@@ -40,6 +40,7 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT
 const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
 
 module.exports = {
+    baseUrl: 'http://' + serverIP + ':' + interfacePORT,
     serverUrl: 'http://' + serverIP, // 服务器IP地址
     interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
     cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,