需管渠道

src/assets/js/common.js

@@ -261,13 +261,13 @@ let common = {
         if (obj.type == 'post') {
             bus.$axios['post'](obj.url + '?t=' + Math.random(), obj.data, header)
                 .then(function (response) {
-                    console.log(response.data)
+                    // console.log(response.data)
                     if (!obj.disableLoading) {
                         loading.close()
                     }
                     if (process.env.VUE_APP_ENV == 'development' || process.env.VUE_APP_ENV == 'devs') {
                         if (response.code === 1 || response.code == '1') {
-                            bus.$message.success(response.data.message)
+                            bus.$message.success(response.message)
                             loading.close()
                             success(response.data)
                             return response

src/components/deptTreeUserNew.vue

@@ -3,17 +3,20 @@
         <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input>
         <el-tree :highlight-current="true" :check-strictly="true" ref="tree" @check-change="handleCheckChange"
             :data="treeList" node-key="id" :default-checked-keys="defaultListc" :default-expanded-keys="defaultListc"
-            @node-click="handleNodeClick" @node-expand="handleNodeClick" :filter-node-method="filterNode">
+            @node-click="handleNodeClick"  :filter-node-method="filterNode">
             <span class="custom-tree-node" slot-scope="{ node, data }" @click="cs(node)">
                 <em style="display: inline-block;width: 20px;" v-if="node.data.haveUserFlag == 'N'&& node.data.children.length == 0"></em>
                 <i class="el-icon-caret-right" v-if="node.data.haveUserFlag == 'Y' && node.data.children.length == 0"></i>
                 <el-checkbox style="margin-right: 10px" v-model="node.checked" v-if="node.data.type == 1"></el-checkbox>
                 <span>{{ node.label }}</span>
+                <!-- @node-expand="handleNodeClick" -->
             </span>
         </el-tree>
     </div>
 </template>
+
 <script>
+import loginInitVue from '../pages/main/userId/loginInit.vue';
     export default {
         props: ["defaultList", "type", "closeList","fillLists"],
         data() {
@@ -112,14 +115,15 @@
                 
                     
                 });
+                // console.log(v.children);
                  
-                    node.childNodes.forEach(m=>{
-                         this.fillLists.forEach(n=>{
-                            if(m.data.loginNoStr == n.fillNo){
-                                m.checked = true
-                            }
-                         })
-                     })
+                    // node.childNodes.forEach(m=>{
+                    //      this.fillLists.forEach(n=>{
+                    //         if(m.data.loginNoStr == n.fillNo){
+                    //             m.checked = true
+                    //         }
+                    //      })
+                    //  })
                      
                 for (let i = 0; i < this.$refs.tree.store._getAllNodes().length; i++) {
                     if (s && v.o == this.$refs.tree.store._getAllNodes()[i].data.o) {
@@ -130,6 +134,8 @@
             },
         },
         created() {
+            console.log(this.fillLists);
+            console.log(this.closeList);
             this.getTree();
             this.defaultListc = this.defaultList;
         },

src/config/dev.js

@@ -24,6 +24,7 @@ let devs = {
     resourceApply: '569ffe50-b25a-11ed-886f-d6cd97160e00',//资源申请
     securityAudit: 'd7dd8e5e-b320-11ed-886f-d6cd97160e00',//安全审计
     userChange: 'c4624dbc-b322-11ed-886f-d6cd97160e00',//用户使用者变更
+    bfsjList: '524e01f7-b25d-11ed-886f-d6cd97160e00',//备份数据
 }
 let dev = {
     TITLE: '本地环境',
@@ -50,6 +51,7 @@ let dev = {
     resourceApply: '569ffe50-b25a-11ed-886f-d6cd97160e00',//资源申请
     securityAudit: 'd7dd8e5e-b320-11ed-886f-d6cd97160e00',//安全审计
     userChange: 'c4624dbc-b322-11ed-886f-d6cd97160e00',//用户使用者变更
+    bfsjList: '524e01f7-b25d-11ed-886f-d6cd97160e00',//备份数据
 }
 let test = {
     TITLE: '测试环境',
@@ -76,8 +78,7 @@ let test = {
     resourceApply: '1f6a7842-b25c-11ed-be6b-00505687dcd3',//资源申请
     securityAudit: '93dc4075-b33f-11ed-be6b-00505687dcd3',//安全审计
     userChange: '3626d7d9-b33f-11ed-be6b-00505687dcd3',//用户使用者变更
-
-
+    bfsjList: 'dbd83414-b25f-11ed-be6b-00505687dcd3',//备份数据
 }
 let prod = {
     TITLE: '线上环境',
@@ -87,6 +88,14 @@ let prod = {
     provincialWorkOrderAreafresourceId: 'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
     provincialWorkOrderfresourceId: '9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
     riskMaterialsfresourceId: 'canvas',//风险防控
+    authoriZation: 'a4c88c4e-d99e-11ed-8255-e00084564cce',//口令授权
+    backupRequire: 'b5c62d50-d99d-11ed-8255-e00084564cce',//备份需求
+    emergencyPlan: '8bcdfa43-d9a0-11ed-8255-e00084564cce',//应急预案
+    internetAccess: '5e83a807-d99e-11ed-8255-e00084564cce',//互联网端口
+    resourceApply: '428f1a81-d9a1-11ed-8255-e00084564cce',//资源申请
+    securityAudit: '99fa2bcc-d99f-11ed-8255-e00084564cce',//安全审计
+    userChange: 'e6eaf005-d99e-11ed-8255-e00084564cce',//用户使用者变更
+    bfsjList: 'f458d35a-d9a0-11ed-8255-e00084564cce',//备份数据
 }
 export const getConfig = () => {
     switch (process.env.VUE_APP_ENV) {

src/pages/main/applyFor/authoriZation.vue

@@ -20,6 +20,7 @@
       <el-dialog
        :title="dialogTitle + '工单'"
         :visible.sync="dialogVisible"
+        v-if="dialogVisible"
         :before-close="handleClose"
         width="100%"
         height="500vh"
@@ -367,7 +368,7 @@ export default {
       mkFileShareAttachList:[],
       requestForm: {
         // fresourceId: "1db52dc3-b328-11ed-886f-d6cd97160e00",
-        fresourceId: "1ecbaf96-b33f-11ed-be6b-00505687dcd3",
+        // fresourceId: "1ecbaf96-b33f-11ed-be6b-00505687dcd3",
         fresourceId: getConfig().authoriZation,
         processDefinitionKey: "KLSQ_process",
         taskId:"",
@@ -589,7 +590,7 @@ export default {
     // },
     "ruleForm.editUserArea":{
       handler(e){
-        console.log(e);
+     
         if(e == "自定义"){
           this.fanwei = true;
         }else{
@@ -599,7 +600,7 @@ export default {
     },
     "ruleForm.editBat":{
       handler(e){
-        console.log(e);
+  
         if(e == "上传附件"){
           this.jiaoben = true;
           this.tianxie = false;
@@ -612,7 +613,7 @@ export default {
   },
   methods: {
       download(u) {
-      console.log(u);
+
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -652,7 +653,7 @@ export default {
       
     },
        download1(u) {
-      console.log(u);
+
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -692,8 +693,7 @@ export default {
       
     },
      processNoLimitUsers() {
-            console.log(this.treeList);
-            console.log(this.treeListonly);
+          
             var userNameString = '';
                 this.noLimitUsers = [];
                 this.treeList.map((o) => {
@@ -717,10 +717,13 @@ export default {
     handleClose(){
       this.ruleForm = {};
       this.backlogTodo();
+      this.haveDone();
+      this.iniTiate();
       this.getneedNo();
       this.dialogVisible = false;
       this.tableData = [];
       this.fileInfo.fileList = [];
+      
     },
     handleCloses(){
       this.treeList = [];
@@ -729,11 +732,11 @@ export default {
       
     },
     clickTabs(name) {
-      console.log(name);
+  
 
       this.$refs.TableList.page = 1;
       this.childname = name;
-        // console.log(this.childname);
+  
       this.page = 1;
        this.baocun = false;
       if (name == "first") {
@@ -758,7 +761,7 @@ export default {
       }
     },
     clickDemand(e, r) {
-      //  console.log(e,r);
+  
       if (e === "文件标题") {
         if(this.childname == "first"){
             if(r.taskName == "发起工单"){
@@ -801,10 +804,10 @@ export default {
       }
     },
       operationZuo(r){
-      console.log(r);
+  
       let list = {}
       list.id = r.id,
-      // console.log(row)
+    
       this.$http({
         url:"/market/KlsqProcess/query",
         method:"post",
@@ -819,7 +822,7 @@ export default {
           this.ruleForm.taskId = r.taskId;
           this.ruleForm.resourceId = r.resourceId;
           this.ruleForm.createId = r.createId;
-          console.log(r.taskName);
+      
           this.ruleForm.taskName1 = r.taskName;
           this.fileInfo.fileList = res.data.editFileShareAttachList;
           this.fileInfo1.fileList = res.data.batFileShareAttachList;
@@ -840,8 +843,7 @@ export default {
     },
     changeNum(val) {
       this.page = val;
-      console.log(this.page);
-      console.log(this.childname);
+     
       switch (this.childname) {
         case "first":
           this.backlogTodo();
@@ -859,18 +861,16 @@ export default {
       }
     },
      uploadBack(u){
-      console.log(u);
+    
       this.attList = u;
       // this.fufujian = u;
     //   this.fuback = u;
     //   console.log(this.fuback);
    },
      uploadBack1(u){
-      console.log(u);
+  
       this.attList1 = u;
-      // this.fufujian = u;
-    //   this.fuback = u;
-    //   console.log(this.fuback);
+  
    },
     close() {
        this.handleClose();
@@ -881,19 +881,20 @@ export default {
       this.dialogVisible = true;
       // this.ruleForm = {}
       this.isdisabled = false;
+      this.noLimitUserName = '';
       this.getUser();
       this.time();
     },
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-      this.ruleForm.docId = this.userInfo.loginNo;
+      
       this.ruleForm.proposer = this.userInfo.loginName;
 
     },
     time() {
       // this.ruleForm.createTime = this.formatDateTime;
       this.ruleForm.proposerTime = this.$formatDate(new Date(), "YYYY-MM-DD");
-      this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
+      
     },
     changeSelect(e) {},
      newFormgong(){
@@ -902,24 +903,24 @@ export default {
 
     },
     submitForm(formName) {
-        console.log(this.$refs.ruleForm)
+    
         this.$refs.ruleForm.validate((valid) => {
-          console.log(valid);
+    
           if (valid) {
              this.$message.success("保存成功");
-              console.log(this.ruleForm);
+      
               this.getUserIds();
               // this.iniTiate();
               // this.newForm();
-               if(this.ruleForm.tableName1 == "发起工单" || this.ruleForm.id){
-                console.log(12212121212121212121);
-                this.newUpdate();
-              }else{
-                this.newForm();
-              }
+              //  if(this.ruleForm.tableName1 == "发起工单" || this.ruleForm.id){
+      
+              //   this.newUpdate();
+              // }else{
+              //   this.newForm();
+              // }
 
           } else {
-            // console.log('error submit!!');
+   
             this.$message.error("请完善表单信息");
             return false;
           }
@@ -943,7 +944,7 @@ export default {
          },
         data: this.ruleForm,
       }).then((res) => {
-        // console.log(res.data.body.id);
+    
           this.ruleForm.id = res.data.body;
           this.request_form.businessKey = res.data.body;
           this.request_form.title = '[IT工作台]-'+'口令授权-'+ this.$refs.ruleForm.model.needName;
@@ -999,8 +1000,14 @@ export default {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
         this.request_form.title = '[IT工作台]-'+'口令授权-'+ this.$refs.ruleForm.model.needName;
-        // console.log(this.request_form);
+        
         // this.clickHandle(this.ruleForm);
+         if(this.ruleForm.tableName1 == "发起工单" || this.ruleForm.id){
+               
+                this.newUpdate();
+              }else{
+                this.newForm();
+              }
        });
      },
      async clickHandle(e) {
@@ -1019,8 +1026,7 @@ export default {
 //         _this.ruleForm.taskId = _this.ruleForm.taskId;
         // a = a 
 //         _this.taskId = data.data;
-       console.log(data);
-      //  console.log(data.code);
+      
       _this.ruleForm.processId = data.data;
        let list = {
          id: e.id,
@@ -1030,15 +1036,14 @@ export default {
           
           // resourceId: _this.nextPath.currentShape[0].resourceId,
        };
-        // console.log(processDefinitionKey);
-        console.log(list);
+       
          _this.setUpdate(list);
       }
      },
     //更新工作流接口
 
     setUpdate(e) {
-      console.log(e);
+     
       this.$http({
        url: "/market/waf/updateBase",
         method: "post",
@@ -1185,7 +1190,7 @@ export default {
         this.tabList[2].number = res.data.totalRecord;
           
       
-       console.log(this.Table);
+      
       })
 
     },
@@ -1206,7 +1211,7 @@ export default {
       //   this.twoTable.data = res.data.data;
       //   this.twoTable.pageData.total = res.data.totalRecord;
       //   this.Table = this.twoTable;
-      //   // console.log(this.Table);
+   
       // });
        let list = {
         tableName : this.requestForm.processDefinitionKey
@@ -1214,7 +1219,7 @@ export default {
        getDoneBase(this.page,"",list).then((res)=>{
        this.twoTable.data = res.data.data;
        this.twoTable.pageData.total = res.data.totalRecord;
-       console.log(this.Table);
+      
        this.tabList[1].number = res.data.totalRecord;
       })
 

src/pages/main/applyFor/backupRequire.vue

@@ -20,6 +20,7 @@
       <el-dialog
        :title="dialogTitle + '工单'"
         :visible.sync="dialogVisible"
+        v-if="dialogVisible"
         :before-close="handleClose"
         width="100%"
         height="500vh"
@@ -446,9 +447,9 @@ export default {
 
     "ruleForm.taskName1":{
       handler(e){
-        console.log(e);
+    
         if(e != "发起备份申请"){
-          console.log(1111112222222);
+        
           this.disshan = true;
           this.disxin = true;
         }else{
@@ -459,7 +460,7 @@ export default {
   },
   methods: {
       download(u) {
-      console.log(u);
+
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -501,6 +502,8 @@ export default {
     handleClose(){
       this.ruleForm = {};
       this.backlogTodo();
+      this.haveDone();
+      this.iniTiate();
       this.getneedNo();
       this.dialogVisible = false;
       this.tableData = [];
@@ -513,11 +516,10 @@ export default {
       
     },
     clickTabs(name) {
-      console.log(name);
 
       this.$refs.TableList.page = 1;
       this.childname = name;
-        // console.log(this.childname);
+     
       this.page = 1;
        this.baocun = false;
       if (name == "first") {
@@ -542,7 +544,7 @@ export default {
       }
     },
     clickDemand(e, r) {
-      //  console.log(e,r);
+ 
       if (e === "文件标题") {
         if(this.childname == "first"){
             if(r.taskName == "发起备份申请"){
@@ -585,10 +587,10 @@ export default {
       }
     },
       operationZuo(r){
-      console.log(r);
+  
       let list = {}
       list.id = r.id,
-      // console.log(row)
+    
       this.$http({
         url:"/market/BfxqProcess/query",
         method:"post",
@@ -603,7 +605,7 @@ export default {
           this.ruleForm.taskId = r.taskId;
           this.ruleForm.resourceId = r.resourceId;
           this.ruleForm.createId = r.createId;
-          console.log(r.taskName);
+        
           this.ruleForm.taskName1 = r.taskName;
           this.fileInfo.fileList = res.data.mkFileShareAttachList;
            if(r.taskName == "发起备份申请"){
@@ -622,8 +624,7 @@ export default {
     },
     changeNum(val) {
       this.page = val;
-      console.log(this.page);
-      console.log(this.childname);
+    
       switch (this.childname) {
         case "first":
           this.backlogTodo();
@@ -641,11 +642,9 @@ export default {
       }
     },
      uploadBack(u){
-      console.log(u);
+   
       this.attList = u;
-      // this.fufujian = u;
-    //   this.fuback = u;
-    //   console.log(this.fuback);
+  
    },
     close() {
       this.handleClose();
@@ -661,14 +660,14 @@ export default {
     },
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-      this.ruleForm.docId = this.userInfo.loginNo;
+      // this.ruleForm.docId = this.userInfo.loginNo;
       this.ruleForm.proposer = this.userInfo.loginName;
 
     },
     time() {
       // this.ruleForm.createTime = this.formatDateTime;
       this.ruleForm.proposerTime = this.$formatDate(new Date(), "YYYY-MM-DD");
-      this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
+      
     },
     changeSelect(e) {},
      newFormgong(){
@@ -677,24 +676,24 @@ export default {
 
     },
     submitForm(formName) {
-        console.log(this.$refs.ruleForm)
+    
         this.$refs.ruleForm.validate((valid) => {
-          console.log(valid);
+     
           if (valid) {
              this.$message.success("保存成功");
-              console.log(this.ruleForm);
+    
               this.getUserIds();
               // this.iniTiate();
               // this.newForm();
-               if(this.ruleForm.tableName1 == "发起备份申请" || this.ruleForm.id){
-                console.log(12212121212121212121);
-                this.newUpdate();
-              }else{
-                this.newForm();
-              }
+              //  if(this.ruleForm.tableName1 == "发起备份申请" || this.ruleForm.id){
+             
+              //   this.newUpdate();
+              // }else{
+              //   this.newForm();
+              // }
 
           } else {
-            // console.log('error submit!!');
+         
             this.$message.error("请完善表单信息");
             return false;
           }
@@ -715,7 +714,7 @@ export default {
          },
         data: this.ruleForm,
       }).then((res) => {
-        // console.log(res.data.body.id);
+      
           this.ruleForm.id = res.data.body;
           this.request_form.businessKey = res.data.body;
           this.request_form.title = '[IT工作台]-'+'备份需求及变更-'+ this.$refs.ruleForm.model.needName;
@@ -766,8 +765,12 @@ export default {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
         this.request_form.title = '[IT工作台]-'+'备份需求及变更-'+ this.$refs.ruleForm.model.needName;
-        // console.log(this.request_form);
-        // this.clickHandle(this.ruleForm);
+         if(this.ruleForm.tableName1 == "发起备份申请" || this.ruleForm.id){
+               
+                this.newUpdate();
+              }else{
+                this.newForm();
+              }
        });
      },
      async clickHandle(e) {
@@ -786,8 +789,7 @@ export default {
 //         _this.ruleForm.taskId = _this.ruleForm.taskId;
         // a = a 
 //         _this.taskId = data.data;
-       console.log(data);
-      //  console.log(data.code);
+   
       _this.ruleForm.processId = data.data;
        let list = {
          id: e.id,
@@ -797,15 +799,14 @@ export default {
           
           // resourceId: _this.nextPath.currentShape[0].resourceId,
        };
-        // console.log(processDefinitionKey);
-        console.log(list);
+       
          _this.setUpdate(list);
       }
      },
     //更新工作流接口
 
     setUpdate(e) {
-      console.log(e);
+
       this.$http({
        url: "/market/waf/updateBase",
         method: "post",
@@ -921,7 +922,7 @@ export default {
          },
         
       }).then((res) => {
-        //  console.log(res.data.body);
+     
         // this.ruleForm.applyNew = res.data;
         this.ruleForm.workOrderNo = res.data.body;
       });
@@ -937,19 +938,17 @@ export default {
         
       }).then((res) => {
         // this.optionList = res.data;
-        // console.log(res.data);
+  
         for( let i=0;i<res.data.length;i++){
-          // console.log(res.data[i].children);
+        
           for(let j=0;j<res.data[i].children.length;j++){
-            // console.log(res.data[i].children[j].label);
+        
             this.optionList.push({
               name:res.data[i].children[j].label
             })
           }
         }
-        //  console.log(res.data.body);
-        // this.ruleForm.applyNew = res.data;
-        // this.ruleForm.workOrderNo = res.data.body;
+        
       });
     },
     
@@ -977,7 +976,7 @@ export default {
         this.tabList[2].number = res.data.totalRecord;
           
       
-       console.log(this.Table);
+  
       })
 
     },
@@ -998,7 +997,7 @@ export default {
       //   this.twoTable.data = res.data.data;
       //   this.twoTable.pageData.total = res.data.totalRecord;
       //   this.Table = this.twoTable;
-      //   // console.log(this.Table);
+   
       // });
        let list = {
         tableName : this.requestForm.processDefinitionKey
@@ -1006,7 +1005,7 @@ export default {
        getDoneBase(this.page,"",list).then((res)=>{
        this.twoTable.data = res.data.data;
        this.twoTable.pageData.total = res.data.totalRecord;
-       console.log(this.Table);
+ 
        this.tabList[1].number = res.data.totalRecord;
       })
 

src/pages/main/applyFor/emergencyPlan.vue

@@ -20,6 +20,7 @@
       <el-dialog
        :title="dialogTitle + '工单'"
         :visible.sync="dialogVisible"
+        v-if="dialogVisible"
         :before-close="handleClose"
         width="100%"
         height="500vh"
@@ -520,9 +521,9 @@ export default {
 
     "ruleForm.taskName1":{
       handler(e){
-        console.log(e);
+     
         if(e != "发起人填写"){
-          console.log(1111112222222);
+   
           this.disshan = true;
           this.disxin = true;
         }else{
@@ -533,7 +534,7 @@ export default {
   },
   methods: {
       download(u) {
-      console.log(u);
+    
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -574,7 +575,11 @@ export default {
     },
     handleClose(){
       this.ruleForm = {};
+      this.haveDone();
+      this.iniTiate();
       this.backlogTodo();
+      this.getToBeRead();
+      this.getBeReadList();
       this.getneedNo();
       this.dialogVisible = false;
       this.tableData = [];
@@ -587,11 +592,11 @@ export default {
       
     },
     clickTabs(name) {
-      console.log(name);
+
 
       this.$refs.TableList.page = 1;
       this.childname = name;
-        // console.log(this.childname);
+      
       this.page = 1;
        this.baocun = false;
       if (name == "first") {
@@ -624,7 +629,7 @@ export default {
         }
     },
     clickDemand(e, r) {
-      //  console.log(e,r);
+    
       if (e === "文件标题") {
         if(this.childname == "first"){
             if(r.taskName == "发起人填写"){
@@ -681,10 +686,10 @@ export default {
       }
     },
       operationZuo(r){
-      console.log(r);
+   
       let list = {}
       list.id = r.id,
-      // console.log(row)
+    
       this.$http({
         url:"/market/yjyaProcess/query",
         method:"post",
@@ -699,7 +704,7 @@ export default {
           this.ruleForm.taskId = r.taskId;
           this.ruleForm.resourceId = r.resourceId;
           this.ruleForm.createId = r.createId;
-          console.log(r.taskName);
+      
           this.ruleForm.taskName1 = r.taskName;
           this.fileInfo.fileList = res.data.mkFileShareAttachList;
            if(r.taskName == "发起人填写"){
@@ -723,22 +728,20 @@ export default {
           let copymanlist = r.copyman.split(',')
            let copytaskidlist = r.copytaskid.split(',')
              let copytaskid=''
-             console.log(copymanlist);
-             console.log(copytaskidlist);
+            
              copymanlist.map((item, index) => {
              if (item == JSON.parse(window.sessionStorage.getItem('userInfo')).loginNoStr) {
               copytaskid=copytaskidlist[index]
                     }
                  })
-               console.log(copytaskid);
+             
               this.getReadList(copytaskid);
         // this.getReadList(r.copytaskid);
       }
     },
     changeNum(val) {
       this.page = val;
-      console.log(this.page);
-      console.log(this.childname);
+
       switch (this.childname) {
         case "first":
           this.backlogTodo();
@@ -764,11 +767,9 @@ export default {
       }
     },
      uploadBack(u){
-      console.log(u);
+   
       this.attList = u;
-      // this.fufujian = u;
-    //   this.fuback = u;
-    //   console.log(this.fuback);
+     
    },
     close() {
       this.handleClose();
@@ -784,14 +785,14 @@ export default {
     },
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-      this.ruleForm.docId = this.userInfo.loginNo;
+      // this.ruleForm.docId = this.userInfo.loginNo;
       this.ruleForm.proposer = this.userInfo.loginName;
 
     },
     time() {
       // this.ruleForm.createTime = this.formatDateTime;
       this.ruleForm.proposerTime = this.$formatDate(new Date(), "YYYY-MM-DD");
-      this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
+      // this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
     },
     changeSelect(e) {},
      newFormgong(){
@@ -800,24 +801,24 @@ export default {
 
     },
     submitForm(formName) {
-        console.log(this.$refs.ruleForm)
+    
         this.$refs.ruleForm.validate((valid) => {
-          console.log(valid);
+       
           if (valid) {
              this.$message.success("保存成功");
-              console.log(this.ruleForm);
+         
               this.getUserIds();
               // this.iniTiate();
               // this.newForm();
-               if(this.ruleForm.tableName1 == "发起人填写" || this.ruleForm.id){
-                console.log(12212121212121212121);
-                this.newUpdate();
-              }else{
-                this.newForm();
-              }
+              //  if(this.ruleForm.tableName1 == "发起人填写" || this.ruleForm.id){
+              
+              //   this.newUpdate();
+              // }else{
+              //   this.newForm();
+              // }
 
           } else {
-            // console.log('error submit!!');
+          
             this.$message.error("请完善表单信息");
             return false;
           }
@@ -838,7 +839,7 @@ export default {
          },
         data: this.ruleForm,
       }).then((res) => {
-        // console.log(res.data.body.id);
+        
           this.ruleForm.id = res.data.body;
           this.request_form.businessKey = res.data.body;
           this.request_form.title = '[IT工作台]-'+'应急预案审批-'+ this.$refs.ruleForm.model.needName;
@@ -887,7 +888,7 @@ export default {
 
       let res = await this.common.httpPost(obj, success);
       function success(data) {
-        console.log(data);
+     
       }
     },
       //获取userID
@@ -906,8 +907,13 @@ export default {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
         this.request_form.title = '[IT工作台]-'+'应急预案审批-'+ this.$refs.ruleForm.model.needName;
-        // console.log(this.request_form);
-        // this.clickHandle(this.ruleForm);
+       
+        if(this.ruleForm.tableName1 == "发起人填写" || this.ruleForm.id){
+              
+                this.newUpdate();
+              }else{
+                this.newForm();
+              }
        });
      },
      async clickHandle(e) {
@@ -926,8 +932,7 @@ export default {
 //         _this.ruleForm.taskId = _this.ruleForm.taskId;
         // a = a 
 //         _this.taskId = data.data;
-       console.log(data);
-      //  console.log(data.code);
+     
       _this.ruleForm.processId = data.data;
        let list = {
          id: e.id,
@@ -937,15 +942,14 @@ export default {
           
           // resourceId: _this.nextPath.currentShape[0].resourceId,
        };
-        // console.log(processDefinitionKey);
-        console.log(list);
+       
          _this.setUpdate(list);
       }
      },
     //更新工作流接口
 
     setUpdate(e) {
-      console.log(e);
+  
       this.$http({
        url: "/market/waf/updateBase",
         method: "post",
@@ -1003,7 +1007,7 @@ export default {
 
       let res = await this.common.httpPost(obj, success);
       function success(data) {
-        console.log(data);
+     
         if (data.lastMan == true) {
           _this.adminResourceId = data.adminResourceId;
         }
@@ -1012,7 +1016,7 @@ export default {
         _this.isWorkflowStatus = data.lastMan == false ? false : true;
         _this.lastManList = data;
 
-        // console.log(_this.isWorkflowStatus);
+   
       }
     },
      getNextPath(e) {
@@ -1037,20 +1041,20 @@ export default {
         data: list,
       }).then((res) => {
         if (res.data.body.nextShapes[0].multi) {
-          console.log('这是mulit节点');
+          // console.log('这是mulit节点');
           if (res.data.body.nextShapes[0].multi.multi === "true") {
-             console.log('这是mulit节点');
+            //  console.log('这是mulit节点');
             this.getLastName();
           } else {
             this.adminResourceId = ''
-            console.log('这不是mulit节点');
+            // console.log('这不是mulit节点');
             this.destroy = true;
             this.dialogVisible1 = true;
             this.getMetirialType();
           }
         } else {
           this.adminResourceId = ''
-          console.log('这不是mulit节点');
+          // console.log('这不是mulit节点');
           this.destroy = true;
           this.dialogVisible1 = true;
           this.getMetirialType();
@@ -1077,7 +1081,7 @@ export default {
 
       let res = await this.common.httpPost(obj, success);
       function success(data) {
-        console.log('[ 接口返回值第一曾 ] >', data)
+        // console.log('[ 接口返回值第一曾 ] >', data)
         let list = [];
         list = data.data.data;
         // list.map((item,index) => {
@@ -1090,7 +1094,7 @@ export default {
         //     }
         //   }
         // });
-        // console.log(list);
+       
         if (data.data.lastmandata.length != 0) {
           data.data.lastmandata.map((item, index) => {
             item.id = index + 22;
@@ -1108,9 +1112,9 @@ export default {
               }
             });
           }
-          console.log(item.children);
+          // console.log(item.children);
         });
-        console.log(list);
+       
 
         // _this.lables.data = list;
         _this.tableData = list;
@@ -1122,8 +1126,7 @@ export default {
     
     //处理按钮,开始工作流接口
     dealwith(){
-      // this.dialogVisible1 = true;
-    //    console.log(this.ruleForm);
+   
     if(this.ruleForm.id){
       this.getNextPath(this.ruleForm.resourceId || "");
     }else{
@@ -1182,37 +1185,12 @@ export default {
          },
         
       }).then((res) => {
-        //  console.log(res.data.body);
+        
         // this.ruleForm.applyNew = res.data;
         this.ruleForm.workOrderNo = res.data.body;
       });
     },
-    //  getdealMan(){
-    //   let id = "itcThird"
-    //    this.$http({
-    //     url: "/market//api/user/info/queryNodePers?params="+ id,
-    //     method: "post",
-    //     headers: {
-    //       "Content-Type": "application/json",
-    //      },
-        
-    //   }).then((res) => {
-    //     // this.optionList = res.data;
-    //     // console.log(res.data);
-    //     for( let i=0;i<res.data.length;i++){
-    //       // console.log(res.data[i].children);
-    //       for(let j=0;j<res.data[i].children.length;j++){
-    //         // console.log(res.data[i].children[j].label);
-    //         this.optionList.push({
-    //           name:res.data[i].children[j].label
-    //         })
-    //       }
-    //     }
-    //     //  console.log(res.data.body);
-    //     // this.ruleForm.applyNew = res.data;
-    //     // this.ruleForm.workOrderNo = res.data.body;
-    //   });
-    // },
+   
     
      backlogTodo(){
       let list = {
@@ -1238,7 +1216,7 @@ export default {
         this.tabList[2].number = res.data.totalRecord;
           
       
-       console.log(this.Table);
+    
       })
 
     },
@@ -1267,7 +1245,7 @@ export default {
        getDoneBase(this.page,"",list).then((res)=>{
        this.twoTable.data = res.data.data;
        this.twoTable.pageData.total = res.data.totalRecord;
-       console.log(this.Table);
+  
        this.tabList[1].number = res.data.totalRecord;
       })
 
@@ -1327,6 +1305,8 @@ export default {
     this.haveDone();
     this.iniTiate();
     this.backlogTodo();
+    this.getToBeRead();
+    this.getBeReadList();
     this.getneedNo();
     // this.getdealMan();
     // this.getDept();

src/pages/main/applyFor/internetAccess.vue

@@ -20,6 +20,7 @@
       <el-dialog
        :title="dialogTitle + '工单'"
         :visible.sync="dialogVisible"
+        v-if="dialogVisible"
         :before-close="handleClose"
         width="100%"
         height="500vh"
@@ -457,9 +458,9 @@ export default {
 
     "ruleForm.taskName1":{
       handler(e){
-        console.log(e);
+     
         if(e != "外网访问端口申请"){
-          console.log(1111112222222);
+      
           this.disshan = true;
           this.disxin = true;
         }else{
@@ -470,7 +471,7 @@ export default {
   },
   methods: {
       download(u) {
-      console.log(u);
+     
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -512,6 +513,8 @@ export default {
     handleClose(){
       this.ruleForm = {};
       this.backlogTodo();
+      this.haveDone();
+      this.iniTiate();
       this.getneedNo();
       this.dialogVisible = false;
       this.tableData = [];
@@ -524,11 +527,11 @@ export default {
       
     },
     clickTabs(name) {
-      console.log(name);
+
 
       this.$refs.TableList.page = 1;
       this.childname = name;
-        // console.log(this.childname);
+       
       this.page = 1;
        this.baocun = false;
       if (name == "first") {
@@ -553,7 +556,7 @@ export default {
       }
     },
     clickDemand(e, r) {
-      //  console.log(e,r);
+     
       if (e === "文件标题") {
         if(this.childname == "first"){
             if(r.taskName == "外网访问端口申请"){
@@ -596,10 +599,10 @@ export default {
       }
     },
       operationZuo(r){
-      console.log(r);
+  
       let list = {}
       list.id = r.id,
-      // console.log(row)
+    
       this.$http({
         url:"/market/HlwProcess/query",
         method:"post",
@@ -614,7 +617,7 @@ export default {
           this.ruleForm.taskId = r.taskId;
           this.ruleForm.resourceId = r.resourceId;
           this.ruleForm.createId = r.createId;
-          console.log(r.taskName);
+       
           this.ruleForm.taskName1 = r.taskName;
           this.fileInfo.fileList = res.data.mkFileShareAttachList;
            if(r.taskName == "外网访问端口申请"){
@@ -633,8 +636,7 @@ export default {
     },
     changeNum(val) {
       this.page = val;
-      console.log(this.page);
-      console.log(this.childname);
+     
       switch (this.childname) {
         case "first":
           this.backlogTodo();
@@ -652,11 +654,9 @@ export default {
       }
     },
      uploadBack(u){
-      console.log(u);
+
       this.attList = u;
-      // this.fufujian = u;
-    //   this.fuback = u;
-    //   console.log(this.fuback);
+      
    },
     close() {
        this.handleClose();
@@ -672,14 +672,14 @@ export default {
     },
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-      this.ruleForm.docId = this.userInfo.loginNo;
+      // this.ruleForm.docId = this.userInfo.loginNo;
       this.ruleForm.proposer = this.userInfo.loginName;
 
     },
     time() {
       // this.ruleForm.createTime = this.formatDateTime;
       this.ruleForm.proposerTime = this.$formatDate(new Date(), "YYYY-MM-DD");
-      this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
+      // this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
     },
     changeSelect(e) {},
      newFormgong(){
@@ -688,24 +688,24 @@ export default {
 
     },
     submitForm(formName) {
-        console.log(this.$refs.ruleForm)
+   
         this.$refs.ruleForm.validate((valid) => {
-          console.log(valid);
+       
           if (valid) {
              this.$message.success("保存成功");
-              console.log(this.ruleForm);
+            
               this.getUserIds();
               // this.iniTiate();
               // this.newForm();
-               if(this.ruleForm.tableName1 == "外网访问端口申请" || this.ruleForm.id){
-                console.log(12212121212121212121);
-                this.newUpdate();
-              }else{
-                this.newForm();
-              }
+              //  if(this.ruleForm.tableName1 == "外网访问端口申请" || this.ruleForm.id){
+             
+              //   this.newUpdate();
+              // }else{
+              //   this.newForm();
+              // }
 
           } else {
-            // console.log('error submit!!');
+           
             this.$message.error("请完善表单信息");
             return false;
           }
@@ -726,7 +726,7 @@ export default {
          },
         data: this.ruleForm,
       }).then((res) => {
-        // console.log(res.data.body.id);
+       
           this.ruleForm.id = res.data.body;
           this.request_form.businessKey = res.data.body;
           this.request_form.title = '[IT工作台]-'+'互联网访问端口开放-'+ this.$refs.ruleForm.model.needName;
@@ -777,8 +777,13 @@ export default {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
         this.request_form.title = '[IT工作台]-'+'互联网访问端口开放-'+ this.$refs.ruleForm.model.needName;
-        // console.log(this.request_form);
-        // this.clickHandle(this.ruleForm);
+      
+          if(this.ruleForm.tableName1 == "外网访问端口申请" || this.ruleForm.id){
+             
+                this.newUpdate();
+              }else{
+                this.newForm();
+              }
        });
      },
      async clickHandle(e) {
@@ -797,8 +802,7 @@ export default {
 //         _this.ruleForm.taskId = _this.ruleForm.taskId;
         // a = a 
 //         _this.taskId = data.data;
-       console.log(data);
-      //  console.log(data.code);
+      
       _this.ruleForm.processId = data.data;
        let list = {
          id: e.id,
@@ -808,15 +812,14 @@ export default {
           
           // resourceId: _this.nextPath.currentShape[0].resourceId,
        };
-        // console.log(processDefinitionKey);
-        console.log(list);
+      
          _this.setUpdate(list);
       }
      },
     //更新工作流接口
 
     setUpdate(e) {
-      console.log(e);
+   
       this.$http({
        url: "/market/waf/updateBase",
         method: "post",
@@ -932,7 +935,7 @@ export default {
          },
         
       }).then((res) => {
-        //  console.log(res.data.body);
+      
         // this.ruleForm.applyNew = res.data;
         this.ruleForm.workOrderNo = res.data.body;
       });
@@ -947,20 +950,17 @@ export default {
          },
         
       }).then((res) => {
-        // this.optionList = res.data;
-        // console.log(res.data);
+        
         for( let i=0;i<res.data.length;i++){
-          // console.log(res.data[i].children);
+         
           for(let j=0;j<res.data[i].children.length;j++){
-            // console.log(res.data[i].children[j].label);
+          
             this.optionList.push({
               name:res.data[i].children[j].label
             })
           }
         }
-        //  console.log(res.data.body);
-        // this.ruleForm.applyNew = res.data;
-        // this.ruleForm.workOrderNo = res.data.body;
+       
       });
     },
     
@@ -988,7 +988,7 @@ export default {
         this.tabList[2].number = res.data.totalRecord;
           
       
-       console.log(this.Table);
+  
       })
 
     },
@@ -1009,7 +1009,7 @@ export default {
       //   this.twoTable.data = res.data.data;
       //   this.twoTable.pageData.total = res.data.totalRecord;
       //   this.Table = this.twoTable;
-      //   // console.log(this.Table);
+    
       // });
        let list = {
         tableName : this.requestForm.processDefinitionKey
@@ -1017,7 +1017,7 @@ export default {
        getDoneBase(this.page,"",list).then((res)=>{
        this.twoTable.data = res.data.data;
        this.twoTable.pageData.total = res.data.totalRecord;
-       console.log(this.Table);
+    
        this.tabList[1].number = res.data.totalRecord;
       })
 

src/pages/main/applyFor/resourceApply.vue

@@ -20,6 +20,7 @@
       <el-dialog
        :title="dialogTitle + '工单'"
         :visible.sync="dialogVisible"
+        v-if="dialogVisible"
         :before-close="handleClose"
         width="100%"
         height="500vh"
@@ -459,9 +460,9 @@ export default {
 
     "ruleForm.taskName1":{
       handler(e){
-        console.log(e);
+    
         if(e != "填写资源申请单"){
-          console.log(1111112222222);
+      
           this.disshan = true;
           this.disxin = true;
         }else{
@@ -472,7 +473,7 @@ export default {
   },
   methods: {
       download(u) {
-      console.log(u);
+  
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -514,6 +515,8 @@ export default {
     handleClose(){
       this.ruleForm = {};
       this.backlogTodo();
+      this.haveDone();
+      this.iniTiate();
       this.getneedNo();
       this.dialogVisible = false;
        this.tableData = [];
@@ -526,11 +529,11 @@ export default {
       
     },
     clickTabs(name) {
-      console.log(name);
+   
 
       this.$refs.TableList.page = 1;
       this.childname = name;
-        // console.log(this.childname);
+     
       this.page = 1;
        this.baocun = false;
       if (name == "first") {
@@ -555,7 +558,7 @@ export default {
       }
     },
     clickDemand(e, r) {
-      //  console.log(e,r);
+  
       if (e === "文件标题") {
         if(this.childname == "first"){
             if(r.taskName == "填写资源申请单"){
@@ -598,10 +601,10 @@ export default {
       }
     },
       operationZuo(r){
-      console.log(r);
+   
       let list = {}
       list.id = r.id,
-      // console.log(row)
+  
       this.$http({
         url:"/market/zysqProcess/query",
         method:"post",
@@ -616,7 +619,7 @@ export default {
           this.ruleForm.taskId = r.taskId;
           this.ruleForm.resourceId = r.resourceId;
           this.ruleForm.createId = r.createId;
-          console.log(r.taskName);
+       
           this.ruleForm.taskName1 = r.taskName;
           this.fileInfo.fileList = res.data.mkFileShareAttachList;
            if(r.taskName == "填写资源申请单"){
@@ -635,8 +638,7 @@ export default {
     },
     changeNum(val) {
       this.page = val;
-      console.log(this.page);
-      console.log(this.childname);
+     
       switch (this.childname) {
         case "first":
           this.backlogTodo();
@@ -654,11 +656,9 @@ export default {
       }
     },
      uploadBack(u){
-      console.log(u);
+    
       this.attList = u;
-      // this.fufujian = u;
-    //   this.fuback = u;
-    //   console.log(this.fuback);
+     
    },
     close() {
        this.handleClose();
@@ -674,14 +674,14 @@ export default {
     },
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-      this.ruleForm.docId = this.userInfo.loginNo;
+      // this.ruleForm.docId = this.userInfo.loginNo;
       this.ruleForm.proposer = this.userInfo.loginName;
 
     },
     time() {
       // this.ruleForm.createTime = this.formatDateTime;
       this.ruleForm.proposerTime = this.$formatDate(new Date(), "YYYY-MM-DD");
-      this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
+      // this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
     },
     changeSelect(e) {},
      newFormgong(){
@@ -690,24 +690,24 @@ export default {
 
     },
     submitForm(formName) {
-        console.log(this.$refs.ruleForm)
+    
         this.$refs.ruleForm.validate((valid) => {
-          console.log(valid);
+    
           if (valid) {
              this.$message.success("保存成功");
-              console.log(this.ruleForm);
+           
               this.getUserIds();
               // this.iniTiate();
               // this.newForm();
-               if(this.ruleForm.tableName1 == "填写资源申请单" || this.ruleForm.id){
-                console.log(12212121212121212121);
-                this.newUpdate();
-              }else{
-                this.newForm();
-              }
+              //  if(this.ruleForm.tableName1 == "填写资源申请单" || this.ruleForm.id){
+            
+              //   this.newUpdate();
+              // }else{
+              //   this.newForm();
+              // }
 
           } else {
-            // console.log('error submit!!');
+           
             this.$message.error("请完善表单信息");
             return false;
           }
@@ -728,7 +728,7 @@ export default {
          },
         data: this.ruleForm,
       }).then((res) => {
-        // console.log(res.data.body.id);
+       
           this.ruleForm.id = res.data.body;
           this.request_form.businessKey = res.data.body;
           this.request_form.title = '[IT工作台]-'+'系统资源申请-'+ this.$refs.ruleForm.model.needName;
@@ -779,8 +779,13 @@ export default {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
         this.request_form.title = '[IT工作台]-'+'系统资源申请-'+ this.$refs.ruleForm.model.needName;
-        // console.log(this.request_form);
-        // this.clickHandle(this.ruleForm);
+       
+          if(this.ruleForm.tableName1 == "填写资源申请单" || this.ruleForm.id){
+          
+                this.newUpdate();
+              }else{
+                this.newForm();
+              }
        });
      },
      async clickHandle(e) {
@@ -799,8 +804,7 @@ export default {
 //         _this.ruleForm.taskId = _this.ruleForm.taskId;
         // a = a 
 //         _this.taskId = data.data;
-       console.log(data);
-      //  console.log(data.code);
+     
       _this.ruleForm.processId = data.data;
        let list = {
          id: e.id,
@@ -810,15 +814,14 @@ export default {
           
           // resourceId: _this.nextPath.currentShape[0].resourceId,
        };
-        // console.log(processDefinitionKey);
-        console.log(list);
+       
          _this.setUpdate(list);
       }
      },
     //更新工作流接口
 
     setUpdate(e) {
-      console.log(e);
+    
       this.$http({
        url: "/market/waf/updateBase",
         method: "post",
@@ -934,8 +937,7 @@ export default {
          },
         
       }).then((res) => {
-        //  console.log(res.data.body);
-        // this.ruleForm.applyNew = res.data;
+      
         this.ruleForm.workOrderNo = res.data.body;
       });
     },
@@ -949,20 +951,17 @@ export default {
          },
         
       }).then((res) => {
-        // this.optionList = res.data;
-        // console.log(res.data);
+        
         for( let i=0;i<res.data.length;i++){
-          // console.log(res.data[i].children);
+         
           for(let j=0;j<res.data[i].children.length;j++){
-            // console.log(res.data[i].children[j].label);
+           
             this.optionList.push({
               name:res.data[i].children[j].label
             })
           }
         }
-        //  console.log(res.data.body);
-        // this.ruleForm.applyNew = res.data;
-        // this.ruleForm.workOrderNo = res.data.body;
+       
       });
     },
     
@@ -990,7 +989,7 @@ export default {
         this.tabList[2].number = res.data.totalRecord;
           
       
-       console.log(this.Table);
+   
       })
 
     },
@@ -1011,7 +1010,7 @@ export default {
       //   this.twoTable.data = res.data.data;
       //   this.twoTable.pageData.total = res.data.totalRecord;
       //   this.Table = this.twoTable;
-      //   // console.log(this.Table);
+     
       // });
        let list = {
         tableName : this.requestForm.processDefinitionKey
@@ -1019,7 +1018,7 @@ export default {
        getDoneBase(this.page,"",list).then((res)=>{
        this.twoTable.data = res.data.data;
        this.twoTable.pageData.total = res.data.totalRecord;
-       console.log(this.Table);
+     
        this.tabList[1].number = res.data.totalRecord;
       })
 

src/pages/main/applyFor/securityAudit.vue

@@ -20,6 +20,7 @@
       <el-dialog
        :title="dialogTitle + '工单'"
         :visible.sync="dialogVisible"
+        v-if="dialogVisible"
         :before-close="handleClose"
         width="100%"
         height="500vh"
@@ -424,9 +425,9 @@ export default {
 
     "ruleForm.taskName1":{
       handler(e){
-        console.log(e);
+ 
         if(e != "填写安全报告单"){
-          console.log(1111112222222);
+        
           this.disshan = true;
           this.disxin = true;
         }else{
@@ -437,7 +438,7 @@ export default {
   },
   methods: {
       download(u) {
-      console.log(u);
+
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -479,6 +480,8 @@ export default {
     handleClose(){
       this.ruleForm = {};
       this.backlogTodo();
+      this.haveDone();
+      this.iniTiate();
       this.getneedNo();
       this.dialogVisible = false;
       this.tableData = [];
@@ -491,11 +494,11 @@ export default {
       
     },
     clickTabs(name) {
-      console.log(name);
+ 
 
       this.$refs.TableList.page = 1;
       this.childname = name;
-        // console.log(this.childname);
+      
       this.page = 1;
        this.baocun = false;
       if (name == "first") {
@@ -520,7 +523,7 @@ export default {
       }
     },
     clickDemand(e, r) {
-      //  console.log(e,r);
+  
       if (e === "文件标题") {
         if(this.childname == "first"){
             if(r.taskName == "填写安全报告单"){
@@ -563,10 +566,10 @@ export default {
       }
     },
       operationZuo(r){
-      console.log(r);
+  
       let list = {}
       list.id = r.id,
-      // console.log(row)
+  
       this.$http({
         url:"/market/AqsjProcess/query",
         method:"post",
@@ -581,7 +584,7 @@ export default {
           this.ruleForm.taskId = r.taskId;
           this.ruleForm.resourceId = r.resourceId;
           this.ruleForm.createId = r.createId;
-          console.log(r.taskName);
+      
           this.ruleForm.taskName1 = r.taskName;
           this.fileInfo.fileList = res.data.mkFileShareAttachList;
            if(r.taskName == "填写安全报告单"){
@@ -600,8 +603,7 @@ export default {
     },
     changeNum(val) {
       this.page = val;
-      console.log(this.page);
-      console.log(this.childname);
+     
       switch (this.childname) {
         case "first":
           this.backlogTodo();
@@ -619,11 +621,9 @@ export default {
       }
     },
      uploadBack(u){
-      console.log(u);
+  
       this.attList = u;
-      // this.fufujian = u;
-    //   this.fuback = u;
-    //   console.log(this.fuback);
+    
    },
     close() {
       this.handleClose();
@@ -639,14 +639,14 @@ export default {
     },
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-      this.ruleForm.docId = this.userInfo.loginNo;
+      // this.ruleForm.docId = this.userInfo.loginNo;
       this.ruleForm.proposer = this.userInfo.loginName;
 
     },
     time() {
       // this.ruleForm.createTime = this.formatDateTime;
       this.ruleForm.proposerTime = this.$formatDate(new Date(), "YYYY-MM-DD");
-      this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
+      // this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
     },
     changeSelect(e) {},
      newFormgong(){
@@ -655,24 +655,24 @@ export default {
 
     },
     submitForm(formName) {
-        console.log(this.$refs.ruleForm)
+     
         this.$refs.ruleForm.validate((valid) => {
-          console.log(valid);
+    
           if (valid) {
              this.$message.success("保存成功");
-              console.log(this.ruleForm);
+            
               this.getUserIds();
               // this.iniTiate();
               // this.newForm();
-               if(this.ruleForm.tableName1 == "填写安全报告单" || this.ruleForm.id){
-                console.log(12212121212121212121);
-                this.newUpdate();
-              }else{
-                this.newForm();
-              }
+              //  if(this.ruleForm.tableName1 == "填写安全报告单" || this.ruleForm.id){
+            
+              //   this.newUpdate();
+              // }else{
+              //   this.newForm();
+              // }
 
           } else {
-            // console.log('error submit!!');
+           
             this.$message.error("请完善表单信息");
             return false;
           }
@@ -693,7 +693,7 @@ export default {
          },
         data: this.ruleForm,
       }).then((res) => {
-        // console.log(res.data.body.id);
+       
           this.ruleForm.id = res.data.body;
           this.request_form.businessKey = res.data.body;
           this.request_form.title = '[IT工作台]-'+'安全审计计划管理-'+ this.$refs.ruleForm.model.needName;
@@ -744,8 +744,13 @@ export default {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
         this.request_form.title = '[IT工作台]-'+'安全审计计划管理-'+ this.$refs.ruleForm.model.needName;
-        // console.log(this.request_form);
-        // this.clickHandle(this.ruleForm);
+       
+         if(this.ruleForm.tableName1 == "填写安全报告单" || this.ruleForm.id){
+              
+                this.newUpdate();
+              }else{
+                this.newForm();
+              }
        });
      },
      async clickHandle(e) {
@@ -764,8 +769,7 @@ export default {
 //         _this.ruleForm.taskId = _this.ruleForm.taskId;
         // a = a 
 //         _this.taskId = data.data;
-       console.log(data);
-      //  console.log(data.code);
+      
       _this.ruleForm.processId = data.data;
        let list = {
          id: e.id,
@@ -775,15 +779,14 @@ export default {
           
           // resourceId: _this.nextPath.currentShape[0].resourceId,
        };
-        // console.log(processDefinitionKey);
-        console.log(list);
+     
          _this.setUpdate(list);
       }
      },
     //更新工作流接口
 
     setUpdate(e) {
-      console.log(e);
+
       this.$http({
        url: "/market/waf/updateBase",
         method: "post",
@@ -899,8 +902,7 @@ export default {
          },
         
       }).then((res) => {
-        //  console.log(res.data.body);
-        // this.ruleForm.applyNew = res.data;
+        
         this.ruleForm.workOrderNo = res.data.body;
       });
     },
@@ -914,20 +916,17 @@ export default {
          },
         
       }).then((res) => {
-        // this.optionList = res.data;
-        // console.log(res.data);
+        
         for( let i=0;i<res.data.length;i++){
-          // console.log(res.data[i].children);
+      
           for(let j=0;j<res.data[i].children.length;j++){
-            // console.log(res.data[i].children[j].label);
+      
             this.optionList.push({
               name:res.data[i].children[j].label
             })
           }
         }
-        //  console.log(res.data.body);
-        // this.ruleForm.applyNew = res.data;
-        // this.ruleForm.workOrderNo = res.data.body;
+       
       });
     },
     
@@ -955,7 +954,7 @@ export default {
         this.tabList[2].number = res.data.totalRecord;
           
       
-       console.log(this.Table);
+     
       })
 
     },
@@ -976,7 +975,6 @@ export default {
       //   this.twoTable.data = res.data.data;
       //   this.twoTable.pageData.total = res.data.totalRecord;
       //   this.Table = this.twoTable;
-      //   // console.log(this.Table);
       // });
        let list = {
         tableName : this.requestForm.processDefinitionKey
@@ -984,7 +982,7 @@ export default {
        getDoneBase(this.page,"",list).then((res)=>{
        this.twoTable.data = res.data.data;
        this.twoTable.pageData.total = res.data.totalRecord;
-       console.log(this.Table);
+   
        this.tabList[1].number = res.data.totalRecord;
       })
 

src/pages/main/applyFor/userChange.vue

@@ -20,6 +20,7 @@
       <el-dialog
        :title="dialogTitle + '工单'"
         :visible.sync="dialogVisible"
+        v-if="dialogVisible"
         :before-close="handleClose"
         width="100%"
         height="500vh"
@@ -435,6 +436,7 @@ export default {
       tableData1:[],
       optionList:[],
       mkFileShareAttachList:[],
+      zibiaoshanid:[],
       requestForm: {
         // fresourceId: "c4624dbc-b322-11ed-886f-d6cd97160e00",
         // fresourceId: "3626d7d9-b33f-11ed-be6b-00505687dcd3",
@@ -620,9 +622,9 @@ export default {
 
     "ruleForm.taskName1":{
       handler(e){
-        console.log(e);
+  
         if(e != "填写变更申请表"){
-          console.log(1111112222222);
+     
           this.disshan = true;
           this.disxin = true;
         }else{
@@ -632,7 +634,7 @@ export default {
     },
      "ruleForm.changeType":{
       handler(e){
-        console.log(e);
+   
         if(e === "数据库"){
           this.database = true;
           this.host = false;
@@ -651,7 +653,7 @@ export default {
   },
   methods: {
       download(u) {
-      console.log(u);
+ 
 
       // if (this.ruleForm.wfFileShareAttachList.length > 1) {
         this.$http({
@@ -692,13 +694,16 @@ export default {
     },
     changeSelect(e) {},
     handleClose(){
+      this.dialogVisible = false;
       this.ruleForm = {};
       this.backlogTodo();
+      this.haveDone();
+      this.iniTiate();
       this.getneedNo();
-      this.dialogVisible = false;
       this.tableData = [];
       this.tableData1 = [];
       this.fileInfo.fileList = [];
+      this.adminpageData.total = [];
     },
     handleCloses(){
       this.treeList = [];
@@ -825,27 +830,65 @@ export default {
                 },
         data: {workOrderNo:this.ruleForm.workOrderNo},
       }).then((res) => {
-         console.log(res.data.data);
+       
          this.tableData1 = res.data.data;
          this.adminpageData.total = res.data.totalRecord;
           
       });
     
      },
+     xinsubTable() {
+        this.$http({
+        url: "/market/YhbgProcessMe/add",
+        method: "post",
+        headers: {
+                    "Content-Type": "application/json",    
+                },
+        data: this.ruleList
+      }).then((res) => {
+      
+         this.subTable();
+        //  this.tableData1 = res.data.data;
+        //  this.adminpageData.total = res.data.totalRecord;
+          
+      });
+    
+     },
+     shansubTable() {
+      let ids = {}
+      ids.ids = this.zibiaoshanid.join(",")
+        this.$http({
+        url: "/market/YhbgProcessMe/delBatch",
+        method: "post",
+        headers: {
+                    "Content-Type": "application/json",
+                    
+                },
+        data: ids
+      }).then((res) => {
+     
+         this.pageNo = 1;
+         this.adminpageData.pageNum = 1;
+         this.subTable();
+        
+          
+      });
+    
+     },
      getRowList(row, column, event, cell) {
-      console.log(row);
+ 
       this.ruleList = row;
       this.dialogVisible3 = true;
     },
        adminhandleSizeChange(val) {
-            console.log(`每页 ${val} 条`);
+       
         },
          adminhandleCurrentChange(val) {
-            // console.log(e)
+           
             this.pageNo = val;
-            console.log(this.pageNo);
+        
             this.subTable()
-            console.log(`当前页: ${val}`);
+        
         },
     newzhanghao(){
       this.dialogVisible2 = true;
@@ -860,14 +903,15 @@ export default {
     },
     
     delete1 (){
-      // console.log(this.multipleSelection);
+    
        if(this.multipleSelection.length != 0){
        this.$confirm('确定要删除?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.delete2();
+          // this.delete2();
+          this.shansubTable();
           this.$message({
             type: 'success',
             message: '删除成功!'
@@ -884,7 +928,7 @@ export default {
        
     },
     delete2 () {
-      // console.log(this.multipleTable);
+  
       var that = this
       // 拿到选中的数据；
       var val = this.multipleSelection
@@ -903,16 +947,30 @@ export default {
       }
       // 清除选中状态
       this.$refs.multipleTable.clearSelection()
+      this.shansubTable();
+      // this.newForm();
+      // this.subTable();
     },
      tableSelectionChange(val) {
-      console.log(val);
+ 
       this.multipleSelection = val;
+      for(let i=0;i<= this.multipleSelection.length;i++){
+        this.zibiaoshanid.push(this.multipleSelection[i].id)
+  
+      }
     },
+
     cunzibiao(){
+      
       this.ruleList.workOrderNo = this.ruleForm.workOrderNo;
+      this.xinsubTable();
       this.tableData1.push(this.ruleList)
       this.dialogVisible2 = false;
       this.ruleList = {};
+      
+      // this.newUpdate();
+      // this.newForm();
+      // this.subTable();
     },
     changeNum(val) {
       this.page = val;
@@ -942,7 +1000,7 @@ export default {
     newMake() {
        this.dialogTitle = "新建";
        this.baocun = true;
-      this.dialogVisible = true;
+       this.dialogVisible = true;
       // this.ruleForm = {}
       this.isdisabled = false;
       this.getUser();
@@ -950,14 +1008,14 @@ export default {
     },
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-      this.ruleForm.docId = this.userInfo.loginNo;
+      // this.ruleForm.docId = this.userInfo.loginNo;
       this.ruleForm.proposer = this.userInfo.loginName;
 
     },
     time() {
       // this.ruleForm.createTime = this.formatDateTime;
       this.ruleForm.proposerTime = this.$formatDate(new Date(), "YYYY-MM-DD");
-      this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
+      // this.ruleForm.docId = this.$formatDate(new Date(), "YYYYMMDDHHmmss");
     },
     changeSelect(e) {},
      newFormgong(){
@@ -972,11 +1030,11 @@ export default {
               this.getUserIds();
               // this.iniTiate();
               // this.newForm();
-               if(this.ruleForm.tableName1 == "填写变更申请表" || this.ruleForm.id){
-                this.newUpdate();
-              }else{
-                this.newForm();
-              }
+              //  if(this.ruleForm.tableName1 == "填写变更申请表" || this.ruleForm.id){
+              //   this.newUpdate();
+              // }else{
+              //   this.newForm();
+              // }
 
           } else {
             this.$message.error("请完善表单信息");
@@ -991,7 +1049,7 @@ export default {
         
     //   }
     this.ruleForm.mkFileShareAttachList = this.attList;
-    this.ruleForm.yhbgProcessMeList = this.tableData1;
+    // this.ruleForm.yhbgProcessMeList = this.tableData1;
         this.$http({
         url: "/market/YhbgProcess/add",
         method: "post",
@@ -1023,6 +1081,7 @@ export default {
               }else{
                  this.ruleForm.mkFileShareAttachList = this.attList;
               }
+          // this.ruleForm.yhbgProcessMeList = this.tableData1;
         this.$http({
           url: "/market/YhbgProcess/update",
           method: "post",
@@ -1031,7 +1090,7 @@ export default {
           },
           data: this.ruleForm,
         }).then((res) =>{
-          
+          this.subTable();
         });
      },
       //获取userID
@@ -1050,6 +1109,12 @@ export default {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
         this.request_form.title = '[IT工作台]-'+'用户使用者变更-'+ this.$refs.ruleForm.model.needName;
+       
+        if(this.ruleForm.tableName1 == "填写变更申请表" || this.ruleForm.id){
+                this.newUpdate();
+              }else{
+                this.newForm();
+              }
        });
      },
      async clickHandle(e) {
@@ -1199,8 +1264,7 @@ export default {
          },
         
       }).then((res) => {
-        //  console.log(res.data.body);
-        // this.ruleForm.applyNew = res.data;
+        
         this.ruleForm.workOrderNo = res.data.body;
       });
     },
@@ -1269,7 +1333,7 @@ export default {
       //   this.twoTable.data = res.data.data;
       //   this.twoTable.pageData.total = res.data.totalRecord;
       //   this.Table = this.twoTable;
-      //   // console.log(this.Table);
+   
       // });
        let list = {
         tableName : this.requestForm.processDefinitionKey

src/pages/main/bfsj/bfsjList.vue

@@ -47,7 +47,7 @@
                         <my-upload v-if="!disabled" @uploadBack="uploadBack" @delloadBack="delloadBack"
                             @clickDownload="download" :fileInfo="fileInfo" :fileList="fromList.mkFileShareAttachList"
                             style="width: 30% !important"></my-upload>
-                        <div v-if="fromList.taskName != '起草'">
+                        <div v-if="fromList.taskName != '填写备份数据申请'">
                             <div v-for="(item, index) in fromList.mkFileShareAttachList" :key="index">
                                 <span style="color: blue;cursor: pointer;" @click="downloadOne(item)">{{
                                     item.fileName
@@ -84,6 +84,7 @@ import Seach from "../../../components/el-search";
 import myUpload from "../../../components/workflowUpload";
 import Workflow from "../../../components/workflowBase";
 import WorkflowEntrance from "../../../components/workflowEntrance";
+import getConfig from '../../../config/dev.js'
 import {
     getTodoBase,
     getDoneBase,
@@ -123,7 +124,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -147,8 +148,8 @@ export default {
             },
             requestForm: {
                 // fresourceId: "524e01f7-b25d-11ed-886f-d6cd97160e00", // 本地环境
-                // fresourceId: "canvas", // 生产环境
-                fresourceId: "canvas", //测试91环境
+                // fresourceId: "dbd83414-b25f-11ed-be6b-00505687dcd3", // 91环境
+                fresourceId: getConfig().bfsjList,
                 processDefinitionKey: "BFSJ_process",
             },
             dialogStatus: false, //dialog显示
@@ -461,7 +462,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -500,7 +501,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downAllFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -593,7 +594,7 @@ export default {
                     console.log(res.taskName)
                     this.dialogTitle = "查看";
                     this.closeStatus = true;
-                    if (res.taskName == "起草") {
+                    if (res.taskName == "填写备份数据申请") {
                         this.disabled = false;
                         this.startStatus = true;
                         this.saveStatus = true;
@@ -607,7 +608,7 @@ export default {
                 }
                 if (this.clickTagName === "first") {//代办
                     this.dialogTitle = "处理";
-                    if (res.taskName == "起草") {
+                    if (res.taskName == "填写备份数据申请") {
                         this.savestatusBtn = false
                         this.disabled = false;
                         this.startStatus = true;
@@ -819,7 +820,7 @@ export default {
             }).then((res) => {
                 this.fromList.taskId = res.data.body[0].taskId;
                 this.fromList.taskName = res.data.body[0].taskName;
-                // if (res.data.body.taskName === "起草") {
+                // if (res.data.body.taskName === "填写备份数据申请") {
                 //     this.isSync = res.data.body.isSync;
                 // } else {
                 //     this.isSync = "1";
@@ -977,7 +978,7 @@ export default {
             getInitiateBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.lableTable.data = res.data.data;
                 // this.lableTable.data.map((item) => {
-                //     if (item.taskName === "起草") {
+                //     if (item.taskName === "填写备份数据申请") {
                 //         item.status = "1";
                 //     } else {
                 //         item.status = "2";

src/pages/main/memberFamily/dataStatistics.vue

@@ -24,9 +24,9 @@
 					</el-table-column>
 					<el-table-column prop="cnt" label="员工总数">
 					</el-table-column>
-					<el-table-column label="操作" width="160px" align="center">
+					<el-table-column label="操作" width="160px" align="center" v-if="look">
 						<template slot-scope="scope">
-							<el-button size="mini" type="primary" @click="choseperson(scope.row)">查看</el-button>
+							<el-button size="mini" type="primary" @click="choseperson(scope.row)" >查看</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -73,12 +73,15 @@
 				delid: '',
 				loading: false,
 				loadinged: false,
+				look:false,
 				time: '',
 				num: '',
 				fillCnt: '',
 				lastUpdateTime: '',
                 sts:1,
                 companyFlag:'',
+                isRegionName:'',
+				regionName:'',
 				// excelCityparam: ""
 				memberFamilyBtnShow: "-1"
 			}
@@ -111,7 +114,7 @@
                         window.navigator.msSaveOrOpenBlob(blob, 'adv.xlsx');
                     } else {
                         /* 火狐谷歌的文件下载方式 */
-                        console.log(response.data.type)
+                        // console.log(response.data.type)
                         var blob = new Blob([response.data])
                         var downloadElement = document.createElement('a')
                         var href = window.URL.createObjectURL(blob);
@@ -125,6 +128,7 @@
                 });
             },
 			choseperson(v){
+			
 				if(v.showButton){
 					window.sessionStorage.memberFamilyBtnShow = v.showButton;
 				}
@@ -133,7 +137,8 @@
 						 this.$router.push({
                         	path: "/employeeInfo",
                             query:{
-                                regionName:v.regionName
+                                regionName:v.regionName,
+								isRegionName:v.isRegionName
                             }
                         });
                         this.setabList("员工信息", "/employeeInfo?regionName="+v.regionName);
@@ -153,7 +158,8 @@
                         this.$router.push({
                         	path: "/employeeInfo",
                             query:{
-                                regionName:v.areaName
+                                regionName:v.areaName,
+								isRegionName:v.isRegionName
                             }
                         });
                         this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
@@ -172,6 +178,7 @@
                     	this.tableData = res.data.data;
                     	this.total = res.data.totalRecord;
                     	this.loading = false;
+						this.isRegionName = res.data.data.isRegionName;
                         this.sts = 2;
                     });
 					
@@ -179,7 +186,8 @@
                     this.$router.push({
                     	path: "/employeeInfo?regionName="+v.areaName,
                         query:{
-                            regionName:v.areaName
+                            regionName:v.areaName,
+							isRegionName:v.isRegionName
                         }
                     });
 					
@@ -204,7 +212,7 @@
 				this.$store.commit("setTabList", Array.from(set));
 			},
 			handleSelectionChange(val) {
-				console.log(val) 
+				// console.log(val) 
 			},
 			//搜索数据
 			searchInfo(v) {
@@ -214,19 +222,45 @@
 			},
 			//获取列表
 			getList(v, n) {
+		
 				this.pageSize = n;
 				let _this = this;
 				this.loading = true;
 				this.tableData = [];
                 let url = '';
-                if(this.companyFlag == 0){
+				if(this.companyFlag == 2){
+					this.$router.push({
+                    	path: "/employeeInfo?regionName="+v.areaName,
+                        query:{
+                            regionName:this.regionName,
+							isRegionName:v.isRegionName
+                        }
+                    });
+					
+                    this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
+				}else if(this.companyFlag == 0){
                     url="/market/cMemberWo/querySummaryByProvPage"
+					this.$http({
+					url: url,
+					method: "post",
+					headers: {
+						"Content-Type": "application/json",
+						"page": '{"pageNo":"' + n + '","pageSize":"10"}'
+					},
+					data: v,
+				}).then((res) => {
+					this.tableData = res.data.data;
+					this.total = res.data.totalRecord;
+					this.loading = false;
+					// this.isRegionName = res.data.data.isRegionName;
+					
+				});
                 }else if(this.companyFlag == 1){
                     url="/market/cMemberWo/querySummaryByAreaPage"
                     v.regionName = this.userInfo.cityName
 					window.sessionStorage.excelCityparam = this.userInfo.cityName;
 					this.sts = 2
-                }
+                
 				this.$http({
 					url: url,
 					method: "post",
@@ -239,8 +273,23 @@
 					this.tableData = res.data.data;
 					this.total = res.data.totalRecord;
 					this.loading = false;
+					// this.isRegionName = res.data.data.isRegionName;
 					
 				});
+				}
+			},
+			judgment(){
+				this.userInfo = JSON.parse(window.sessionStorage.userInfo);
+				if(this.userInfo.duty <= 9){
+					if(this.userInfo.loginNoStr == "kanyanli"){
+						this.look = true;
+					}else{
+						this.look = false;
+					}
+					
+				}else{
+					this.look = true;
+				}
 			},
 			// 分页
 			currchange(v) {
@@ -297,12 +346,14 @@
                     data: {},
                 }).then((res) => {
                     this.companyFlag = res.data.companyFlag;
+					this.regionName = res.data.groupName;
                      this.getList({}, 1);
                 });
 			}
 		},
 		mounted() {
 			this.getUser();
+			this.judgment();
 			window.sessionStorage.memberFamilyBtnShow = this.memberFamilyBtnShow
 		},
 		created() {

src/pages/main/memberFamily/empInfoFilling.vue

@@ -35,7 +35,7 @@
         </div>
 
         <el-dialog title="员工信息" :visible.sync="dialogStatus" width="50%" :destroy-on-close="true"
-            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closedia" :fullscreen="true">
+            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closedia" :fullscreen="true" :show-close="false">
             <div>
 
                 <el-table class="com-table" ref="multipleTable" :data="infodata" tooltip-effect="dark" size="small"
@@ -43,7 +43,7 @@
 
                     <el-table-column prop="memberRelation" label="成员关系">
                         <template slot-scope="scope">
-                            <el-select clearable v-model="scope.row.memberRelation" :disabled="disableStatus">
+                            <el-select clearable v-model="scope.row.memberRelation" :disabled="scope.row.memberRelation == '本人' ? true : false">
                                 <el-option v-for="items in relationopt" :key="items.dataCode" :label="items.dataName"
                                     :value="items.dataCode">
                                 </el-option>
@@ -158,7 +158,7 @@
                             </el-button>
                             <el-button size="mini" type="primary" @click="choline(3,scope)" v-if="scope.row.id">修改
                             </el-button>
-                            <el-button size="mini" type="danger" @click="choline(2,scope)" v-if="scope.row.id">删除
+                            <el-button size="mini" type="danger" @click="choline(2,scope)" v-if="scope.row.id && scope.row.memberRelation != '本人'">删除
                             </el-button>
                         </template>
                     </el-table-column>
@@ -217,6 +217,7 @@
                 tableData: [{}],
                 dialogStatus: false,
                 disableStatus: false,
+                disableStatus1: false,
                 titname: '',
                 infolist: {},
                 userInfo: {},
@@ -234,7 +235,17 @@
                 partyGroupopt: [],
                 immiTypeopt: [],
                 fillId: '',
+                relationship:[],
+                relationshipqi:[],
+
+            }
+        },
+        watch:{
+          'scope.row.memberRelation':{
+            handler(newVal,oldVal){
+                // console.log(newVal);
             }
+          }
         },
         methods: {
             sfzyz(v){
@@ -253,13 +264,162 @@
                 // console.log(n.row);
                 let url = '';
                 if (v == 1) {
-                    url = "/market/cMemberFillDetail/add"
+                  
+                    for(let i=0; i<this.infodata.length;i++){
+                      
+                         this.relationship.push(this.infodata[i].memberRelation)
+                    
+                     }  
+                        if(this.relationship.indexOf("本人") == -1 ){
+                             this.$message.error("请先添加本人");
+                        }else{
+                            url = "/market/cMemberFillDetail/add"
+                     
+                    if(!n.row.memberRelation){
+                    this.$message({
+                        message: '请填写成员关系',
+                        type: 'error'
+                    });
+                    return
+                }
+                
+                if(!n.row.memberName){
+                    this.$message({
+                        message: '请填写成员姓名',
+                        type: 'error'
+                    });
+                    return
+                }
+                if(!n.row.memberSex){
+                    this.$message({
+                        message: '请填写成员性别',
+                        type: 'error'
+                    });
+                    return
+                }
+                if(!n.row.idCard){
+                    this.$message({
+                        message: '请填写成员身份证号',
+                        type: 'error'
+                    });
+                    return
+                }
+                this.$http({
+                    url: url,
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: n.row,
+                }).then((res) => {
+                    if (res.data.result === 1) {
+                        _this.$message({
+                            message: res.data.desc,
+                            type: 'error'
+                        });
+                    } else {
+                        _this.$message({
+                            message: '成功',
+                            type: 'success'
+                        });
+                        _this.$http({
+                            url: "/market/cMemberFillDetail/queryPage",
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                                "page": '{"pageNo":"' + 1 + '","pageSize":"100"}'
+                            },
+                            data: {
+                                fillId: _this.fillId
+                            },
+                        }).then((res) => {
+                            _this.infodata = res.data.data;
+                            // _this.infodata.push({});
+                            _this.infodata.push({fillId: this.fillId});
+                          
+                             for(let i=0; i<_this.infodata.length;i++){
+                       
+                         _this.relationshipqi.push(_this.infodata[i].memberRelation)
+                      
+                     } 
+                     if(_this.relationshipqi.indexOf("本人") != -1 ){
+                             _this.relationopt.splice(22,1);
+                        }
+                        });
+                    }
+                });
+              }
+          
                     // _this.infodata.push({});
                 } else if (v == 3) {
                     url = "/market/cMemberFillDetail/update"
+                    if(!n.row.memberRelation){
+                    this.$message({
+                        message: '请填写成员关系',
+                        type: 'error'
+                    });
+                    return
+                }
+                
+                if(!n.row.memberName){
+                    this.$message({
+                        message: '请填写成员姓名',
+                        type: 'error'
+                    });
+                    return
+                }
+                if(!n.row.memberSex){
+                    this.$message({
+                        message: '请填写成员性别',
+                        type: 'error'
+                    });
+                    return
+                }
+                if(!n.row.idCard){
+                    this.$message({
+                        message: '请填写成员身份证号',
+                        type: 'error'
+                    });
+                    return
+                }
+                this.$http({
+                    url: url,
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: n.row,
+                }).then((res) => {
+                    if (res.data.result === 1) {
+                        _this.$message({
+                            message: res.data.desc,
+                            type: 'error'
+                        });
+                    } else {
+                        _this.$message({
+                            message: '成功',
+                            type: 'success'
+                        });
+                        _this.$http({
+                            url: "/market/cMemberFillDetail/queryPage",
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                                "page": '{"pageNo":"' + 1 + '","pageSize":"100"}'
+                            },
+                            data: {
+                                fillId: _this.fillId
+                            },
+                        }).then((res) => {
+                            _this.infodata = res.data.data;
+                            // _this.infodata.push({});
+                            _this.infodata.push({fillId: this.fillId});
+                        });
+                    }
+                });
                 } else if (v == 2) {
                     url = "/market/cMemberFillDetail/del"
-                }
+               
                 if(!n.row.memberRelation){
                     this.$message({
                         message: '请填写成员关系',
@@ -275,14 +435,6 @@
                     });
                     return
                 }
-                // if(!n.row.bornDate){
-                //     this.$message({
-                //         message: '请填写成员出生日期',
-                //         type: 'error'
-                //     });
-                //     return
-                // }
-                
                 if(!n.row.memberSex){
                     this.$message({
                         message: '请填写成员性别',
@@ -297,48 +449,6 @@
                     });
                     return
                 }
-                // if(!n.row.partyGroup){
-                //     this.$message({
-                //         message: '请填写成员政治面貌',
-                //         type: 'error'
-                //     });
-                //     return
-                // }
-                // if(!n.row.workUnit){
-                //     this.$message({
-                //         message: '请填写成员工作单位',
-                //         type: 'error'
-                //     });
-                //     return
-                // }
-                // if(!n.row.memberTel){
-                //     this.$message({
-                //         message: '请填写成员联系电话',
-                //         type: 'error'
-                //     });
-                //     return
-                // }
-                // if(!n.row.memberAddress){
-                //     this.$message({
-                //         message: '请填写成员联系地址',
-                //         type: 'error'
-                //     });
-                //     return
-                // }
-                // if(!n.row.interiorStaff){
-                //     this.$message({
-                //         message: '请填写是否移动系统内工作',
-                //         type: 'error'
-                //     });
-                //     return
-                // }
-                // if(!n.row.staffName){
-                //     this.$message({
-                //         message: '请填写系统内员工职务',
-                //         type: 'error'
-                //     });
-                //     return
-                // }
                 this.$http({
                     url: url,
                     method: "post",
@@ -369,10 +479,14 @@
                             },
                         }).then((res) => {
                             _this.infodata = res.data.data;
-                            _this.infodata.push({});
+                            // _this.infodata.push({});
+                            _this.infodata.push({fillId: this.fillId});
+                            
+                            
                         });
                     }
                 });
+                 }
             },
             jumpfw() {
                 this.$router.push({
@@ -461,11 +575,21 @@
                     },
                 }).then((res) => {
                     this.infodata = res.data.data;
+                  
                     this.infodata.push({fillId: this.fillId});
+                     for(let i=0; i<this.infodata.length;i++){
+                
+                         this.relationshipqi.push(this.infodata[i].memberRelation)
+                  
+                     } 
+                     if(this.relationshipqi.indexOf("本人") != -1 ){
+                             this.relationopt.splice(22,1);
+                        }
                 });
             },
             //添加
             dialogCli(v) {
+
                 if(this.disableStatus){
                     this.infolist = {};
                     this.dialogStatus = false;
@@ -473,9 +597,12 @@
 
                     let _this = this;
                     let infodata1 = JSON.parse(JSON.stringify(this.infodata))
+                 
                     let infodataLast = infodata1[infodata1.length-1]
+                
                     if(Object.keys(infodataLast).length >= 2){
                         if(!infodataLast.memberRelation && !infodataLast.memberName && !infodataLast.memberSex && !infodataLast.idCard){
+                       
                             this.loadinged = true;
                         this.$http({
                             url: "/market/cMemberFillDetail/saveFillDetailSummaryNew",
@@ -535,6 +662,8 @@
                             });
                             return false
                         }
+                        
+                        
                         this.loadinged = true;
                         this.$http({
                             url: "/market/cMemberFillDetail/saveFillDetailSummaryNew",
@@ -563,10 +692,13 @@
                                 _this.getList({}, _this.pageSize);
                             }
                         });
-                        }
+                  
+                       
+            }
                         
                     }else if(Object.keys(infodataLast).length == 1){
-                        this.loadinged = true;
+                    
+                                this.loadinged = true;
                         this.$http({
                             url: "/market/cMemberFillDetail/saveFillDetailSummaryNew",
                             method: "post",
@@ -594,59 +726,10 @@
                                 _this.getList({}, _this.pageSize);
                             }
                         });
+                       
+                        
                     }
 
-
-                    // let isInfodataNull = infodataLast.filter((item)=>{
-                    //     console.log(item.length);
-                    //     return item.length
-                    // })
-                    // console.log(isInfodataNull);  
-                // this.infodata.forEach((item,index)=>{
-                    // if(!infodataLast.memberRelation){
-                    //     this.$message({
-                    //         message: '请填写成员关系',
-                    //         type: 'error'
-                    //     });
-                    //     return false
-                    // }
-                    
-                    // if(!infodataLast.memberName){
-                    //     this.$message({
-                    //         message: '请填写成员姓名',
-                    //         type: 'error'
-                    //     });
-                    //     return false
-                    // }
-                    
-                    // if(!infodataLast.memberSex){
-                    //     this.$message({
-                    //         message: '请填写成员性别',
-                    //         type: 'error'
-                    //     });
-                    //     return false
-                    // }
-                    // if(!infodataLast.idCard){
-                    //     this.$message({
-                    //         message: '请填写成员身份证号',
-                    //         type: 'error'
-                    //     });
-                    //     return false
-                    // }
-                // })
-                    // this.$http({
-                    //     url: "/market/cMemberFillDetail/saveFillDetailSummaryNew",
-                    //     method: "post",
-                    //     headers: {
-                    //         "Content-Type": "application/json",
-                    //         "page": '{"pageNo":"' + 1 + '","pageSize":"100"}'
-                    //     },
-                    //     data: infodata1,
-                    // }).then((res) => {
-                    //     this.infolist = {};
-                    //     this.dialogStatus = false;
-                    // });
-                    // console.log(infodata1)
                 
                 }
                 
@@ -721,7 +804,7 @@
             },
             //文件返回值
             uploadBack(v) {
-                console.log(v)
+                // console.log(v)
             },
             //功能栏
             iconCli(v) {

src/pages/main/memberFamily/employeeInfo.vue

@@ -128,12 +128,24 @@
             outexl(){
                 let url = '/market/cMemberWo/excelExportDetailSummary';
                 let paramsf = {};
-                
+                this.userInfo = JSON.parse(window.sessionStorage.userInfo)
                 if(this.memberFamilyBtnShow && (this.memberFamilyBtnShow == "1")){
                     paramsf.areaName = this.$route.query.regionName
                 }else{
+                    // if(this.userInfo.loginNoStr != "kanyanli"){
+                    //     paramsf.regionName = this.$route.query.regionName
+                    // }
+                    //  paramsf.areaName = this.$route.query.regionName 
+                if(this.$route.query.isRegionName == 1){
                     paramsf.regionName = this.$route.query.regionName
+                    paramsf.areaNameIsNull = 0
+                   }else{
+                    paramsf.areaName = this.$route.query.regionName
+                   }
                 }
+                paramsf.isShow = 0;
+                var memberFamilyBtnShow = JSON.parse(window.sessionStorage.memberFamilyBtnShow)
+                paramsf.showButton = memberFamilyBtnShow
                 this.$http({
                     url: url,
                     method: "post",
@@ -150,7 +162,7 @@
                         window.navigator.msSaveOrOpenBlob(blob, 'adv.xlsx');
                     } else {
                         /* 火狐谷歌的文件下载方式 */
-                        console.log(response.data.type)
+                        // console.log(response.data.type)
                         var blob = new Blob([response.data])
                         var downloadElement = document.createElement('a')
                         var href = window.URL.createObjectURL(blob);
@@ -205,7 +217,21 @@
                 let _this = this;
                 this.loading = true;
                 this.tableData = [];
-                v.areaName = this.$route.query.regionName;
+                this.userInfo = JSON.parse(window.sessionStorage.userInfo)
+                //  this.userInfo.loginNoStr != "kanyanli"? :   
+                //  console.log(this.userInfo.loginNoStr);   
+            
+                
+                    if(this.$route.query.isRegionName == 1){
+                        v.regionName = this.$route.query.regionName
+                        v.areaNameIsNull = 0
+                    }else{
+                        v.areaName = this.$route.query.regionName
+                    }
+                    
+                
+                
+                // v.areaName = this.$route.query.regionName
                 v.isShow = 0;
                 var memberFamilyBtnShow = JSON.parse(window.sessionStorage.memberFamilyBtnShow)
                 v.showButton = memberFamilyBtnShow
@@ -332,7 +358,7 @@
             },
             //文件返回值
             uploadBack(v) {
-                console.log(v)
+                // console.log(v)
             },
             //功能栏
             iconCli(v) {

src/pages/main/memberFamily/haveInHand.vue

@@ -382,17 +382,20 @@ export default {
             });
         },
         deletes(val, index) {
+         
             this.treeList.splice(index, 1);
             this.closeList = this.treeList;
         },
         deletess(val, index) {
+        
             this.treeListOld.splice(index, 1);
-            this.closeList = this.treeListOld;
+            // this.closeList = this.treeListOld;
         },
         deletest(val, index) {
             this.treeListp.splice(index, 1);
         },
         treeCheck(v) {
+     
             this.treeList = v;
         },
         choseDept(v) {
@@ -650,7 +653,7 @@ export default {
         },
         //文件返回值
         uploadBack(v) {
-            console.log(v)
+            // console.log(v)
         },
         //功能栏
         iconCli(v) {

src/pages/main/memberFamily/index.vue

@@ -34,7 +34,7 @@
 						<i class="el-icon-notebook-1"></i>
 						<span>已结束 </span>
 					</div>
-					<div class="adv-tit adv-add" @click="advadd" v-if="roleStatus == 0">
+					<div class="adv-tit adv-add" @click="advadd" v-if="this.isAuthor">
 						<i class="el-icon-plus"></i>
 						<span>申请</span>
 					</div>
@@ -84,7 +84,7 @@
 				</el-form-item>
 			</el-form>
 			<div style="text-align: right;margin-top: 20px">
-				<el-button @click="dialogCli(1)" type="primary">确 定</el-button>
+				<el-button @click="isClick && dialogCli(1)" type="primary">确 定</el-button>
 				<el-button @click="dialogCli(2)">取 消</el-button>
 			</div>
 		</el-dialog>
@@ -150,6 +150,8 @@
 				dialogStatus: false,
 				disableStatus: false,
 				dialogStatusp: false,
+				isAuthor:false,
+				isClick: true,
 				infolist: {},
 				treeList:[],
 				treeListp:[],
@@ -170,6 +172,28 @@
 			}
 		},
 		methods: {
+		getPermissions(){
+            this.$http({
+                url: "/market/waf/checkRole",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                data: {name:"渠道人员填报"},
+            }).then((res) => {
+             
+                this.isAuthor = res.data.body;
+                // if(res.data.isAuthor){
+                //     this.isViewer = true;
+                // }else{
+                //     this.isViewer = res.data.isViewer;
+                // }
+                /*if(!this.isViewer){
+                    this.msg = "权限错误！";
+                    this.popupMsg();
+                }*/
+            });
+        },
 			dialogCli(v) {
 				let _this = this;
 				if (v === 1) {
@@ -187,7 +211,7 @@
 						})
 					}
 					param.fillList = [];
-                    // console.log(this.treeList)
+               
 					for (let i = 0; i < this.treeList.length; i++) {
 						param.fillList.push({
 							fillNo:this.treeList[i].receiveNo,
@@ -205,6 +229,7 @@
 							}
 						}
 					}
+					this.isClick = false;
                     this.$refs.infolist.validate(valid => {
                         if (valid) {
                             this.$http({
@@ -229,7 +254,9 @@
                             		_this.treeList = [];
                             		_this.treeListp = [];
                             		_this.dialogStatus = false;
+
                             	}
+								this.isClick = true;
                             });
                         }
                     })
@@ -352,21 +379,21 @@
                     	path: "/empInfoFilling",
                     });
                     this.setabList("信息填报", "/empInfoFilling");
-                    this.$http({
-                        url: "/market/cMemberFill/queryMkMemberFillInfo",
-                        method: "post",
-                        headers: {
-                            "Content-Type": "application/json",
-                        },
-                        data: {},
-                    }).then((res) => {
-                        if(res.data){
-                            this.$router.push({
-                            	path: "/empInfoFilling",
-                            });
-                            this.setabList("信息填报", "/empInfoFilling");
-                        }
-                    });
+                    // this.$http({
+                    //     url: "/market/cMemberFill/queryMkMemberFillInfo",
+                    //     method: "post",
+                    //     headers: {
+                    //         "Content-Type": "application/json",
+                    //     },
+                    //     data: {},
+                    // }).then((res) => {
+                    //     if(res.data){
+                    //         this.$router.push({
+                    //         	path: "/empInfoFilling",
+                    //         });
+                    //         this.setabList("信息填报", "/empInfoFilling");
+                    //     }
+                    // });
 				}else{
 					this.$router.push({
 						path: "/dataStatistics",
@@ -406,7 +433,7 @@
 
 			getUser() {
 				this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-				// console.log(this.userInfo);
+			
 				let newArr = [];
 				
 				if(this.userInfo.cityName == null && this.userInfo.countyName == null){
@@ -424,7 +451,7 @@
 							sts: 0
 						},
 					}).then((res) => {
-						// console.log(res.data.body);
+						
 						res.data.body.forEach(item=>{
 							newArr.push(...item.dutyNo.split(","));
 						})
@@ -473,6 +500,7 @@
 			},
 		},
 		mounted() {
+			this.getPermissions();
 			this.getUser();
 			this.getlist();
 		},