Merge branch 'develop' into FOTON

src/App.vue

@@ -215,7 +215,7 @@ export default {
         && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin'
         && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin'
         && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex'
-        && this.$route.name !== 'blankPage') {
+        && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) {
         this.isBoolean = true
       } else {
         this.isBoolean = false

src/main.js

@@ -107,6 +107,9 @@ router.beforeEach(function (to, from, next) {
   // 返回值为登录状态
   /** 判断是不是在手机端操作 */
   if (isMobile()) {
+    if(toName === 'processCenter'){
+        window.close();
+    }
     if ((token === null || token === '' ) && toName !== 'Login') {
       if(toName !== 'phoneIndex'){
         sessionStorage.removeItem("param");
@@ -117,13 +120,18 @@ router.beforeEach(function (to, from, next) {
       }
     } else {
       if (toName.slice(0,5) !== 'phone') {
-        let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
-            '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
-        let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
-        next({path: phoneRouter + '?' + paramPhone})
+          if(toName === 'LoginVerify'){
+              next('/blankPage')
+          }else {
+              if(toName === 'blankPage' || toName === 'processedPage') {
+                  next()
+              }else {
+                  extractedVerify()
+              }
+          }
       }else {
         if(toName !== 'blankPage'){
-          if(to.matched.length == 0){
+          if(to.matched.length === 0){
             next('/blankPage')
           }else {
             next()
@@ -174,48 +182,54 @@ router.beforeEach(function (to, from, next) {
         let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus;
         let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished;
 
-        if (hisCount && hisCount > 0) { // 业务系统 当前节点已完成
-          // 根据type判断跳转具体流程页面
-          if (prcType === '1') {
-            // 标准入库流程数据
-            extracted("bzrkStep5");
-          } else if (prcType === '4') {
-            //标准清单发布流程数据
-            extracted("bzqdfbStep1-4");
-          } else if (prcType === '5') {
-            //标准项目合规评估 标准维度
-            if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
-              extracted("xmpgStep1-2");
-            } else {
-              extracted("xmpgStep1-7");
+        if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成
+            if(isMobile()){
+                next('/processedPage')
+            }else {
+                // 根据type判断跳转具体流程页面
+                if (prcType === '1') {
+                    // 标准入库流程数据
+                    extracted("bzrkStep5");
+                } else if (prcType === '4') {
+                    //标准清单发布流程数据
+                    extracted("bzqdfbStep1-4");
+                } else if (prcType === '5') {
+                    //标准项目合规评估 标准维度
+                    if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
+                        extracted("xmpgStep1-2");
+                    } else {
+                        extracted("xmpgStep1-7");
+                    }
+                } else if (prcType === '6') {
+                    //标准项目合规评估 项目维度
+                    if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") {
+                        extracted("xmpg2Step1-2");
+                    } else {
+                        extracted("xmpg2Step1-12");
+                    }
+                } else if (prcType === '8') {
+                    // 未符合项整改
+                    extracted("wfhxzgStep5-1");
+                } else if (prcType === '9') {
+                    extracted("bzjdStep1-6");
+                    //标准调研流程
+                } else if (prcType === '2') {
+                    extracted("bzdyStep1-9");
+                } else if (prcType === '3') {
+                    //标准征求意见
+                    extracted("bzzqyjStep1-9");
+                } else if (prcType === '10') {
+                    //项目清单确认
+                    extracted("xmqdqrStep1-3");
+                }
             }
-          } else if (prcType === '6') {
-            //标准项目合规评估 项目维度
-            if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") {
-              extracted("xmpg2Step1-2");
-            } else {
-              extracted("xmpg2Step1-12");
-            }
-          } else if (prcType === '8') {
-            // 未符合项整改
-            extracted("wfhxzgStep5-1");
-          } else if (prcType === '9') {
-            extracted("bzjdStep1-6");
-            //标准调研流程
-          } else if (prcType === '2') {
-            extracted("bzdyStep1-9");
-          } else if (prcType === '3') {
-            //标准征求意见
-            extracted("bzzqyjStep1-9");
-          } else if (prcType === '10') {
-            //项目清单确认
-            extracted("xmqdqrStep1-3");
-          }
         } else { // 业务系统 当前节点未完成
           // commitStatus 大于0 表示当前节点存在未完成干活流程
           // isNotFinished OA 系统显示接受任务 已置为已办
           if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
-            if (prcType === '3') {
+            if(isMobile()) {
+              extractedIphone()
+            }else if (prcType === '3') {
               //标准征求意见 接受节点 未完成 oa已办 跳转详情页面
               if (path === '/bzzqyjStep3') {
                 extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
@@ -246,7 +260,12 @@ router.beforeEach(function (to, from, next) {
               }
             }
           } else {
-            extracted3()
+              if(isMobile()) {
+                  extractedIphone()
+              }else{
+                extracted3()
+              }
+
           }
         }
         function extracted(routerPath) {
@@ -268,6 +287,13 @@ router.beforeEach(function (to, from, next) {
             next()
           }
         }
+
+        function extractedIphone() {
+            let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
+                '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
+            let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
+            next({path: phoneRouter + '?' + paramPhone})
+        }
         function extracted2(routerPath,param2) {
           if (token === null || token === '') {
             extractedLocalStorage(routerPath,param2);

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -535,8 +535,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -544,8 +544,8 @@
             size="1100px">
       <div>相似度:{{ similarityDegree }}</div>
       <div style="height: 600px;overflow: auto;display: flex;">
-        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
       </div>
     </el-dialog>
   </div>

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -432,8 +432,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>

src/pages/processCenter/pages/creatProcess/bzjd/step4.vue

@@ -286,8 +286,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>

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

@@ -291,8 +291,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
         <loading :loading="loading">加载中...</loading>

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -290,8 +290,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
         <loading :loading="loading">加载中...</loading>

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

@@ -568,14 +568,16 @@ export default {
     handleSubmit() {
       this.isSubmit = true
       this.wbbzform.dlFlag = '1'
+      this.wbbzform.comityOptionsOne = this.comityOptionsOne
+      this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
+      this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
       this.wbbzform.fileName = this.fileInfoList
       this.wbbzform.passUser = this.$store.getters.userInfo.userId
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
+      let json = JSON.stringify( this.wbbzform)
       console.log(json);
-      return
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue

@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,6 +147,7 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
@@ -479,9 +481,23 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.wbbzform = JSON.parse(JSON.stringify(item));
+        this.wbbzform.comityOptionsOne.forEach(item =>{
+         if(this.wbbzform.associationName === item.id){
+           this.wbbzform.associationName = item.name
+         }
+        })
+        this.wbbzform.comityOptionsTwo.forEach(item =>{
+          if(this.wbbzform.committee === item.id){
+            this.wbbzform.committee = item.name
+          }
+        })
+        this.wbbzform.comityOptionsOneThree.forEach(item =>{
+          if(this.wbbzform.workingGroup === item.id){
+            this.wbbzform.workingGroup = item.name
+          }
+        })
         this.associationData = item.associationData
         this.participantsData = item.participantsData
         item.fileName.forEach(itemId => {
@@ -547,7 +563,7 @@ export default {
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
+      let json = JSON.stringify( this.wbbzform)
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue

@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,6 +147,7 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>

src/pages/processedPage/index.vue

@@ -0,0 +1,30 @@
+<template>
+  <div class="processedPage">
+    <van-icon name="checked" color="#1fcd24" size="70"/>
+    <div style="font-size: 15px;margin-top: 20px;color: #8c939d">当前任务已处理</div>
+    <el-button type="primary" size="small" style="margin-top: 30px;width: 270px;" @click="$router.go(-1)">返回</el-button>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue';
+import { Icon } from 'vant';
+
+Vue.use(Icon);
+export default {
+  name: "processedPage",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+.processedPage {
+  text-align: center;
+  margin-top: 55%;
+}
+
+</style>

src/router/index.js

@@ -23,6 +23,15 @@ const routes = [
       title: '手机提示页面',
     }
   },
+  {
+    path: '/processedPage',
+    name: 'processedPage',
+    component: resolve => require(['@/pages/processedPage/index.vue'], resolve),
+    meta: {
+      requireAuth: true,
+      title: '手机提示页面',
+    }
+  },
   {
     path: '*',
     redirect: '/loginVerify'