Merge branch 'bing-xuguan' into 'master'

Bing xuguan

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

src/components/deptTreeUserNew.vue

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

src/components/uploadfour.vue

@@ -0,0 +1,311 @@
+<template>
+  <div v-loading="loading">
+    <el-upload
+      class="upload-demo"
+      :drag="fileInfo.type !== 'btn'"
+      multiple
+      :limit="fileInfo.limit"
+      ref="upload"
+      action="string"
+      :on-remove="handleRemove"
+      :on-exceed="handleExceed"
+      :file-list="attList"
+      :auto-upload="true"
+      :show-file-list="fileInfo.type !== 'btn'"
+      :before-upload="deforeUp"
+      :http-request="signUpload"
+      :on-preview="defUp"
+      :disabled="disabled"
+
+    >
+      <div v-if="fileInfo.type !== 'btn'">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">点击上传</div>
+      </div>
+      <div v-if="fileInfo.type === 'btn'">
+        <el-button
+          :size="fileInfo.size ? fileInfo.size : 'medium'"
+          :type="fileInfo.btntype"
+          >{{ fileInfo.typename }}</el-button
+        >
+      </div>
+    </el-upload>
+  </div>
+</template>
+<script>
+export default {
+  // props: ["fileInfo", "fileList", "type"],
+  props: {
+    fileInfo: {
+      type: Object,
+      default: () => {}
+    },
+    fileList: {
+      type: Array,
+      default: () => []
+    },
+    type: {
+      type: Array,
+      default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      fileLists: [],
+      attList: [
+        // {
+        //   attchFileId: "",
+        //   fileCode: "202209271105276441",
+        //   name: "1231233333333333.xlsx",
+        //   id: "202209271105276441",
+        //   opName: "范岩",
+        //   opNo: "fanyan",
+        //   opTime: "2022-09-27 11:05:27",
+        //   type: 'success',
+        // },
+      ],
+      loading: false,
+      num: 0,
+      s: false,
+    };
+  },
+  // props:{
+  //    disabled: {
+  //     type: Boolean,
+  //     default: () => {},
+  //   },
+  // },
+  methods: {
+    signUpload() {},
+    //删除
+    handleRemove(file) {
+      // console.log(file);
+      // console.log(this.attList);
+      for (let i = 0; i < this.attList.length; i++) {
+        if (this.attList[i].name === file.name) {
+          this.attList.splice(i, 1);
+          
+           
+         
+          // this.$emit("clickDownload",this.attList);
+        }
+      }
+    //  console.log(this.attList)
+    this.$emit("uploadBack", this.attList);
+    },
+   
+    //数量限制
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 ${this.fileInfo.limit} 个文件，本次选择了 ${
+          files.length
+        } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+      );
+    },
+    defUp(file){
+        this.$emit("clickDownload",this.attList);
+    },
+    deforeUp(file) {
+      const isLt2M = file.size / 1024 / 1024 < 100;
+      if (!isLt2M) {
+        this.$message.error("上传文件大小不能超过 20MB!");
+        return false;
+      }
+      if (this.fileInfo.type == "img") {
+        const isImg = file.type.split("/")[0] == "image";
+        if (!isImg) {
+          this.$message.error("请上传图片格式文件!");
+          return false;
+        }
+      }
+      if (this.fileInfo.typexz == "ppt") {
+        const isImg = file.name.split(".")[1] == "pptx";
+        // console.log(file.name.split(".")[1] == "pptx");
+        if (!isImg) {
+          this.$message.error("请上传ppt格式文件!");
+          return false;
+        }
+      }
+      if (this.fileInfo.typexz == "csv") {
+        const isImg = file.name.split(".")[1] == "csv";
+        if (!isImg) {
+          this.$message.error("请上传csv格式文件!");
+          return false;
+        }
+      }
+      if (this.fileInfo.typexz == "xlsx") {
+        const isImg = file.name.split(".")[1] == "xlsx";
+        if (!isImg) {
+          this.$message.error("请上传xlsx格式文件!");
+          return false;
+        }
+      }
+      this.loading = true;
+      let query = new FormData();
+      query.append("file", file);
+      if (this.fileInfo.typename == "新增素材") {
+        query.append("advType", this.fileInfo.advType);
+        query.append("advTypeName", this.fileInfo.advTypeName);
+      }
+      if (
+        this.fileInfo.url == "/market/cIllegalCallTask/importTempByProv" ||
+        this.fileInfo.url ==
+          "/market/cChannelInfo/cIllegalCallTask/importTempByProv"
+      ) {
+        query.append("taskId", this.fileInfo.taskId);
+        query.append("tempId", this.fileInfo.tempId);
+      }
+      //违规外呼
+      if (this.fileInfo.uploadType == "outCall") {
+        query.append("uploadType", "outCall");
+        query.append("relId", this.fileInfo.relId);
+      }
+      if (this.fileInfo.uploadType == "train") {
+        query.append("uploadType", "train");
+        query.append("relId", this.fileInfo.relId);
+      }
+      //运营类项目考核及结算
+      if (this.fileInfo.url == "/market/cmkAttachInfo/upload") {
+        query.append("uploadType", this.fileInfo.uploadType);
+      }
+      if (this.fileInfo.url == "/market/cStoreOutWo/importData") {
+        query.append("woNo", this.fileInfo.woNo);
+      }
+      if (this.fileInfo.url == "/market/cStoreScheTrainEva/importDataEva") {
+        query.append("evaId", this.fileInfo.evaId);
+      }
+      this.num++;
+      let _this = this;
+      this.$http({
+        url: this.fileInfo.url,
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: query,
+      })
+        .then((res) => {
+          if (this.fileInfo.type === "btn") {
+            this.$refs["upload"].clearFiles();
+            this.$emit("uploadBack", res);
+            
+            this.$emit("clickDownload",res);
+            if (res.data.result == 0) {
+              this.$emit("onSuccess", file);
+              _this.$message({
+                message: res.data.desc,
+                type: "success",
+              });
+            } else if (res.data.result == 1) {
+              _this.$message({
+                message: res.data.desc,
+                type: "error",
+              });
+            } else if (res.data.result == 2) {
+              _this.$message({
+                message: res.data.desc,
+                type: "warning",
+              });
+            } else if (res.data.result == 3) {
+              _this.$message({
+                message: res.data.desc,
+                type: "info",
+              });
+            } else {
+              _this.$message({
+                message: res.data.desc,
+                type: "success",
+              });
+            }
+            this.num--;
+            if (this.num == 0) {
+              this.loading = false;
+            }
+            return;
+          }
+          if (this.fileInfo.type === "voice") {
+            this.attList = res.data;
+          } else {
+            this.attList.push({
+              id: res.data.body.id,
+              name: res.data.body.fileName,
+              fileCode: res.data.body.fileCode,
+              opName: res.data.body.opName,
+              opNo: res.data.body.opNo,
+              opTime: res.data.body.opTime,
+              attchFileId: res.data.body.attchFileId,
+              type: res.data.body.type,
+            });
+          }
+          this.$emit("uploadBack", this.attList);
+          // this.$emit("clickDownload",this.attList);
+          this.num--;
+          if (this.num == 0) {
+            this.loading = false;
+          }
+          return true;
+        })
+        .catch((res) => {
+          this.$message({
+            message: file.name + "上传失败",
+            type: "error",
+          });
+          this.num--;
+          if (this.num == 0) {
+            this.loading = false;
+          }
+          for (let i = 0; i < this.$refs["upload"].uploadFiles.length; i++) {
+            if (file.name == this.$refs["upload"].uploadFiles[i].name) {
+              this.$refs["upload"].uploadFiles.splice(i, 1);
+            }
+          }
+          return false;
+        });
+    },
+  },
+  mounted() {},
+  created() {
+    this.attList = [];
+    // console.log(this.fileList);
+    if(this.fileList){
+      for (let i = 0; i < this.fileList.length; i++) {
+        this.attList.push({
+            id: this.fileList[i].id,
+            name: this.fileList[i].fileName,
+            fileCode: this.fileList[i].fileCode,
+            opName: this.fileList[i].opName,
+            opNo: this.fileList[i].opNo,
+            opTime: this.fileList[i].opTime,
+            attchFileId: this.fileList[i].attchFileId,
+            type: this.fileList[i].type,
+        })
+    }
+    }
+    
+    // console.log(this.attList);
+  },
+  watch: {
+    fileList() {
+      this.attList = [];
+      for (let i = 0; i < this.fileList.length; i++) {
+        this.attList.push({
+          id: this.fileList[i].id,
+          name: this.fileList[i].fileName,
+          fileCode: this.fileList[i].fileCode,
+          opName: this.fileList[i].opName,
+          opNo: this.fileList[i].opNo,
+          opTime: this.fileList[i].opTime,
+          attchFileId: this.fileList[i].attchFileId,
+          type: this.fileList[i].type,
+        });
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+</style>

src/config/dev.js

@@ -17,6 +17,17 @@ let devs = {
     tyshList: '345a2955-b321-11ed-886f-d6cd97160e00',//通用审核流程
     userList: '65791a1e-b1ac-11ed-886f-d6cd97160e00',//用户清单流程
     internetAssessment: '87753452-c2f3-11ed-9c8b-d6cd97160e00',//互联网电视
+    authoriZation: '1db52dc3-b328-11ed-886f-d6cd97160e00',//口令授权
+    backupRequire: '4e2aaa61-b339-11ed-886f-d6cd97160e00',//备份需求
+    emergencyPlan: '238f139e-b28f-11ed-886f-d6cd97160e00',//应急预案
+    internetAccess: '2c4fd13a-b32a-11ed-886f-d6cd97160e00',//互联网端口
+    resourceApply: '569ffe50-b25a-11ed-886f-d6cd97160e00',//资源申请
+    securityAudit: 'd7dd8e5e-b320-11ed-886f-d6cd97160e00',//安全审计
+    userChange: 'c4624dbc-b322-11ed-886f-d6cd97160e00',//用户使用者变更
+    bfsjList: '524e01f7-b25d-11ed-886f-d6cd97160e00',//备份数据
+    docAppr: '47b27979-b250-11ed-886f-d6cd97160e00',//文件审批流程
+    firewall: '9d7c2f92-b251-11ed-886f-d6cd97160e00',//防火墙
+    opcode: 'b79206a9-b258-11ed-886f-d6cd97160e00',//opcode
 }
 let dev = {
     TITLE: '本地环境',
@@ -36,6 +47,17 @@ let dev = {
     tyshList: '345a2955-b321-11ed-886f-d6cd97160e00',//通用审核流程
     userList: '65791a1e-b1ac-11ed-886f-d6cd97160e00',//用户清单流程
     internetAssessment: '87753452-c2f3-11ed-9c8b-d6cd97160e00',//互联网电视
+    authoriZation: '1db52dc3-b328-11ed-886f-d6cd97160e00',//口令授权
+    backupRequire: '4e2aaa61-b339-11ed-886f-d6cd97160e00',//备份需求
+    emergencyPlan: '238f139e-b28f-11ed-886f-d6cd97160e00',//应急预案
+    internetAccess: '2c4fd13a-b32a-11ed-886f-d6cd97160e00',//互联网端口
+    resourceApply: '569ffe50-b25a-11ed-886f-d6cd97160e00',//资源申请
+    securityAudit: 'd7dd8e5e-b320-11ed-886f-d6cd97160e00',//安全审计
+    userChange: 'c4624dbc-b322-11ed-886f-d6cd97160e00',//用户使用者变更
+    bfsjList: '524e01f7-b25d-11ed-886f-d6cd97160e00',//备份数据
+    docAppr: '47b27979-b250-11ed-886f-d6cd97160e00',//文件审批流程
+    firewall: '9d7c2f92-b251-11ed-886f-d6cd97160e00',//防火墙
+    opcode: 'b79206a9-b258-11ed-886f-d6cd97160e00',//opcode
 }
 let test = {
     TITLE: '测试环境',
@@ -55,7 +77,17 @@ let test = {
     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
 }
 let prod = {
     TITLE: '线上环境',
@@ -65,6 +97,14 @@ let prod = {
     provincialWorkOrderAreafresourceId: 'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
     provincialWorkOrderfresourceId: '9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
     riskMaterialsfresourceId: 'canvas',//风险防控
+    authoriZation: 'a4c88c4e-d99e-11ed-8255-e00084564cce',//口令授权
+    backupRequire: 'b5c62d50-d99d-11ed-8255-e00084564cce',//备份需求
+    emergencyPlan: '8bcdfa43-d9a0-11ed-8255-e00084564cce',//应急预案
+    internetAccess: '5e83a807-d99e-11ed-8255-e00084564cce',//互联网端口
+    resourceApply: '428f1a81-d9a1-11ed-8255-e00084564cce',//资源申请
+    securityAudit: '99fa2bcc-d99f-11ed-8255-e00084564cce',//安全审计
+    userChange: 'e6eaf005-d99e-11ed-8255-e00084564cce',//用户使用者变更
+    bfsjList: 'f458d35a-d9a0-11ed-8255-e00084564cce',//备份数据
     accountApplicationfresourceId: '27a9dbbf-d742-11ed-8255-e00084564cce',//账号申请流程
     accountdelfresourceId: '8a519886-d742-11ed-8255-e00084564cce',//账号删除
     accountPermissionsfresourceId: '2e508b91-d741-11ed-8255-e00084564cce',//账号权限申请流程
@@ -75,6 +115,9 @@ let prod = {
     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
 }
 export const getConfig = () => {
     switch (process.env.VUE_APP_ENV) {

src/pages/main/bfsj/bfsjList.vue

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

src/pages/main/firewall/index.vue

@@ -45,6 +45,7 @@ import Table from "../../../components/el-form.vue";
 import Tables from "../../../components/el-forms.vue";
 import FormTable from "./formTable.vue";
 import { updateBase } from "../../../http/api.js";
+import getConfig from '../../../config/dev.js'
 import {
     getTodoBase,
     getDoneBase,
@@ -116,7 +117,8 @@ export default {
             requestForm: {
                 // fresourceId: "9d7c2f92-b251-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "86e7c09e-b256-11ed-be6b-00505687dcd3", //测试环境
-                fresourceId:'3c3df7fb-d918-11ed-8255-e00084564cce',//生产环境
+                // fresourceId:'3c3df7fb-d918-11ed-8255-e00084564cce',//生产环境
+                fresourceId: getConfig().firewall,
                 processDefinitionKey: "fhq_process",
             },
             treeList: [], //候选人列表

src/pages/main/memberFamily/dataStatistics.vue

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

src/pages/main/memberFamily/empInfoFilling.vue

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

src/pages/main/memberFamily/employeeInfo.vue

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

src/pages/main/memberFamily/haveInHand.vue

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

src/pages/main/memberFamily/index.vue

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

src/pages/main/opcode/index.vue

@@ -43,7 +43,7 @@ import WorkflowEntrance from "../../../components/workflowEntrance";
 import Tabs from "../../../components/el-tabs.vue";
 import Table from "../../../components/el-form.vue";
 import Tables from "../../../components/el-forms.vue";
-
+import getConfig from '../../../config/dev.js'
 import FormTable from "./formTables.vue";
 import { updateBase } from "../../../http/api.js";
 import {
@@ -117,7 +117,8 @@ export default {
             requestForm: {
                 // fresourceId: "b79206a9-b258-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "1245d300-b25a-11ed-be6b-00505687dcd3", //测试环境
-                fresourceId:'6b9e1cb2-d918-11ed-8255-e00084564cce',//生产环境
+                // fresourceId:'6b9e1cb2-d918-11ed-8255-e00084564cce',//生产环境
+                fresourceId: getConfig().opcode,
                 processDefinitionKey: "op_process",
             },
             treeList: [], //候选人列表

src/pages/main/userList/docAppr.vue

@@ -86,6 +86,7 @@ import Seach from "../../../components/el-search";
 import myUpload from "../../../components/workflowUpload";
 import Workflow from "../../../components/workflowBase";
 import WorkflowEntrance from "../../../components/workflowEntrance";
+import getConfig from '../../../config/dev.js'
 import {
     getTodoBase,
     getDoneBase,
@@ -152,8 +153,9 @@ export default {
             },
             requestForm: {
                 // fresourceId: "47b27979-b250-11ed-886f-d6cd97160e00", // 本地环境
-                fresourceId: "917d8bf9-d918-11ed-8255-e00084564cce", // 生产环境
+                // fresourceId: "917d8bf9-d918-11ed-8255-e00084564cce", // 生产环境
                 // fresourceId: "3b21cf73-b251-11ed-be6b-00505687dcd3", //测试91环境
+                fresourceId: getConfig().docAppr,
                 processDefinitionKey: "WJSP_process",
             },
             dialogStatus: false, //dialog显示

src/router/index.js

@@ -2339,6 +2339,55 @@ const routes = [{
                 ['../pages/main/accountPermissions/accountApplication.vue'], resolve)
         },
         {
+            meta: { name:  '系统资源申请', keepAlive: false },
+            path: '/resourceApply',
+            name: 'resourceApply',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/applyFor/resourceApply.vue'], resolve)
+        },
+        {
+            meta: { name:  '应急预案审批', keepAlive: false },
+            path: '/emergencyPlan',
+            name: 'emergencyPlan',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/applyFor/emergencyPlan.vue'], resolve)
+        },
+        {
+            meta: { name:  '安全审计计划管理', keepAlive: false },
+            path: '/securityAudit',
+            name: 'securityAudit',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/applyFor/securityAudit.vue'], resolve)
+        },
+        {
+            meta: { name:  '用户使用者变更', keepAlive: false },
+            path: '/userChange',
+            name: 'userChange',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/applyFor/userChange.vue'], resolve)
+        },
+        {
+            meta: { name:  '口令授权', keepAlive: false },
+            path: '/authoriZation',
+            name: 'authoriZation',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/applyFor/authoriZation.vue'], resolve)
+        },
+        {
+            meta: { name:  '互联网端口访问', keepAlive: false },
+            path: '/internetAccess',
+            name: 'internetAccess',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/applyFor/internetAccess.vue'], resolve)
+        },
+        {
+            meta: { name:  '备份需求及变更', keepAlive: false },
+            path: '/backupRequire',
+            name: 'backupRequire',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/applyFor/backupRequire.vue'], resolve)
+        },
+        {
             meta: { name: '文件审批流程', keepAlive: false },
             path: '/docAppr',
             name: 'docAppr',
@@ -2399,6 +2448,13 @@ const routes = [{
             name: 'internetAssessment',
             component: resolve => require(['../pages/main/internetAssessment/internetAssessment.vue'], resolve),
             meta: { title: '互联网电视考核' }
+        },
+        {
+            meta: { name: '备份数据恢复申请流程', keepAlive: false },
+            path: '/bfsjList',
+            name: 'bfsjList',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/bfsj/bfsjList.vue'], resolve)
         }