Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!145

src/api/process.js

@@ -415,6 +415,14 @@ export function isEnd (data) {
   })
 }
 
+export function get_verify_by_instance (data) {
+  return axios({
+    url: '/api/lawss/activiti/get_verify_by_instance',
+    method: 'get',
+    params: data
+  })
+}
+
 // 流程委托接口
 export function changeAssigneeNew (data) {
   return axios({

src/main.js

@@ -4,7 +4,6 @@ require('es6-promise').polyfill();
 require('es6-promise/auto');
 import Vue from 'vue'
 import App from './App'
-import router from './router'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // jQuery
@@ -42,6 +41,68 @@ import Contextmenu from 'vue-contextmenujs'
 
 import animate from 'animate.css'
 
+// 引入路由器
+import router from './router'
+// 路由解析器
+import Re from 'path-to-regexp'
+
+import { get_verify_by_instance } from 'api/process'
+
+
+// 路由拦截
+router.beforeEach(function (to, from, next) {
+  let path = to.path;
+  console.log("auth : to =>", to);
+  console.log("auth : path =>" + path);
+  let taskId = to.query.taskIds;
+  let prcId = to.query.prcId;
+  let prcNum = to.query.prcNum;
+  let prcName = to.query.prcName;
+  let prcType = to.query.prcType;
+  if(taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null){
+    get_verify_by_instance({
+      taskId: taskId, // 任务id
+      pId: prcId // 流程实例
+    }).then(res => {
+      if(res && res > 0){
+        let param = "?taskIds="+taskId+"&prcId="+prcId
+        +"&prcNum="+prcNum+"&prcName="+prcName+"&prcType="+prcType;
+        // 根据type判断跳转具体流程页面
+        if (prcType === '1') {
+          // 标准入库流程数据
+          next({path:"bzrkStep5"+param})
+        }else if(prcType === '4'){
+          //标准清单发布流程数据
+          next({path:"bzqdfbStep1-4"+param})
+        }else if (prcType === '5'){
+          //标准项目合规评估 标准维度
+          next({path:"xmpgStep1-2"+param})
+        }else if(prcType === '6'){
+          //标准项目合规评估 项目维度
+          next({path:"xmpg2Step1-2"+param})
+        } else if (prcType === '8') {
+          // 未符合项整改
+          next({path:"wfhxzgStep5-1"+param})
+        } else if(prcType === '9'){
+          next({path:"bzjdStep1-6"+param})
+          //标准调研流程
+        }else if(prcType === '2'){
+          next({path:"bzdyStep1-9"+param})
+        }else if(prcType === '3'){
+          //标准征求意见
+          next({path:"bzzqyjStep1-9"+param})
+        }else if(prcType === '10'){
+          //项目清单确认
+          next({path:"xmqdqrStep1-2"+param})
+        }
+      }
+      console.log("res : res =>", res);
+    })
+  }
+  next()
+})
+
+
 Vue.config.productionTip = false
 // jquery
 Vue.prototype.$ = $

src/pages/home1/components/release/index.vue

@@ -3,86 +3,102 @@
   <div class="release">
     <ul>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
-          <div style="height: 18px;">
+        <div style="height: 18px;">
-            <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+          <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+          <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
-          </div>
+        </div>
       </li>
     </ul>
   </div>
 </template>
 
 <script>
-export default {
+  export default {
-  name: 'Release',
+    name: 'Release',
-  components: {},
+    components: {},
-  mixins: [],
+    mixins: [],
-  data() {
+    data() {
-    return {
+      return {
-      putTime: '',
+        putTime: '',
-      standardReleaseList: [],  //标准发布数据
+        standardReleaseList: [],  //标准发布数据
-    }
+        updateTime:""
-  },
+      }
-  computed: {},
+    },
-  watch: {},
+    computed: {},
-  mounted() {
+    watch: {},
-    this.getDate()
+    mounted() {
-    this.getAdvice()
+      this.getDate()
-    this.addDate()
+      this.getAdvice()
-  },
+      this.addDate()
-  methods: {
+    },
-    // 点击查看
+    methods: {
-    handlePreview (item) {
+      //获取当前年月日
-      let routeUrl = this.$router.resolve({
+      addDate(){
-        name: 'OtherStandardDetails',
+        const nowDate = new Date();
-        params: {
+        const date = {
-          id: item.id,
+          year: nowDate.getFullYear(),
-          pageType: item.standType + '_STAND'
+          month: nowDate.getMonth() + 1,
+          date: nowDate.getDate(),
         }
-      })
+        const newmonth = date.month>10?date.month:'0'+date.month
-      window.open(routeUrl.href, '_blank')
+        const day = date.date>10?date.date:'0'+date.date
-    },
+        this.updateTime = date.year + '-' + newmonth + '-' + day
-    //截取时间
+        console.log("当前时间"+this.updateTime)
-    getDate (date) {
+      },
-      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+      // 点击查看
-    },
+      handlePreview (item) {
-    //获取数据
+        let routeUrl = this.$router.resolve({
-    getAdvice() {
+          name: 'OtherStandardDetails',
-      let obj = {}
+          params: {
-      obj.limit = 8
+            id: item.id,
-      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
+            pageType: item.standType + '_STAND'
-        _this: this
-      }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
           }
         })
-      }, e => {
+        window.open(routeUrl.href, '_blank')
-      })
+      },
+      //截取时间
+      getDate (date) {
+        return date != null ? date.substring(0, date.indexOf(' ')) : ''
+      },
+      //获取数据
+      getAdvice() {
+        let obj = {}
+        obj.limit = 8
+        this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
+          _this: this
+        }, res => {
+          this.standardReleaseList = res.data
+          let arr = res.data
+          arr.forEach(item => {
+            if(item.standName !== ""){
+              this.standardReleaseList.push(item)
+            }
+          })
+        }, e => {
+        })
+      },
     },
-  },
 
-}
+  }
 </script>
 
 <style lang="less" scoped>
-.release {
+  .release {
-  .time-title {
+    .time-title {
-    margin: 15px;
+      margin: 15px;
-    .time {
+      .time {
-      float: right;
+        float: right;
-      color:#FFFFFF;
+        color:#FFFFFF;
-    }
+      }
-    a {
+      a {
-      color: #ffffff;
+        color: #ffffff;
-      &:hover {
+        &:hover {
-        color: #e9c851;
+          color: #e9c851;
-        cursor:pointer;
+          cursor:pointer;
-        text-decoration: underline;
+          text-decoration: underline;
+        }
       }
     }
   }
-}
 </style>
+

src/pages/localTool/standardWarning.vue

@@ -109,7 +109,7 @@
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -172,7 +172,7 @@
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -237,7 +237,7 @@
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
                     <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -301,7 +301,7 @@
                 </el-table-column>
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                     <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
                   </template>
                 </el-table-column>

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -100,6 +100,12 @@
                                 </div>
                             </template>
                         </el-table-column>
+
+                        <el-table-column
+                                prop="dyhz"
+                                label="回执说明"
+                                align="center">
+                        </el-table-column>
                     </el-table>
                 </div>
                 <el-collapse accordion>
@@ -392,6 +398,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue

@@ -71,10 +71,6 @@
             width="55"
             align="center">
           </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="条款号">
-          </el-table-column>
           <el-table-column
             prop="productLine"
             label="产品线">

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -71,10 +71,6 @@
             width="55"
             align="center">
           </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="条款号">
-          </el-table-column>
           <el-table-column
             prop="productLine"
             label="产品线">

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -4157,6 +4157,7 @@ export default {
         .el-card{
           min-width: min-content;
         }
+        height: 95%;
         width: 95%;
         position: absolute;
         left: 0;

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -203,10 +203,8 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                <div>
+                <div style="color: #2d8cf0">
-                  <a>
                     {{ formatIssueDate(scope.row.issueTime) }}
-                  </a>
                 </div>
               </template>
             </el-table-column>
@@ -217,7 +215,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <a>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</a>
+                <span style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -227,7 +225,7 @@
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a>
+                <span style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -236,7 +234,7 @@
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <a>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</a>
+                <span style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -250,7 +248,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <a>{{ textStatusMap[scope.row.textStatus] }}</a>
+                <span style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -4738,7 +4736,7 @@ export default {
       .el-card {
         min-width: min-content;
       }
-
+      height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;
       left: 0;

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -163,7 +163,7 @@
         </el-table-column>
         <el-table-column
         prop="actualCloseTime"
-        width="150"
+        width="130"
         align="center"
         sortable
         label="实际关闭时间">