Merge branch 'master' of https://git.agilestar.cn/spfm/spfm-market-front into hjw-2023.1.4

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

@@ -264,14 +264,14 @@ let common = {
                         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)
+                        bus.$message.success(response.data.message)
+                         loading.close()
+                         success(response.data.data)
+                         return response
+                        // if (response.code === 1 ||response.code == '1') {
+                        //     bus.$message.success(response.data.message)
                         //      loading.close()
-                        //      success(response.data)
+                        //      success(response.data.data)
                         //      return response
                     } else {
                         if (obj.printMsg) {

src/assets/js/http.js

@@ -1,4 +1,4 @@
-
+
 import axios from 'axios'
 import common from "./common.js";
 import vue from '../../components/common/bus';

src/assets/js/url.js

@@ -13,6 +13,7 @@ const urls = {
     //新需求申请单工作流接口
     formList: {
         startWork: ctxForm + '/startProcess',   //开始工作流
+        startWorkList: ctxForm + '/batchStartProcess',   //开始工作流多人
         nextWork: ctxForm + '/complateTask',  //工作流next流转
         getWorkId: ctxForm + '/getRunningProcessInstance', // 获取工作流任务id
         transferTask: ctxForm + '/process/transferTask/',//转派工作流接口

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/workflowBase.vue

@@ -447,6 +447,8 @@ export default {
     clickGetTree(e, index) {
       this.$refs.defTree.userList = [];
       this.backThree = [];
+      this.$refs.defTree.userList = [];
+      this.backThree = [];
       this.CopyStatus = false;
       this.TransferStatus = false;
       //   this.clickTaskName = e.properties.name;
@@ -473,19 +475,33 @@ export default {
         });
         this.nextDealManList = arr.toString();
       } else {
+        if (this.manyPeopleStatus == true) {
+        this.backThree = e;
+
+        let arr = [];
+        this.backThree.map((item) => {
+          arr.push(item.loginNoStr);
+        });
+        this.nextDealManList = arr.toString();
+      } else {
         if (e.length > 1) {
-          this.$message.error("只能选择一个人");
-          return;
-        } else {
-          this.backThree = e;
+            this.$message.error("只能选择一个人");
+            return;
+          } else {
+            this.backThree = e;
           if (this.CopyStatus === true) {
             this.getTreeLists(e[0].loginNoStr, 2);
           }
 
+            if (this.CopyStatus === true) {
+            this.getTreeLists(e[0].loginNoStr, 2);
+          }
+
           if (e[0]) {
-            this.selectUser = e[0].loginNameStr;
-          } else {
-            this.selectUser = "暂无选择";
+              this.selectUser = e[0].loginNameStr;
+            } else {
+              this.selectUser = "暂无选择";
+          }
           }
         }
       }
@@ -598,17 +614,20 @@ export default {
   text-align: center;
 }
 
+
 .flex-icon {
   float: right;
   margin-right: 20px;
   color: #4277a1;
 }
 
+
 .flex-handle {
   width: 100%;
   padding: 30px;
   display: flex;
 
+
   .flex-right {
     width: 50%;
     border: 1px solid #e1e1e1;
@@ -616,15 +635,18 @@ export default {
   }
 }
 
+
 .flex-left {
   width: 50%;
   display: flex;
   flex-direction: column;
 
+
   .flex-left-header {
     display: flex;
     justify-content: space-around;
 
+
     .flex-path {
       height: 280px;
       border: 1px solid #e1e1e1;
@@ -633,11 +655,13 @@ export default {
   }
 }
 
+
 .flex-common {
   padding: 10px 5%;
   font-size: 18px;
 }
 
+
 .flex-left-header-text {
   height: 40px;
   line-height: 40px;
@@ -648,21 +672,25 @@ export default {
   font-weight: bold;
 }
 
+
 .flex-path-list {
   overflow-y: scroll;
   overflow-x: hidden;
   height: 14rem;
 }
 
+
 .flex-slide {
   overflow-y: scroll;
   overflow-x: hidden;
 }
 
+
 .active {
   background-color: #f3faff;
 }
 
+
 .flex-opinion {
   height: 280px;
   border: 1px solid #e1e1e1;
@@ -670,28 +698,33 @@ export default {
   margin-top: 20px;
 }
 
+
 .flex-right-text {
   margin-right: 20px;
   width: 50%;
 }
 
+
 .flex-commons {
   height: 280px;
   border: 1px solid #e1e1e1;
   width: 30%;
 }
 
+
 .flex-footer-botton {
   display: flex;
   justify-content: space-evenly;
 }
 
+
 .flex-button {
   margin-top: 10px;
   margin-bottom: 10px;
 
+
   ::v-deep .el-button--primary {
     width: 222px;
   }
 }
-</style>
+</style>

src/pages/main/endToEnd/index.vue

@@ -194,8 +194,41 @@
         </el-dialog>
 
 
-
-        <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
+        <el-dialog
+        title="选择审批人"
+        :visible.sync="checkexa"
+        width="100%"
+        style="height: 100%"
+        :fullscreen="true"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 100%">
+          <el-form :model="infolist" ref="infolist"  :rules="rules" style="height: 100%">
+            <el-form-item prop="visiblec" style="height: 100%" >
+             
+              <deptTreeOnly
+                @treeCheck="treeCheckonly"
+                :defaultList="defaultList"
+                :type="depttype"
+                :closeList="closeList"
+              ></deptTreeOnly>
+              <div style="text-align: center; margin-top: 30px">
+                <el-button type="primary" @click="checkProcessUser()"
+                  >确 定</el-button
+                >
+                <el-button @click="checkexa = false">取 消</el-button>
+                <!-- <el-button v-if="titname == '添加'" type="primary" @click="dialogCliadd">确 定</el-button>
+                    <el-button v-if="titname != '添加'" type="primary" @click="dialogCli(2)">确 定</el-button>
+                    <el-button @click="checkexa = false">取 消</el-button> -->
+              </div>
+              
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-dialog>
+        <!-- <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
             :modal-append-to-body="false" :close-on-click-modal="false">
             <div>
 
@@ -218,7 +251,7 @@
                     <el-button @click="checkexa = false">取 消</el-button>
                 </div>
             </div>
-        </el-dialog>
+        </el-dialog> -->
 
         <myMessage :messTit='messTit' @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
             v-if="centerDialogVisible"></myMessage>
@@ -231,7 +264,8 @@
     import toolList from '../../../components/toolList'
     import myUpload from '../../../components/upload'
     import uploadDown from '../../../components/uploadDown.vue'
-    import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    // import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    import deptTreeOnly from "../../../components/newTree.vue";
 
     export default {
         components: {
@@ -313,7 +347,7 @@
                 demandTypeopt: [],
                 carryChannelopt: [],
                 checkexa: false,
-                treeListonly: {},
+                treeListonly: [],
                 defaultList: [],
                 closeList: false,
                 depttype: 0,
@@ -362,6 +396,17 @@
             }
         },
         methods: {
+             checkProcessUser() {
+                let _this = this;
+                if (_this.treeListonly.length > 1) {
+                    _this.$message({
+                    message: "只能选择一个人",
+                    type: "error",
+                    });
+                } else {
+                    _this.dialogCliadd();
+                }
+                },
             //搜索数据
             searchInfo(v) {
                 this.params = {};
@@ -380,6 +425,25 @@
             },
             treeCheckonly(v) {
                 this.treeListonly = v;
+                console.log(v);
+                this.treeListonly.leaderAuditName = v[0].label;
+                this.treeListonly.leaderAuditNo = v[0].key;
+                // var val = {...v};
+                // console.log(val);
+                
+
+                //  let newArr=v.map(function (currentValue, index, ar) {
+                //     console.log(currentValue);//遍历打印1,2,3
+                //     // console.log(index);//遍历打印0,1,2
+                //     console.log(ar);//遍历打印三次[1, 2, 3]
+                //     // console.log(currentValue.key);
+                   
+                // //    this.treeListonly.leaderAuditName = currentValue.label;
+                // },)
+                // this.treeListonly.leaderAuditNo = newArr.currentValue.key;
+                // console.log(this.currentValue.key);
+
+
             },
             choline(v, n) {
                 if (v == 1) {
@@ -595,6 +659,7 @@
                     }
                     this.submitInfo("/bpm/api/submitTask", params);
                 } else if (v === 2) {
+                    console.log(222222)
                     let param = {
                         dealType: '0',
                         dealTypeDesc: '提交',
@@ -684,6 +749,7 @@
             },
             //添加
             dialogCliadd(v) {
+                console.log(11111)
                 let _this = this;
                 let info = {};
                 info.params = {};
@@ -710,7 +776,7 @@
                         return
                     }
                 }
-
+                console.log(123);
                 for (let i = 0; i < this.options.length; i++) {
                     if (this.terminal == this.options[i].procId) {
                         info.procName = this.options[i].procName;
@@ -782,6 +848,7 @@
                     data: {},
                 }).then((res) => {
                     this.options = res.data.data;
+                    console.log(res.data.data);
                 });
             },
             closeMessage(v) {
@@ -870,6 +937,9 @@
     }
 </script>
 <style scoped lang="scss">
+    ::v-deep .el-dialog .flex-box{
+        height: 400px;
+    }
     .onetab {
         margin-bottom: 20px;
         padding: 0 20px;

src/pages/main/integral/index.vue

@@ -150,7 +150,43 @@
                 </div>
             </div>
         </el-dialog>
-        <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
+        <el-dialog
+        title="选择审批人"
+        :visible.sync="checkexa"
+        width="100%"
+        style="height: 100%"
+        :fullscreen="true"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 100%">
+          <el-form :model="infolist" ref="infolist" style="height: 100%">
+            <el-form-item  style="height: 100%" >
+             
+              <deptTreeOnly
+                @treeCheck="treeCheckonly"
+                :defaultList="defaultList"
+                :type="depttype"
+                :closeList="closeList"
+              ></deptTreeOnly>
+              <div style="text-align: center; margin-top: 30px">
+                <el-button type="primary" @click="checkProcessUser()"
+                  >确 定</el-button
+                >
+				<!-- <el-button type="primary" @click="dialogCliadd" v-if="!visionchonly">确 定</el-button>
+        			<el-button type="primary" @click="dialogCli(2)" v-if="visionchonly">确 定</el-button> -->
+                <el-button @click="checkexa = false">取 消</el-button>
+                <!-- <el-button type="primary" @click="dialogCliadd" v-if="vision != '审批'">确 定</el-button>
+                    <el-button type="primary" @click="dialogCli(2)" v-if="vision == '审批'">确 定</el-button>
+                <el-button @click="checkexa = false">取 消</el-button> -->
+              </div>
+             
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-dialog>
+        <!-- <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
             :modal-append-to-body="false" :close-on-click-modal="false">
             <div>
 
@@ -173,7 +209,7 @@
                     <el-button @click="checkexa = false">取 消</el-button>
                 </div>
             </div>
-        </el-dialog>
+        </el-dialog> -->
 
         <myMessage :messTit='messTit' @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
             v-if="centerDialogVisible"></myMessage>
@@ -186,7 +222,8 @@
     import toolList from '../../../components/toolList'
     import myUpload from '../../../components/upload'
     import uploadDown from '../../../components/uploadDown.vue'
-    import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    // import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    import deptTreeOnly from "../../../components/newTree.vue";
 
     export default {
         components: {
@@ -276,12 +313,25 @@
             }
         },
         methods: {
+            checkProcessUser() {
+                let _this = this;
+                if (_this.treeListonly.length > 1) {
+                    _this.$message({
+                    message: "只能选择一个人",
+                    type: "error",
+                    });
+                } else {
+                    _this.dialogCliadd();
+                }
+                },
             deletes() {
                 this.treeListonly = {};
                 this.closeList = !this.closeList;
             },
             treeCheckonly(v) {
                 this.treeListonly = v;
+                this.treeListonly.leaderAuditName = v[0].label;
+                this.treeListonly.leaderAuditNo = v[0].key;
             },
             choline(v, n) {
                 if (v == 1) {
@@ -670,6 +720,15 @@
     }
 </script>
 <style scoped lang="scss">
+    ::v-deep .el-dialog__body {
+        max-height: calc(100vh - 70px) !important;
+        min-height: 100px;
+        height: 100%;
+        overflow-y: hidden;
+        }
+    ::v-deep .el-dialog .flex-box{
+        height: 400px;
+    }
     .onetab {
         margin-bottom: 20px;
         padding: 0 20px;

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/pages/main/outCallDemand/index.vue

@@ -230,7 +230,49 @@
 				</div>
 			</div>
 		</el-dialog>
-        <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
+		 <el-dialog
+        title="选择审批人"
+        :visible.sync="checkexa"
+        width="100%"
+        style="height: 100%"
+        :fullscreen="true"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 100%">
+          <el-form :model="infolist" ref="infolist" style="height: 100%">
+            <el-form-item prop="visiblec" style="height: 100%">
+              <!-- <span style="width: 80px">审批人员</span> -->
+              <deptTreeOnly
+                @treeCheck="treeCheckonly"
+                :defaultList="defaultList"
+                :type="depttype"
+                :closeList="closeList"
+              ></deptTreeOnly>
+              <div style="text-align: center; margin-top: 30px">
+                <el-button type="primary" @click="checkProcessUser()"
+                  >确 定</el-button
+                >
+				<!-- <el-button type="primary" @click="dialogCliadd" v-if="!visionchonly">确 定</el-button>
+        			<el-button type="primary" @click="dialogCli(2)" v-if="visionchonly">确 定</el-button> -->
+                <el-button @click="checkexa = false">取 消</el-button>
+              </div>
+              <!-- <div class="tree treeUser">
+                <p>
+                  {{ treeListonly.leaderAuditName }}
+                  <i
+                    v-if="treeListonly.leaderAuditName"
+                    @click="treeDelete()"
+                    class="el-icon-error"
+                  ></i>
+                </p>
+              </div> -->
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-dialog>
+        <!-- <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
         	:modal-append-to-body="false" :close-on-click-modal="false">
         	<div>
 
@@ -254,7 +296,7 @@
         			<el-button @click="checkexa = false">取 消</el-button>
         		</div>
         	</div>
-        </el-dialog>
+        </el-dialog> -->
 
 	</fullscreen>
 
@@ -265,7 +307,8 @@
 	import toolList from '../../../components/toolList'
 	import myUpload from '../../../components/upload'
 	import uploadDown from '../../../components/uploadDown.vue'
-    import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    // import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+	import deptTreeOnly from "../../../components/newTree.vue";
 
 	export default {
 		components: {
@@ -532,12 +575,25 @@
 			}
 		},
 		methods: {
+			checkProcessUser() {
+                let _this = this;
+                if (_this.treeListonly.length > 1) {
+                    _this.$message({
+                    message: "只能选择一个人",
+                    type: "error",
+                    });
+                } else {
+                    _this.dialogCliadd();
+                }
+                },
             deletes() {
             	this.treeListonly = {};
             	this.closeList = !this.closeList;
             },
             treeCheckonly(v) {
             	this.treeListonly = v;
+				this.treeListonly.leaderAuditName = v[0].label;
+				this.treeListonly.leaderAuditNo = v[0].key;
             },
 			closedia() {
 				this.infolist = {
@@ -937,6 +993,9 @@
 	}
 </script>
 <style scoped lang="scss">
+	::v-deep .el-dialog .flex-box{
+        height: 400px;
+    }
 	.onetab {
 		margin-bottom: 20px;
 		padding: 0 20px;

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
@@ -2152,6 +2162,19 @@ const routes = [{
             component: resolve => require(['../pages/main/processruns/processruns.vue'], resolve),
             meta: { title: '运行流程' }
         }
+        ,{
+            meta: { name: '风险防控管理', keepAlive: false },
+            path: '/riskMaterials',
+            name: 'riskMaterials',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/leader/risk/riskMaterials.vue'], resolve)
+        },{
+            meta: { name: '风险防控管理', keepAlive: false },
+            path: '/riskManagement',
+            name: 'riskManagement',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/leader/risk/riskManagement.vue'], resolve)
+        },
     ]
 },
 {

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,