Merge branch 'hjw-222' into 'master'

Hjw 222

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

src/config/dev.js

@@ -74,32 +74,32 @@ let test = {
     BASE_URL: "http://10.149.85.91:8000/spfm", //测试环境
     BASE_API: "http://10.149.85.91:8000/api",//工作流测试环境
     EXCEL_URL: "http://10.149.85.91:7777", //测试excel路径
-    provincialWorkOrderAreafresourceId: '33b0af93-b1ce-11ed-be6b-00505687dcd3',//通用工单地市
-    provincialWorkOrderfresourceId: '4fdbb96e-8bfd-11ed-8988-00505687dcd3',//通用工单省
-    riskMaterialsfresourceId: '3124a2d4-7209-11ed-8d6f-00505687dcd3',//风险防控
-    materialApplicationfresourceId:'8f0e9c49-b348-11ed-be6b-00505687dcd3',//宣传物料省
-    materialApplicationdsfresourceId:'a7f127b7-b348-11ed-be6b-00505687dcd3',//宣传物料地市
+    provincialWorkOrderAreafresourceId: 'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
+    provincialWorkOrderfresourceId: '9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
+    riskMaterialsfresourceId: 'canvas',//风险防控
+    materialApplicationfresourceId:'b58e5e25-ce13-11ed-afb6-e00084564cce',//宣传物料省
+    materialApplicationdsfresourceId:'cd072057-ce13-11ed-afb6-e00084564cce',//宣传物料地市
+    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',//备份数据
     accountApplicationfresourceId: '27a9dbbf-d742-11ed-8255-e00084564cce',//账号申请流程
-    accountdelfresourceId: 'e907b062-b33f-11ed-be6b-00505687dcd3',//账号删除
-    accountPermissionsfresourceId: '2b9e648d-b24d-11ed-be6b-00505687dcd3',//账号权限申请流程
-    aqbgsyListfresourceId: 'bc3402ee-b33f-11ed-be6b-00505687dcd3',//安全报告审阅
-    klhfsqList: 'd4101040-b33e-11ed-be6b-00505687dcd3',//口令恢复申请流程
-    rltzjlList: 'b9283efe-b33e-11ed-be6b-00505687dcd3',//容量调整记录流程
-    sjkdbList: 'd36c60c0-b33f-11ed-be6b-00505687dcd3',//数据库导表流程
-    tyshList: '4a4153db-b33f-11ed-be6b-00505687dcd3',//通用审核流程
-    userList: '4edefb21-b24f-11ed-be6b-00505687dcd3',//用户清单流程
-    internetAssessment: 'd4092f5e-c49b-11ed-a8d3-00505687dcd3',//互联网电视
-    authoriZation: '1ecbaf96-b33f-11ed-be6b-00505687dcd3',//口令授权
-    backupRequire: 'ed1f02d2-b33e-11ed-be6b-00505687dcd3',//备份需求
-    emergencyPlan: '03be5f93-b340-11ed-be6b-00505687dcd3',//应急预案
-    internetAccess: '094631e4-b33f-11ed-be6b-00505687dcd3',//互联网端口
-    resourceApply: '1f6a7842-b25c-11ed-be6b-00505687dcd3',//资源申请
-    securityAudit: '93dc4075-b33f-11ed-be6b-00505687dcd3',//安全审计
-    userChange: '3626d7d9-b33f-11ed-be6b-00505687dcd3',//用户使用者变更
-    bfsjList: 'dbd83414-b25f-11ed-be6b-00505687dcd3',//备份数据
-    docAppr: '3b21cf73-b251-11ed-be6b-00505687dcd3',//文件审批流程
-    firewall: '86e7c09e-b256-11ed-be6b-00505687dcd3',//防火墙
-    opcode: '1245d300-b25a-11ed-be6b-00505687dcd3',//opcode
+    accountdelfresourceId: '8a519886-d742-11ed-8255-e00084564cce',//账号删除
+    accountPermissionsfresourceId: '2e508b91-d741-11ed-8255-e00084564cce',//账号权限申请流程
+    aqbgsyListfresourceId: '19bed1f4-d743-11ed-8255-e00084564cce',//安全报告审阅
+    klhfsqList: '9f3ab9d2-d743-11ed-8255-e00084564cce',//口令恢复申请流程
+    rltzjlList: 'd38ce419-d743-11ed-8255-e00084564cce',//容量调整记录流程
+    sjkdbList: 'd874ccdd-d742-11ed-8255-e00084564cce',//数据库导表流程
+    tyshList: '5b87cb0b-d743-11ed-8255-e00084564cce',//通用审核流程
+    userList: '81bc22d8-d741-11ed-8255-e00084564cce',//用户清单流程
+    internetAssessment: '433402bb-d52d-11ed-afb6-e00084564cce',//互联网电视
+    docAppr: '917d8bf9-d918-11ed-8255-e00084564cce',//文件审批流程
+    firewall: '3c3df7fb-d918-11ed-8255-e00084564cce',//防火墙
+    opcode: '6b9e1cb2-d918-11ed-8255-e00084564cce',//opcode
 }
 let prod = {
     TITLE: '线上环境',

src/pages/main/accountPermissions/accountApplication.vue

@@ -1673,7 +1673,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("任务主题", res.data.data[0]);
                 }
@@ -1721,7 +1721,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }
@@ -1734,6 +1734,8 @@ export default {
             this.usernumber()
         } else {
             let { id, type } = this.$route.query;
+            console.log(id);
+            console.log(type);
             let list = {
                 taskId: id,
                 tableName: this.tableName

src/pages/main/accountPermissions/accountPermissions.vue

@@ -913,7 +913,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("申请主题", res.data.data[0]);
                 }
@@ -961,7 +961,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/accountPermissions/accountdel.vue

@@ -1172,7 +1172,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("任务主题", res.data.data[0]);
                 }
@@ -1220,7 +1220,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/accountPermissions/aqbgsyList.vue

@@ -950,7 +950,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("标题", res.data.data[0]);
                 }
@@ -998,7 +998,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/accountPermissions/klhfsqList.vue

@@ -983,7 +983,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("工单标题", res.data.data[0]);
                 }
@@ -1031,7 +1031,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/accountPermissions/rltzjlList.vue

@@ -1002,7 +1002,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("标题", res.data.data[0]);
                 }
@@ -1050,7 +1050,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/accountPermissions/sjkdbList.vue

@@ -1312,7 +1312,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("任务主题", res.data.data[0]);
                 }
@@ -1360,7 +1360,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/accountPermissions/tyshList.vue

@@ -992,7 +992,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("标题", res.data.data[0]);
                 }
@@ -1040,7 +1040,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/applyFor/authoriZation.vue

@@ -1041,12 +1041,15 @@ export default {
     },
 
 
-    backlogTodo() {
+    backlogTodo(e, status) {
       let list = {
         tableName: this.requestForm.processDefinitionKey,
       };
       // getInitiateBase   getTodoBase
-      getTodoBase(this.page, "", list).then((res) => {
+      getTodoBase(this.page, "", e || list).then((res) => {
+        if (status === 0) {
+          this.clickDemand("文件标题", res.data.data[0]);
+        }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;
         // this.Table = this.firstTable;
@@ -1113,12 +1116,26 @@ export default {
 
   },
   created() {
-    this.Table = this.firstTable;
-    this.haveDone();
-    this.iniTiate();
-    this.backlogTodo();
-    this.getneedNo();
-    // this.getDept();
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo();
+      this.getneedNo();
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.requestForm.processDefinitionKey,
+      };
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo(list, 0);
+      this.getneedNo();
+    }
+
   },
 };
 </script>

src/pages/main/applyFor/backupRequire.vue

@@ -16,7 +16,7 @@
             <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
             <el-button type="primary" @click="close()">关闭</el-button>
           </div>
-          
+
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <!--dialogVisible1 = true -->
             <div class="flex-title">备份需求及变更</div>
@@ -859,12 +859,15 @@ export default {
       });
     },
 
-    backlogTodo() {
+    backlogTodo(e, status) {
       let list = {
         tableName: this.requestForm.processDefinitionKey,
       };
       // getInitiateBase   getTodoBase
-      getTodoBase(this.page, "", list).then((res) => {
+      getTodoBase(this.page, "", e || list).then((res) => {
+        if (status === 0) {
+          this.clickDemand("文件标题", res.data.data[0]);
+        }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;
         // this.Table = this.firstTable;
@@ -930,13 +933,27 @@ export default {
 
   },
   created() {
-    this.Table = this.firstTable;
-    this.haveDone();
-    this.iniTiate();
-    this.backlogTodo();
-    this.getneedNo();
-    this.getdealMan();
-    // this.getDept();
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo();
+      this.getneedNo();
+      this.getdealMan();
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.requestForm.processDefinitionKey,
+      };
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo(list, 0);
+      this.getneedNo();
+      this.getdealMan();
+    }
   },
 };
 </script>

src/pages/main/applyFor/emergencyPlan.vue

@@ -19,7 +19,7 @@
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <!--dialogVisible1 = true -->
             <div class="flex-title">应急预案审批</div>
-          
+
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 50%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -1100,12 +1100,15 @@ export default {
     },
 
 
-    backlogTodo() {
+    backlogTodo(e, status) {
       let list = {
         tableName: this.requestForm.processDefinitionKey,
       };
       // getInitiateBase   getTodoBase
-      getTodoBase(this.page, "", list).then((res) => {
+      getTodoBase(this.page, "", e || list).then((res) => {
+        if (status === 0) {
+          this.clickDemand("文件标题", res.data.data[0]);
+        }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;
         // this.Table = this.firstTable;
@@ -1209,15 +1212,32 @@ export default {
 
   },
   created() {
-    this.Table = this.firstTable;
-    this.haveDone();
-    this.iniTiate();
-    this.backlogTodo();
-    this.getToBeRead();
-    this.getBeReadList();
-    this.getneedNo();
-    // this.getdealMan();
-    // this.getDept();
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo();
+      this.getToBeRead();
+      this.getBeReadList();
+      this.getneedNo();
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.requestForm.processDefinitionKey,
+      };
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo(list, 0);
+      this.getToBeRead();
+      this.getBeReadList();
+      this.getneedNo();
+    }
+
+
+
   },
 };
 </script>

src/pages/main/applyFor/internetAccess.vue

@@ -13,8 +13,8 @@
         <span class="dialog-body">
           <div>
             <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
-              <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
-              <el-button type="primary" @click="close()">关闭</el-button>
+            <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
+            <el-button type="primary" @click="close()">关闭</el-button>
           </div>
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <!--dialogVisible1 = true -->
@@ -101,7 +101,8 @@
         :destroy-on-close="true">
         <!--  -->
         <!-- <Workflow :list="ruleForm" :requestForm="requestForm" @dialogVisible1 = "Visible1"/> -->
-        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm" :request_formTitle="request_form.title"/>
+        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm"
+          :request_formTitle="request_form.title" />
         <!-- @dialogVisible1 = "Visible1" -->
         <!-- <WorkflowEntrance
           :list="ruleForm"
@@ -864,12 +865,15 @@ export default {
       });
     },
 
-    backlogTodo() {
+    backlogTodo(e, status) {
       let list = {
         tableName: this.requestForm.processDefinitionKey,
       };
       // getInitiateBase   getTodoBase
-      getTodoBase(this.page, "", list).then((res) => {
+      getTodoBase(this.page, "", e || list).then((res) => {
+        if (status === 0) {
+          this.clickDemand("文件标题", res.data.data[0]);
+        }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;
         // this.Table = this.firstTable;
@@ -935,13 +939,27 @@ export default {
 
   },
   created() {
-    this.Table = this.firstTable;
-    this.haveDone();
-    this.iniTiate();
-    this.backlogTodo();
-    this.getneedNo();
-    this.getdealMan();
-    // this.getDept();
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo();
+      this.getneedNo();
+      this.getdealMan();
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.requestForm.processDefinitionKey,
+      };
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo(list, 0);
+      this.getneedNo();
+      this.getdealMan();
+    }
   },
 };
 </script>

src/pages/main/applyFor/resourceApply.vue

@@ -11,7 +11,7 @@
         :before-close="handleClose" width="100%" height="500vh" class="dialogClass" top="0" :modal="false"
         :modal-append-to-body="true">
         <span class="dialog-body">
-          
+
           <div>
             <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
             <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
@@ -21,7 +21,7 @@
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <!--dialogVisible1 = true -->
             <div class="flex-title">系统资源申请</div>
-          
+
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 33%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -866,12 +866,15 @@ export default {
       });
     },
 
-    backlogTodo() {
+    backlogTodo(e, status) {
       let list = {
         tableName: this.requestForm.processDefinitionKey,
       };
       // getInitiateBase   getTodoBase
-      getTodoBase(this.page, "", list).then((res) => {
+      getTodoBase(this.page, "", e || list).then((res) => {
+        if (status === 0) {
+          this.clickDemand("文件标题", res.data.data[0]);
+        }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;
         // this.Table = this.firstTable;
@@ -937,13 +940,27 @@ export default {
 
   },
   created() {
-    this.Table = this.firstTable;
-    this.haveDone();
-    this.iniTiate();
-    this.backlogTodo();
-    this.getneedNo();
-    this.getdealMan();
-    // this.getDept();
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo();
+      this.getneedNo();
+      this.getdealMan();
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.requestForm.processDefinitionKey,
+      };
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo(list, 0);
+      this.getneedNo();
+      this.getdealMan();
+    }
   },
 };
 </script>

src/pages/main/applyFor/securityAudit.vue

@@ -845,12 +845,15 @@ export default {
       });
     },
 
-    backlogTodo() {
+    backlogTodo(e, status) {
       let list = {
         tableName: this.requestForm.processDefinitionKey,
       };
       // getInitiateBase   getTodoBase
-      getTodoBase(this.page, "", list).then((res) => {
+      getTodoBase(this.page, "", e || list).then((res) => {
+        if (status === 0) {
+          this.clickDemand("文件标题", res.data.data[0]);
+        }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;
         // this.Table = this.firstTable;
@@ -913,13 +916,27 @@ export default {
 
   },
   created() {
-    this.Table = this.firstTable;
-    this.haveDone();
-    this.iniTiate();
-    this.backlogTodo();
-    this.getneedNo();
-    this.getdealMan();
-    // this.getDept();
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo();
+      this.getneedNo();
+      this.getdealMan();
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.requestForm.processDefinitionKey,
+      };
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo(list, 0);
+      this.getneedNo();
+      this.getdealMan();
+    }
   },
 };
 </script>

src/pages/main/applyFor/userChange.vue

@@ -1115,12 +1115,15 @@ export default {
       });
     },
 
-    backlogTodo() {
+    backlogTodo(e, status) {
       let list = {
         tableName: this.requestForm.processDefinitionKey,
       };
       // getInitiateBase   getTodoBase
-      getTodoBase(this.page, "", list).then((res) => {
+      getTodoBase(this.page, "", e || list).then((res) => {
+        if (status === 0) {
+          this.clickDemand("文件标题", res.data.data[0]);
+        }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;
         // this.Table = this.firstTable;
@@ -1184,13 +1187,27 @@ export default {
 
   },
   created() {
-    this.Table = this.firstTable;
-    this.haveDone();
-    this.iniTiate();
-    this.backlogTodo();
-    this.getneedNo();
-    this.getdealMan();
-    // this.getDept();
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo();
+      this.getneedNo();
+      this.getdealMan();
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.requestForm.processDefinitionKey,
+      };
+      this.Table = this.firstTable;
+      this.haveDone();
+      this.iniTiate();
+      this.backlogTodo(list, 0);
+      this.getneedNo();
+      this.getdealMan();
+    }
   },
 };
 </script>

src/pages/main/bfsj/bfsjList.vue

@@ -16,7 +16,7 @@
             <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>                
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">备份数据恢复</div>
@@ -66,10 +66,10 @@
             <el-dialog title="处理操作" width="100%" :visible.sync="handleStatus" :before-close="handleCloses" :modal="false"
                 v-if="handleStatus" :destroy-on-close="true">
                 <Workflow :list="fromList" v-if="isWorkflowStatus == true" @updateForm="updateForm"
-                    :requestForm="requestForm" :request_formTitle="request_form.title"/>
+                    :requestForm="requestForm" :request_formTitle="request_form.title" />
 
                 <WorkflowEntrance :list="fromList" v-else :lastManList="lastManList" @beforeClose="updateForm"
-                    :requestForm="requestForm" :request_formTitle="request_form.title"/>
+                    :requestForm="requestForm" :request_formTitle="request_form.title" />
                 <!-- 后期维护 -->
             </el-dialog>
         </div>
@@ -715,7 +715,7 @@ export default {
                     console.log(this.$refs.form.model)
                     this.savestatusBtn = true
                     if (this.fromList.id) {
-                        this.request_form.title = '[IT工作台]-'+'备份数据-'+ this.fromList.needName;
+                        this.request_form.title = '[IT工作台]-' + '备份数据-' + this.fromList.needName;
                         this.$http({
                             url: "/market/bfsjProcess/update",
                             method: "post",
@@ -755,7 +755,7 @@ export default {
         },
         setForm(e) {
             // console.log(this.$refs.form)
-            this.request_form.title = '[IT工作台]-'+'备份数据-'+ this.fromList.needName;
+            this.request_form.title = '[IT工作台]-' + '备份数据-' + this.fromList.needName;
             // this.request_form.title = this.$refs.form.needName;
             // this.$refs.form.taskId = e;
             this.fromList.accessoryIdList = []
@@ -835,7 +835,7 @@ export default {
         clickHandles() {
             this.getNextPath(this.fromList.resourceId || "");
             console.log(this.fromList);
-            this.request_form.title = '[IT工作台]-'+'备份数据-'+ this.fromList.needName;
+            this.request_form.title = '[IT工作台]-' + '备份数据-' + this.fromList.needName;
             // if (this.fromList.taskId) {
             //     this.destroy = true;
             //     this.handleStatus = true;
@@ -950,7 +950,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+            getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("标题", res.data.data[0]);
                 }
@@ -998,7 +998,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+            getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/firewall/index.vue

@@ -163,7 +163,7 @@ export default {
                     },
                     {
                         label: "申请人",
-                        prop: "predealman",
+                        prop: "applicant",
                         width: 300,
                     },
                     {
@@ -442,7 +442,7 @@ export default {
             let list = {
                 tableName: this.request_form.processDefinitionKey,
             };
-            getTodoBase(this.totalPage, "", list).then((res) => {
+            getTodoBase(this.totalPage, "", e || list).then((res) => {
                 if (status === 0) {
                     this.clickDemand("标题", res.data.data[0]);
                 }

src/pages/main/internetAssessment/internetAssessment.vue

@@ -289,7 +289,7 @@
                                             @click="editw(scope.row, scope.$index)">{{
                                                 scope.row.show ? '保存' : "修改" }}
                                         </el-button>
-                                        <el-button type="text" @click="delectv(scope.$index, scope.row)">删除</el-button>
+                                        <el-button type="text" @click="delectw(scope.$index, scope.row)">删除</el-button>
                                     </div>
                                 </template>
                             </el-table-column>
@@ -1406,7 +1406,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("考核主题", res.data.data[0]);
                 }
@@ -1444,7 +1444,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         },
@@ -1602,6 +1602,17 @@ export default {
                 })
                 .catch(() => { });
         },
+        delectw(index, row) {
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.fromList.content1.tableData2.splice(index, 1);
+                })
+                .catch(() => { });
+        },
         addNewHost1() {
             this.fromList.content1.tableData1.push({
                 item: '',

src/pages/main/opcode/index.vue

@@ -163,7 +163,7 @@ export default {
                     },
                     {
                         label: "申请人",
-                        prop: "predealman",
+                        prop: "applicant",
                         width: 300,
                     },
                     {
@@ -453,7 +453,7 @@ export default {
             let list = {
                 tableName: this.request_form.processDefinitionKey,
             };
-            getTodoBase(this.totalPage, "", list).then((res) => {
+            getTodoBase(this.totalPage, "", e || list).then((res) => {
                 if (status === 0) {
                     this.clickDemand("工单标题", res.data.data[0]);
                 }

src/pages/main/postage/index.vue

@@ -364,10 +364,24 @@ export default {
     };
   },
   created() {
-    this.getQueryList();
-    this.getMeLaunch();
-    this.getQueryDone();
-    this.lableTable = this.firstTable;
+    let status = JSON.stringify(this.$route.query) == "{}";
+    if (status) {
+      this.getQueryList();
+      this.getMeLaunch();
+      this.getQueryDone();
+      this.lableTable = this.firstTable;
+    } else {
+      let { id, type } = this.$route.query;
+      let list = {
+        taskId: id,
+        tableName: this.tableName
+      };
+      this.getQueryList(list, 0);
+      this.getMeLaunch();
+      this.getQueryDone();
+      this.lableTable = this.firstTable;
+    }
+
   },
   mounted() {
     this.getUserPhone();
@@ -396,7 +410,7 @@ export default {
       let list = {
         tableName: this.request_form.processDefinitionKey,
       };
-      getTodoBase(this.totalPage, "", list).then((res) => {
+      getTodoBase(this.totalPage, "", e || list).then((res) => {
         this.lableTable.data = res.data.data;
         // this.tableData.map((item) => {
         //   item.status = "1";

src/pages/main/provincialWorkOrder/provincialWorkOrder.vue

@@ -1331,7 +1331,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
             // queryReadBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {

src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue

@@ -1105,7 +1105,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/userList/docAppr.vue

@@ -966,7 +966,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("标题", res.data.data[0]);
                 }
@@ -1016,7 +1016,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+             getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }

src/pages/main/userList/userList.vue

@@ -16,7 +16,7 @@
             <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">用户清单</div>
@@ -69,7 +69,7 @@
                     :requestForm="requestForm" :request_formTitle="request_form.title" />
 
                 <WorkflowEntrance :list="fromList" v-else :lastManList="lastManList" @beforeClose="updateForm"
-                    :requestForm="requestForm"  :request_formTitle="request_form.title"/>
+                    :requestForm="requestForm" :request_formTitle="request_form.title" />
                 <!-- 后期维护 -->
             </el-dialog>
         </div>
@@ -150,7 +150,7 @@ export default {
                 // fresourceId: "65791a1e-b1ac-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "4edefb21-b24f-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().userList, 
+                fresourceId: getConfig().userList,
                 processDefinitionKey: "YHQD_process",
             },
             dialogStatus: false, //dialog显示
@@ -950,7 +950,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+            getTodoBase(this.pageNo, "", e || { tableName: this.tableName }).then((res) => {
                 if (status === 0) {
                     this.clickDemand("标题", res.data.data[0]);
                 }
@@ -998,7 +998,7 @@ export default {
             getDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[1].number = res.data.totalRecord
             });
-            getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+            getTodoBase(this.pageNo, "", { tableName: this.tableName }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
         }