需求上线

public/static/views/performance.html

@@ -62,6 +62,9 @@
         display: none;
     }
 
+    .luckysheet-share-logo {
+        display: none !important;
+    }
     /* .btn-primary{
         float: right;
     } */

src/components/onlyoffice-editor/onlyoffice-editor.vue

@@ -61,7 +61,7 @@ export default {
         // 编辑器宽度
         width: 1200,
         // 编辑器高度
-        height: 600,
+        height: 550,
         // 编辑器类型，支持 word、cell（表格）、slide（PPT）
         documentType: 'word',
         // 文档配置

src/components/workflowBase.vue

@@ -256,6 +256,11 @@ export default {
         if (this.backThree.length > 0) {
           newlist.nextDealMan = "admin";
         }
+        if (this.backThree.length == 0) {
+          this.$message.error("请选择候选人");
+          this.buttonLoading = false
+          return false;
+        }
         this.nextWorks(newlist, list);
       } else {
         console.log(456);
@@ -272,6 +277,7 @@ export default {
             this.nextWork();
           } else {
             this.$message.error("请选择候选人");
+            this.buttonLoading = false
             return false;
           }
         } else {
@@ -295,6 +301,7 @@ export default {
           }
           if (this.clicknextName === "") {
             this.$message.error("请选择流程节点");
+            this.buttonLoading = false
             return false;
           }
           if (this.backThree.length > 0) {
@@ -307,6 +314,7 @@ export default {
             if (this.clicknextName === "流程结束" || this.clicknextName === "提交至任务发起人") {
             } else {
               this.$message.error("请选择候选人");
+              this.buttonLoading = false
               return false;
             }
           }

src/components/workflowEntrance.vue

@@ -132,7 +132,7 @@ export default {
       treeCopyList: [],
       demand: "",
       close: "",
-      nextDealManLists: ''
+      nextDealManLists: []
     };
   },
   props: {
@@ -201,8 +201,14 @@ export default {
           (obj.url = _this.$url.formList.getComplateLastMan), //下一步工作流接口
           (obj.data = list);
       } else {
+
+        console.log(this.nextDealManLists);
+        if (this.nextDealManLists.length == 0) {
+          this.$message.error("请选择人员");
+          return false;
+        }
         let listss = {
-          userId: _this.nextDealManLists, //人员id
+          userId: _this.nextDealManLists.toString(), //人员id
           taskId: this.list.taskId, //表单标识
           loginstr: JSON.parse(window.sessionStorage.userInfo).loginNoStr,
           // taskName: this.clicknextName, //流程节点
@@ -309,6 +315,8 @@ export default {
     },
     async nextWork(list) {
       //e:yes||no,list：传入数组，title:结束标签，res:驳回标签,id:工单更新id
+
+
       let _this = this;
       let obj = {
         url: _this.$url.formList.nextWork, //下一步工作流接口
@@ -508,13 +516,13 @@ export default {
         //   this.$message.error("只能选择一个人");
         //   return;
         // } else {
-          this.backThree = e;
-          let arr = [];
-          this.backThree.map((item) => {
-            arr.push(item.loginNoStr);
-          });
-          this.nextDealManLists = arr.toString();
-        }
+        this.backThree = e;
+        let arr = [];
+        this.backThree.map((item) => {
+          arr.push(item.loginNoStr);
+        });
+        this.nextDealManLists = arr;
+      }
       // }
     },
     //获取字典表常用意见

src/config/dev.js

@@ -32,6 +32,8 @@ let devs = {
     docAppr: '47b27979-b250-11ed-886f-d6cd97160e00',//文件审批流程
     firewall: '9d7c2f92-b251-11ed-886f-d6cd97160e00',//防火墙
     opcode: 'b79206a9-b258-11ed-886f-d6cd97160e00',//opcode
+    magicboxAudits: 'a8e1ba49-13c3-11ee-b06f-d6cd97160e00',//魔百和大屏广告自有业务承载审批
+    ggsj_processfresourceId:'7f3e39a2-ed7e-11ed-8138-e00084564cce',//广告设计及素材库
 }
 let dev = {
     TITLE: '本地环境',
@@ -66,6 +68,8 @@ let dev = {
     docAppr: '917d8bf9-d918-11ed-8255-e00084564cce',//文件审批流程
     firewall: '3c3df7fb-d918-11ed-8255-e00084564cce',//防火墙
     opcode: '6b9e1cb2-d918-11ed-8255-e00084564cce',//opcode
+    magicboxAudits: 'a8e1ba49-13c3-11ee-b06f-d6cd97160e00',//魔百和大屏广告自有业务承载审批
+    ggsj_processfresourceId:'7f3e39a2-ed7e-11ed-8138-e00084564cce',//广告设计及素材库
 }
 let test = {
     TITLE: '测试环境',
@@ -100,6 +104,8 @@ let test = {
     docAppr: '917d8bf9-d918-11ed-8255-e00084564cce',//文件审批流程
     firewall: '3c3df7fb-d918-11ed-8255-e00084564cce',//防火墙
     opcode: '6b9e1cb2-d918-11ed-8255-e00084564cce',//opcode
+    magicboxAudits: 'bfe8ae71-1553-11ee-a3bf-00505687dcd3',//魔百和大屏广告自有业务承载审批
+    ggsj_processfresourceId:'7f3e39a2-ed7e-11ed-8138-e00084564cce',//广告设计及素材库
 }
 let prod = {
     TITLE: '线上环境',
@@ -134,6 +140,8 @@ let prod = {
     docAppr: '917d8bf9-d918-11ed-8255-e00084564cce',//文件审批流程
     firewall: '3c3df7fb-d918-11ed-8255-e00084564cce',//防火墙
     opcode: '6b9e1cb2-d918-11ed-8255-e00084564cce',//opcode
+    magicboxAudits: 'b366747e-1bc4-11ee-98a6-ca8216f07734',//魔百和大屏广告自有业务承载审批
+    ggsj_processfresourceId:'7f3e39a2-ed7e-11ed-8138-e00084564cce',//广告设计及素材库
 }
 export const getConfig = () => {
     switch (process.env.VUE_APP_ENV) {

src/pages/main/accountPermissions/accountApplication.vue

@@ -697,18 +697,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table

src/pages/main/accountPermissions/accountPermissions.vue

@@ -266,18 +266,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table

src/pages/main/accountPermissions/accountdel.vue

@@ -365,18 +365,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table

src/pages/main/accountPermissions/aqbgsyList.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>
@@ -150,7 +150,7 @@ export default {
                 // fresourceId: "014cf465-b31c-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "bc3402ee-b33f-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().aqbgsyListfresourceId, 
+                fresourceId: getConfig().aqbgsyListfresourceId,
                 processDefinitionKey: "AQBG_process",
             },
             dialogStatus: false, //dialog显示
@@ -217,18 +217,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table
@@ -715,7 +715,14 @@ export default {
                     console.log(this.$refs.form.model)
                     this.savestatusBtn = true
                     if (this.fromList.id) {
-                        this.request_form.title = '[IT工作台]-安全报告审阅-'+this.fromList.needName;
+                        this.fromList.accessoryIdList = []
+                        console.log(this.fromList.accessoryList);
+                        if (this.fromList.accessoryList) {
+                            this.fromList.accessoryList.map((item) => {
+                                this.fromList.accessoryIdList.push(item.id);
+                            })
+                        }
+                        this.request_form.title = '[IT工作台]-安全报告审阅-' + this.fromList.needName;
                         this.$http({
                             url: "/market/AqbgProcess/update",
                             method: "post",
@@ -755,7 +762,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 +842,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 +957,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-             getTodoBase(this.pageNo, "", e || { 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 +1005,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
             });
         }
@@ -1026,9 +1033,11 @@ export default {
 .copyClass {
     display: flex;
 }
+
 ::v-deep .el-form-item__label {
     text-align: center;
 }
+
 .flex-header-text-tree {
     width: 50%;
     text-align: center;

src/pages/main/accountPermissions/klhfsqList.vue

@@ -270,18 +270,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table

src/pages/main/accountPermissions/rltzjlList.vue

@@ -245,18 +245,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table

src/pages/main/accountPermissions/sjkdbList.vue

@@ -401,18 +401,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table

src/pages/main/accountPermissions/tyshList.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="150px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">通用审核流程</div>
@@ -86,10 +86,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>
@@ -192,7 +192,7 @@ export default {
                 // fresourceId: "345a2955-b321-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "4a4153db-b33f-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().tyshList, 
+                fresourceId: getConfig().tyshList,
                 processDefinitionKey: "TYSH_process",
             },
             dialogStatus: false, //dialog显示
@@ -259,18 +259,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table
@@ -757,6 +757,13 @@ export default {
                     console.log(this.$refs.form.model)
                     this.savestatusBtn = true
                     if (this.fromList.id) {
+                        this.fromList.accessoryIdList = []
+                        console.log(this.fromList.accessoryList);
+                        if (this.fromList.accessoryList) {
+                            this.fromList.accessoryList.map((item) => {
+                                this.fromList.accessoryIdList.push(item.id);
+                            })
+                        }
                         this.request_form.title = '[IT工作台]-通用审核-' + this.fromList.needName;
                         this.$http({
                             url: "/market/TyshProcess/update",
@@ -992,7 +999,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-             getTodoBase(this.pageNo, "", e || { 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 +1047,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/advertising/materialApplication.vue

@@ -1141,11 +1141,11 @@ export default {
           this.$message.error("请先点击保存");
         } else {
           this.dialogVisible1 = true;
-          this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.businessName;
+          this.request_form.title = '[市场经营管理平台]-' + '省宣传物料申请及审批-' + this.infolist.businessName;
         }
       } else {
         this.dialogVisible1 = true;
-        this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.businessName;
+        this.request_form.title = '[市场经营管理平台]-' + '省宣传物料申请及审批-' + this.infolist.businessName;
       }
 
     },
@@ -1216,7 +1216,7 @@ export default {
       this.infolist = r;
       this.infolist.id = r.id;
       this.request_form.businessKey = r.id;
-      this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + r.needName;
+      this.request_form.title = '[市场经营管理平台]-' + '省宣传物料申请及审批-' + r.needName;
       this.getUserIds();
 
     },
@@ -1572,7 +1572,7 @@ export default {
           } else {
             list.mkFileShareAttachList = this.attList;
           }
-          this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.needName;
+          this.request_form.title = '[市场经营管理平台]-' + '省宣传物料申请及审批-' + this.infolist.needName;
           this.$http({
             url: "/market/xcwlProcessImport/update",
             method: "post",

src/pages/main/advertising/materialApplicationds.vue

@@ -1105,11 +1105,11 @@ export default {
           this.$message.error("请先点击保存");
         } else {
           this.dialogVisible1 = true;
-          this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.businessName;
+          this.request_form.title = '[市场经营管理平台]-' + '地市宣传物料申请及审批-' + this.infolist.businessName;
         }
       } else {
         this.dialogVisible1 = true;
-        this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.businessName;
+        this.request_form.title = '[市场经营管理平台]-' + '地市宣传物料申请及审批-' + this.infolist.businessName;
       }
 
     },
@@ -1180,7 +1180,7 @@ export default {
       this.infolist = r;
       this.infolist.id = r.id;
       this.request_form.businessKey = r.id;
-      this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + r.needName;
+      this.request_form.title = '[市场经营管理平台]-' + '地市宣传物料申请及审批-' + r.needName;
       this.getUserIds();
 
     },
@@ -1535,7 +1535,7 @@ export default {
           } else {
             list.mkFileShareAttachList = this.attList;
           }
-          this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.needName;
+          this.request_form.title = '[市场经营管理平台]-' + '地市宣传物料申请及审批-' + this.infolist.needName;
           this.$http({
             url: "/market/xcwlProcessImport/update",
             method: "post",

src/pages/main/bfsj/bfsjList.vue

@@ -216,18 +216,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table
@@ -715,6 +715,13 @@ export default {
                     console.log(this.$refs.form.model)
                     this.savestatusBtn = true
                     if (this.fromList.id) {
+                        this.fromList.accessoryIdList = []
+                        console.log(this.fromList.mkFileShareAttachList);
+                        if (this.fromList.mkFileShareAttachList) {
+                            this.fromList.mkFileShareAttachList.map((item) => {
+                                this.fromList.accessoryIdList.push(item.id);
+                            })
+                        }
                         this.request_form.title = '[IT工作台]-' + '备份数据-' + this.fromList.needName;
                         this.$http({
                             url: "/market/bfsjProcess/update",

src/pages/main/homeMarket/magicboxAudit/index.vue

@@ -20,10 +20,10 @@
                             <i class="el-icon-notebook-1"></i>
                             <span>已归档 <em>{{totalFinish||0}}</em></span>
                         </div>
-                        <div class="adv-tit adv-add" @click="advadd">
+                        <!-- <div class="adv-tit adv-add" @click="advadd">
                             <i class="el-icon-plus"></i>
                             <span>创建</span>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
             </el-col>

src/pages/main/internetAssessment/internetAssessment.vue

@@ -537,18 +537,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table
@@ -1149,7 +1149,7 @@ export default {
                             })
                         }
                         this.fromList.content = JSON.stringify(this.$refs.form.model.content1);
-                        this.request_form.title = '[市场工作台]-互联网电视考核-' + this.fromList.needName;
+                        this.request_form.title = '[市场经营管理平台]-互联网电视考核-' + this.fromList.needName;
                         this.$http({
                             url: "/market/HlwDskhProcess/update",
                             method: "post",
@@ -1188,7 +1188,7 @@ export default {
             });
         },
         setForm(e) {
-            this.request_form.title = '[市场工作台]-互联网电视考核-' + this.fromList.needName;
+            this.request_form.title = '[市场经营管理平台]-互联网电视考核-' + this.fromList.needName;
             this.fromList.accessoryIdList = []
             // console.log(this.fromList.accessoryList);
             if (this.fromList.accessoryList) {

src/pages/main/leader/risk/riskManagement.vue

@@ -908,7 +908,7 @@ export default {
             // });
         },
         setForm(e) {
-            this.request_form.title = '[市场工作台]-风险点防控-'+this.fromList.needName;
+            this.request_form.title = '[市场经营管理平台]-风险点防控-'+this.fromList.needName;
             this.fromList.transactorList = []
             this.treeListonly.map((item) => {
                 this.fromList.transactorList.push(item.key)

src/pages/main/leader/risk/riskMaterials.vue

@@ -260,17 +260,17 @@ export default {
                 {
                     index: "first",
                     label: "我的工单",
-                    number: 1,
+                    number: "",
                 },
                 {
                     index: "two",
                     label: "待审批",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "已处理",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table
@@ -948,7 +948,7 @@ export default {
                                 //     this.fromList.processAccessoryList = attList;
                                 // }
                                 this.fromList.tableName = this.tableName;
-                                this.request_form.title = '[市场工作台]-风险点防控-'+this.fromList.needName;
+                                this.request_form.title = '[市场经营管理平台]-风险点防控-'+this.fromList.needName;
                                 this.$http({
                                     url: "/market/fxfkProcess/update",
                                     method: "post",
@@ -1002,7 +1002,7 @@ export default {
         },
         setForm(e) {
             // console.log(this.$refs.form)
-            this.request_form.title = '[市场工作台]-风险点防控-'+this.fromList.needName;
+            this.request_form.title = '[市场经营管理平台]-风险点防控-'+this.fromList.needName;
             // this.request_form.title = this.$refs.form.needName;
             // this.$refs.form.taskId = e;
             this.$http({
@@ -1075,14 +1075,14 @@ export default {
                 if (this.savestatusBtn) {
                     this.destroy = true;
                     this.handleStatus = true;
-                    this.request_form.title = '[市场工作台]-风险点防控-'+this.fromList.needName;
+                    this.request_form.title = '[市场经营管理平台]-风险点防控-'+this.fromList.needName;
                 } else {
                     this.$message.error("请先点击保存按钮");
                 }
             } else {
                 this.destroy = true;
                 this.handleStatus = true;
-                this.request_form.title = '[市场工作台]-风险点防控-'+this.fromList.needName;
+                this.request_form.title = '[市场经营管理平台]-风险点防控-'+this.fromList.needName;
             }
         },
         //处理关闭

src/pages/main/onlineOfficeExcel/index.vue

@@ -144,7 +144,7 @@
             </div>
             <el-dialog :title="'新建'" :visible.sync="addNewDiaStatus" width="50%" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false" v-if="addNewDiaStatus">
-                <div v-loading="loading">
+                <div v-loading="loading" style="padding: 30px;">
                     <el-form :model="form" ref="form">
                         <div class="online">
                             <el-form-item prop="fileName">
@@ -172,62 +172,61 @@
             <el-dialog :title="'新建'" :visible.sync="addNewStatus" width="450px" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false">
                 <div>
-                    <div style="padding-bottom: 30px;display:flex">
+                    <div style="padding: 30px;display:flex">
                         <div style="width: 85px;display: inline-block;cursor: pointer"
                             @click="addNewDiaStatus = true; form = {}">
                             <span class="iconfont icon-wenjian" style="font-size: 80px;color: dodgerblue"></span>
                             <p style="margin-left: 20px;margin-top: 10px">在线文档</p>
                         </div>
                         <div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer">
-                            <myUpload style="" @uploadBack=" uploadBack " :fileInfo=" fileInfo2 "
-                                :fileList=" fileInfo2.fileList " :filenowFolder=" nowFolder ">
+                            <myUpload style="" @uploadBack="uploadBack" :fileInfo="fileInfo2" :fileList="fileInfo2.fileList"
+                                :filenowFolder="nowFolder">
                             </myUpload>
                         </div>
                         <div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer"
-                            @click=" addFolderStatus = true ">
+                            @click=" addFolderStatus = true">
                             <span class="iconfont icon-wenjianjia" style="font-size: 80px;color: dodgerblue"></span>
                             <p style="margin-left: 20px;margin-top: 10px">文件夹</p>
                         </div>
                     </div>
                 </div>
             </el-dialog>
-            <el-dialog :title=" '新增文件夹' " :visible.sync=" addFolderStatus " width="50%" :destroy-on-close=" true "
-                :modal-append-to-body=" false " :close-on-click-modal=" false ">
-                <div v-loading=" loading ">
-                    <el-form :model=" infolist " ref="infolist">
+            <el-dialog :title="'新增文件夹'" :visible.sync="addFolderStatus" width="50%" :destroy-on-close="true"
+                :modal-append-to-body="false" :close-on-click-modal="false">
+                <div v-loading="loading" style="padding: 30px;">
+                    <el-form :model="infolist" ref="infolist">
                         <div class="online">
                             <el-form-item prop="name">
                                 <span>文件夹名称</span>
-                                <el-input v-model=" infolist.name " placeholder="文件夹名称"
-                                    :disabled=" disableStatus "></el-input>
+                                <el-input v-model="infolist.name" placeholder="文件夹名称" :disabled="disableStatus"></el-input>
                             </el-form-item>
                         </div>
                     </el-form>
                     <div slot="footer" class="dialog-footer myfooter">
-                        <el-button type="primary" @click=" addNewFolder() ">确 定</el-button>
-                        <el-button @click=" addFolderStatus = false ">取 消</el-button>
+                        <el-button type="primary" @click=" addNewFolder()">确 定</el-button>
+                        <el-button @click=" addFolderStatus = false">取 消</el-button>
                     </div>
                 </div>
             </el-dialog>
-            <el-dialog :title=" '分享选项' " :visible.sync=" shareStatus " width="450px" :destroy-on-close=" true "
-                :modal-append-to-body=" false " :close-on-click-modal=" false ">
-                <div style="margin-left: 30px;padding-bottom: 20px" v-loading=' shareLoading '>
+            <el-dialog :title="'分享选项'" :visible.sync="shareStatus" width="450px" :destroy-on-close="true"
+                :modal-append-to-body="false" :close-on-click-modal="false">
+                <div style="margin-left: 30px;padding-bottom: 20px;padding: 30px;;" v-loading='shareLoading'>
                     <!-- <el-button type="primary" @click="processExcelShare(1)" plain>仅我可编辑</el-button> -->
-                    <el-button type="primary" @click=" openOADialog(2) " plain>部门内所有人可编辑</el-button>
-                    <el-button type="primary" @click=" checkexa = true " plain>指定人可编辑</el-button>
+                    <el-button type="primary" @click=" openOADialog(2)" plain>部门内所有人可编辑</el-button>
+                    <el-button type="primary" @click=" checkexa = true" plain>指定人可编辑</el-button>
                 </div>
             </el-dialog>
-            <el-dialog title="选择填报人" :visible.sync=" checkexa " width="100%" :destroy-on-close=" true "
-                :modal-append-to-body=" false " :close-on-click-modal=" false " v-loading=" shareLoading ">
-                <div>
-                    <el-form :model=" exaList " ref="addInfoList">
+            <el-dialog title="选择填报人" :visible.sync="checkexa" width="100%" :destroy-on-close="true"
+                :modal-append-to-body="false" :close-on-click-modal="false" v-loading="shareLoading">
+                <div style="padding: 30px;">
+                    <el-form :model="exaList" ref="addInfoList">
                         <el-form-item prop="processUserId" class="info-line online">
                             <!-- <span style="width: 80px;margin-right: 20px">审批人员</span> -->
                             <div style="max-height:500px ;">
                                 <!-- <deptTreeUserNew class="tree" @treeCheck="treeCheckonly" :defaultList="defaultList"
                                 :type="depttype" :closeList="closeList"></deptTreeUserNew> -->
-                                <deptTreeOnly @treeCheck=" treeCheckonly " :defaultList=" defaultList " :type=" depttype "
-                                    :closeList=" closeList ">
+                                <deptTreeOnly @treeCheck="treeCheckonly" :defaultList="defaultList" :type="depttype"
+                                    :closeList="closeList">
                                 </deptTreeOnly>
                             </div>
                             <!-- <div class="tree treeUser">
@@ -239,50 +238,54 @@
                     </el-form>
 
                     <div slot="footer" style="text-align: right;padding-bottom: 20px">
-                        <el-button type="primary" @click=" checkProcessUser(3) ">确 定</el-button>
-                        <el-button @click=" checkexa = false ">取 消</el-button>
+                        <el-button type="primary" @click=" checkProcessUser(3)">确 定</el-button>
+                        <el-button @click=" checkexa = false">取 消</el-button>
                     </div>
                 </div>
             </el-dialog>
-            <el-dialog title="移动到" :visible.sync=" moveStatus " width="500px" :destroy-on-close=" true "
-                :modal-append-to-body=" false " :close-on-click-modal=" false ">
-                <div>
-                    <el-tree ref="tree" class="tree-line" :expand-on-click-node=" false " :auto-expand-parent=" true "
-                        :default-expand-all=" true " :default-checked-keys=" checkedMenu " :data=" moveMenuList "
-                        @check=" checkChange " @node-click=" folderNodeClick " node-key="functionCode"
-                        @expand-on-click-node=" false ">
+            <el-dialog title="移动到" :visible.sync="moveStatus" width="500px" :destroy-on-close="true"
+                :modal-append-to-body="false" :close-on-click-modal="false">
+                <div style="padding: 30px;">
+                    <el-tree ref="tree" class="tree-line" :expand-on-click-node="false" :auto-expand-parent="true"
+                        :default-expand-all="true" :default-checked-keys="checkedMenu" :data="moveMenuList"
+                        @check="checkChange" @node-click="folderNodeClick" node-key="functionCode"
+                        @expand-on-click-node=" false">
                         <span class="custom-tree-node" slot-scope="{ node }">
                             <span>
-                                <span v-if=" node.data.type == 4 " style="color: #009cff"
+                                <span v-if="node.data.type == 4" style="color: #009cff"
                                     class="iconfont icon-wenjianjia"></span>
                                 <span v-else style="color: #fdb441" class="iconfont icon-wenjian"></span>
                                 <span
-                                    :style=" node.data.hasOwnProperty('parent') ? 'font-size:14px;padding-left:5px' : 'font-size:12px;padding-left:5px' ">{{
-                                    node.data.functionName
+                                    :style="node.data.hasOwnProperty('parent') ? 'font-size:14px;padding-left:5px' : 'font-size:12px;padding-left:5px'">{{
+                                        node.data.functionName
                                     }}</span>
                             </span>
                         </span>
                     </el-tree>
                     <div slot="footer" style="text-align: right;padding-bottom: 20px">
-                        <el-button type="primary" @click=" addFolderStatus = true " style="margin-right: 100px"
+                        <el-button type="primary" @click=" addFolderStatus = true" style="margin-right: 100px"
                             icon="el-icon-plus">新建文件夹
                         </el-button>
-                        <el-button type="primary" @click=" moveExcel() ">确 定</el-button>
-                        <el-button @click=" moveStatus = false ">取 消</el-button>
+                        <el-button type="primary" @click=" moveExcel()">确 定</el-button>
+                        <el-button @click=" moveStatus = false">取 消</el-button>
                     </div>
                 </div>
             </el-dialog>
-            <el-dialog :modal=" false " :title=" officetitle " :visible.sync=" officeStatus " style="height:100% ;"
-                :fullscreen=" true " width="100%" height="100%" center>
-                <div id="DocEditor" v-if=" officeStatus ">
-                    <onlyoffice-editor editorId="DocEditor" :src=" src " :config=" config " @ready=" onReady " />
+            <el-dialog :modal="false" :title="officetitle" :visible.sync="officeStatus" style="height:100% ;"
+                :fullscreen="true" width="100%" height="100%" center>
+                <div id="DocEditor" v-if="officeStatus">
+                    <div style="position: fixed; z-index: 10000;top: 13px;right: 50px;">
+                        <el-button size="small" type="primary" v-if="oaStatus" @click="oaStatusClick"
+                            :loading="buttonLoading">填写完成</el-button>
+                        <!-- <el-button size="small" type="primary" @click="officeStatus = false">关闭</el-button> -->
+                    </div>
+                    <onlyoffice-editor editorId="DocEditor" :src="src" :config="config" @ready="onReady" />
                 </div>
             </el-dialog>
-            <myMessage :messTit=' messTit ' @closeMessage=" processDel " :centerDialogVisible=" delVisible "
-                v-if=" delVisible ">
+            <myMessage :messTit='messTit' @closeMessage="processDel" :centerDialogVisible="delVisible" v-if="delVisible">
             </myMessage>
-            <myMessageRadio :messTit=' oaTitle ' @closeMessage=" processOa " :centerDialogVisible=" oaVisible "
-                v-if=" oaVisible " yesBtnName="是" noBtnName="否" ok-btn-name="提交"></myMessageRadio>
+            <myMessageRadio :messTit='oaTitle' @closeMessage="processOa" :centerDialogVisible="oaVisible" v-if="oaVisible"
+                yesBtnName="是" noBtnName="否" ok-btn-name="提交"></myMessageRadio>
         </div>
     </fullscreen>
 </template>
@@ -317,7 +320,9 @@ export default {
         return {
             form: {},
             shareadmin: '',
+            buttonLoading: false, //按钮loadding
             officetitle: '',
+            oaStatus: false,
             officeStatus: false,
             addNewDiaStatus: false,
             fileInfo: {
@@ -387,6 +392,7 @@ export default {
             nowMoveFolder: {},
             shareLoading: false,
             woNo: '',
+            woNos: [],
             moveMenuList: [],
             addShareType: 0,
             excelFullScreen: false,
@@ -474,39 +480,66 @@ export default {
             this.page = e;
             this.currentPage(this.dataList)
         },
-        processWoNo() {
-            console.log(this.woNo);
-            var _this = this;
-            this.$http({
-                url: '/market/cOnlineSyncExcel/processWoNo',
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: {
-                    id: _this.woNo,
-                },
-            }).then((res) => {
-                if (res.data.result === 1) {
-                    if (res.data.result != 'WONOEMPTY') {
-                        _this.$message({
-                            message: res.data.desc,
-                            type: 'error'
-                        });
+        oaStatusClick() {
+            var _this = this
+            console.log('this.woNos-----------------------------');
+            console.log(this.woNos);
+            this.buttonLoading = true
+            if (this.woNos.length > 0) {
+                this.woNos.map((item) => {
+                    this.$http({
+                        url: '/market/cOnlineSyncExcel/processWoNo',
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: {
+                            id: item,
+                        },
+                    }).then((res) => {
+                        if (res.data.result === 1) {
+                            if (res.data.result != 'WONOEMPTY') {
+                                _this.$message({
+                                    message: res.data.desc,
+                                    type: 'error'
+                                });
+                            }
+                        } else {
+                        }
+
+                    });
+                })
+                setTimeout(() => {
+                    this.getList({}, 1);
+                }, 2500);
+            } else {
+                this.$http({
+                    url: '/market/cOnlineSyncExcel/processWoNo',
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {
+                        id: _this.woNo,
+                    },
+                }).then((res) => {
+                    if (res.data.result === 1) {
+                        if (res.data.result != 'WONOEMPTY') {
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'error'
+                            });
+                        }
+                    } else {
                     }
-                } else {
-                    // moveToEdit(e)
-                    // _this.$message({
-                    //     message: '请填写完毕后点击“保存”按钮',
-                    //     type: 'success'
-                    // });
-                    // var id = res.data.desc;
-                    // //放入id，切换到excel模式
-                    // document.getElementById('excelId').setAttribute("value", id);
-                    // _this.showExcel = true;
-                    // console.log(_this.showExcel);
-                }
-            });
+                });
+                setTimeout(() => {
+                    this.getList({}, 1);
+                }, 2500);
+            }
+        },
+        getExcleInfoByOaId() {
+            var _this = this
             this.$http({
                 url: '/market/cOnlineSyncExcel/getExcleInfoByOaId',
                 method: "post",
@@ -654,6 +687,24 @@ export default {
         moveToEdit(e) {
             this.officetitle = e.fileName
             let _this = this;
+            console.log('e.woNo');
+            console.log(e.woNo);
+            if (e.woNo) {
+                if (e.woNo.length > 0) {
+                    _this.woNos = e.woNo
+                    console.log('true');
+                    this.oaStatus = true
+                } else {
+                    this.oaStatus = false
+                    console.log('false');
+                }
+
+            } else {
+                this.oaStatus = false
+            }
+
+
+
             _this.$util.ajaxJson("正在加载", getConfig().OFFICE_URL + "/office/restfile/edit", {
                 id: e.id,
                 edit: true,
@@ -804,6 +855,12 @@ export default {
                 })
                 this.total = res.data.totalRecord;
                 this.loading = false;
+                if (this.buttonLoading) {
+                    this.woNos = []
+                    this.officeStatus = false
+                    this.oaStatus = false
+                    this.buttonLoading = false
+                }
             });
         },
         addNewFolder() {
@@ -988,19 +1045,20 @@ export default {
         this.woNo = this.getUrlKey("id")//获取地址栏参数
         console.log(this.woNo);
         if (this.woNo != null) {
-            this.processWoNo();
+            this.getExcleInfoByOaId();
         }
         // this.woNo = this.$route.query.woNo
         // if (this.woNo != null) {
-        //     this.processWoNo();
+        //     this.getExcleInfoByOaId();
         // } else {
         //
         // }
+
+    },
+    created() {
         this.getList({}, 1);
         this.getTreeData();
         this.shareadmin = JSON.parse(window.sessionStorage.getItem('userInfo')).loginNoStr
-    },
-    created() {
         // window['fullScreen'] = (rp) => {
         //     this.processFullScreen(rp);
         // }
@@ -1039,11 +1097,16 @@ svg {
 
 ::v-deep .el-dialog--center {
     height: 100%;
-    margin-top: 10px !important;
 }
 
 ::v-deep .el-dialog__body {
-    height: 100%;
+    height: calc(100% - 54px);
+    padding: 0px !important;
+}
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+    color: rgb(0, 0, 0);
+    font-weight: 900;
 }
 
 .custom-tree-node {
@@ -1110,9 +1173,9 @@ svg {
     padding: 30px 0 10px 0;
 }
 
-.el-button {
-    height: 36px;
-}
+// .el-button {
+//     height: 36px;
+// }
 
 .choice-style {
     background: rgb(255, 255, 255);

src/pages/main/onlineOfficeExcelSC/index.vue

@@ -144,7 +144,7 @@
             </div>
             <el-dialog :title="'新建'" :visible.sync="addNewDiaStatus" width="50%" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false" v-if="addNewDiaStatus">
-                <div v-loading="loading">
+                <div v-loading="loading" style="padding: 30px;">
                     <el-form :model="form" ref="form">
                         <div class="online">
                             <el-form-item prop="fileName">
@@ -172,7 +172,7 @@
             <el-dialog :title="'新建'" :visible.sync="addNewStatus" width="450px" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false">
                 <div>
-                    <div style="padding-bottom: 30px;display:flex">
+                    <div style="padding: 30px;display:flex">
                         <div style="width: 85px;display: inline-block;cursor: pointer"
                             @click="addNewDiaStatus = true; form = {}">
                             <span class="iconfont icon-wenjian" style="font-size: 80px;color: dodgerblue"></span>
@@ -193,7 +193,7 @@
             </el-dialog>
             <el-dialog :title="'新增文件夹'" :visible.sync="addFolderStatus" width="50%" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false">
-                <div v-loading="loading">
+                <div v-loading="loading" style="padding: 30px;">
                     <el-form :model="infolist" ref="infolist">
                         <div class="online">
                             <el-form-item prop="name">
@@ -210,7 +210,7 @@
             </el-dialog>
             <el-dialog :title="'分享选项'" :visible.sync="shareStatus" width="450px" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false">
-                <div style="margin-left: 30px;padding-bottom: 20px" v-loading='shareLoading'>
+                <div style="margin-left: 30px;padding-bottom: 20px;padding: 30px;" v-loading='shareLoading'>
                     <!-- <el-button type="primary" @click="processExcelShare(1)" plain>仅我可编辑</el-button> -->
                     <el-button type="primary" @click="openOADialog(2)" plain>部门内所有人可编辑</el-button>
                     <el-button type="primary" @click="checkexa = true" plain>指定人可编辑</el-button>
@@ -218,7 +218,7 @@
             </el-dialog>
             <el-dialog title="选择填报人" :visible.sync="checkexa" width="100%" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false" v-loading="shareLoading">
-                <div>
+                <div style="padding: 30px;">
                     <el-form :model="exaList" ref="addInfoList">
                         <el-form-item prop="processUserId" class="info-line online">
                             <!-- <span style="width: 80px;margin-right: 20px">审批人员</span> -->
@@ -245,7 +245,7 @@
             </el-dialog>
             <el-dialog title="移动到" :visible.sync="moveStatus" width="500px" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false">
-                <div>
+                <div style="padding: 30px;">
                     <el-tree ref="tree" class="tree-line" :expand-on-click-node="false" :auto-expand-parent="true"
                         :default-expand-all="true" :default-checked-keys="checkedMenu" :data="moveMenuList"
                         @check="checkChange" @node-click="folderNodeClick" node-key="functionCode"
@@ -274,6 +274,10 @@
             <el-dialog :modal="false" :title="officetitle" :visible.sync="officeStatus" style="height:100% ;"
                 :fullscreen="true" width="100%" height="100%" center>
                 <div id="DocEditor" v-if="officeStatus">
+                    <div style="position: fixed; z-index: 10000;top: 13px;right: 50px;">
+                        <el-button size="small" type="primary" v-if="oaStatus" @click="oaStatusClick"
+                            :loading="buttonLoading">填写完成</el-button>
+                    </div>
                     <onlyoffice-editor editorId="DocEditor" :src="src" :config="config" @ready="onReady" />
                 </div>
             </el-dialog>
@@ -315,7 +319,9 @@ export default {
         return {
             form: {},
             shareadmin: '',
+            buttonLoading: false, //按钮loadding
             officetitle: '',
+            oaStatus: false,
             officeStatus: false,
             addNewDiaStatus: false,
             fileInfo: {
@@ -385,6 +391,7 @@ export default {
             nowMoveFolder: {},
             shareLoading: false,
             woNo: '',
+            woNos: [],
             moveMenuList: [],
             addShareType: 0,
             excelFullScreen: false,
@@ -472,39 +479,64 @@ export default {
             this.page = e;
             this.currentPage(this.dataList)
         },
-        processWoNo() {
-            console.log(this.woNo);
-            var _this = this;
-            this.$http({
-                url: '/market/cOnlineSyncExcelMarket/processWoNo',
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: {
-                    id: _this.woNo,
-                },
-            }).then((res) => {
-                if (res.data.result === 1) {
-                    if (res.data.result != 'WONOEMPTY') {
-                        _this.$message({
-                            message: res.data.desc,
-                            type: 'error'
-                        });
+
+        oaStatusClick() {
+            var _this = this
+            this.buttonLoading = true
+            if (this.woNos.length > 0) {
+                this.woNos.map((item) => {
+                    this.$http({
+                        url: '/market/cOnlineSyncExcelMarket/processWoNo',
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: {
+                            id: item,
+                        },
+                    }).then((res) => {
+                        if (res.data.result === 1) {
+                            if (res.data.result != 'WONOEMPTY') {
+                                _this.$message({
+                                    message: res.data.desc,
+                                    type: 'error'
+                                });
+                            }
+                        } else {
+                        }
+                    });
+                })
+                setTimeout(() => {
+                    this.getList({}, 1);
+                }, 2500);
+            } else {
+                this.$http({
+                    url: '/market/cOnlineSyncExcelMarket/processWoNo',
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {
+                        id: _this.woNo,
+                    },
+                }).then((res) => {
+                    if (res.data.result === 1) {
+                        if (res.data.result != 'WONOEMPTY') {
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'error'
+                            });
+                        }
+                    } else {
                     }
-                } else {
-                    // moveToEdit(e)
-                    // _this.$message({
-                    //     message: '请填写完毕后点击“保存”按钮',
-                    //     type: 'success'
-                    // });
-                    // var id = res.data.desc;
-                    // //放入id，切换到excel模式
-                    // document.getElementById('excelId').setAttribute("value", id);
-                    // _this.showExcel = true;
-                    // console.log(_this.showExcel);
-                }
-            });
+                });
+                setTimeout(() => {
+                    this.getList({}, 1);
+                }, 2500);
+            }
+        },
+        getExcleInfoByOaId() {
+            var _this = this
             this.$http({
                 url: '/market/cOnlineSyncExcelMarket/getExcleInfoByOaId',
                 method: "post",
@@ -652,6 +684,21 @@ export default {
         moveToEdit(e) {
             this.officetitle = e.fileName
             let _this = this;
+
+            if (e.woNo) {
+                if (e.woNo.length > 0) {
+                    _this.woNos = e.woNo
+                    console.log('true');
+                    this.oaStatus = true
+                } else {
+                    this.oaStatus = false
+                    console.log('false');
+                }
+
+            } else {
+                this.oaStatus = false
+            }
+
             _this.$util.ajaxJson("正在加载", getConfig().OFFICE_URL + "/office/restfile/edit", {
                 id: e.id,
                 edit: true,
@@ -803,6 +850,12 @@ export default {
                 })
                 this.total = res.data.totalRecord;
                 this.loading = false;
+                if (this.buttonLoading) {
+                    this.woNos = []
+                    this.officeStatus = false
+                    this.oaStatus = false
+                    this.buttonLoading = false
+                }
             });
         },
         addNewFolder() {
@@ -987,19 +1040,20 @@ export default {
         this.woNo = this.getUrlKey("id")//获取地址栏参数
         console.log(this.woNo);
         if (this.woNo != null) {
-            this.processWoNo();
+            this.getExcleInfoByOaId();
         }
         // this.woNo = this.$route.query.woNo
         // if (this.woNo != null) {
-        //     this.processWoNo();
+        //     this.getExcleInfoByOaId();
         // } else {
         //
         // }
+
+    },
+    created() {
         this.getList({}, 1);
         this.getTreeData();
         this.shareadmin = JSON.parse(window.sessionStorage.getItem('userInfo')).loginNoStr
-    },
-    created() {
         // window['fullScreen'] = (rp) => {
         //     this.processFullScreen(rp);
         // }
@@ -1038,11 +1092,16 @@ svg {
 
 ::v-deep .el-dialog--center {
     height: 100%;
-    margin-top: 10px !important;
 }
 
 ::v-deep .el-dialog__body {
-    height: 100%;
+    height: calc(100% - 54px);
+    padding: 0px !important;
+}
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+    color: rgb(0, 0, 0);
+    font-weight: 900;
 }
 
 .custom-tree-node {
@@ -1109,9 +1168,9 @@ svg {
     padding: 30px 0 10px 0;
 }
 
-.el-button {
-    height: 36px;
-}
+// .el-button {
+//     height: 36px;
+// }
 
 .choice-style {
     background: rgb(255, 255, 255);

src/pages/main/productionDataExport/cityHome.vue

@@ -167,18 +167,18 @@
                     {
                         index: "first",
                         label: "我的待办",
-                        number: 0,
+                        number: "",
                         name: "prosss_key",
                     },
                     {
                         index: "two",
                         label: "我的已办",
-                        number: 0,
+                        number: "",
                     },
                     {
                         index: "three",
                         label: "我发起的",
-                        number: 0,
+                        number: "",
                     }
                 ],//上层跳转已发起已办等
                 todoBase: {

src/pages/main/productionDataExport/provinceHome.vue

@@ -169,18 +169,18 @@
                     {
                         index: "first",
                         label: "我的待办",
-                        number: 0,
+                        number: "",
                         name: "prosss_key",
                     },
                     {
                         index: "two",
                         label: "我的已办",
-                        number: 0,
+                        number: "",
                     },
                     {
                         index: "three",
                         label: "我发起的",
-                        number: 0,
+                        number: "",
                     }
                 ],//上层跳转已发起已办等
                 todoBase: {

src/pages/main/provincialWorkOrder/provincialWorkOrder.vue

@@ -284,18 +284,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
                 // {
                 //     index: "four",

src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue

@@ -289,18 +289,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table

src/pages/main/terminals/advertincreases.vue

@@ -233,6 +233,7 @@ import Workflow from "../../../components/workflowBase";
 import mySearch from "../../../components/search.vue";
 import myUpload from "../../../components/upload.vue";
 import deptTreeOnly from "../../../components/deptTreeOnly.vue";
+import getConfig from '../../../config/dev.js'
 
 export default {
   components: {
@@ -452,7 +453,8 @@ export default {
         processDefinitionKey: "ggsj_process",
       },
       requestForm: {
-          fresourceId: "7f3e39a2-ed7e-11ed-8138-e00084564cce", //线上环境
+        fresourceId: getConfig().ggsj_processfresourceId,
+          // fresourceId: "7f3e39a2-ed7e-11ed-8138-e00084564cce", //线上环境
         
         // fresourceId: "3886c339-ebe4-11ed-997f-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00",//本地环境
@@ -522,7 +524,7 @@ export default {
       }).then((res) => {
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
-        this.request_form.title = '[市场工作台]-'+'广告设计及素材库-'+ this.$refs.infolist.model.need_name;
+        this.request_form.title = '[市场经营管理平台]-'+'广告设计及素材库-'+ this.$refs.infolist.model.need_name;
         this.$http({
         url: "/market/ggsj/add",
         method: "post",

src/pages/main/terminals/components/adverts.vue

@@ -225,6 +225,7 @@
 import Workflow from "../../../../components/workflowBase";
 import uploadDown from "../../../../components/uploadDown.vue";
 import myUpload from "../../../../components/upload.vue";
+import getConfig from '../../../../config/dev.js'
 export default {
   props: ["componentInfo", "componentStatus", "changeinfo", "draftStatus"],
   components: {
@@ -238,7 +239,8 @@ export default {
       // draftStatus:'',//起草状态更改表单状态
       uploadDownStatus: false,
       requestForm: {
-        fresourceId: "7f3e39a2-ed7e-11ed-8138-e00084564cce", //线上环境
+        fresourceId: getConfig().ggsj_processfresourceId,
+        // fresourceId: "7f3e39a2-ed7e-11ed-8138-e00084564cce", //线上环境
        
         // fresourceId: "3886c339-ebe4-11ed-997f-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00", //本地环境
@@ -483,7 +485,7 @@ export default {
     },
     //添加
     dialogClis() {
-      this.request_form.title = '[市场工作台]-'+'广告设计及素材库-'+ this.$refs.infoApply.model.need_name;
+      this.request_form.title = '[市场经营管理平台]-'+'广告设计及素材库-'+ this.$refs.infoApply.model.need_name;
       this.$http({
         url: "/market/ggsj/update",
         method: "post",
@@ -496,7 +498,7 @@ export default {
       });
     },
     dialogCli(v) {
-      this.request_form.title = '[市场工作台]-'+'广告设计及素材库-'+ this.$refs.infoApply.model.need_name;
+      this.request_form.title = '[市场经营管理平台]-'+'广告设计及素材库-'+ this.$refs.infoApply.model.need_name;
       if(v ==2 ){
         this.checkexa = true;
       }

src/pages/main/userList/docAppr.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">
                 <!-- <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px"> -->
@@ -68,10 +68,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>
@@ -222,18 +222,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table
@@ -722,12 +722,13 @@ export default {
                     this.savestatusBtn = true
                     if (this.fromList.id) {
                         console.log("if (this.fromList.id)")
-                        this.fromList.attId = null
+                        // this.fromList.attId = []
                         // if (this.fromList.accessoryList) {
                         //     this.fromList.accessoryList.map((item) => {
                         //         this.fromList.attId.push(item.id);
                         //     })
                         // }
+                        delete this.fromList.attId;//特殊处理
                         this.request_form.title = '[IT工作台]-文件审批-' + this.fromList.title;
                         this.$http({
                             url: "/market/wjspProcess/update",
@@ -966,7 +967,7 @@ export default {
         //我的待办
         getQueryList(e, status) {
             this.loading = true;
-             getTodoBase(this.pageNo, "", e || { 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 +1017,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

@@ -217,18 +217,18 @@ export default {
                 {
                     index: "first",
                     label: "我的待办",
-                    number: 1,
+                    number: "",
                     name: "prosss_key",
                 },
                 {
                     index: "two",
                     label: "我的已办",
-                    number: 2,
+                    number: "",
                 },
                 {
                     index: "three",
                     label: "我发起的",
-                    number: 3,
+                    number: "",
                 },
             ],
             lableTable: {},//传给子组件table
@@ -715,6 +715,13 @@ export default {
                     console.log(this.$refs.form.model)
                     this.savestatusBtn = true
                     if (this.fromList.id) {
+                        this.fromList.accessoryIdList = []
+                        console.log(this.fromList.accessoryList);
+                        if (this.fromList.accessoryList) {
+                            this.fromList.accessoryList.map((item) => {
+                                this.fromList.accessoryIdList.push(item.id);
+                            })
+                        }
                         this.request_form.title = '[IT工作台]-用户清单-' + this.fromList.needName;
                         this.$http({
                             url: "/market/YhqdProcess/update",

src/router/index.js

@@ -2532,6 +2532,12 @@ const routes = [{
             meta: { title: '互联网电视考核' }
         },
         {
+            path: '/magicboxAudits',
+            name: 'magicboxAudits',
+            component: resolve => require(['../pages/main/magicboxAudits/magicboxAudits.vue'], resolve),
+            meta: { title: '新魔百和大屏广告自有业务承载审批' }
+        },
+        {
             meta: { name: '备份数据恢复申请流程', keepAlive: false },
             path: '/bfsjList',
             name: 'bfsjList',