Merge branch 'workflow-master' into 'master'

Workflow master

See merge request spfm/spfm-market-front!392

config/dev.env.js

@@ -9,7 +9,8 @@ module.exports = merge(prodEnv, {
   // ctxForm: '"http://10.149.85.91:8000"',//dev
   // ctxForm: '"http://43.138.50.94:8880"',//test
   // ctxForm: '"http://192.168.2.124:8880"',//test
-  ctxForm: '"http://10.230.15.228:8000"',//生产
+  ctxForm: '"http://10.230.26.15:8000"',//生产
+
   excludeMeWhenSelectNextHandler:false,
   excludeFormerHanlder:false,
   envTitle:'"本地开发环境"'

src/assets/js/common.js

@@ -263,16 +263,16 @@ let common = {
                     if (!obj.disableLoading) {
                         loading.close()
                     }
-                    if (response.data.code === 1 ||response.data.code == '1') {
-                       bus.$message.success(response.data.message)
-                        loading.close()
-                        success(response.data.data)
-                        return response
-                        // if (response.data === 1 ||response.data == '1') {
-                        //     bus.$message.success(response.message)
-                        //      loading.close()
-                        //      success(response.data)
-                        //      return response
+                    // if (response.code === 1 ||response.code == '1') {
+                    //    bus.$message.success(response.data.message)
+                    //     loading.close()
+                    //     success(response.data)
+                    //     return response
+                        if (response.code === 1 ||response.code == '1') {
+                            bus.$message.success(response.data.message)
+                             loading.close()
+                             success(response.data.data)
+                             return response
                     } else {
                         if (obj.printMsg) {
                             if (response.message) {

src/assets/js/http.js

@@ -10,7 +10,7 @@ axios.defaults.headers.post['Content-Type'] = 'application/json';//'multipart/fo
 axios.interceptors.response.use(
   response => {
     //vue.$store.commit('endLoading');
-    if(response.config.url.indexOf('8880')!=-1 || response.config.url.indexOf('8099')!=-1){
+    if(response.config.url.indexOf('8880')!=-1 || response.config.url.indexOf('8000')!=-1){
       return response.data;
     }else{
       return response;

src/components/deptTreeP.vue

@@ -1,64 +1,73 @@
 <template>
-    <div class="treebox">
-        <el-tree ref="tree" @node-expand="handleNodeClick" @node-click="handleCheckChange" :data="treeList" node-key="o"
-            :default-checked-keys="defaultListc" :default-expanded-keys="defaultList"></el-tree>
-    </div>
+  <div class="treebox">
+    <el-tree
+      ref="tree"
+      @node-expand="handleNodeClick"
+      @node-click="handleCheckChange"
+      :data="treeList"
+      node-key="o"
+      :default-checked-keys="defaultListc"
+      :default-expanded-keys="defaultList"
+    ></el-tree>
+  </div>
 </template>
 
 <script>
-    export default {
-        props: ["defaultList","type"],
-        data() {
-            return {
-                treeList: [],
-                opt: [],
-                defaultProps: {
-                    children: 'children',
-                    label: 'label'
-                },
-                defaultListc:[]
-            };
+export default {
+  props: ["defaultList", "type"],
+  data() {
+    return {
+      treeList: [],
+      opt: [],
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      defaultListc: [],
+    };
+  },
+  methods: {
+    getTree(v) {
+      this.$http({
+        url: "/sysmgr/csysdept/queryAllList",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
         },
-        methods: {
-            getTree(v) {
-                this.$http({
-                    url: "/sysmgr/csysdept/queryAllList",
-                    method: "post",
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                    data: {
-                        parentorgid: v
-                    },
-                }).then((res) => {
-                    this.treeList = res.data;
-                });
-            },
-            handleCheckChange(v) {
-                let opt = [{
-					id:v.id,
-					o:v.o,
-					ou:v.ou,
-					displayname:v.displayname
-				}];
-                this.$emit("treeCheck",opt)
-            },
+        data: {
+          parentorgid: v,
         },
-        mounted() {},
-        created() {
-            this.getTree();
-            this.defaultListc = this.defaultList;
+      }).then((res) => {
+        this.treeList = res.data;
+      });
+    },
+    handleCheckChange(v) {
+      let opt = [
+        {
+          id: v.id,
+          o: v.o,
+          ou: v.ou,
+          displayname: v.displayname,
         },
-        watch:{
-            type(){
-                this.defaultListc = this.defaultList;
-            }
-        }
-    };
+      ];
+      this.$emit("treeCheck", opt);
+    },
+  },
+  mounted() {},
+  created() {
+    this.getTree();
+    this.defaultListc = this.defaultList;
+  },
+  watch: {
+    type() {
+      this.defaultListc = this.defaultList;
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-    .treebox {
-        border: 1px solid #ddd;
-    }
+.treebox {
+  border: 1px solid #ddd;
+}
 </style>

src/components/workflow.vue

@@ -9,7 +9,7 @@
               选择路径
 
               <div class="flex-path-list">
-                <div v-if="transferStatus" @click="clickTransfer(1)">转派</div>
+                <div v-if="transferStatus" :class="active" @click="clickTransfer(1)">转派</div>
                 <div v-if="copyStatus" @click="clickTransfer(2)">抄送</div>
                 <div
                   v-for="(item, index) in node.nextShapes"
@@ -136,6 +136,7 @@ export default {
   name: "workflow",
   data() {
     return {
+      active:'',
       transferStatus: false, //转派按钮控制
       manyPeopleStatus: false, //多人处理下发任务
       TransferStatus: false, //是否点击转派状态
@@ -211,6 +212,7 @@ export default {
       };
       await this.common.httpPost(obj, success);
       function success(data) {
+        console.log(data);
         let updateList = {
           taskId: data.taskid,
           id: _this.list.id,
@@ -241,12 +243,12 @@ export default {
       };
       if (this.manyPeopleStatus == true) {
         list.procinstid = this.list.processId;
-        if (this.backThree.length <= 1) {
-          this.$message.error("请选择多人");
-          return;
-        } else {
+        // if (this.backThree.length <= 1) {
+        //   this.$message.error("请选择多人");
+        //   return;
+        // } else {
           list.lastmanList = this.nextDealManList;
-        }
+        // }
         if (this.nodes.currentShape) {
           newlist.resolution = this.nodes.currentShape[0].condition.resolution;
           newlist.approve = this.nodes.currentShape[0].condition.approve;
@@ -460,28 +462,35 @@ export default {
       }
 
       this.$http({
-        url: "/market/api/user/info/queryNodePers?params=" + id,
+       url: "/market/api/user/info/queryNodePers?params=" + id,
         method: "post",
         headers: {
           "Content-Type": "application/json",
         },
         data: "",
       }).then((res) => {
+        console.log(res);
         if (status === 2) {
           this.treeCopyList = res.data; //抄送
           //  this.$refs.defTrees.treeList = res.data;
         } else {
-          this.treeList = res.data; //抄送
+          // let list = []
+          // list.push(res.data)
+          // this.treeList = list; //抄送
+          this.treeList = res.data
           // this.$refs.defTree.treeList = res.data;
         }
       });
     },
+
+   
     //转派按钮方法
     clickTransfer(e) {
       this.$refs.defTree.userList = [];
       this.backThree = [];
       this.treeList = [];
       if (e == 1) {
+        this.active = this.active!=""?'':'active'
         this.manyPeopleStatus = false;
         this.TransferStatus = true;
       } else if (e == 2) {
@@ -491,6 +500,7 @@ export default {
     },
     //点击节点获取下一步的处理人字段
     clickGetTree(e, index) {
+      this.active = ''
       this.$refs.defTree.userList = [];
       this.backThree = [];
       // this.CopyStatus = false;

src/components/workflowEntrance.vue

@@ -9,8 +9,8 @@
               选择路径
 
               <div class="flex-path-list">
-                <div @click="getTreeLists(9)">转派</div>
-                <div @click="getclose()">结束</div>
+                <div :class="active" @click="getTreeLists(9)">转派</div>
+                <div :class="actives" @click="getclose()">结束</div>
                 <!-- <div
                   v-for="(item, index) in node.nextShapes"
                   :key="index"
@@ -138,6 +138,8 @@ export default {
   name: "workflow",
   data() {
     return {
+      active:'',
+      actives:'',
       MultipersonTransfer: false,
       transferStatus: false, //转派按钮控制
       TransferStatus: false, //是否点击转派状态
@@ -183,6 +185,8 @@ export default {
       this.backThree = [];
       this.treeList = [];
       this.close = "1";
+      this.actives = this.actives!=""? "" :'actives'
+      this.active = ""
     },
     // async getqueryMultiTaskId() {
     //   let list = {
@@ -457,6 +461,8 @@ export default {
     //查询候选人接口
     getTreeLists(e, status) {
       if (e === 9) {
+        this.active = this.active!=""? '' :'active'
+        this.actives = ""
         this.MultipersonTransfer = true;
       } else {
         this.MultipersonTransfer = false;
@@ -636,6 +642,12 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+.active {
+  background-color: #f3faff;
+}
+.actives {
+  background-color: #f3faff;
+}
 .flex-header-text-tree {
   width: 50%;
   text-align: center;

src/pages/main/leader/components/formTable.vue

@@ -331,13 +331,13 @@
             >
             <a
               target="_blank"
-              href="./static/file/b.xlsx"
+              href="./static/file/c.xlsx"
               download="业务需求模板.xlsx"
               >《业务需求模板.xlsx》、</a
             >
             <a
               target="_blank"
-              href="./static/file/c.xlsx"
+              href="./static/file/b.xlsx"
               download="敏感信息范围说明.xlsx"
               >《敏感信息范围说明.xlsx》、</a
             >

src/pages/main/leader/demand/demandHome.vue

@@ -55,6 +55,7 @@
         <el-button type="primary" v-if="closeStatus" @click="handleClose"
           >关闭</el-button
         >
+        
         <el-button
           type="primary"
           v-if="forwardStatus"
@@ -978,7 +979,12 @@ export default {
         },
         data: this.$refs.formTable.form,
       }).then((res) => {
-        this.$message.success("转需求管理平台成功！");
+        if(res.data.result === 1) {
+          this.$message.success(res.data.desc);
+        }else{
+          this.$message.error(res.data.desc);
+        }
+        
       });
     },
     //批量导出搜索
@@ -1458,6 +1464,7 @@ export default {
 
       let res = await this.common.httpPost(obj, success);
       function success(data) {
+        console.log(data);
         _this.fromList.processId = data.data;
         _this.taskId = data.data;
         let list = {

src/pages/main/leader/demand/demandHomes.vue

@@ -82,7 +82,7 @@
         </div>
       </div>
     </el-dialog>
-    <div v-if="destroy">
+    <div >
       <el-dialog
         title="处理操作"
         width="100%"
@@ -94,17 +94,17 @@
       >
         <Workflow
           :list="fromList"
-          v-if="isWorkflowStatus == true"
+   
           @beforeClose="beforeClose"
           :requestForm="requestForm"
         />
-        <WorkflowEntrance
+        <!-- <WorkflowEntrance
           :list="fromList"
           v-else
           :lastManList="lastManList"
           @beforeClose="beforeClose"
           :requestForm="requestForm"
-        />
+        /> -->
 
         <!-- 后期维护 -->
       </el-dialog>
@@ -209,7 +209,7 @@ export default {
       textarea: "未填写意见",
       num: 0,
       dialogStatus: false, //新建dialog显示
-      handleStatus: false, //处理按钮状态
+      handleStatus: true, //处理按钮状态
       tabList: [
         {
           index: "first",

src/router/index.js

@@ -2108,6 +2108,16 @@ const routes = [{
             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcel/index'], resolve)
         },
         {
+            
+            meta: {
+                name: '协同编辑',
+                keepAlive: false
+            },
+            path: '/editOnline',
+            name: 'editOnline',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcel/index'], resolve)
+        },
+        {
             meta: {
                 name: '在线文档(市场)',
                 keepAlive: false

vue.config.js

@@ -134,7 +134,7 @@ module.exports = {
                 // target: 'http://127.0.0.1:9600/',
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
-                // target: 'http://192.168.2.169:9600/',
+                // target: 'http://192.168.2.124:9600/',
                 // target: "http://124.223.66.248:9600",
                 target: "http://43.138.50.94:9600",
                 changeOrigin: true,