2 年前 · 42f1813177
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,9 @@
 
				 .DS_Store
			
 
				 node_modules
			
 
				 /dist
			
 
				-<<<<<<< HEAD
			
 
				 dist.zip
			
 
				-
			
 
				-=======
			
 
				 /dist-test
			
 
				 dist.zip
			
 
				->>>>>>> 2e174cfb914257ff0e2bab0e76423d7d1fe78aba
			
 
				 # local env files
			
 
				 .env.local
			
 
				 .env.*.local
			
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
 
				     "lint": "vue-cli-service lint",
			
 
				     "analyz": "vue-cli-service build"
			
 
				   },
			
 
				+
			
 
				   "dependencies": {
			
 
				     "@fullcalendar/daygrid": "^5.10.1",
			
 
				     "@fullcalendar/interaction": "^5.10.1",
			
--- a/public/index.html
+++ b/public/index.html
@@ -21,7 +21,7 @@
 
				   <link rel='stylesheet' href='/static/js/luckysheet/assets/iconfont/iconfont.css' />
			
 
				   <script src="./static/js/base64.min.js"></script>
			
 
				   <script src="/static/js/ace.js"></script>
			
 
				-  <script src="./static/js/jquery-1.8.2.min.js"></script>
			
 
				+  <!-- <script src="./static/js/jquery-1.8.2.min.js"></script> -->
			
 
				 </head>
			
 
				 
			
 
				 <body>
			
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -9,11 +9,14 @@ axios.defaults.headers.post['Content-Type'] = 'application/json';//'multipart/fo
 
				 // http response 拦截器
			
 
				 axios.interceptors.response.use(
			
 
				   response => {
			
 
				+    console.log('奇奇怪怪的网络请求');
			
 
				     //vue.$store.commit('endLoading');
			
 
				     if(response.config.url.indexOf('8880')!=-1 || response.config.url.indexOf('8099')!=-1){
			
 
				+
			
 
				       return response.data;
			
 
				     }else{
			
 
				       return response;
			
 
				+      
			
 
				     }
			
 
				   },
			
 
				   error => {
			
--- a/src/components/el-forms.vue
+++ b/src/components/el-forms.vue
@@ -0,0 +1,165 @@
 
				+<template>
			
 
				+  <div>
			
 
				+    <slot :name="list.name"></slot>
			
 
				+    <el-table
			
 
				+      ref="table"
			
 
				+      style="width: 100%"
			
 
				+      :data="list.data"
			
 
				+      :height="list.height + 'px'"
			
 
				+      :max-height="list.height + 'px'"
			
 
				+      @row-click="getRowData"
			
 
				+      @selection-change="selectionChange"
			
 
				+      empty-text="暂无数据"
			
 
				+      @cell-click="getRowList"
			
 
				+      :cell-style="columnbackgroundStyle"
			
 
				+      row-key="id"
			
 
				+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
			
 
				+    >
			
 
				+      <!-- 是否多选 -->
			
 
				+      <el-table-column
			
 
				+        v-if="list.isSelection"
			
 
				+        :selecttable="list"
			
 
				+        type="selection"
			
 
				+        :width="list.width || 50"
			
 
				+        align="center"
			
 
				+      />
			
 
				+
			
 
				+      <!-- 是否需要序号 -->
			
 
				+      <el-table-column
			
 
				+        v-if="list.isIndex"
			
 
				+        type="index"
			
 
				+        label="序号"
			
 
				+        width="55"
			
 
				+        align="center"
			
 
				+      />
			
 
				+      <template v-for="item in list.titledata">
			
 
				+        <el-table-column
			
 
				+          :key="item.prop"
			
 
				+          :prop="item.prop"
			
 
				+          :label="item.label"
			
 
				+          align="center"
			
 
				+          show-overflow-tooltip
			
 
				+          :width="item.width || 100"
			
 
				+        />
			
 
				+      </template>
			
 
				+      <!-- 操作列 -->
			
 
				+      <el-table-column
			
 
				+        v-if="list.isOperation"
			
 
				+        v-bind="list.data && list.data.length ? { fixed: 'right' } : null"
			
 
				+        style="margin-right: 20px"
			
 
				+        class-name="handle-td"
			
 
				+        label-class-name="tc"
			
 
				+        :label="list.operation.label"
			
 
				+        align="center"
			
 
				+      >
			
 
				+        <!-- UI统一一排放3个，4个以上出现更多 -->
			
 
				+        <template slot-scope="scope">
			
 
				+          <!-- 三个一排的情况，去掉隐藏的按钮后的长度 -->
			
 
				+          <template v-if="list.operation.data.length > 0">
			
 
				+            <div class="btn">
			
 
				+              <div v-for="item in list.operation.data" :key="item.label">
			
 
				+                <template v-if="item.type !== 'icon'">
			
 
				+                  <el-button
			
 
				+                    v-bind="item"
			
 
				+                    :type="item.type ? item.type : ''"
			
 
				+                    size="mini"
			
 
				+                    @click.native.prevent="
			
 
				+                      item.handleRow(scope.$index, scope.row, item.label)
			
 
				+                    "
			
 
				+                  >
			
 
				+                    {{ item.label }}
			
 
				+                  </el-button>
			
 
				+                </template>
			
 
				+                <template v-else>
			
 
				+                  <i
			
 
				+                    :class="[icon, item.icon]"
			
 
				+                    v-bind="item"
			
 
				+                    @click="item.handleRow(scope.$index, scope.row, item.label)"
			
 
				+                  />
			
 
				+                </template>
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </template>
			
 
				+        </template>
			
 
				+      </el-table-column>
			
 
				+    </el-table>
			
 
				+    <div class="page">
			
 
				+      <el-pagination
			
 
				+        style="display: flex; flex-direction: row-reverse"
			
 
				+        v-if="list.pageData.total > 0"
			
 
				+        :current-page.sync="page"
			
 
				+        :page-sizes="
			
 
				+          list.pageData.pageSizes ? list.pageData.pageSizes : [5, 10, 15, 20]
			
 
				+        "
			
 
				+        :page-size="list.pageData.pageSize"
			
 
				+        layout="total, sizes, prev, pager, next, jumper"
			
 
				+        :total="list.pageData.total"
			
 
				+        @size-change="handleSizeChange"
			
 
				+        @current-change="handleCurrentChange"
			
 
				+      />
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+  data(){
			
 
				+    return{
			
 
				+     page:1
			
 
				+    }
			
 
				+  },
			
 
				+  props: {
			
 
				+    //  表格数据和表格部分属性的对象
			
 
				+    // eslint-disable-next-line vue/require-default-prop
			
 
				+    list: {
			
 
				+      type: Object,
			
 
				+    },
			
 
				+  },
			
 
				+  created() {
			
 
				+
			
 
				+  },
			
 
				+  methods: {
			
 
				+    columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
			
 
				+      if (column.type == "default") {
			
 
				+        if (column.label === "文件标题") {
			
 
				+          return "color:#0682CD;";
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectionChange(val) {
			
 
				+
			
 
				+      //多选数字回调
			
 
				+      this.$emit("num", val);
			
 
				+    },
			
 
				+    handleAdd(name) {
			
 
				+     
			
 
				+      this.$emit("toolMsg", name);
			
 
				+    },
			
 
				+    handleRow(index, row, lable) {
			
 
				+     
			
 
				+    },
			
 
				+    handleSizeChange(val) {
			
 
				+      this.$emit("changeSize", val);
			
 
				+      console.log(`每页 ${val} 条`);
			
 
				+    },
			
 
				+    handleCurrentChange(val) {
			
 
				+      this.$emit("changeNum", val);
			
 
				+      console.log(`当前页: ${val}`);
			
 
				+    },
			
 
				+    // 点击行即可选中
			
 
				+    getRowData(row) {
			
 
				+      this.$refs.table.toggleRowSelection(row);
			
 
				+    },
			
 
				+    getRowList(row, column, event, cell) {
			
 
				+      this.$emit("clickDemand", column.label, row);
			
 
				+    },
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.btn{
			
 
				+  display: flex;
			
 
				+  justify-content: center;
			
 
				+}
			
 
				+</style>
			
--- a/src/components/p-header.vue
+++ b/src/components/p-header.vue
@@ -190,6 +190,7 @@ export default {
 
				       }, 500);
			
 
				     },
			
 
				     handleLogout() {
			
 
				+      console.log(123);
			
 
				       this.$confirm("正在退出登录,是否继续", "提示", {
			
 
				         type: "warning",
			
 
				       })
			
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -1,236 +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="fileList"
			
 
				-             :auto-upload="true" :show-file-list="fileInfo.type !== 'btn'"
			
 
				-            :before-upload="deforeUp" :http-request="signUpload">
			
 
				-            <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'" icon="el-icon-upload" :type="fileInfo.btntype">{{fileInfo.typename}}</el-button>
			
 
				-            </div>
			
 
				-        </el-upload>
			
 
				-    </div>
			
 
				+  <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'],
			
 
				-        data() {
			
 
				-            return {
			
 
				-                fileLists: [],
			
 
				-                attList: [],
			
 
				-                loading: false,
			
 
				-                num: 0,
			
 
				-                s: false
			
 
				-            }
			
 
				-        },
			
 
				-        methods: {
			
 
				-            signUpload(){},
			
 
				-            //删除
			
 
				-            handleRemove(file) {
			
 
				-                for (let i = 0; i < this.attList.length; i++) {
			
 
				-                    if (this.attList[i].fileName === file.name) {
			
 
				-                        this.attList.splice(i, 1);
			
 
				-                        this.$emit('uploadBack', this.attList)
			
 
				-                    }
			
 
				-                }
			
 
				-            },
			
 
				-            //数量限制
			
 
				-            handleExceed(files, fileList) {
			
 
				-                this.$message.warning(
			
 
				-                    `当前限制选择 ${this.fileInfo.limit} 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`
			
 
				-                );
			
 
				-            },
			
 
				-            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",
			
 
				-                    type:this.fileInfo.urlType ?this.fileInfo.urlType :'',
			
 
				-                    headers: {
			
 
				-                        "Content-Type": "application/json",
			
 
				-                    },
			
 
				-                    data: query,
			
 
				-                }).then((res) => {
			
 
				-                    if (this.fileInfo.type === 'btn') {
			
 
				-                        this.$refs['upload'].clearFiles();
			
 
				-                        console.log(res);
			
 
				-                        this.$emit('uploadBack',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,
			
 
				-                            fileName: 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.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() {
			
 
				-
			
 
				+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",
			
 
				         },
			
 
				-        created() {
			
 
				-            this.attList = [];
			
 
				-            for (let i = 0; i < this.fileList.length; i++) {
			
 
				-                this.attList.push({
			
 
				-                    id: this.fileList[i].id,
			
 
				-                    fileName: 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,
			
 
				-                })
			
 
				+        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",
			
 
				+              });
			
 
				             }
			
 
				-        },
			
 
				-        watch: {
			
 
				-            fileList() {
			
 
				-                this.attList = [];
			
 
				-                for (let i = 0; i < this.fileList.length; i++) {
			
 
				-                    this.attList.push({
			
 
				-                        id: this.fileList[i].id,
			
 
				-                        fileName: 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,
			
 
				-                    })
			
 
				-                }
			
 
				+            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>
			
--- a/src/components/workflow.vue
+++ b/src/components/workflow.vue
@@ -271,9 +271,6 @@ export default {
 
				       }
			
 
				     },
			
 
				     submitWork() {
			
 
				-      console.log(this.nodes);
			
 
				-      //多人转派环节
			
 
				-
			
 
				       //多人会签处理环节
			
 
				       let list = {
			
 
				         userId: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员id
			
--- a/src/components/workflowBaseshoubu.vue
+++ b/src/components/workflowBaseshoubu.vue
@@ -0,0 +1,698 @@
 
				+<template>
			
 
				+  <div>
			
 
				+    <div class="flex-handle">
			
 
				+      <div class="flex-left">
			
 
				+        <div class="flex-left-header">
			
 
				+          <div class="flex-path">
			
 
				+            <div class="flex-left-header-text">
			
 
				+              选择路径
			
 
				+
			
 
				+              <div class="flex-path-list">
			
 
				+                <div v-if="transferStatus" @click="clickTransfer(1)">转派</div>
			
 
				+                <div v-if="copyStatus" @click="clickTransfer(2)">抄送</div>
			
 
				+                <div v-for="(item, index) in node.nextShapes" :key="index" :class="seleIndex == index ? 'active' : ''"
			
 
				+                  @click="clickGetTree(item, index)">
			
 
				+                  {{ item.properties.name }}
			
 
				+                </div>
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+          <div class="flex-commons">
			
 
				+            <div class="flex-left-header-text">
			
 
				+              常用意见
			
 
				+              <span @click="clickEdit" class="flex-icon"><i class="el-icon-edit"></i>修改</span>
			
 
				+            </div>
			
 
				+            <div class="flex-slide">
			
 
				+              <div v-for="(item, index) in commonlyList" :key="index" ref="common" class="flex-common"
			
 
				+                @click="clickCommonly($event)">
			
 
				+                {{ item.dataName }}
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+        <div class="flex-opinion">
			
 
				+          <div class="flex-left-header-text">意见内容</div>
			
 
				+          <el-input type="textarea" autosize placeholder="请输入内容" v-model="textarea">
			
 
				+          </el-input>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <div class="flex-right" :class="{ copyClass: CopyStatus }">
			
 
				+        <div class="flex-left-header-text" :class="{ 'flex-right-text': CopyStatus }">
			
 
				+          本部门人员办理
			
 
				+          <div style="display: flex">
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              候选人
			
 
				+              <deptTree ref="defTree" class="flex-slide" :treeList="treeList" @changeTree="changeTree" />
			
 
				+            </div>
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              已选人员
			
 
				+              <!-- <div class="">{{ selectUser }}</div> -->
			
 
				+              <div class="" v-for="(item, index) in backThree" :key="index">
			
 
				+                {{ item.loginNameStr }}
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+        <div v-if="CopyStatus" class="flex-left-header-text flex-right-text">
			
 
				+          抄送人员
			
 
				+          <div style="display: flex">
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              抄送人
			
 
				+              <deptTree ref="defTrees" class="flex-slide" :treeList="treeCopyList" @changeTree="changeTreeCopy" />
			
 
				+            </div>
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              已选人员
			
 
				+              <div class="">{{ copyUser }}</div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+    <div class="flex-footer-botton">
			
 
				+      <div class="flex-button">
			
 
				+        <el-button type="primary" @click="submitWork()">提交</el-button>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+    <el-dialog title="修改常用意见" :visible.sync="editStatus" width="100%" :before-close="editCloses" :modal="false"
			
 
				+      :destroy-on-close="true">
			
 
				+      <div style="overflow-y: scroll; overflow-x: hidden; height: 240px">
			
 
				+        <div v-for="(item, index) in commonlyList" :key="index" ref="common" class="flex-common">
			
 
				+          {{ item.dataName
			
 
				+}}<i class="el-icon-circle-close" @click="deleStatus(item)"></i>
			
 
				+        </div>
			
 
				+        <div class="flex-common">
			
 
				+          <i class="el-icon-circle-plus-outline" @click="addStatus()"></i>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </el-dialog>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import deptTree from "./workDeptThree.vue";
			
 
				+export default {
			
 
				+  inject: ['reload'],
			
 
				+  components: {
			
 
				+    deptTree,
			
 
				+  },
			
 
				+  name: "workflow",
			
 
				+  data() {
			
 
				+    return {
			
 
				+      manyPeopleStatus: false, //多人处理下发任务
			
 
				+      editStatus: false, //常用意见控制
			
 
				+      transferStatus: false, //转派按钮控制
			
 
				+      TransferStatus: false, //是否点击转派状态
			
 
				+      copyStatus: false, //抄送按钮控制
			
 
				+      CopyStatus: false, //是否点击抄送状态
			
 
				+      node: [], //路径列表
			
 
				+      seleIndex: "", //点击路径下标
			
 
				+      commonlyList: [], //常用意见数组
			
 
				+      textarea: "未填写意见", //意见内容字段
			
 
				+      copyUser: "", //抄送人员列表
			
 
				+      selectUser: "", //已选人员列表
			
 
				+      treeList: [], // 待选人员列表
			
 
				+      propsList: [],
			
 
				+      nodes: [],
			
 
				+      initialList: [], //第一次进入是加载节点
			
 
				+      clicknextName: "", //获取的流程节点
			
 
				+      backThree: [],
			
 
				+      treeCopyList: [],
			
 
				+      demand: "",
			
 
				+      nextDealManList: "",
			
 
				+      isLastManStatus: false,
			
 
				+    };
			
 
				+  },
			
 
				+  props: {
			
 
				+    //  表格数据和表格部分属性的对象
			
 
				+    // eslint-disable-next-line vue/require-default-prop
			
 
				+    list: {
			
 
				+      type: Object,
			
 
				+    },
			
 
				+    requestForm: {
			
 
				+      type: Object,
			
 
				+    },
			
 
				+  },
			
 
				+  created() {
			
 
				+    this.getNextPath(this.list.resourceId, 1);
			
 
				+    this.getMetirialType();
			
 
				+  },
			
 
				+  methods: {
			
 
				+    async nextWorks(lists, list) {
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: _this.$url.formList.nextWork, //下一步工作流接口
			
 
				+        data: lists,
			
 
				+        status: "form",
			
 
				+      };
			
 
				+      await this.common.httpPost(obj, success);
			
 
				+      function success(data) {
			
 
				+        let updateList = {
			
 
				+          taskId: data.taskid,
			
 
				+          id: _this.list.id,
			
 
				+          resourceId: _this.nodes.currentShape[0].resourceId,
			
 
				+          tableName: _this.requestForm.processDefinitionKey,
			
 
				+        };
			
 
				+        list.taskId = data.taskid;
			
 
				+        _this.setUpdate(updateList);
			
 
				+        _this.getLastManList(list);
			
 
				+      }
			
 
				+    },
			
 
				+    submitWork() {
			
 
				+      //多人会签处理环节
			
 
				+      let list = {
			
 
				+        userId: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员id
			
 
				+        taskId: this.list.taskId, //表单标识
			
 
				+        // procinstid: this.list.processId,
			
 
				+        taskName: this.clicknextName, //流程节点
			
 
				+        userCode: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员code
			
 
				+        content: this.textarea, //意见内容
			
 
				+      };
			
 
				+      let newlist = {
			
 
				+        userId: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员id
			
 
				+        taskId: this.list.taskId, //表单标识
			
 
				+        // procinstid: this.list.processId,
			
 
				+        taskName: this.clicknextName, //流程节点
			
 
				+        userCode: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员code
			
 
				+        content: this.textarea, //意见内容
			
 
				+      };
			
 
				+      if (this.manyPeopleStatus == true) {
			
 
				+        list.procinstid = this.list.processId.data?this.list.processId.data:this.list.processId;
			
 
				+        // if (this.backThree.length <= 1) {
			
 
				+        // this.$message.error("请选择多人");
			
 
				+        // return;
			
 
				+        // } else {
			
 
				+        list.lastmanList = this.nextDealManList;
			
 
				+        // }
			
 
				+        if (this.nodes.currentShape) {
			
 
				+          newlist.resolution = this.nodes.currentShape[0].condition.resolution;
			
 
				+          newlist.approve = this.nodes.currentShape[0].condition.approve;
			
 
				+        }
			
 
				+        if (this.backThree.length > 0) {
			
 
				+          newlist.nextDealMan = "admin";
			
 
				+        }
			
 
				+        this.nextWorks(newlist, list);
			
 
				+      } else {
			
 
				+        console.log(456);
			
 
				+        //生成需求决策编号
			
 
				+        if (this.clicknextName === "起草人发送") {
			
 
				+          this.getDemand();
			
 
				+        }
			
 
				+        if (!this.list.taskId) {
			
 
				+          this.$message.error("请先保存表单后处理");
			
 
				+          return false;
			
 
				+        }
			
 
				+        if (this.TransferStatus === true) {
			
 
				+          if (this.backThree.length > 0) {
			
 
				+            this.nextWork();
			
 
				+          } else {
			
 
				+            this.$message.error("请选择候选人");
			
 
				+            return false;
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.treeCopyList.length) {
			
 
				+            //抄送
			
 
				+            list.copyman = this.treeCopyList[0].loginNoStrCopy;
			
 
				+          }
			
 
				+          if (this.isLastManStatus == true) {
			
 
				+            list.lastman = "yes";
			
 
				+          }
			
 
				+          if (this.nodes.currentShape) {
			
 
				+            list.resolution = this.nodes.currentShape[0].condition.resolution;
			
 
				+            list.approve = this.nodes.currentShape[0].condition.approve;
			
 
				+          }
			
 
				+          if (this.clicknextName === "") {
			
 
				+            this.$message.error("请选择流程节点");
			
 
				+            return false;
			
 
				+          }
			
 
				+          if (this.backThree.length > 0) {
			
 
				+            if (this.manyPeopleStatus == true) {
			
 
				+              list.nextDealManList = this.nextDealManList;
			
 
				+            } else {
			
 
				+              list.nextDealMan = this.backThree[0].loginNoStr;
			
 
				+            }
			
 
				+          } else {
			
 
				+            if (this.clicknextName === "流程结束") {
			
 
				+            } else {
			
 
				+              this.$message.error("请选择候选人");
			
 
				+              return false;
			
 
				+            }
			
 
				+          }
			
 
				+          this.nextWork(list);
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    //生成需求决策编号接口
			
 
				+    getDemand() {
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/getBusi",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: {},
			
 
				+      }).then((res) => {
			
 
				+        this.demand = res.data;
			
 
				+      });
			
 
				+    },
			
 
				+    async getLastManList(e) {
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: _this.$url.formList.getComplateLastMan, //开始工作流接口
			
 
				+        data: e,
			
 
				+        // status: "form",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+      };
			
 
				+
			
 
				+      let res = await this.common.httpPost(obj, success);
			
 
				+      function success(data) { }
			
 
				+    },
			
 
				+    async nextWork(list) {
			
 
				+      //e:yes||no,list：传入数组，title:结束标签，res:驳回标签,id:工单更新id
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: _this.$url.formList.nextWork, //下一步工作流接口
			
 
				+        data: list,
			
 
				+        status: "form",
			
 
				+      };
			
 
				+      if (_this.TransferStatus === true) {
			
 
				+        let lists = {
			
 
				+          userId: _this.backThree[0].loginNoStr,
			
 
				+          taskId: _this.list.taskId,
			
 
				+          content: _this.textarea,
			
 
				+        };
			
 
				+        obj.url = _this.$url.formList.transferTask + _this.list.taskId;
			
 
				+        obj.data = lists;
			
 
				+      }
			
 
				+      await this.common.httpPost(obj, success);
			
 
				+      function success(data) {
			
 
				+        if (data != null) {
			
 
				+          if (_this.TransferStatus === true) {
			
 
				+            let list = {
			
 
				+              taskId: data.taskid,
			
 
				+              id: _this.list.id,
			
 
				+              tableName: _this.requestForm.processDefinitionKey,
			
 
				+            };
			
 
				+
			
 
				+            _this.setUpdate(list);
			
 
				+          } else {
			
 
				+            let list = {
			
 
				+              taskId: data.taskid,
			
 
				+              id: _this.list.id,
			
 
				+              resourceId: _this.nodes.currentShape[0].resourceId,
			
 
				+              taskName: _this.nodes.nextShapes[0].properties.name,
			
 
				+              tableName: _this.requestForm.processDefinitionKey,
			
 
				+            };
			
 
				+            if (data.copytaskid) {
			
 
				+              list.copytaskid = data.copytaskid;
			
 
				+              list.copyman = _this.treeCopyList[0].loginNoStrCopy;
			
 
				+            }
			
 
				+            if (_this.demand) {
			
 
				+              list.needNo = _this.demand;
			
 
				+            }
			
 
				+            _this.setUpdate(list);
			
 
				+          }
			
 
				+        } else {
			
 
				+          let list = {
			
 
				+            taskName: "结束",
			
 
				+            id: _this.list.id,
			
 
				+            tableName: _this.requestForm.processDefinitionKey,
			
 
				+          };
			
 
				+          _this.setUpdate(list);
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    setUpdate(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/updateBase",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: e,
			
 
				+      }).then((res) => {
			
 
				+        this.$emit("updateForm", true);
			
 
				+      });
			
 
				+    },
			
 
				+    //查询路径接口
			
 
				+    getNextPath(e, status) {
			
 
				+      let { fresourceId, processDefinitionKey } = this.requestForm;
			
 
				+      let list = {
			
 
				+        fresourceId: fresourceId,
			
 
				+        processId: processDefinitionKey,
			
 
				+      };
			
 
				+      e ? (list.resourceId = e) : list;
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/queryPath",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: list,
			
 
				+      }).then((res) => {
			
 
				+        if (status === 1) {
			
 
				+          //第一次进入取路径
			
 
				+          this.initialList = res.data.body;
			
 
				+          if (res.data.body.nextShapes[0].multi !== null) {
			
 
				+            if (res.data.body.nextShapes[0].multi.multi === "true") {
			
 
				+              // this.getqueryMultiTaskId();
			
 
				+              this.isLastManStatus = true;
			
 
				+            } else {
			
 
				+              this.isLastManStatus = false;
			
 
				+            }
			
 
				+          }
			
 
				+          if (res.data.body.nextShapes[0].loop !== null) {
			
 
				+            if (res.data.body.nextShapes[0].loop.loop === "true") {
			
 
				+              this.transferStatus = true; //转派按钮生效
			
 
				+            } else {
			
 
				+              this.transferStatus = false;
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.transferStatus = false;
			
 
				+          }
			
 
				+          if (res.data.body.nextShapes[0].copy !== null) {
			
 
				+            if (res.data.body.nextShapes[0].copy.copy === "true") {
			
 
				+              // this.copyStatus = true; //抄送按钮生效
			
 
				+              this.CopyStatus = true;
			
 
				+            } else {
			
 
				+              this.copyStatus = false;
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.copyStatus = false;
			
 
				+          }
			
 
				+          res.data.body.currentShape.map((item, index) => {
			
 
				+            this.getNextPath(item.resourceId, 2);
			
 
				+          });
			
 
				+        }
			
 
				+        if (status === 2) {
			
 
				+          if (res.data.body.nextShapes[0].condition !== null) {
			
 
				+            this.node = res.data.body;
			
 
				+          } else {
			
 
				+            this.getNextPath(res.data.body.nextShapes[0].resourceId, 2);
			
 
				+          }
			
 
				+        }
			
 
				+        if (status === 3) {
			
 
				+          this.nodes = res.data.body;
			
 
				+          this.getTreeLists(res.data.body, 1);
			
 
				+
			
 
				+          if (res.data.body.nextShapes[0].multi !== null) {
			
 
				+            if (res.data.body.nextShapes[0].multi.multi === "true") {
			
 
				+              this.manyPeopleStatus = true; //转派按钮生效
			
 
				+            } else {
			
 
				+              this.manyPeopleStatus = false;
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.manyPeopleStatus = false;
			
 
				+          }
			
 
				+        }
			
 
				+      });
			
 
				+    },
			
 
				+    //查询候选人接口
			
 
				+    getTreeLists(e, status) {
			
 
				+      let createdId = "createId";
			
 
				+      let id =
			
 
				+        e.nextShapes[0].properties.documentation === createdId
			
 
				+          ? this.list.createId
			
 
				+          : e.nextShapes[0].properties.documentation;
			
 
				+      console.log(id);
			
 
				+      this.$http({
			
 
				+        url: "/market/api/user/info/queryNodePers?params=" + id,
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: "",
			
 
				+      }).then((res) => {
			
 
				+        console.log(status);
			
 
				+        if (status === 2) {
			
 
				+          this.treeCopyList = res.data; //抄送
			
 
				+          //  this.$refs.defTrees.treeList = res.data;
			
 
				+        } else {
			
 
				+          this.treeList = res.data; //抄送
			
 
				+          // this.$refs.defTree.treeList = res.data;
			
 
				+          console.log(this.treeList);
			
 
				+        }
			
 
				+      });
			
 
				+    },
			
 
				+    //转派按钮方法
			
 
				+    clickTransfer(e) {
			
 
				+      if (e == 1) {
			
 
				+        this.TransferStatus = true;
			
 
				+      } else if (e == 2) {
			
 
				+        this.CopyStatus = true;
			
 
				+      }
			
 
				+      this.getTreeLists(this.initialList, e);
			
 
				+    },
			
 
				+    //点击节点获取下一步的处理人字段
			
 
				+    clickGetTree(e, index) {
			
 
				+      this.$refs.defTree.userList = [];
			
 
				+      this.backThree = [];
			
 
				+      this.CopyStatus = false;
			
 
				+      this.TransferStatus = false;
			
 
				+      //   this.clickTaskName = e.properties.name;
			
 
				+      this.clicknextName = e.properties.name;
			
 
				+      this.seleIndex = index;
			
 
				+      this.getNextPath(e.resourceId, 3); //1 为点击后获取线
			
 
				+    },
			
 
				+    //点击常用意见方法
			
 
				+    clickCommonly(e) {
			
 
				+      this.textarea = e.currentTarget.innerHTML;
			
 
				+    },
			
 
				+    //点击修改
			
 
				+    clickEdit() {
			
 
				+      this.editStatus = true;
			
 
				+    },
			
 
				+    //选择树的回调
			
 
				+    changeTree(e) {
			
 
				+      if (this.manyPeopleStatus == true) {
			
 
				+        this.backThree = e;
			
 
				+
			
 
				+        let arr = [];
			
 
				+        this.backThree.map((item) => {
			
 
				+          arr.push(item.loginNoStr);
			
 
				+        });
			
 
				+        this.nextDealManList = arr.toString();
			
 
				+      } else {
			
 
				+        if (e.length > 1) {
			
 
				+          this.$message.error("只能选择一个人");
			
 
				+          return;
			
 
				+        } else {
			
 
				+          this.backThree = e;
			
 
				+          if (this.CopyStatus === true) {
			
 
				+            this.getTreeLists(e[0].loginNoStr, 2);
			
 
				+          }
			
 
				+
			
 
				+          if (e[0]) {
			
 
				+            this.selectUser = e[0].loginNameStr;
			
 
				+          } else {
			
 
				+            this.selectUser = "暂无选择";
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    //获取字典表常用意见
			
 
				+    getMetirialType(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/cfgDataDict/queryList",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: {
			
 
				+          dictCodePks: "approval",
			
 
				+        },
			
 
				+      }).then((res) => {
			
 
				+        console.log(res);
			
 
				+        this.commonlyList = res.data;
			
 
				+      });
			
 
				+    },
			
 
				+    //添加字典表常用意见
			
 
				+    geaddctType(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/cfgDataDict/add",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: e,
			
 
				+      }).then((res) => {
			
 
				+        this.getMetirialType();
			
 
				+      });
			
 
				+    },
			
 
				+    //关闭修改
			
 
				+    editCloses() {
			
 
				+      this.editStatus = false;
			
 
				+    },
			
 
				+    //常用意见添加
			
 
				+    addStatus() {
			
 
				+      let newData = Date.parse(new Date());
			
 
				+      this.$prompt("请输入常用意见", "提示", {
			
 
				+        confirmButtonText: "确定",
			
 
				+        cancelButtonText: "取消",
			
 
				+      })
			
 
				+        .then(({ value }) => {
			
 
				+          let list = {
			
 
				+            dictCode: "approval",
			
 
				+            dataCode: newData,
			
 
				+            dataName: value,
			
 
				+            dictName: "审批意见",
			
 
				+          };
			
 
				+          this.geaddctType(list);
			
 
				+          this.$message({
			
 
				+            type: "success",
			
 
				+            message: "常用意见添加成功",
			
 
				+          });
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          this.$message({
			
 
				+            type: "info",
			
 
				+            message: "取消输入",
			
 
				+          });
			
 
				+        });
			
 
				+    },
			
 
				+    //常用意见删除
			
 
				+    deleStatus(e) {
			
 
				+      this.$confirm("此操作将删除此常用意见, 是否继续?", "提示", {
			
 
				+        confirmButtonText: "确定",
			
 
				+        cancelButtonText: "取消",
			
 
				+        type: "warning",
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          let list = {
			
 
				+            dataCode: e.dataCode,
			
 
				+            dictCode: "approval",
			
 
				+          };
			
 
				+          this.geDelectType(list);
			
 
				+          this.$message({
			
 
				+            type: "success",
			
 
				+            message: "删除成功!",
			
 
				+          });
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          this.$message({
			
 
				+            type: "info",
			
 
				+            message: "已取消删除",
			
 
				+          });
			
 
				+        });
			
 
				+    },
			
 
				+    //删除字典表常用意见
			
 
				+    geDelectType(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/cfgDataDicts/del",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: e,
			
 
				+      }).then((res) => {
			
 
				+        this.getMetirialType();
			
 
				+      });
			
 
				+    },
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang='scss' scoped>
			
 
				+.flex-header-text-tree {
			
 
				+  width: 50%;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+
			
 
				+.flex-icon {
			
 
				+  float: right;
			
 
				+  margin-right: 20px;
			
 
				+  color: #4277a1;
			
 
				+}
			
 
				+
			
 
				+.flex-handle {
			
 
				+  width: 100%;
			
 
				+  padding: 30px;
			
 
				+  display: flex;
			
 
				+
			
 
				+  .flex-right {
			
 
				+    width: 50%;
			
 
				+    border: 1px solid #e1e1e1;
			
 
				+    margin-left: 20px;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.flex-left {
			
 
				+  width: 50%;
			
 
				+  display: flex;
			
 
				+  flex-direction: column;
			
 
				+
			
 
				+  .flex-left-header {
			
 
				+    display: flex;
			
 
				+    justify-content: space-around;
			
 
				+
			
 
				+    .flex-path {
			
 
				+      height: 280px;
			
 
				+      border: 1px solid #e1e1e1;
			
 
				+      width: 68%;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.flex-common {
			
 
				+  padding: 10px 5%;
			
 
				+  font-size: 18px;
			
 
				+}
			
 
				+
			
 
				+.flex-left-header-text {
			
 
				+  height: 40px;
			
 
				+  line-height: 40px;
			
 
				+  color: black;
			
 
				+  padding-left: 10px;
			
 
				+  background-color: #cde4f6;
			
 
				+  font-size: 18px;
			
 
				+  font-weight: bold;
			
 
				+}
			
 
				+
			
 
				+.flex-path-list {
			
 
				+  overflow-y: scroll;
			
 
				+  overflow-x: hidden;
			
 
				+  height: 14rem;
			
 
				+}
			
 
				+
			
 
				+.flex-slide {
			
 
				+  overflow-y: scroll;
			
 
				+  overflow-x: hidden;
			
 
				+}
			
 
				+
			
 
				+.active {
			
 
				+  background-color: #f3faff;
			
 
				+}
			
 
				+
			
 
				+.flex-opinion {
			
 
				+  height: 280px;
			
 
				+  border: 1px solid #e1e1e1;
			
 
				+  width: 100%;
			
 
				+  margin-top: 20px;
			
 
				+}
			
 
				+
			
 
				+.flex-right-text {
			
 
				+  margin-right: 20px;
			
 
				+  width: 50%;
			
 
				+}
			
 
				+
			
 
				+.flex-commons {
			
 
				+  height: 280px;
			
 
				+  border: 1px solid #e1e1e1;
			
 
				+  width: 30%;
			
 
				+}
			
 
				+
			
 
				+.flex-footer-botton {
			
 
				+  display: flex;
			
 
				+  justify-content: space-evenly;
			
 
				+}
			
 
				+
			
 
				+.flex-button {
			
 
				+  margin-top: 10px;
			
 
				+  margin-bottom: 10px;
			
 
				+
			
 
				+  ::v-deep .el-button--primary {
			
 
				+    width: 222px;
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
--- a/src/components/workflowBasexcwls.vue
+++ b/src/components/workflowBasexcwls.vue
@@ -0,0 +1,795 @@
 
				+<template>
			
 
				+  <div>
			
 
				+    <div class="flex-handle">
			
 
				+      <div class="flex-left">
			
 
				+        <div class="flex-left-header">
			
 
				+          <div class="flex-path">
			
 
				+            <div class="flex-left-header-text">
			
 
				+              选择路径
			
 
				+
			
 
				+              <div class="flex-path-list">
			
 
				+                <div
			
 
				+                  v-if="manyReassignment"
			
 
				+                  :class="actives"
			
 
				+                  @click="clickManyTransfer(1)"
			
 
				+                >
			
 
				+                  转派
			
 
				+                </div>
			
 
				+                <div
			
 
				+                  v-if="transferStatus"
			
 
				+                  :class="active"
			
 
				+                  @click="clickTransfer(1)"
			
 
				+                >
			
 
				+                  转派
			
 
				+                </div>
			
 
				+                <div v-if="copyStatus" @click="clickTransfer(2)">抄送</div>
			
 
				+                <div
			
 
				+                  v-for="(item, index) in node.nextShapes"
			
 
				+                  :key="index"
			
 
				+                  :class="seleIndex == index ? 'active' : ''"
			
 
				+                  @click="clickGetTree(item, index)"
			
 
				+                >
			
 
				+                  {{ item.properties.name }}
			
 
				+                </div>
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+          <div class="flex-commons">
			
 
				+            <div class="flex-left-header-text">
			
 
				+              常用意见
			
 
				+              <span @click="clickEdit" class="flex-icon"
			
 
				+                ><i class="el-icon-edit"></i>修改</span
			
 
				+              >
			
 
				+            </div>
			
 
				+            <div class="flex-slide">
			
 
				+              <div
			
 
				+                v-for="(item, index) in commonlyList"
			
 
				+                :key="index"
			
 
				+                ref="common"
			
 
				+                class="flex-common"
			
 
				+                @click="clickCommonly($event)"
			
 
				+              >
			
 
				+                {{ item.dataName }}
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+        <div class="flex-opinion">
			
 
				+          <div class="flex-left-header-text">意见内容</div>
			
 
				+          <el-input
			
 
				+            type="textarea"
			
 
				+            autosize
			
 
				+            placeholder="请输入内容"
			
 
				+            v-model="textarea"
			
 
				+          >
			
 
				+          </el-input>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <div class="flex-right" :class="{ copyClass: CopyStatus }">
			
 
				+        <div
			
 
				+          class="flex-left-header-text"
			
 
				+          :class="{ 'flex-right-text': CopyStatus }"
			
 
				+        >
			
 
				+          本部门人员办理
			
 
				+          <div style="display: flex">
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              候选人
			
 
				+              <deptTree
			
 
				+                ref="defTree"
			
 
				+                class="flex-slide"
			
 
				+                :treeList="treeList"
			
 
				+                @changeTree="changeTree"
			
 
				+              />
			
 
				+            </div>
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              已选人员
			
 
				+              <!-- <div class="">{{ selectUser }}</div> -->
			
 
				+              <div class="" v-for="(item, index) in backThree" :key="index">
			
 
				+                {{ item.loginNameStr }}
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+        <div v-if="CopyStatus" class="flex-left-header-text flex-right-text">
			
 
				+          抄送人员
			
 
				+          <div style="display: flex">
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              抄送人
			
 
				+              <deptTree
			
 
				+                ref="defTrees"
			
 
				+                class="flex-slide"
			
 
				+                :treeList="treeCopyList"
			
 
				+                @changeTree="changeTreeCopy"
			
 
				+              />
			
 
				+            </div>
			
 
				+            <div class="flex-header-text-tree">
			
 
				+              已选人员
			
 
				+              <div class="">{{ copyUser }}</div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+    <div class="flex-footer-botton">
			
 
				+      <div class="flex-button">
			
 
				+        <el-button type="primary" @click="submitWork()">提交</el-button>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+    <el-dialog
			
 
				+      title="修改常用意见"
			
 
				+      :visible.sync="editStatus"
			
 
				+      width="100%"
			
 
				+      :before-close="editCloses"
			
 
				+      :modal="false"
			
 
				+      :destroy-on-close="true"
			
 
				+    >
			
 
				+      <div style="overflow-y: scroll; overflow-x: hidden; height: 240px">
			
 
				+        <div
			
 
				+          v-for="(item, index) in commonlyList"
			
 
				+          :key="index"
			
 
				+          ref="common"
			
 
				+          class="flex-common"
			
 
				+        >
			
 
				+          {{ item.dataName
			
 
				+          }}<i class="el-icon-circle-close" @click="deleStatus(item)"></i>
			
 
				+        </div>
			
 
				+        <div class="flex-common">
			
 
				+          <i class="el-icon-circle-plus-outline" @click="addStatus()"></i>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </el-dialog>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import deptTree from "./workDeptThree.vue";
			
 
				+export default {
			
 
				+  components: {
			
 
				+    deptTree,
			
 
				+  },
			
 
				+  name: "workflow",
			
 
				+  data() {
			
 
				+    return {
			
 
				+      active: "",
			
 
				+      manyPeopleStatus: false, //多人处理下发任务
			
 
				+      editStatus: false, //常用意见控制
			
 
				+      transferStatus: false, //转派按钮控制
			
 
				+      TransferStatus: false, //是否点击转派状态
			
 
				+      copyStatus: false, //抄送按钮控制
			
 
				+      CopyStatus: false, //是否点击抄送状态
			
 
				+      node: [], //路径列表
			
 
				+      seleIndex: "1099", //点击路径下标
			
 
				+      commonlyList: [], //常用意见数组
			
 
				+      textarea: "未填写意见", //意见内容字段
			
 
				+      copyUser: "", //抄送人员列表
			
 
				+      selectUser: "", //已选人员列表
			
 
				+      treeList: [], // 待选人员列表
			
 
				+      propsList: [],
			
 
				+      nodes: [],
			
 
				+      initialList: [], //第一次进入是加载节点
			
 
				+      clicknextName: "", //获取的流程节点
			
 
				+      backThree: [],
			
 
				+      treeCopyList: [],
			
 
				+      demand: "",
			
 
				+      nextDealManList: "",
			
 
				+      isLastManStatus: false,
			
 
				+      manyReassignment: false,
			
 
				+      actives: "",
			
 
				+    };
			
 
				+  },
			
 
				+  props: {
			
 
				+    //  表格数据和表格部分属性的对象
			
 
				+    // eslint-disable-next-line vue/require-default-prop
			
 
				+    list: {
			
 
				+      type: Object,
			
 
				+    },
			
 
				+    requestForm: {
			
 
				+      type: Object,
			
 
				+    },
			
 
				+    adminResourceId: {
			
 
				+      type: String,
			
 
				+    },
			
 
				+  },
			
 
				+  created() {
			
 
				+    console.log(this.list);
			
 
				+    this.getNextPath(this.list.resourceId, 1);
			
 
				+    this.getMetirialType();
			
 
				+  },
			
 
				+  methods: {
			
 
				+    //多人转派
			
 
				+    clickManyTransfer() {
			
 
				+      (this.actives = this.actives != "" ? "" : "active"),
			
 
				+        (this.seleIndex = "1099");
			
 
				+      this.getNextPath(this.adminResourceId, 3);
			
 
				+    },
			
 
				+    async getLastManList(e) {
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: _this.$url.formList.getComplateLastMan, //开始工作流接口
			
 
				+        data: e,
			
 
				+        // status: "form",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+      };
			
 
				+
			
 
				+      let res = await this.common.httpPost(obj, success);
			
 
				+      function success(data) {}
			
 
				+    },
			
 
				+    async nextWorks(lists, list) {
			
 
				+      let listss = {
			
 
				+        userId: this.nextDealManList, //人员id
			
 
				+        taskId: this.list.taskId, //表单标识
			
 
				+        loginstr: JSON.parse(window.sessionStorage.userInfo).loginNoStr,
			
 
				+        // taskName: this.clicknextName, //流程节点
			
 
				+        content: this.textarea, //意见内容
			
 
				+      };
			
 
				+      if (this.manyReassignment == true) {
			
 
				+        let _this = this;
			
 
				+        let obj = {
			
 
				+          url: _this.$url.formList.getNewTransferTask + _this.list.taskId, //下一步工作流接口
			
 
				+          data: listss,
			
 
				+          status: "form",
			
 
				+        };
			
 
				+        await this.common.httpPost(obj, success);
			
 
				+        function success(data) {
			
 
				+          _this.$emit("beforeClose", true);
			
 
				+        }
			
 
				+      } else {
			
 
				+        let _this = this;
			
 
				+        let obj = {
			
 
				+          url: _this.$url.formList.nextWork, //下一步工作流接口
			
 
				+          data: lists,
			
 
				+          status: "form",
			
 
				+        };
			
 
				+        await this.common.httpPost(obj, success);
			
 
				+        function success(data) {
			
 
				+          console.log(data);
			
 
				+          let updateList = {
			
 
				+            taskId: data.taskid,
			
 
				+            id: _this.list.id,
			
 
				+            resourceId: _this.nodes.currentShape[0].resourceId,
			
 
				+            tableName: _this.requestForm.processDefinitionKey1,
			
 
				+          };
			
 
				+          list.taskId = data.taskid;
			
 
				+          _this.setUpdate(updateList);
			
 
				+          _this.getLastManList(list);
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    submitWork() {
			
 
				+      //多人会签处理环节
			
 
				+      let list = {
			
 
				+        userId: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员id
			
 
				+        taskId: this.list.taskId, //表单标识
			
 
				+        // procinstid: this.list.processId,
			
 
				+        taskName: this.clicknextName, //流程节点
			
 
				+        userCode: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员code
			
 
				+        content: this.textarea, //意见内容
			
 
				+      };
			
 
				+      let newlist = {
			
 
				+        userId: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员id
			
 
				+        taskId: this.list.taskId, //表单标识
			
 
				+        // procinstid: this.list.processId,
			
 
				+        taskName: this.clicknextName, //流程节点
			
 
				+        userCode: JSON.parse(window.sessionStorage.userInfo).loginNo, //人员code
			
 
				+        content: this.textarea, //意见内容
			
 
				+      };
			
 
				+      if (this.manyPeopleStatus == true) {
			
 
				+        list.procinstid = this.list.processId;
			
 
				+        // if (this.backThree.length <= 1) {
			
 
				+        // this.$message.error("请选择多人");
			
 
				+        // return;
			
 
				+        // } else {
			
 
				+        list.lastmanList = this.nextDealManList;
			
 
				+        // }
			
 
				+        if (this.nodes.currentShape) {
			
 
				+          newlist.resolution = this.nodes.currentShape[0].condition.resolution;
			
 
				+          newlist.approve = this.nodes.currentShape[0].condition.approve;
			
 
				+        }
			
 
				+        if (this.backThree.length > 0) {
			
 
				+          newlist.nextDealMan = "admin";
			
 
				+        }
			
 
				+        this.nextWorks(newlist, list);
			
 
				+      } else {
			
 
				+        console.log(456);
			
 
				+        //生成需求决策编号
			
 
				+        if (this.clicknextName === "起草人发送") {
			
 
				+          this.getDemand();
			
 
				+        }
			
 
				+        if (!this.list.taskId) {
			
 
				+          this.$message.error("请先保存表单后处理");
			
 
				+          return false;
			
 
				+        }
			
 
				+        if (this.TransferStatus === true) {
			
 
				+          if (this.backThree.length > 0) {
			
 
				+            this.nextWork();
			
 
				+          } else {
			
 
				+            this.$message.error("请选择候选人");
			
 
				+            return false;
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.treeCopyList.length) {
			
 
				+            //抄送
			
 
				+            list.copyman = this.treeCopyList[0].loginNoStrCopy;
			
 
				+          }
			
 
				+          if (this.isLastManStatus == true) {
			
 
				+            list.lastman = "yes";
			
 
				+          }
			
 
				+          if (this.nodes.currentShape) {
			
 
				+            list.resolution = this.nodes.currentShape[0].condition.resolution;
			
 
				+            list.approve = this.nodes.currentShape[0].condition.approve;
			
 
				+          }
			
 
				+          if (this.clicknextName === "") {
			
 
				+            this.$message.error("请选择流程节点");
			
 
				+            return false;
			
 
				+          }
			
 
				+          if (this.backThree.length > 0) {
			
 
				+            if (this.manyPeopleStatus == true) {
			
 
				+              list.nextDealManList = this.nextDealManList;
			
 
				+            } else {
			
 
				+              list.nextDealMan = this.backThree[0].loginNoStr;
			
 
				+            }
			
 
				+          } else {
			
 
				+            if (this.clicknextName === "流程结束"||this.clicknextName === "提交至任务发起人") {
			
 
				+            } else {
			
 
				+              this.$message.error("请选择候选人");
			
 
				+              return false;
			
 
				+            }
			
 
				+          }
			
 
				+          this.nextWork(list);
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    //生成需求决策编号接口
			
 
				+    getDemand() {
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/getBusi",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: {},
			
 
				+      }).then((res) => {
			
 
				+        this.demand = res.data;
			
 
				+      });
			
 
				+    },
			
 
				+    async nextWork(list) {
			
 
				+      console.log(list);
			
 
				+      //e:yes||no,list：传入数组，title:结束标签，res:驳回标签,id:工单更新id
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: _this.$url.formList.nextWork, //下一步工作流接口
			
 
				+        data: list,
			
 
				+        status: "form",
			
 
				+      };
			
 
				+      if (_this.TransferStatus === true) {
			
 
				+        let lists = {
			
 
				+          userId: _this.backThree[0].loginNoStr,
			
 
				+          taskId: _this.list.taskId,
			
 
				+          content: _this.textarea,
			
 
				+        };
			
 
				+        obj.url = _this.$url.formList.transferTask + _this.list.taskId;
			
 
				+        obj.data = lists;
			
 
				+      }
			
 
				+      await this.common.httpPost(obj, success);
			
 
				+      function success(data) {
			
 
				+        console.log(data);
			
 
				+        if (data != null) {
			
 
				+          if (_this.TransferStatus === true) {
			
 
				+            let list = {
			
 
				+              taskId: data.taskid,
			
 
				+              // taskId: _this.list.taskId,
			
 
				+              id: _this.list.id,
			
 
				+              tableName: _this.requestForm.processDefinitionKey1,
			
 
				+            };
			
 
				+
			
 
				+            _this.setUpdate(list);
			
 
				+          } else {
			
 
				+            let list = {
			
 
				+              taskId: data.taskid,
			
 
				+              // taskId:_this.list.taskId,
			
 
				+              id: _this.list.id,
			
 
				+              resourceId: _this.nodes.currentShape[0].resourceId,
			
 
				+              taskName: _this.nodes.nextShapes[0].properties.name,
			
 
				+              tableName: _this.requestForm.processDefinitionKey1,
			
 
				+            };
			
 
				+            if (data.copytaskid) {
			
 
				+              list.copytaskid = data.copytaskid;
			
 
				+              list.copyman = _this.treeCopyList[0].loginNoStrCopy;
			
 
				+            }
			
 
				+            if (_this.demand) {
			
 
				+              list.needNo = _this.demand;
			
 
				+            }
			
 
				+            _this.setUpdate(list);
			
 
				+          }
			
 
				+        } else {
			
 
				+          let list = {
			
 
				+            taskName: "结束",
			
 
				+            id: _this.list.id,
			
 
				+            tableName: _this.requestForm.processDefinitionKey1,
			
 
				+          };
			
 
				+          _this.setUpdate(list);
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    setUpdate(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/updateBase",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: e,
			
 
				+      }).then((res) => {
			
 
				+        console.log(res.data.body[0].resourceId);
			
 
				+        this.list.resourceId = res.data.body[0].resourceId;
			
 
				+        this.$emit("updateForm", true);
			
 
				+      });
			
 
				+    },
			
 
				+    //查询路径接口
			
 
				+    getNextPath(e, status) {
			
 
				+      console.log(e);
			
 
				+      console.log(this.requestForm);
			
 
				+      let { fresourceId, processDefinitionKey } = this.requestForm;
			
 
				+      let list = {
			
 
				+        fresourceId: fresourceId,
			
 
				+        processId: processDefinitionKey,
			
 
				+      };
			
 
				+      e ? (list.resourceId = e) : list;
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/queryPath",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: list,
			
 
				+      }).then((res) => {
			
 
				+        console.log(res.data.body);
			
 
				+        if (status === 1) {
			
 
				+          //第一次进入取路径
			
 
				+          this.initialList = res.data.body;
			
 
				+          if (res.data.body.nextShapes[0].multi !== null) {
			
 
				+            if (res.data.body.nextShapes[0].multi.multi === "true") {
			
 
				+              // this.getqueryMultiTaskId();
			
 
				+              this.isLastManStatus = true;
			
 
				+            } else {
			
 
				+              this.isLastManStatus = false;
			
 
				+            }
			
 
				+          }
			
 
				+          if (res.data.body.nextShapes[0].loop !== null) {
			
 
				+            if (res.data.body.nextShapes[0].loop.loop === "true") {
			
 
				+              this.transferStatus = true; //转派按钮生效
			
 
				+            } else {
			
 
				+              this.transferStatus = false;
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.transferStatus = false;
			
 
				+          }
			
 
				+          if (res.data.body.nextShapes[0].copy !== null) {
			
 
				+            if (res.data.body.nextShapes[0].copy.copy === "true") {
			
 
				+              // this.copyStatus = true; //抄送按钮生效
			
 
				+              this.CopyStatus = true;
			
 
				+            } else {
			
 
				+              this.copyStatus = false;
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.copyStatus = false;
			
 
				+          }
			
 
				+          res.data.body.currentShape.map((item, index) => {
			
 
				+            this.getNextPath(item.resourceId, 2);
			
 
				+          });
			
 
				+        }
			
 
				+        if (status === 2) {
			
 
				+          //  this.getNextPath(res.data.body.nextShapes[0].resourceId, 2);
			
 
				+          if (res.data.body.nextShapes[0].condition !== null) {
			
 
				+            this.node = res.data.body;
			
 
				+          } else {
			
 
				+            console.log(res.data.body.nextShapes[0].resourceId);
			
 
				+            this.getNextPath(res.data.body.nextShapes[0].resourceId, 2);
			
 
				+          }
			
 
				+        }
			
 
				+        if (status === 3) {
			
 
				+          this.nodes = res.data.body;
			
 
				+          this.getTreeLists(res.data.body, 1);
			
 
				+
			
 
				+          if (res.data.body.nextShapes[0].multi !== null) {
			
 
				+            if (res.data.body.nextShapes[0].multi.multi === "true") {
			
 
				+              this.manyPeopleStatus = true; //转派按钮生效
			
 
				+            } else {
			
 
				+              this.manyPeopleStatus = false;
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.manyPeopleStatus = false;
			
 
				+          }
			
 
				+        }
			
 
				+      });
			
 
				+    },
			
 
				+    //查询候选人接口
			
 
				+    getTreeLists(e, status) {
			
 
				+      let createdId = "createId";
			
 
				+      let id =
			
 
				+        e.nextShapes[0].properties.documentation === createdId
			
 
				+          ? this.list.createId
			
 
				+          : e.nextShapes[0].properties.documentation;
			
 
				+      console.log(id);
			
 
				+      this.$http({
			
 
				+        url: "/market/api/user/info/queryNodePers?params=" + id,
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: "",
			
 
				+      }).then((res) => {
			
 
				+        console.log(status);
			
 
				+        if (status === 2) {
			
 
				+          this.treeCopyList = res.data; //抄送
			
 
				+          //  this.$refs.defTrees.treeList = res.data;
			
 
				+        } else {
			
 
				+          this.treeList = res.data; //抄送
			
 
				+          // this.$refs.defTree.treeList = res.data;
			
 
				+          console.log(this.treeList);
			
 
				+        }
			
 
				+      });
			
 
				+    },
			
 
				+    //转派按钮方法
			
 
				+    clickTransfer(e) {
			
 
				+      if (e == 1) {
			
 
				+        this.TransferStatus = true;
			
 
				+      } else if (e == 2) {
			
 
				+        this.CopyStatus = true;
			
 
				+      }
			
 
				+      this.getTreeLists(this.initialList, e);
			
 
				+    },
			
 
				+    //点击节点获取下一步的处理人字段
			
 
				+    clickGetTree(e, index) {
			
 
				+      this.$refs.defTree.userList = [];
			
 
				+      this.backThree = [];
			
 
				+      this.CopyStatus = false;
			
 
				+      this.TransferStatus = false;
			
 
				+      //   this.clickTaskName = e.properties.name;
			
 
				+      this.clicknextName = e.properties.name;
			
 
				+      this.seleIndex = index;
			
 
				+      this.getNextPath(e.resourceId, 3); //1 为点击后获取线
			
 
				+    },
			
 
				+    //点击常用意见方法
			
 
				+    clickCommonly(e) {
			
 
				+      this.textarea = e.currentTarget.innerHTML;
			
 
				+    },
			
 
				+    //点击修改
			
 
				+    clickEdit() {
			
 
				+      this.editStatus = true;
			
 
				+    },
			
 
				+    //选择树的回调
			
 
				+    changeTree(e) {
			
 
				+      if (this.manyPeopleStatus == true) {
			
 
				+        this.backThree = e;
			
 
				+
			
 
				+        let arr = [];
			
 
				+        this.backThree.map((item) => {
			
 
				+          arr.push(item.loginNoStr);
			
 
				+        });
			
 
				+        this.nextDealManList = arr.toString();
			
 
				+      } else {
			
 
				+        if (e.length > 1) {
			
 
				+          this.$message.error("只能选择一个人");
			
 
				+          return;
			
 
				+        } else {
			
 
				+          this.backThree = e;
			
 
				+          if (this.CopyStatus === true) {
			
 
				+            this.getTreeLists(e[0].loginNoStr, 2);
			
 
				+          }
			
 
				+
			
 
				+          if (e[0]) {
			
 
				+            this.selectUser = e[0].loginNameStr;
			
 
				+          } else {
			
 
				+            this.selectUser = "暂无选择";
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    //获取字典表常用意见
			
 
				+    getMetirialType(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/cfgDataDict/queryList",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: {
			
 
				+          dictCodePks: "approval",
			
 
				+        },
			
 
				+      }).then((res) => {
			
 
				+        console.log(res);
			
 
				+        this.commonlyList = res.data;
			
 
				+      });
			
 
				+    },
			
 
				+    //添加字典表常用意见
			
 
				+    geaddctType(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/cfgDataDict/add",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: e,
			
 
				+      }).then((res) => {
			
 
				+        this.getMetirialType();
			
 
				+      });
			
 
				+    },
			
 
				+    //关闭修改
			
 
				+    editCloses() {
			
 
				+      this.editStatus = false;
			
 
				+    },
			
 
				+    //常用意见添加
			
 
				+    addStatus() {
			
 
				+      let newData = Date.parse(new Date());
			
 
				+      this.$prompt("请输入常用意见", "提示", {
			
 
				+        confirmButtonText: "确定",
			
 
				+        cancelButtonText: "取消",
			
 
				+      })
			
 
				+        .then(({ value }) => {
			
 
				+          let list = {
			
 
				+            dictCode: "approval",
			
 
				+            dataCode: newData,
			
 
				+            dataName: value,
			
 
				+            dictName: "审批意见",
			
 
				+          };
			
 
				+          this.geaddctType(list);
			
 
				+          this.$message({
			
 
				+            type: "success",
			
 
				+            message: "常用意见添加成功",
			
 
				+          });
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          this.$message({
			
 
				+            type: "info",
			
 
				+            message: "取消输入",
			
 
				+          });
			
 
				+        });
			
 
				+    },
			
 
				+    //常用意见删除
			
 
				+    deleStatus(e) {
			
 
				+      this.$confirm("此操作将删除此常用意见, 是否继续?", "提示", {
			
 
				+        confirmButtonText: "确定",
			
 
				+        cancelButtonText: "取消",
			
 
				+        type: "warning",
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          let list = {
			
 
				+            dataCode: e.dataCode,
			
 
				+            dictCode: "approval",
			
 
				+          };
			
 
				+          this.geDelectType(list);
			
 
				+          this.$message({
			
 
				+            type: "success",
			
 
				+            message: "删除成功!",
			
 
				+          });
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          this.$message({
			
 
				+            type: "info",
			
 
				+            message: "已取消删除",
			
 
				+          });
			
 
				+        });
			
 
				+    },
			
 
				+    //删除字典表常用意见
			
 
				+    geDelectType(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/cfgDataDicts/del",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: e,
			
 
				+      }).then((res) => {
			
 
				+        this.getMetirialType();
			
 
				+      });
			
 
				+    },
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang='scss' scoped>
			
 
				+.flex-header-text-tree {
			
 
				+  width: 50%;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+
			
 
				+.flex-icon {
			
 
				+  float: right;
			
 
				+  margin-right: 20px;
			
 
				+  color: #4277a1;
			
 
				+}
			
 
				+
			
 
				+.flex-handle {
			
 
				+  width: 100%;
			
 
				+  padding: 30px;
			
 
				+  display: flex;
			
 
				+
			
 
				+  .flex-right {
			
 
				+    width: 50%;
			
 
				+    border: 1px solid #e1e1e1;
			
 
				+    margin-left: 20px;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.flex-left {
			
 
				+  width: 50%;
			
 
				+  display: flex;
			
 
				+  flex-direction: column;
			
 
				+
			
 
				+  .flex-left-header {
			
 
				+    display: flex;
			
 
				+    justify-content: space-around;
			
 
				+
			
 
				+    .flex-path {
			
 
				+      height: 280px;
			
 
				+      border: 1px solid #e1e1e1;
			
 
				+      width: 68%;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.flex-common {
			
 
				+  padding: 10px 5%;
			
 
				+  font-size: 18px;
			
 
				+}
			
 
				+
			
 
				+.flex-left-header-text {
			
 
				+  height: 40px;
			
 
				+  line-height: 40px;
			
 
				+  color: black;
			
 
				+  padding-left: 10px;
			
 
				+  background-color: #cde4f6;
			
 
				+  font-size: 18px;
			
 
				+  font-weight: bold;
			
 
				+}
			
 
				+
			
 
				+.flex-path-list {
			
 
				+  overflow-y: scroll;
			
 
				+  overflow-x: hidden;
			
 
				+  height: 14rem;
			
 
				+}
			
 
				+
			
 
				+.flex-slide {
			
 
				+  overflow-y: scroll;
			
 
				+  overflow-x: hidden;
			
 
				+}
			
 
				+
			
 
				+.active {
			
 
				+  background-color: #f3faff;
			
 
				+}
			
 
				+
			
 
				+.flex-opinion {
			
 
				+  height: 280px;
			
 
				+  border: 1px solid #e1e1e1;
			
 
				+  width: 100%;
			
 
				+  margin-top: 20px;
			
 
				+}
			
 
				+
			
 
				+.flex-right-text {
			
 
				+  margin-right: 20px;
			
 
				+  width: 50%;
			
 
				+}
			
 
				+
			
 
				+.flex-commons {
			
 
				+  height: 280px;
			
 
				+  border: 1px solid #e1e1e1;
			
 
				+  width: 30%;
			
 
				+}
			
 
				+
			
 
				+.flex-footer-botton {
			
 
				+  display: flex;
			
 
				+  justify-content: space-evenly;
			
 
				+}
			
 
				+
			
 
				+.flex-button {
			
 
				+  margin-top: 10px;
			
 
				+  margin-bottom: 10px;
			
 
				+
			
 
				+  ::v-deep .el-button--primary {
			
 
				+    width: 222px;
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
--- a/src/http/index.js
+++ b/src/http/index.js
@@ -1,6 +1,19 @@
 
				 import Vue from 'vue';
			
 
				 import axios from 'axios';
			
 
				 import VueAxios from 'vue-axios';
			
 
				+import getConfig from '../config/dev.js'
			
 
				+let list = getConfig()
			
 
				+const status = (res) => {
			
 
				+    let regexp = /\d+\/api\//
			
 
				+    let r = regexp.test(res)
			
 
				+
			
 
				+    return r;
			
 
				+}
			
 
				+// const Rstatus = (res) => {
			
 
				+//     let regexps = /8000/
			
 
				+//     let qr = regexps.test(res)
			
 
				+//     return qr;
			
 
				+// }
			
 
				 // axios.defaults.headers.post['Content-Type'] = 'application/json';
			
 
				 axios.defaults.transformRequest = [function (data) {
			
 
				     if (data instanceof Object && !(data instanceof FormData)) {
			
@@ -8,44 +21,49 @@ axios.defaults.transformRequest = [function (data) {
 
				     }
			
 
				     return data;
			
 
				 }],
			
 
				-axios.defaults.baseURL = 'http://43.138.50.94:9600/';
			
 
				-    // 添加请求拦截器
			
 
				-    axios.interceptors.request.use(function (config) {
			
 
				-        // console.log(config);
			
 
				-        // if(config.type === 'office'){
			
 
				-        //     config.baseURL = 'http://192.168.2.124:7779'
			
 
				-        // }else{
			
 
				-        //     config.baseURL = 'http://43.138.50.94:9600/'
			
 
				-        // }
			
 
				-        if (config.url.startsWith("http")) {
			
 
				-            return config;
			
 
				-        }
			
 
				-        let localhost = ''
			
 
				-        // if (process.env.NODE_ENV == "production") {
			
 
				-        //     localhost = window.staticHost ? window.staticHost : "/spfm/"
			
 
				-        // }
			
 
				-        config.url = localhost + config.url
			
 
				-        console.log(config.url);
			
 
				-        let url = localhost + config.url
			
 
				-        if (url.indexOf('/sysmgr/sys/login/auth/captcha') == -1 && url.indexOf('/sysmgr/sys/login/auth/token') == -1) {
			
 
				-            let token = window.sessionStorage.agileauthtoken;
			
 
				-            if (token != undefined && token != 'undefined') {
			
 
				-                token = JSON.parse(token);
			
 
				+
			
 
				+    axios.defaults.baseURL = list.BASE_URL
			
 
				+// 添加请求拦截器
			
 
				+axios.interceptors.request.use(function (config) {
			
 
				+
			
 
				+    var n = status(config.url)
			
 
				+    // var s = Rstatus(config.url)
			
 
				+
			
 
				+    // console.log('[ axios.config ] >', config)
			
 
				+    // if (config.url.startsWith("http")) {
			
 
				+    //     return config;
			
 
				+    // }
			
 
				+    // let localhost = ''
			
 
				+    // if (process.env.NODE_ENV == "production") {
			
 
				+    //     localhost = window.staticHost ? window.staticHost : "/spfm/"
			
 
				+    // }
			
 
				+    // console.log('[ axios.localhost ] >', localhost)
			
 
				+    // config.url = localhost + config.url
			
 
				+    // let url = localhost + config.url
			
 
				+    // console.log('[ axios.url ] >', url)
			
 
				+
			
 
				+    if (list.BASE_URL.indexOf('/sysmgr/sys/login/auth/captcha') == -1 && list.BASE_URL.indexOf('/sysmgr/sys/login/auth/token') == -1) {
			
 
				+        let token = window.sessionStorage.agileauthtoken;
			
 
				+        if (token != undefined && token != 'undefined') {
			
 
				+            token = JSON.parse(token);
			
 
				+            if (n === false) {
			
 
				                 config.headers['agileauthtoken'] = token
			
 
				-            } else {
			
 
				-                global.$vm.$notify.error({
			
 
				-                    title: '提示',
			
 
				-                    message: '登录超时'
			
 
				-                })
			
 
				-                global.$vm.$router.push('/login')
			
 
				             }
			
 
				+
			
 
				+        } else {
			
 
				+            global.$vm.$notify.error({
			
 
				+                title: '提示',
			
 
				+                message: '登录超时'
			
 
				+            })
			
 
				+            global.$vm.$router.push('/login')
			
 
				         }
			
 
				-        // 在发送请求之前做些什么
			
 
				-        return config;
			
 
				-    }, function (error) {
			
 
				-        // 对请求错误做些什么
			
 
				-        return Promise.reject(error);
			
 
				-    });
			
 
				+    }
			
 
				+    // 在发送请求之前做些什么
			
 
				+    return config;
			
 
				+}, function (error) {
			
 
				+    // 对请求错误做些什么
			
 
				+    return Promise.reject(error);
			
 
				+});
			
 
				 
			
 
				 
			
 
				 // // 添加响应拦截器
			
--- a/src/pages/main/advertising/acceptance.vue
+++ b/src/pages/main/advertising/acceptance.vue
@@ -1,88 +1,40 @@
 
				 <template>
			
 
				     <div>
			
 
				         <div class="container">
			
 
				-            <el-form
			
 
				-                :model="infolist"
			
 
				-                ref="infolist"
			
 
				-                :rules="rules"
			
 
				-                class="container-box"
			
 
				-                label-width="80px"
			
 
				-            >
			
 
				+            <el-form :model="infolist" ref="infolist" :rules="rules" class="container-box" label-width="80px">
			
 
				                 <div>
			
 
				                     <div class="section2">
			
 
				-                        <a
			
 
				-                            href="#"
			
 
				-                            style="margin: 20px 0;margin-right: 20px;"
			
 
				-                            @click="dialogApplication(1)"
			
 
				-                            >验收清单</a
			
 
				-                        >
			
 
				-                        <a
			
 
				-                            href="#"
			
 
				-                            style="margin: 20px 0;margin-right: 20px;"
			
 
				-                            @click="dialogApplication(2)"
			
 
				-                            >发货回执</a
			
 
				-                        >
			
 
				+                        <a href="#" style="margin: 20px 0;margin-right: 20px;" @click="dialogApplication(1)">验收清单</a>
			
 
				+                        <aX href="#" style="margin: 20px 0;margin-right: 20px;" @click="dialogApplication(2)">发货回执</aX>
			
 
				                     </div>
			
 
				                     <div>
			
 
				                         <el-form-item class="info-line online">
			
 
				                             <span>验收说明</span>
			
 
				-                            <el-input
			
 
				-                                v-model="examDescription"
			
 
				-                                type="textarea"
			
 
				-                                :rows="4"
			
 
				-                            ></el-input>
			
 
				+                            <el-input v-model="examDescription" type="textarea" :rows="4"></el-input>
			
 
				                         </el-form-item>
			
 
				                     </div>
			
 
				 
			
 
				                     <div>
			
 
				                         <el-form-item class="info-line online">
			
 
				                             <span>验收证明</span>
			
 
				-                            <myUpload
			
 
				-                                @uploadBack="uploadBack"
			
 
				-                                :fileInfo="fileInfo"
			
 
				-                                :fileList="fileInfo.fileList"
			
 
				-                            >
			
 
				+                            <myUpload @uploadBack="uploadBack" :fileInfo="fileInfo" :fileList="fileInfo.fileList">
			
 
				                             </myUpload>
			
 
				                         </el-form-item>
			
 
				                     </div>
			
 
				                 </div>
			
 
				 
			
 
				                 <div class="t-footer t-footer1">
			
 
				-                    <el-button
			
 
				-                        type="primary"
			
 
				-                        style="width: 120px"
			
 
				-                        @click="dialogCli(1)"
			
 
				-                        >完 成</el-button
			
 
				-                    >
			
 
				-                    <el-button @click="dialogCli(2)" style="width: 120px"
			
 
				-                        >取 消</el-button
			
 
				-                    >
			
 
				+                    <el-button type="primary" style="width: 120px" @click="dialogCli(1)">完 成</el-button>
			
 
				+                    <el-button @click="dialogCli(2)" style="width: 120px">取 消</el-button>
			
 
				                 </div>
			
 
				             </el-form>
			
 
				         </div>
			
 
				-        <el-dialog
			
 
				-            title="验收清单"
			
 
				-            :visible.sync="ysListDialogStatus"
			
 
				-            width="50%"
			
 
				-            :destroy-on-close="true"
			
 
				-            :modal-append-to-body="false"
			
 
				-            :close-on-click-modal="false"
			
 
				-        >
			
 
				-            <el-form
			
 
				-                :model="infolist"
			
 
				-                ref="infolist"
			
 
				-                :rules="rules"
			
 
				-                style="height: 50vh;overflow-y: scroll; width:100%"
			
 
				-                :fullscreen="true"
			
 
				-            >
			
 
				+        <el-dialog title="验收清单" :visible.sync="ysListDialogStatus" width="50%" :destroy-on-close="true"
			
 
				+            :modal-append-to-body="false" :close-on-click-modal="false">
			
 
				+            <el-form :model="infolist" ref="infolist" :rules="rules" style="height: 50vh;overflow-y: scroll; width:100%"
			
 
				+                :fullscreen="true">
			
 
				                 <div class="info-line">
			
 
				-                    <el-table
			
 
				-                        :data="tableData"
			
 
				-                        style="width: 100%;"
			
 
				-                        border
			
 
				-                        size="large"
			
 
				-                        
			
 
				-                    >
			
 
				+                    <el-table :data="tableData" style="width: 100%;" border size="large">
			
 
				                         <el-table-column prop="id" label="物料ID">
			
 
				                         </el-table-column>
			
 
				                         <el-table-column prop="regionName" label="地市公司">
			
@@ -115,50 +67,34 @@
 
				                         </el-table-column>
			
 
				                         <el-table-column prop="price" label="单价">
			
 
				                         </el-table-column>
			
 
				-                        <el-table-column
			
 
				-                            prop="quantity"
			
 
				-                            label="数量"
			
 
				-                            width="100"
			
 
				-                        >
			
 
				+                        <el-table-column prop="quantity" label="数量" width="100">
			
 
				                         </el-table-column>
			
 
				                         <el-table-column prop="priority" label="优先级">
			
 
				                         </el-table-column>
			
 
				                         <el-table-column label="结算金额" width="140px" prop="settlementAmount">
			
 
				                             <template slot-scope="scope">
			
 
				-                            <div>
			
 
				-                                {{
			
 
				-                                    scope.row.quantity *
			
 
				+                                <div>
			
 
				+                                    {{
			
 
				+                                        scope.row.quantity *
			
 
				                                         scope.row.price *
			
 
				                                         scope.row.coefficient
			
 
				-                                }}
			
 
				-                            </div>
			
 
				-                        </template>
			
 
				+                                    }}
			
 
				+                                </div>
			
 
				+                            </template>
			
 
				                         </el-table-column>
			
 
				                     </el-table>
			
 
				                 </div>
			
 
				             </el-form>
			
 
				 
			
 
				             <div class="t-footer">
			
 
				-                <el-button type="primary" @click="downloadExcel">下载</el-button
			
 
				-                >
			
 
				-                
			
 
				+                <el-button type="primary" @click="downloadExcel">下载</el-button>
			
 
				+
			
 
				                 <el-button @click="ysListDialogStatus = false">取 消</el-button>
			
 
				             </div>
			
 
				         </el-dialog>
			
 
				-        <el-dialog
			
 
				-            title="发货回执"
			
 
				-            :visible.sync="feedbackListDialogStatus"
			
 
				-            width="30%"
			
 
				-            :destroy-on-close="true"
			
 
				-            :modal-append-to-body="false"
			
 
				-            :close-on-click-modal="false"
			
 
				-        >
			
 
				-            <el-form
			
 
				-                :model="infolist"
			
 
				-                ref="infolist"
			
 
				-                :rules="rules"
			
 
				-                style="height: 20vh;"
			
 
				-            >
			
 
				+        <el-dialog title="发货回执" :visible.sync="feedbackListDialogStatus" width="30%" :destroy-on-close="true"
			
 
				+            :modal-append-to-body="false" :close-on-click-modal="false">
			
 
				+            <el-form :model="infolist" ref="infolist" :rules="rules" style="height: 20vh;">
			
 
				                 <div class="info-line">
			
 
				                     <!-- <a :href="feedbackList">{{ feedbackList }}</a> -->
			
 
				                     {{ feedbackList }}
			
@@ -169,17 +105,11 @@
 
				                 <!-- <el-button type="primary" @click="dialogSubmit()"
			
 
				                     >确 定</el-button
			
 
				                 > -->
			
 
				-                <el-button @click="feedbackListDialogStatus = false"
			
 
				-                    >取 消</el-button
			
 
				-                >
			
 
				+                <el-button @click="feedbackListDialogStatus = false">取 消</el-button>
			
 
				             </div>
			
 
				         </el-dialog>
			
 
				-        <myMessage
			
 
				-            :messTit="messTit"
			
 
				-            @closeMessage="closeMessage(1)"
			
 
				-            :centerDialogVisible="centerDialogVisible"
			
 
				-            v-if="centerDialogVisible"
			
 
				-        ></myMessage>
			
 
				+        <myMessage :messTit="messTit" @closeMessage="closeMessage(1)" :centerDialogVisible="centerDialogVisible"
			
 
				+            v-if="centerDialogVisible"></myMessage>
			
 
				     </div>
			
 
				 </template>
			
 
				 <script>
			
@@ -255,11 +185,11 @@ export default {
 
				                     headers: {
			
 
				                         "Content-Type": "application/json"
			
 
				                     },
			
 
				-                    data: { 
			
 
				+                    data: {
			
 
				                         woId: this.params.woId,
			
 
				                         cityWoId: this.params.cityWoId,
			
 
				                         countryWoId: this.params.countyWoId
			
 
				-                        }
			
 
				+                    }
			
 
				                 }).then(res => {
			
 
				                     this.tableData = res.data;
			
 
				                     // this.feedbackList = res.data.receipt;
			
@@ -297,8 +227,8 @@ export default {
 
				                 // this.examList.woId = this.params.woId;
			
 
				 
			
 
				                 this.examList.woId = this.params.woId,
			
 
				-                this.examList.woCityId = this.params.cityWoId,
			
 
				-                this.examList.id = this.params.countyWoId
			
 
				+                    this.examList.woCityId = this.params.cityWoId,
			
 
				+                    this.examList.id = this.params.countyWoId
			
 
				                 this.examList.attList = JSON.stringify(fileList);
			
 
				                 this.examList.remark = this.examDescription;
			
 
				                 this.submitInfo(
			
@@ -310,7 +240,7 @@ export default {
 
				                 // this.infolist = {};
			
 
				                 // this.attList = [];
			
 
				                 // this.examDescription = "";
			
 
				-                this.$router.push({ path: '/materialApplication'});
			
 
				+                this.$router.push({ path: '/materialApplication' });
			
 
				                 return;
			
 
				             }
			
 
				         },
			
@@ -354,40 +284,40 @@ export default {
 
				                 }
			
 
				             });
			
 
				         },
			
 
				-        downloadExcel(){
			
 
				+        downloadExcel() {
			
 
				             this.$http({
			
 
				-                    url: "/market/cadvBusiMetirialWo/export",
			
 
				-                    method: "post",
			
 
				-                    headers: {
			
 
				-                        "Content-Type": "application/json"
			
 
				-                    },
			
 
				-                    responseType: "blob",
			
 
				-                    data: { id: this.params.woId }
			
 
				-                }).then(res => {
			
 
				-                    if (window.navigator && window.navigator.msSaveOrOpenBlob) {
			
 
				-                        let blob = new Blob([res.data], {
			
 
				-                            type: "application/vnd.ms-excel"
			
 
				-                        });
			
 
				-                        window.navigator.msSaveOrOpenBlob(
			
 
				-                            blob,
			
 
				-                            // this.wo.bizName + ".xlsx"
			
 
				-                            "验收清单" + ".xlsx"
			
 
				-                        );
			
 
				-                    } else {
			
 
				-                        /* 火狐谷歌的文件下载方式 */
			
 
				-                        var blob = new Blob([res.data]);
			
 
				-                        var downloadElement = document.createElement("a");
			
 
				-                        var href = window.URL.createObjectURL(blob);
			
 
				-                        downloadElement.href = href;
			
 
				-                        downloadElement.download = "验收清单" + ".xlsx";
			
 
				-                        document.body.appendChild(downloadElement);
			
 
				-                        downloadElement.click();
			
 
				-                        document.body.removeChild(downloadElement);
			
 
				-                        window.URL.revokeObjectURL(href);
			
 
				-
			
 
				-                        this.ysListDialogStatus = false
			
 
				-                    }
			
 
				-                });
			
 
				+                url: "/market/cadvBusiMetirialWo/export",
			
 
				+                method: "post",
			
 
				+                headers: {
			
 
				+                    "Content-Type": "application/json"
			
 
				+                },
			
 
				+                responseType: "blob",
			
 
				+                data: { id: this.params.woId }
			
 
				+            }).then(res => {
			
 
				+                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
			
 
				+                    let blob = new Blob([res.data], {
			
 
				+                        type: "application/vnd.ms-excel"
			
 
				+                    });
			
 
				+                    window.navigator.msSaveOrOpenBlob(
			
 
				+                        blob,
			
 
				+                        // this.wo.bizName + ".xlsx"
			
 
				+                        "验收清单" + ".xlsx"
			
 
				+                    );
			
 
				+                } else {
			
 
				+                    /* 火狐谷歌的文件下载方式 */
			
 
				+                    var blob = new Blob([res.data]);
			
 
				+                    var downloadElement = document.createElement("a");
			
 
				+                    var href = window.URL.createObjectURL(blob);
			
 
				+                    downloadElement.href = href;
			
 
				+                    downloadElement.download = "验收清单" + ".xlsx";
			
 
				+                    document.body.appendChild(downloadElement);
			
 
				+                    downloadElement.click();
			
 
				+                    document.body.removeChild(downloadElement);
			
 
				+                    window.URL.revokeObjectURL(href);
			
 
				+
			
 
				+                    this.ysListDialogStatus = false
			
 
				+                }
			
 
				+            });
			
 
				         },
			
 
				         closedia() {
			
 
				             this.infolist = {};
			
@@ -429,7 +359,7 @@ export default {
 
				             // this.getList(this.params);
			
 
				         }
			
 
				     },
			
 
				-    created() {}
			
 
				+    created() { }
			
 
				 };
			
 
				 </script>
			
 
				 <style scoped lang="scss">
			
@@ -438,6 +368,7 @@ a {
 
				     color: #169bd5;
			
 
				     cursor: pointer;
			
 
				 }
			
 
				+
			
 
				 .img-box {
			
 
				     height: calc(100vh - 240px);
			
 
				     overflow-y: scroll;
			
@@ -535,10 +466,12 @@ a {
 
				     padding-right: 20px;
			
 
				     margin-top: 20px;
			
 
				 }
			
 
				+
			
 
				 .t-footer1 {
			
 
				     padding-right: 0;
			
 
				     margin-top: 80px;
			
 
				 }
			
 
				+
			
 
				 .onetab {
			
 
				     padding: 20px;
			
 
				     height: calc(100% - 180px);
			
@@ -621,13 +554,16 @@ a {
 
				     display: flex;
			
 
				     align-items: center;
			
 
				     margin-bottom: 20px;
			
 
				+
			
 
				     button {
			
 
				         margin-bottom: 0 !important;
			
 
				     }
			
 
				+
			
 
				     h3 {
			
 
				         margin-right: 40px;
			
 
				     }
			
 
				 }
			
 
				+
			
 
				 ::v-deep.online .el-form-item__content {
			
 
				     width: 100%;
			
 
				     margin-left: 0 !important;
			
@@ -637,9 +573,11 @@ a {
 
				     width: 100% !important;
			
 
				     padding: 0 !important;
			
 
				 }
			
 
				+
			
 
				 .el-row {
			
 
				     margin: 0 !important;
			
 
				 }
			
 
				+
			
 
				 .tree {
			
 
				     width: calc(50% - 60px) !important;
			
 
				     display: inline-block;
			
@@ -680,9 +618,11 @@ a {
 
				         margin-bottom: 5px;
			
 
				     }
			
 
				 }
			
 
				+
			
 
				 ::v-deep.container .el-upload-dragger {
			
 
				     height: 120px !important;
			
 
				 }
			
 
				+
			
 
				 .upload-demo {
			
 
				     width: 60% !important;
			
 
				 }
			
--- a/src/pages/main/advertising/businessHall.vue
+++ b/src/pages/main/advertising/businessHall.vue
@@ -5,14 +5,20 @@
 
				             <div class="search" style="justify-content: flex-start;">
			
 
				                 <el-button class="btn-check" size="medium" type="primary" @click="outlist">导出
			
 
				                 </el-button>
			
 
				-                <el-button class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
			
 
				+                <el-button v-if="
			
 
				+                    userInfo.countyName != null || userInfo.cityName != null
			
 
				+                " class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
			
 
				                 </el-button>
			
 
				-                <myUpload style="display:inline-block;" :fileInfo="fileInfot" :fileList="fileInfot.fileList"
			
 
				+                <myUpload v-if="
			
 
				+                    userInfo.countyName != null || userInfo.cityName != null
			
 
				+                " style="display:inline-block;" :fileInfo="fileInfot" :fileList="fileInfot.fileList"
			
 
				                     @uploadBack='uploadBack'></myUpload>
			
 
				-                <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="
			
 
				+                <!-- <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="
			
 
				                     userInfo.countyName != null || userInfo.cityName != null
			
 
				                 ">添加
			
 
				-                </el-button>
			
 
				+                </el-button> -->
			
 
				+                <!-- <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" >添加
			
 
				+                </el-button> -->
			
 
				             </div>
			
 
				             <div class="search">
			
 
				                 <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
			
@@ -22,7 +28,7 @@
 
				                 </el-button>
			
 
				             </div>
			
 
				             <div class="tabbox">
			
 
				-                <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
			
 
				+                <el-table height="calc(100% - 100px)" class="com-table" ref="multipleTable" :data="tableData"
			
 
				                     tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
			
 
				                     <el-table-column prop="regionName" label="公司">
			
 
				                     </el-table-column>
			
@@ -160,8 +166,8 @@
 
				                         </el-form-item>
			
 
				                         <el-form-item prop="sceneName">
			
 
				                             <span>使用场景</span>
			
 
				-                            <el-select @change="accountcho" :popper-append-to-body="false" v-model="infolist.sceneName"
			
 
				-                                placeholder="使用场景" :disabled="disableStatus">
			
 
				+                            <el-select @change="accountcho" v-model="infolist.sceneName" placeholder="使用场景"
			
 
				+                                :disabled="disableStatus">
			
 
				                                 <el-option v-for="item in sceneOpt" :key="item.dataCode" :label="item.dataName"
			
 
				                                     :value="item.dataName">
			
 
				                                 </el-option>
			
@@ -188,15 +194,16 @@
 
				                             <span>物料编码</span>
			
 
				                             <el-input v-model="infolist.metirialCode" disabled></el-input>
			
 
				                         </el-form-item>
			
 
				-                        <el-form-item prop="metirialName">
			
 
				+                        <el-form-item>
			
 
				                             <span>物料名称</span>
			
 
				-                            <el-select :disabled="disableStatus" :popper-append-to-body="false"
			
 
				-                                v-model="infolist.metirialName" placeholder="物料名称" @change="materialNameChange">
			
 
				-                                <el-option v-for="(item, index) in materialNameopt" :key="index" :label="item.metirialName"
			
 
				-                                    :value="item.metirialName">
			
 
				+                            <el-select :disabled="disableStatus" v-model="infolist.metirialName" placeholder="物料名称"
			
 
				+                                @change="materialNameChange">
			
 
				+                                <el-option v-for="(item, index) in metirialOpt" :key="index" :label="item.metirialNames"
			
 
				+                                    :value="item.metirialNames">
			
 
				                                 </el-option>
			
 
				                             </el-select>
			
 
				                         </el-form-item>
			
 
				+
			
 
				                         <el-form-item>
			
 
				                             <span>物料单位</span>
			
 
				                             <el-input v-model="infolist.unit" disabled></el-input>
			
@@ -210,12 +217,14 @@
 
				                             infolist.unit == '延长米'
			
 
				                         ">
			
 
				                             <span>长(米)</span>
			
 
				-                            <el-input type="number" v-model="infolist.length" placeholder="长" :disabled="disableStatus">
			
 
				+                            <el-input oninput="value = parseInt(value) || ''" v-model="infolist.length" placeholder="长"
			
 
				+                                :disabled="disableStatus">
			
 
				                             </el-input>
			
 
				                         </el-form-item>
			
 
				                         <el-form-item prop="width" v-if="infolist.unit == '平方米'">
			
 
				                             <span>宽(米)</span>
			
 
				-                            <el-input type="number" v-model="infolist.width" placeholder="宽" :disabled="disableStatus">
			
 
				+                            <el-input oninput="value = parseInt(value) ||''" v-model="infolist.width" placeholder="宽"
			
 
				+                                :disabled="disableStatus">
			
 
				                             </el-input>
			
 
				                         </el-form-item>
			
 
				                         <el-form-item prop="direction">
			
@@ -228,35 +237,27 @@
 
				                             <span>系数</span>
			
 
				                             <el-input :value="coefficient" placeholder="系数" disabled></el-input>
			
 
				                         </el-form-item>
			
 
				-                        <el-form-item>
			
 
				+                        <!-- <el-form-item>
			
 
				                             <span>单价</span>
			
 
				                             <el-input :value="coefficient" placeholder="单价" disabled></el-input>
			
 
				-                        </el-form-item>
			
 
				+                        </el-form-item> -->
			
 
				                         <el-form-item>
			
 
				                             <span>优先级-仅灯箱画面填报</span>
			
 
				                             <el-input v-model="infolist.priority" placeholder="优先级-仅灯箱画面填报"
			
 
				                                 @keyup.native="numberVertify"></el-input>
			
 
				                         </el-form-item>
			
 
				-                        <!-- <el-form-item prop="quantity">
			
 
				-                                <span>数量</span>
			
 
				-                                <el-input
			
 
				-                                    v-model="infolist.quantity"
			
 
				-                                    placeholder="数量"
			
 
				-                                    :disabled="quantityDisabled"
			
 
				-                                ></el-input>
			
 
				-                            </el-form-item> -->
			
 
				-                        <el-form-item>
			
 
				+                        <el-form-item  style="display: none;">
			
 
				+                            <span>数量</span>
			
 
				+                            <el-input v-model="infolist.quantity" placeholder="数量" :disabled="quantityDisabled"></el-input>
			
 
				+                        </el-form-item>
			
 
				+                        <el-form-item style="display: none;">
			
 
				                             <span>物料单价(不含税)</span>
			
 
				                             <el-input v-model="infolist.price" disabled></el-input>
			
 
				                         </el-form-item>
			
 
				-                        <!-- <el-form-item prop="settlementAmount">
			
 
				-                                <span>结算金额</span>
			
 
				-                                <el-input
			
 
				-                                    v-model="infolist.settlementAmount"
			
 
				-                                    placeholder="结算金额"
			
 
				-                                    disabled
			
 
				-                                ></el-input>
			
 
				-                            </el-form-item> -->
			
 
				+                        <el-form-item prop="settlementAmount" style="display: none;">
			
 
				+                            <span>结算金额</span>
			
 
				+                            <el-input v-model="infolist.settlementAmount" placeholder="结算金额" disabled></el-input>
			
 
				+                        </el-form-item>
			
 
				                     </div>
			
 
				                 </el-form>
			
 
				 
			
@@ -270,13 +271,14 @@
 
				 
			
 
				         <myMessage :messTit="messTit" @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
			
 
				             v-if="centerDialogVisible"></myMessage>
			
 
				-</fullscreen>
			
 
				+    </fullscreen>
			
 
				 </template>
			
 
				 <script>
			
 
				 import mySearch from "../../../components/search.vue";
			
 
				 import myMessage from "../../../components/myMessage.vue";
			
 
				 import toolList from "../../../components/toolList";
			
 
				 import myUpload from "../../../components/upload.vue";
			
 
				+import { log } from "console";
			
 
				 
			
 
				 export default {
			
 
				     components: {
			
@@ -688,10 +690,12 @@ export default {
 
				         };
			
 
				     },
			
 
				     computed: {
			
 
				+
			
 
				         coefficient: function () {
			
 
				             if (
			
 
				                 this.infolist.width == undefined &&
			
 
				                 this.infolist.length == undefined
			
 
				+
			
 
				             ) {
			
 
				                 this.infolist.coefficient = "1";
			
 
				                 this.settlementAmount();
			
@@ -726,6 +730,15 @@ export default {
 
				             // return this.infolist.settlementAmount
			
 
				         },
			
 
				         accountcho(v) {
			
 
				+            this.metirialOpt = []
			
 
				+            // console.log('出发bug');
			
 
				+            // console.log(this.infolist);
			
 
				+            if (this.infolist.metirialName) {
			
 
				+                this.infolist.metirialName = "";
			
 
				+            }
			
 
				+
			
 
				+            // console.log(this.infolist);
			
 
				+
			
 
				             //   this.account = v;
			
 
				             //   let x = v;
			
 
				             //   if (v == "营业厅-VI改造" || v == "营业厅-常规物料") {
			
@@ -744,6 +757,7 @@ export default {
 
				                 },
			
 
				                 data: { sceneName: v }
			
 
				             }).then(res => {
			
 
				+                console.log(res);
			
 
				                 this.metirialOpt = res.data.data;
			
 
				             });
			
 
				         },
			
@@ -761,11 +775,13 @@ export default {
 
				         //   }
			
 
				         // },
			
 
				         materialNameChange(v) {
			
 
				+
			
 
				             this.metirialInfoSingle = this.materialNameopt.filter(item => {
			
 
				                 return item.metirialName == v;
			
 
				             });
			
 
				+            console.log(this.metirialInfoSingle);
			
 
				             this.infolist.metirialCode = this.metirialInfoSingle[0].metirialCode;
			
 
				-            this.infolist.size = this.metirialInfoSingle[0].size;
			
 
				+            // this.infolist.size = this.metirialInfoSingle[0].size;
			
 
				             this.infolist.unit = this.metirialInfoSingle[0].unit;
			
 
				 
			
 
				             if (this.metirialInfoSingle[0].coefficient == "1") {
			
@@ -776,6 +792,9 @@ export default {
 
				                 this.$set(this.infolist, "quantity", "");
			
 
				             }
			
 
				             this.infolist.price = this.metirialInfoSingle[0].price;
			
 
				+            // this.infolist.metirialName = this.metirialInfoSingle[0].metirialNames;
			
 
				+            // console.log(this.metirialInfoSingle[0].metirialName);
			
 
				+            // console.log(this.infolist);
			
 
				         },
			
 
				         // advancecheck() {
			
 
				         //   this.num = this.infolist.price * this.infolist.conversion;
			
@@ -787,14 +806,14 @@ export default {
 
				         },
			
 
				         //搜索数据
			
 
				         searchInfo(v) {
			
 
				+            console.log(v);
			
 
				             this.params = {};
			
 
				             v[0] ? (this.params.regionName = v[0]) : "";
			
 
				             v[1] ? (this.params.countyName = v[1]) : "";
			
 
				             v[2] ? (this.params.channelName = v[2]) : "";
			
 
				             v[3] ? (this.params.sceneName = v[3]) : "";
			
 
				             //新增物料类别和物料名称模糊查询
			
 
				-            v[4] ? (this.params.metirialType = v[4]) : "";
			
 
				-            v[5] ? (this.params.metirialName = v[5]) : "";
			
 
				+            v[4] ? (this.params.metirialName = v[4]) : "";
			
 
				             this.getList(this.params, this.pageSize);
			
 
				         },
			
 
				         //获取列表
			
@@ -873,8 +892,11 @@ export default {
 
				                     parentCompId: this.infolist.regionCode
			
 
				                 }
			
 
				             }).then(res => {
			
 
				+                console.log(v);
			
 
				+                console.log('[ 这是什么 ] >', res)
			
 
				                 if (v !== 3) {
			
 
				                     this.countyOpt = res.data;
			
 
				+                    console.log(this.countyOpt);
			
 
				                 }
			
 
				 
			
 
				             });
			
@@ -1021,6 +1043,7 @@ export default {
 
				                                 parentCompId: this.regionOpt[i].compId
			
 
				                             }
			
 
				                         }).then(res => {
			
 
				+                            console.log('[ res ] >', res)
			
 
				                             if (this.userInfo.cityName != null && this.userInfo.countyName == null) {
			
 
				                                 this.countyOpt = res.data;
			
 
				                             } else if (this.userInfo.cityName != null && this.userInfo.countyName != null) {
			
@@ -1056,6 +1079,7 @@ export default {
 
				                     parentCompId: "0"
			
 
				                 }
			
 
				             }).then(res => {
			
 
				+                console.log('[ 0 ] >', res)
			
 
				                 // this.regionOpt = res.data;
			
 
				 
			
 
				                 if (
			
--- a/src/pages/main/advertising/contractCap.vue
+++ b/src/pages/main/advertising/contractCap.vue
@@ -138,7 +138,7 @@
 
				         </el-dialog>
			
 
				         <myMessage :messTit="messTit" @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
			
 
				             v-if="centerDialogVisible"></myMessage>
			
 
				-</fullscreen>
			
 
				+    </fullscreen>
			
 
				 </template>
			
 
				 <script>
			
 
				 import mySearch from "../../../components/search.vue";
			
@@ -247,14 +247,14 @@ export default {
 
				     },
			
 
				     computed: {
			
 
				 
			
 
				-        //     secbuySchedule: function() {
			
 
				-        //         this.infolist.secbuySchedule = (this.infolist.secbuyPreAccount - this.infolist.secbuyLastAccount) / this.infolist.secbuyPreAccount;
			
 
				-        //         this.infolist.secbuySchedule = ((parseFloat(this.infolist.secbuySchedule)*100).toFixed(2));
			
 
				-        //         if(isNaN(this.infolist.secbuySchedule)){
			
 
				-        //             this.infolist.secbuySchedule = ''
			
 
				-        //         }
			
 
				-        //         return this.infolist.secbuySchedule;
			
 
				-        //     }
			
 
				+        secbuySchedule: function () {
			
 
				+            this.infolist.secbuySchedule = (this.infolist.secbuyPreAccount - this.infolist.secbuyLastAccount) / this.infolist.secbuyPreAccount;
			
 
				+            this.infolist.secbuySchedule = ((parseFloat(this.infolist.secbuySchedule) * 100).toFixed(2));
			
 
				+            if (isNaN(this.infolist.secbuySchedule)) {
			
 
				+                this.infolist.secbuySchedule = ''
			
 
				+            }
			
 
				+            return this.infolist.secbuySchedule;
			
 
				+        }
			
 
				     },
			
 
				     methods: {
			
 
				         closedia() {
			
@@ -297,7 +297,7 @@ export default {
 
				                 method: "post",
			
 
				                 headers: {
			
 
				                     "Content-Type": "application/json",
			
 
				-                    page: '{"pageNo":"' + n + '","pageSize":"10"}'
			
 
				+                    page: '{"pageNo":"' + n + '","pageSize":"100"}'
			
 
				                 },
			
 
				                 data: v
			
 
				             }).then(res => {
			
@@ -391,13 +391,13 @@ export default {
 
				             }
			
 
				         },
			
 
				         submitInfo(u) {
			
 
				-            // callback(new Error('不能为空'))
			
 
				-            // if (
			
 
				-            //     this.infolist.secbuyPreAccount <=
			
 
				-            //     this.infolist.secbuyLastAccount
			
 
				-            // ) {
			
 
				-            //     new Error("二采预算总额应大于二采剩余预算");
			
 
				-            // }
			
 
				+            if (
			
 
				+                parseInt(this.infolist.secbuyPreAccount) <=
			
 
				+                parseInt(this.infolist.costAccount)
			
 
				+            ) {
			
 
				+                this.$message.error('二采预算总额应大于二采剩余预算')
			
 
				+                return;
			
 
				+            }
			
 
				 
			
 
				             let _this = this;
			
 
				             this.$refs.infolist.validate(valid => {
			
@@ -547,7 +547,7 @@ export default {
 
				     watch: {
			
 
				         "infolist.secbuyPreAccount": {
			
 
				             handler(newVal) {
			
 
				-                  this.infolist.secbuyLastAccount =  newVal -  this.infolist.costAccount
			
 
				+                this.infolist.secbuyLastAccount = newVal - this.infolist.costAccount
			
 
				             },
			
 
				         },
			
 
				     }
			
--- a/src/pages/main/advertising/index.vue
+++ b/src/pages/main/advertising/index.vue
@@ -19,10 +19,14 @@
 
				 				</div> -->
			
 
				 			<h2 class="font-ui" style="margin-top: 20px;">宣传物料管理</h2>
			
 
				 			<div class="adv-type">
			
 
				-				<div class="wfour" @click="jumpinfo('/materialApplication', '宣传物料申请及审批')">
			
 
				-					<span><i class="el-icon-folder-opened"></i></span>
			
 
				-					<span>宣传物料申请及审批</span>
			
 
				-				</div>
			
 
				+				 <div class="wfour" @click="jumpinfo('/materialApplication','宣传物料申请及审批-省代地市下单')">
			
 
				+			        <span><i class="el-icon-folder-opened"></i></span>
			
 
				+			        <span>宣传物料申请及审批-省代地市下单</span>
			
 
				+			    </div>
			
 
				+				 <div class="wfour" @click="jumpinfo('/materialApplicationds','宣传物料申请及审批-地市下单')">
			
 
				+			        <span><i class="el-icon-folder-opened"></i></span>
			
 
				+			        <span>宣传物料申请及审批-地市下单</span>
			
 
				+			    </div>
			
 
				 				<!-- <div class="wfour" @click="jumpinfo('/materialApplicationc','市级物料申请')">
			
 
				 				        <span><i class="el-icon-folder-opened"></i></span>
			
 
				 				        <span>市级物料申请</span>
			
@@ -42,9 +46,9 @@
 
				 				        <span><i class="el-icon-folder-opened"></i></span>
			
 
				 				        <span>一采物料类型建档</span>
			
 
				 				    </div> -->
			
 
				-				<div class="wfive" @click="jumpinfo('/materiel', '二采物料类型建档')" v-if="province">
			
 
				+				<div class="wfive" @click="jumpinfo('/materiel', '宣传物料及印刷品类型建档')" v-if="province">
			
 
				 					<span><i class="el-icon-folder-opened"></i></span>
			
 
				-					<span>二采物料类型建档</span>
			
 
				+					<span>宣传物料及印刷品类型建档</span>
			
 
				 				</div>
			
 
				 				<div class="wfive" @click="jumpinfo('/contractCap', '预算及合同上限')">
			
 
				 					<span><i class="el-icon-folder-opened"></i></span>
			
--- a/src/pages/main/advertising/materialAppMessage.vue
+++ b/src/pages/main/advertising/materialAppMessage.vue
@@ -36,7 +36,7 @@
 
				 
			
 
				                     <el-table-column prop="quantity" label="数量">
			
 
				                     </el-table-column>
			
 
				-                    <el-table-column prop="settlementAmount" label="结算金额(元,不含税)">
			
 
				+                    <el-table-column prop="selectedGysPrice" label="结算金额(元,不含税)">
			
 
				                     </el-table-column>
			
 
				                 </el-table>
			
 
				                 <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
			
--- a/src/pages/main/advertising/materialAppNum.vue
+++ b/src/pages/main/advertising/materialAppNum.vue
@@ -11,8 +11,14 @@
 
				                 <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
			
 
				                     tooltip-effect="dark" size="small" border style="width: 100%" @selection-change="selectionChange"
			
 
				                     v-loading="loading">
			
 
				+         
			
 
				+
			
 
				                     <el-table-column type="selection" width="55">
			
 
				                     </el-table-column>
			
 
				+                    <el-table-column prop="region" label="城市">
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column prop="district" label="区县">
			
 
				+                    </el-table-column>
			
 
				                     <el-table-column prop="needName" label="业务名称">
			
 
				                     </el-table-column>
			
 
				                     <el-table-column prop="state" label="需求编号">
			
--- a/src/pages/main/advertising/materialApplication.vue
+++ b/src/pages/main/advertising/materialApplication.vue
--- a/src/pages/main/advertising/materialApplicationExa.vue
+++ b/src/pages/main/advertising/materialApplicationExa.vue
--- a/src/pages/main/advertising/materialApplicationadd.vue
+++ b/src/pages/main/advertising/materialApplicationadd.vue
--- a/src/pages/main/advertising/materialApplicationc.vue
+++ b/src/pages/main/advertising/materialApplicationc.vue
@@ -207,7 +207,7 @@
 
				             searchInfo(v) {
			
 
				                 this.params = {};
			
 
				                 v[0] ? this.params.metirialName = v[0] : '';
			
 
				-                v[0] ? this.params.regionName = v[0] : '';
			
 
				+                v[1] ? this.params.regionName = v[1] : '';
			
 
				                 this.getList(this.params, this.pageSize);
			
 
				             },
			
 
				             //获取列表
			
--- a/src/pages/main/advertising/materialApplicationds.vue
+++ b/src/pages/main/advertising/materialApplicationds.vue
--- a/src/pages/main/advertising/materialApplistatic.vue
+++ b/src/pages/main/advertising/materialApplistatic.vue
@@ -9,15 +9,15 @@
 
				             <div class="tabbox">
			
 
				                 <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
			
 
				                     tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
			
 
				-                    <el-table-column prop="countyName" label="地市">
			
 
				+                    <el-table-column prop="regionName" label="地市">
			
 
				                     </el-table-column>
			
 
				-                    <el-table-column prop="metirialType" label="物料类型">
			
 
				+                    <el-table-column prop="metirialName" label="物料名称">
			
 
				                     </el-table-column>
			
 
				                     <el-table-column prop="price" label="单价">
			
 
				                     </el-table-column>
			
 
				                     <el-table-column prop="size" label="规格">
			
 
				                     </el-table-column>
			
 
				-                    <el-table-column prop="priority" label="数量">
			
 
				+                    <el-table-column prop="coefficient" label="系数">
			
 
				                     </el-table-column>
			
 
				 					<el-table-column prop="settlementAmount" label="小计">
			
 
				                     </el-table-column>
			
@@ -32,7 +32,8 @@
 
				 
			
 
				 </template>
			
 
				 <script>
			
 
				-    import mySearch from "../../../components/search.vue";
			
 
				+    import { log } from "console";
			
 
				+import mySearch from "../../../components/search.vue";
			
 
				     import toolList from '../../../components/toolList'
			
 
				 
			
 
				     export default {
			
@@ -53,7 +54,7 @@
 
				                     },
			
 
				 					{
			
 
				                         type: 'input',
			
 
				-                        tit: '物料类型',
			
 
				+                        tit: '物料名称',
			
 
				                         value: '',
			
 
				                         width: '48%',
			
 
				                     },
			
@@ -79,11 +80,13 @@
 
				             //搜索数据
			
 
				             searchInfo(v) {
			
 
				                 this.params = {};
			
 
				-                v[0] ? this.params.metirialName = v[0] : '';
			
 
				+                v[0] ? this.params.regionName = v[0] : '';
			
 
				+                v[1] ? this.params.metirialName = v[1] : ''
			
 
				                 this.getList(this.params, this.pageSize);
			
 
				             },
			
 
				             //获取列表
			
 
				             getList(v, n) {
			
 
				+
			
 
				                 console.log(v);
			
 
				                 this.pageSize = n;
			
 
				                 this.loading = true;
			
@@ -99,6 +102,9 @@
 
				                 }).then((res) => {
			
 
				                     console.log(res);
			
 
				                     this.tableData = res.data.data;
			
 
				+                    this.tableData.map((item) =>{
			
 
				+                           item.settlementAmount = item.coefficient*item.price;
			
 
				+                    })
			
 
				                     this.allNum = res.data.retMsg;
			
 
				                     this.total = res.data.totalRecord;
			
 
				                     this.loading = false;
			
@@ -120,6 +126,8 @@
 
				             },
			
 
				         },
			
 
				         mounted() {
			
 
				+            console.log(this.$route);
			
 
				+                console.log(this.$router);
			
 
				             this.getList({}, 1);
			
 
				         },
			
 
				         created() {
			
--- a/src/pages/main/advertising/materiel.vue
+++ b/src/pages/main/advertising/materiel.vue
@@ -7,16 +7,21 @@
 
				                     :searchList="searchList"
			
 
				                     @searchInfo="searchInfo"
			
 
				                 ></mySearch>
			
 
				-                <el-button class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
			
 
				+
			
 
				+                <el-button 
			
 
				+                class="btn-check" 
			
 
				+                size="medium" type="primary" 
			
 
				+                @click="exportTempletelist" v-if="userInfo.duty <= 9" >下载导入模板
			
 
				                 </el-button>
			
 
				                 <el-button
			
 
				                     class="btn-check"
			
 
				                     size="medium"
			
 
				                     type="primary"
			
 
				-                    @click="dialogCheck(3)" v-if="userInfo.loginNo=='jiangshuai'"
			
 
				+                    @click="dialogCheck(3)" v-if="userInfo.loginNoStr == 'jiangshuai'"
			
 
				                     >添加
			
 
				                 </el-button>
			
 
				-                <myUpload style="display:inline-block;" :fileInfo="fileInfot"
			
 
				+                
			
 
				+                <myUpload style="display:inline-block;" :fileInfo="fileInfot" v-if="userInfo.loginNoStr == 'jiangshuai'"
			
 
				                           :fileList="fileInfot.fileList" @uploadBack='uploadBack'></myUpload>
			
 
				             </div>
			
 
				             <div class="tabbox">
			
@@ -78,13 +83,15 @@
 
				                             <el-button
			
 
				                                 size="mini"
			
 
				                                 type="primary"
			
 
				-                                @click="dialogCheck(2, scope.row)" v-if="userInfo.loginNo=='jiangshuai'"
			
 
				+                                @click="dialogCheck(2, scope.row)" v-if="userInfo.loginNoStr == 'jiangshuai'"
			
 
				                                 >修改</el-button
			
 
				                             >
			
 
				+                            
			
 
				+                             <!-- v-if="userInfo.loginNo=='jiangshuai'" -->
			
 
				                             <el-button
			
 
				                                 size="mini"
			
 
				                                 type="danger"
			
 
				-                                @click="delLine(scope.row)" v-if="userInfo.loginNo=='jiangshuai'"
			
 
				+                                @click="delLine(scope.row)" v-if="userInfo.loginNoStr == 'jiangshuai'"
			
 
				                                 >删除</el-button
			
 
				                             >
			
 
				                         </template>
			
@@ -607,13 +614,13 @@ export default {
 
				                 fileList: [],
			
 
				                 woNo: "",
			
 
				             },
			
 
				-            tooltit: "二采物料类型建档",
			
 
				+            tooltit: "宣传物料及印刷品类型建档",
			
 
				             fullscreen: false,
			
 
				             total: 0,
			
 
				             pageSize: 1,
			
 
				             tableData: [],
			
 
				             dialogStatus: false,
			
 
				-            disableStatus: false,
			
 
				+            disableStatus: false,//是否禁用弹窗
			
 
				             titname: "",
			
 
				             infolist: {},
			
 
				             userInfo: {},
			
@@ -728,7 +735,7 @@ export default {
 
				             suppOpt: [],
			
 
				             usePlanceArr: [],
			
 
				             metirialTypeopt: [],
			
 
				-            metirialCodeDisableStatus: false,
			
 
				+            metirialCodeDisableStatus: false,//物料编码是否禁用
			
 
				             // scene:[]
			
 
				         };
			
 
				     },
			
@@ -815,6 +822,13 @@ export default {
 
				         uploadBack(v) {
			
 
				             let that = this;
			
 
				             console.log(v);
			
 
				+            console.log(v.data.desc);
			
 
				+            if(v.data.desc != "导入成功"){
			
 
				+                let timer = setTimeout(() => {
			
 
				+                   this.$message.error("物料编码已存在，请更改物料编码"); 
			
 
				+                },800)
			
 
				+                
			
 
				+            }
			
 
				             if(v.data.result==0){
			
 
				                 that.getList({}, 1);
			
 
				                 that.getUser();
			
--- a/src/pages/main/advertising/supplier.vue
+++ b/src/pages/main/advertising/supplier.vue
@@ -31,8 +31,8 @@
 
				 					</el-table-column>
			
 
				 					<!-- <el-table-column prop="buyTypeName" label="采购类型">
			
 
				 					</el-table-column> -->
			
 
				-					<el-table-column prop="contractEndTime" label="截止时间">
			
 
				-					</el-table-column>
			
 
				+					<!-- <el-table-column prop="contractEndTime" label="截止时间">
			
 
				+					</el-table-column> -->
			
 
				                     <el-table-column label="操作" width="160px" align="center">
			
 
				                         <template slot-scope="scope">
			
 
				                             <el-button size="mini" type="primary" @click="dialogCheck(1,scope.row)">查看</el-button>
			
@@ -59,7 +59,7 @@
 
				                         </el-form-item>
			
 
				 						<el-form-item>
			
 
				                             <span>供应商编码</span>
			
 
				-                            <el-input v-model="infolist.code" placeholder="供应商编码" disabled></el-input>
			
 
				+                            <el-input v-model="infolist.code" placeholder="供应商编码" :disabled="disableStatus"></el-input>
			
 
				                         </el-form-item>
			
 
				 						<el-form-item prop="cost">
			
 
				 						    <span>框架总额</span>
			
@@ -67,7 +67,7 @@
 
				 						</el-form-item>
			
 
				                         <el-form-item prop="lastCost">
			
 
				 						    <span>剩余总额</span>
			
 
				-						    <el-input v-model="infolist.lastCost" placeholder="剩余总额" :disabled="disableStatus"></el-input>
			
 
				+						    <el-input v-model="infolist.lastCost" placeholder="剩余总额" :disabled="disablesStatus"></el-input>
			
 
				 						</el-form-item>
			
 
				                         <el-form-item prop="schedule">
			
 
				 						    <span>总额进度</span>
			
@@ -81,7 +81,7 @@
 
				 						    <span>合同编号</span>
			
 
				 						    <el-input v-model="infolist.frameContractNo" placeholder="合同编号" :disabled="disableStatus"></el-input>
			
 
				 						</el-form-item>
			
 
				-						<el-form-item prop="contractSignTime">
			
 
				+						<!-- <el-form-item prop="contractSignTime">
			
 
				 						    <span>签订时间</span>
			
 
				 						    <el-date-picker v-model="infolist.contractSignTime" type="datetime" placeholder="签订时间" :disabled="disableStatus">
			
 
				 						    </el-date-picker>
			
@@ -90,15 +90,15 @@
 
				 						    <span>截止时间</span>
			
 
				 						    <el-date-picker v-model="infolist.contractEndTime" type="datetime" placeholder="截止时间" :disabled="disableStatus">
			
 
				 						    </el-date-picker>
			
 
				-						</el-form-item>
			
 
				-                        <el-form-item prop="contractEndTime">
			
 
				+						</el-form-item> -->
			
 
				+                        <el-form-item >
			
 
				 						    <span>预占总额</span>
			
 
				-						    <el-input v-model="infolist.preCost"  placeholder="预占总额" :disabled="disableStatus">
			
 
				+						    <el-input v-model="infolist.preCost"  placeholder="预占总额" :disabled="disablesStatus">
			
 
				 						    </el-input>
			
 
				 						</el-form-item>
			
 
				-                        <el-form-item prop="contractEndTime">
			
 
				+                        <el-form-item >
			
 
				 						    <span>下单总额</span>
			
 
				-						    <el-input v-model="infolist.billCost"  placeholder="下单总额" :disabled="disableStatus">
			
 
				+						    <el-input v-model="infolist.billCost"  placeholder="下单总额" :disabled="disablesStatus">
			
 
				 						    </el-input>
			
 
				 						</el-form-item>
			
 
				                
			
@@ -204,6 +204,7 @@
 
				             //     }
			
 
				             // }
			
 
				             return {
			
 
				+                disablesStatus:false,
			
 
				                 rules: {
			
 
				                     name: [{
			
 
				                         required: true,
			
@@ -360,15 +361,18 @@
 
				                 if (v === 1) {
			
 
				                     this.titname = '查看';
			
 
				                     this.disableStatus = true;
			
 
				+                    this.disablesStatus = true;
			
 
				                     return
			
 
				                 } else if (v === 2) {
			
 
				                     this.titname = '修改';
			
 
				                     this.disableStatus = false;
			
 
				+                    this.disablesStatus = true;
			
 
				                     this.supplierNameOrigin = this.infolist.name
			
 
				 
			
 
				                 } else if (v === 3) {
			
 
				                     this.titname = '添加';
			
 
				                     this.disableStatus = false;
			
 
				+                    this.disablesStatus = false;
			
 
				                 }
			
 
				                 this.infolist.opNo = this.userInfo.loginNo;
			
 
				                 this.infolist.opName = this.userInfo.loginName;
			
--- a/src/pages/main/bfsj/bfsjList.vue
+++ b/src/pages/main/bfsj/bfsjList.vue
--- a/src/pages/main/closeFill/advanceDeposit.vue
+++ b/src/pages/main/closeFill/advanceDeposit.vue
--- a/src/pages/main/comWin/prosess.vue
+++ b/src/pages/main/comWin/prosess.vue
@@ -183,6 +183,7 @@ export default {
 
				       };
			
 
				       this.common.httpPost(obj, success);
			
 
				       function success(data) {
			
 
				+        console.log(data);
			
 
				         self.list = data.data.rows;
			
 
				         self.total = data.data.total;
			
 
				       }
			
--- a/src/pages/main/documentCollection/documentCollectionApprovalExcel.vue
+++ b/src/pages/main/documentCollection/documentCollectionApprovalExcel.vue
@@ -5,7 +5,7 @@
 
				                 name="excelIframe" id="excelIframe"></iframe>
			
 
				         </fullscreen>
			
 
				         <el-dialog :title="'督办'" :visible.sync="dubanStatus" width="50%" :destroy-on-close="true"
			
 
				-            :modal-append-to-body="false" :close-on-click-modal="false">
			
 
				+            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closeduban">
			
 
				             <el-form ref="form" :model="testModel" :rules="rules">
			
 
				                 <div>
			
 
				                     <div style="padding: 10px 20%;">
			
@@ -34,14 +34,14 @@
 
				                         </el-form-item>
			
 
				                     </div>
			
 
				                     <div slot="footer" style="text-align: right;padding-bottom: 20px;padding-top: 20px">
			
 
				-                        <el-button @click="dubanStatus = false">取 消</el-button>
			
 
				+                        <el-button @click="closeduban">取 消</el-button>
			
 
				                         <el-button type="primary" @click="processAuthduban()">确 定</el-button>
			
 
				                     </div>
			
 
				                 </div>
			
 
				             </el-form>
			
 
				         </el-dialog>
			
 
				         <el-dialog :title="'权限设置'" :visible.sync="authSettingStatus" width="100%" :show-close="true"
			
 
				-            :modal-append-to-body="false">
			
 
				+            :modal-append-to-body="false" :before-close="closequanxian">
			
 
				             <el-form :model="testModel" ref="addInfoList">
			
 
				                 <div>
			
 
				                     <div class="info-line">
			
@@ -59,6 +59,7 @@
 
				                         <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="2"
			
 
				                             style="margin: 10px">特殊权限</el-radio>
			
 
				                         <div id="limit">
			
 
				+                            <div style="margin: 10px;display: inline-block;color: red;">注：分配的行的权限不能重复</div>
			
 
				                             <div v-for="(item, index) in limitList">
			
 
				                                 <div style="margin-right: 10px;margin-left: 10px;display: inline-block;">负责人：</div>
			
 
				                                 <el-button v-if="type == '1' || type == '2'" type="primary"
			
@@ -113,10 +114,10 @@
 
				         <el-dialog title="选择填报人" :visible.sync="noLimitDialog" width="100%" :destroy-on-close="true"
			
 
				             :modal-append-to-body="false" :close-on-click-modal="false">
			
 
				             <div style="max-height:500px ;">
			
 
				-                <deptTreeUserNew v-if="authType == '1'" @treeCheck="treeCheckonly" :defaultList="defaultList"
			
 
				-                    :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew>
			
 
				-                <deptTreeUserNew v-if="authType == '2'" @treeCheck="treeCheckonly" :defaultList="defaultList"
			
 
				-                    :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew>
			
 
				+                <!-- <deptTreeUserNew v-if="authType == '1'" @treeCheck="treeCheckonly" :defaultList="defaultList"
			
 
				+                    :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew> -->
			
 
				+                <deptTreeUserNew @treeCheck="treeCheckonly" :defaultList="defaultList" :type="depttype"
			
 
				+                    :closeList="closeList" oneORmore="2" treeListType="1"></deptTreeUserNew>
			
 
				 
			
 
				                 <div slot="footer" style="text-align: right;padding-bottom: 20px">
			
 
				                     <el-button @click="noLimitDialog = false">取 消</el-button>
			
@@ -125,7 +126,7 @@
 
				             </div>
			
 
				         </el-dialog>
			
 
				         <el-dialog :title="'提交'" :visible.sync="authDialog" width="50%" :destroy-on-close="true"
			
 
				-            :modal-append-to-body="false" :close-on-click-modal="false">
			
 
				+            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closetijiao">
			
 
				             <el-form :model="testModel" ref="addInfoList">
			
 
				                 <div>
			
 
				                     <div class="info-line">
			
@@ -150,7 +151,7 @@
 
				                     </div>
			
 
				                     <br />
			
 
				                     <div slot="footer" style="text-align: right;padding-bottom: 20px;padding-top: 20px">
			
 
				-                        <el-button @click="authDialog = false">取 消</el-button>
			
 
				+                        <el-button @click="closetijiao()">取 消</el-button>
			
 
				                         <el-button type="primary" @click="processAudit()" :disabled="BtnDisabled">确 定</el-button>
			
 
				                     </div>
			
 
				                 </div>
			
@@ -266,6 +267,16 @@ export default {
 
				         }
			
 
				     },
			
 
				     methods: {
			
 
				+        closequanxian() {
			
 
				+            this.authSettingStatus = false
			
 
				+            this.limitList = [{}]
			
 
				+            this.noLimitUserName = ''
			
 
				+            this.authType = '2'
			
 
				+        },
			
 
				+        closeduban() {
			
 
				+            this.dubanStatus = false
			
 
				+            this.testModel = {}
			
 
				+        },
			
 
				         // 填报日期
			
 
				         handleWrite(value) {
			
 
				             if (value) {//
			
@@ -307,6 +318,12 @@ export default {
 
				             //     };
			
 
				             // }
			
 
				         },
			
 
				+        closetijiao() {
			
 
				+            this.authDialog = false;
			
 
				+            this.treeListType = '';
			
 
				+            this.auditForm.receiverName = '';
			
 
				+            this.auditForm.authType = ''
			
 
				+        },
			
 
				         auditUserAdd() {
			
 
				             this.checkexapeople = true;
			
 
				         },
			
@@ -479,7 +496,7 @@ export default {
 
				                         message: '处理成功',
			
 
				                         type: 'success'
			
 
				                     });
			
 
				-                    
			
 
				+
			
 
				                     //没找到关闭标签页之前的临时处理措施
			
 
				                     // const newUrl = '#' + this.$route.path + '?type=5&id=' + this.getUrlKey("id");
			
 
				                     // console.log(newUrl);
			
@@ -787,9 +804,9 @@ export default {
 
				                 }
			
 
				             } else if (this.authType == '2') {
			
 
				                 this.limitList.map((o) => {
			
 
				-                    console.log(o.userIds);
			
 
				+                    // console.log(o.userIds);
			
 
				                     console.log(o.editStart);
			
 
				-                    console.log(o.editStartCol);
			
 
				+                    console.log(o.editEnd);
			
 
				                     let str = o.editStartCol + o.editEndCol
			
 
				                     if (o.userIds == null || o.userIds[0].key == null) {
			
 
				                         this.$message({
			
@@ -863,6 +880,34 @@ export default {
 
				                         return;
			
 
				                     }
			
 
				                 })
			
 
				+                // let arr = []
			
 
				+                // this.limitList.map((o) => {
			
 
				+                //     for (var i = o.editStart; i <= o.editEnd; i++) {
			
 
				+                //         arr.push(i);
			
 
				+                //     }
			
 
				+                // })
			
 
				+                // console.log(arr);
			
 
				+
			
 
				+                // let arr2 = arr.sort();
			
 
				+                // for (let i = 0; i < arr2.length; i++) {
			
 
				+
			
 
				+                //     if (typeof (arr2[i]) === 'number') {
			
 
				+                //         arr2[i] = arr2[i].toString()
			
 
				+                //     }
			
 
				+                //     if (typeof (arr2[i + 1]) === 'number') {
			
 
				+                //         arr2[i + 1] = arr2[i + 1].toString()
			
 
				+                //     }
			
 
				+                //     console.log(typeof (arr2[i]));
			
 
				+                //     console.log((arr2[i]));
			
 
				+                //     if (arr2[i] === arr2[i + 1]) {
			
 
				+                //         this.$message({
			
 
				+                //             message: '分配的行的权限不能重复',
			
 
				+                //             type: 'error'
			
 
				+                //         });
			
 
				+                //         this.success = false;
			
 
				+                //         return;
			
 
				+                //     }
			
 
				+                // }
			
 
				                 console.log(this.limitList);
			
 
				             }
			
 
				             if (this.success) {
			
@@ -1180,6 +1225,7 @@ export default {
 
				 span {
			
 
				     width: 80px;
			
 
				 }
			
 
				+
			
 
				 ::v-deep .el-button--text {
			
 
				     display: none !important;
			
 
				 }
			
--- a/src/pages/main/documentCollection/newTree.vue
+++ b/src/pages/main/documentCollection/newTree.vue
@@ -97,7 +97,7 @@ export default {
 
				       }
			
 
				       if (v.o !== this.treeId) {
			
 
				         this.$http({
			
 
				-          url: "/sysmgr/sysuserinfo/queryListByName",
			
 
				+          url: "/sysmgr/sysuserinfo/querySysUserListByNameOrderByDuty",
			
 
				           method: "post",
			
 
				           headers: {
			
 
				             "Content-Type": "application/json",
			
--- a/src/pages/main/leader/demand/demandHome.vue
+++ b/src/pages/main/leader/demand/demandHome.vue
@@ -139,6 +139,7 @@
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				+
			
 
				 import Workflow from "../../../../components/workflow";
			
 
				 import WorkflowEntrance from "../../../../components/workflowEntrance";
			
 
				 import FormTable from "../components/formTable.vue";
			
@@ -1238,6 +1239,8 @@ export default {
 
				       this.dialogTitle = "新建";
			
 
				       this.lables.data = [];
			
 
				       this.disabled = false;
			
 
				+      this.saveStatus = false;
			
 
				+      this.startStatus = false
			
 
				       await this.getDepartmentName();
			
 
				     },
			
 
				     //获取用户部门名称
			
--- a/src/pages/main/leader/leaderHome.vue
+++ b/src/pages/main/leader/leaderHome.vue
@@ -53,6 +53,7 @@
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				+import {getConfig} from '../../../../config/config.js'
			
 
				 import ProcessingInstruction from "./leaderHprocess.vue";
			
 
				 import hometask from "./leaderhomeTask.vue";
			
 
				 import numberhits from "./numberHits.vue";
			
@@ -208,6 +209,7 @@ export default {
 
				     },
			
 
				   },
			
 
				   mounted() {
			
 
				+    this.getConfig()
			
 
				     this.getpeo();
			
 
				     this.getNotice();
			
 
				     this.getTags();
			
--- a/src/pages/main/leader/leaderhomeTask.vue
+++ b/src/pages/main/leader/leaderhomeTask.vue
@@ -278,6 +278,7 @@
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				+import { getConfig } from '../../../config/dev.js'
			
 
				 export default {
			
 
				   components: {},
			
 
				   // props:["tableDatayj","niticList"],
			
@@ -658,6 +659,9 @@ export default {
 
				     },
			
 
				   },
			
 
				   mounted() {
			
 
				+    let list = getConfig()
			
 
				+    console.log(list);
			
 
				+    
			
 
				     this.daiban({}, 1);
			
 
				     this.getListyj({}, 1);
			
 
				     this.getOPlist({}, 1);
			
--- a/src/pages/main/performance/mould.vue
+++ b/src/pages/main/performance/mould.vue
@@ -3,7 +3,6 @@
 
				     <div class="simple-container">
			
 
				       <simple-form
			
 
				         :form="table_form"
			
 
				-        :handle="table_handle"
			
 
				         @search="handleSearch"
			
 
				         @add="handleVisible('add')"
			
 
				         class="department-form"
			
@@ -169,12 +168,12 @@ export default {
 
				         },
			
 
				       ],
			
 
				       table_list: [],
			
 
				-      table_handle: [
			
 
				-        {
			
 
				-          label: "新增模板",
			
 
				-          props: "add",
			
 
				-        },
			
 
				-      ],
			
 
				+      // table_handle: [
			
 
				+      //   // {
			
 
				+      //   //   label: "新增模板",
			
 
				+      //   //   props: "add",
			
 
				+      //   // },
			
 
				+      // ],
			
 
				       table_handle_row: [
			
 
				         {
			
 
				           label: "下发",
			
--- a/src/pages/main/postage/formTable.vue
+++ b/src/pages/main/postage/formTable.vue
@@ -0,0 +1,614 @@
 
				+<template>
			
 
				+  <div>
			
 
				+    <div>
			
 
				+      <div class="flex-title">资费配置工单</div>
			
 
				+      <el-form ref="form" :model="form" :rules="rule" :disabled="disabled">
			
 
				+        <el-row>
			
 
				+          <el-col :span="12">
			
 
				+
			
 
				+            <el-form-item label="文件标题:" prop="needName">
			
 
				+              <el-input v-model="form.needName"></el-input>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+          <el-col :span="6">
			
 
				+            <el-form-item label="申请部门:" prop="applydept">
			
 
				+              <el-input v-model="form.applydept" :disabled="true"></el-input>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+          <el-col :span="6">
			
 
				+
			
 
				+            <el-form-item label="申请科室:" prop="applydepartment">
			
 
				+              <el-input v-model="form.applydepartment" :disabled="true"></el-input>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+
			
 
				+        </el-row>
			
 
				+
			
 
				+
			
 
				+        <el-row>
			
 
				+          <el-col :span="6">
			
 
				+            <el-form-item label="拟稿时间:">
			
 
				+              <el-date-picker type="date" :disabled="true" placeholder="选择日期" v-model="form.proposerTime"
			
 
				+                :picker-options="pickerOptions" value-format="yyyy-MM-dd" style="width: 100%"></el-date-picker>
			
 
				+            </el-form-item>
			
 
				+
			
 
				+          </el-col>
			
 
				+          <el-col :span="6">
			
 
				+
			
 
				+            <el-form-item label="拟稿人:" prop="proposer">
			
 
				+              <el-input v-model="form.proposer" :disabled="true"></el-input>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+          <el-col :span="6">
			
 
				+
			
 
				+            <el-form-item label="编号:" prop="fileno">
			
 
				+              <el-input v-model="form.fileno" :disabled="true"></el-input>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+
			
 
				+
			
 
				+          <el-col :span="6">
			
 
				+            <el-form-item label="联系电话" prop="phone">
			
 
				+              <el-input v-model="form.phone" :disabled="true"></el-input>
			
 
				+            </el-form-item>
			
 
				+
			
 
				+          </el-col>
			
 
				+
			
 
				+
			
 
				+        </el-row>
			
 
				+
			
 
				+        <el-row>
			
 
				+          <el-col :span="6">
			
 
				+
			
 
				+            <el-form-item label="操作类型:" prop="operationType">
			
 
				+              <el-select v-model="form.operationType" placeholder="请选择">
			
 
				+                <el-option label="新资费配置" value="新资费配置"></el-option>
			
 
				+                <el-option label="资费修改" value="资费修改"></el-option>
			
 
				+              </el-select>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+          <el-col :span="6">
			
 
				+
			
 
				+            <el-form-item label="业务线条:" prop="businessLine">
			
 
				+              <el-select v-model="form.businessLine" placeholder="请选择">
			
 
				+                <el-option label="市场线条" value="是"></el-option>
			
 
				+                <el-option label="政企线条" value="否"></el-option>
			
 
				+              </el-select>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+          <el-col :span="6">
			
 
				+
			
 
				+            <el-form-item label="宽带配置选项:" prop="isSevenProject">
			
 
				+              <el-select v-model="form.broadband" placeholder="请选择">
			
 
				+                <el-option label="是" value="是"></el-option>
			
 
				+                <el-option label="无" value="否"></el-option>
			
 
				+              </el-select>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+          <el-col :span="6">
			
 
				+            <el-form-item label="资费价格:" prop="proposer">
			
 
				+              <el-input v-model="form.tariffPrice"></el-input>
			
 
				+            </el-form-item>
			
 
				+          </el-col>
			
 
				+        </el-row>
			
 
				+
			
 
				+
			
 
				+        <el-row>
			
 
				+          <!-- 新资费配置显示表单 -->
			
 
				+          <div v-if="newPostAge">
			
 
				+            <el-row>
			
 
				+              <el-col :span="6">
			
 
				+
			
 
				+                <el-form-item label="需求时限:">
			
 
				+                  <el-date-picker type="date" :disabled="timeStatus" placeholder="选择日期" v-model="form.demandTime"
			
 
				+                    :picker-options="pickerOptions" value-format="yyyy-MM-dd" style="width: 100%"></el-date-picker>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+              <el-col :span="6">
			
 
				+                <el-form-item label="资费名称:" prop="proposer">
			
 
				+                  <el-input v-model="form.tariffName"></el-input>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+            </el-row>
			
 
				+
			
 
				+            <el-row>
			
 
				+              <el-col :span="24">
			
 
				+                <el-form-item label="资费描述" prop="tariffDesc" label-width="110px">
			
 
				+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.tariffDesc"></el-input>
			
 
				+                </el-form-item>
			
 
				+
			
 
				+              </el-col>
			
 
				+            </el-row>
			
 
				+
			
 
				+            <el-row :gutter="20">
			
 
				+              <el-col :span="4">
			
 
				+                <el-form-item label="费用收取方式:" prop="costPayWay" label-width="150px">
			
 
				+                  <el-select v-model="form.costPayWay" placeholder="请选择">
			
 
				+                    <el-option label="费用一次性收取" value="费用一次性收取"></el-option>
			
 
				+                    <el-option label="按日分摊" value="按日分摊"></el-option>
			
 
				+                    <el-option label="区分上下半月" value="区分上下半月"></el-option>
			
 
				+                    <el-option label="不区分上下半月" value="不区分上下半月"></el-option>
			
 
				+                    <el-option label="月租日计" value="月租日计"></el-option>
			
 
				+                    <el-option label="其他" value="其他"></el-option>
			
 
				+                  </el-select>
			
 
				+                </el-form-item>
			
 
				+
			
 
				+              </el-col>
			
 
				+              <el-col :span="20">
			
 
				+                <el-form-item prop="costPayWayInput">
			
 
				+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.costPayWayInput"></el-input>
			
 
				+                </el-form-item>
			
 
				+
			
 
				+              </el-col>
			
 
				+
			
 
				+            </el-row>
			
 
				+            <el-row>
			
 
				+              <el-col :span="24">
			
 
				+
			
 
				+                <el-form-item label="办理场景" prop="handleWay" label-width="110px">
			
 
				+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.handleWay"></el-input>
			
 
				+                </el-form-item>
			
 
				+              </el-col>>
			
 
				+
			
 
				+            </el-row>
			
 
				+            <el-row>
			
 
				+              <el-col :span="10">
			
 
				+
			
 
				+                <el-form-item label="提醒短信:" prop="remindMmsg">
			
 
				+                  <el-checkbox-group v-model="remindMmsg">
			
 
				+                    <el-checkbox label="无" name="remindMmsg" :disabled="checkBoxNone"></el-checkbox>
			
 
				+                    <el-checkbox label="到期提醒" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
			
 
				+                    <el-checkbox label="办理成功" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
			
 
				+                    <el-checkbox label="退订成功" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
			
 
				+                    <el-checkbox label="限速提醒" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
			
 
				+                    <el-checkbox label="余额提醒" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
			
 
				+                    <el-checkbox label="用尽失效" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
			
 
				+                  </el-checkbox-group>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+              <el-col :span="14">
			
 
				+                <el-form-item prop="remindMsgInput" label-width="110px">
			
 
				+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.remindMsgInput"></el-input>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+            </el-row>
			
 
				+            <el-row :gutter="20">
			
 
				+              <el-col :span="6">
			
 
				+                <el-form-item label="酬金要求:" prop="gratuity">
			
 
				+                  <el-select v-model="form.gratuity" placeholder="请选择">
			
 
				+                    <el-option label="无" value="无"></el-option>
			
 
				+                    <el-option label="有" value="有"></el-option>
			
 
				+                  </el-select>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+              <el-col :span="18">
			
 
				+                <el-form-item prop="gratuityInput" style="width:100%">
			
 
				+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.gratuityInput"></el-input>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+            </el-row>
			
 
				+            <el-row :gutter="20">
			
 
				+              <el-col :span="6">
			
 
				+                <el-form-item label="报表要求:" prop="reportForm">
			
 
				+                  <el-select v-model="form.reportForm" placeholder="请选择">
			
 
				+                    <el-option label="无" value="无"></el-option>
			
 
				+                    <el-option label="有" value="有"></el-option>
			
 
				+                  </el-select>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+              <el-col :span="18">
			
 
				+                <el-form-item prop="reportFormInput">
			
 
				+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.reportFormInput"></el-input>
			
 
				+                </el-form-item>
			
 
				+              </el-col>
			
 
				+
			
 
				+            </el-row>
			
 
				+            <el-row>
			
 
				+              <el-form-item label="工单协议条款内容调整" prop="clause" label-width="140px">
			
 
				+                <el-input type="textarea" maxlength="500" show-word-limit v-model="form.clause"></el-input>
			
 
				+              </el-form-item>
			
 
				+            </el-row>
			
 
				+            <el-row>
			
 
				+              <el-form-item label="备注/内容" prop="needBackdrop">
			
 
				+                <el-input type="textarea" maxlength="500" show-word-limit v-model="form.content"></el-input>
			
 
				+              </el-form-item>
			
 
				+            </el-row>
			
 
				+          </div>
			
 
				+        </el-row>
			
 
				+        <el-row>
			
 
				+
			
 
				+          <div v-if="postEdit">
			
 
				+            <el-row>
			
 
				+              <el-form-item label="内容" prop="count" label-width="110px">
			
 
				+                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.count"></el-input>
			
 
				+              </el-form-item>
			
 
				+            </el-row>
			
 
				+
			
 
				+
			
 
				+            <el-row>
			
 
				+              <el-form-item label="资费工单协议条款内容调整" prop="clause" label-width="170px">
			
 
				+                <el-input type="textarea" maxlength="500" show-word-limit v-model="form.clause"></el-input>
			
 
				+              </el-form-item>
			
 
				+            </el-row>
			
 
				+          </div>
			
 
				+        </el-row>
			
 
				+        <el-row>
			
 
				+          <el-form-item label="附件：" prop="mkFileShareAttachList" label-width="120px">
			
 
				+            <my-upload ref="upload" @uploadBack="uploadBack" @delloadBack="delloadBack" @clickDownload="download"
			
 
				+              :fileInfo="fileInfo" :fileList="list.mkFileShareAttachList"></my-upload>
			
 
				+          </el-form-item>
			
 
				+        </el-row>
			
 
				+
			
 
				+
			
 
				+      </el-form>
			
 
				+    </div>
			
 
				+    <div></div>
			
 
				+    <div></div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import myUpload from "../../../components/workflowUpload";
			
 
				+
			
 
				+export default {
			
 
				+  components: {
			
 
				+    myUpload,
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      costPayWayInputRule: {
			
 
				+        costPayWayInput: [
			
 
				+          { required: true, message: "请填写", trigger: "blur" },
			
 
				+        ],
			
 
				+      },
			
 
				+      gratuityInputRule: {
			
 
				+        gratuityInput: [
			
 
				+          { required: true, message: "请填写", trigger: "blur" },
			
 
				+        ],
			
 
				+      },
			
 
				+      reportFormInputRule: {
			
 
				+        reportFormInput: [
			
 
				+          { required: true, message: "请填写", trigger: "blur" },
			
 
				+        ],
			
 
				+      },
			
 
				+      checkBoxNone: false,
			
 
				+      checkBoxStatus: false,
			
 
				+      fileInfo: {
			
 
				+        type: "bt1n",
			
 
				+        typename: "上传文件",
			
 
				+        limit: 5,
			
 
				+        url: "/market/waf/upload",
			
 
				+        fileList: [],
			
 
				+      },
			
 
				+      postEdit: false,
			
 
				+      newPostAge: false,
			
 
				+      pickerOptions: {
			
 
				+        disabledDate(time) {
			
 
				+          return time.getTime() < Date.now() - 8.64e7;
			
 
				+        },
			
 
				+      },
			
 
				+      oneList: [],
			
 
				+      childrenList: [],
			
 
				+      twoList: [],
			
 
				+      twoStatus: false,
			
 
				+      threeList: [],
			
 
				+      threeStatus: false,
			
 
				+      fourList: [],
			
 
				+      fourStatus: false,
			
 
				+      fiveList: [],
			
 
				+      fiveStatus: false,
			
 
				+      isSensitiveDataStatus: false,
			
 
				+      timeStatus: false,
			
 
				+      functionStatus: false,
			
 
				+      reportStatus: false,
			
 
				+      Length: "",
			
 
				+      form: {},
			
 
				+      rules: {},
			
 
				+      rule: {
			
 
				+        needName: [
			
 
				+          { required: true, message: "请输入需求名称", trigger: "blur" },
			
 
				+        ],
			
 
				+        operationType: [
			
 
				+          { required: true, message: "请选择操作类型", trigger: "change" },
			
 
				+        ]
			
 
				+      },
			
 
				+      copyRule: {},
			
 
				+      isList: [],
			
 
				+      remindMmsg: []
			
 
				+    };
			
 
				+  },
			
 
				+  props: {
			
 
				+    list: {
			
 
				+      type: Object,
			
 
				+      default: () => { },
			
 
				+    },
			
 
				+    disabled: {
			
 
				+      type: Boolean,
			
 
				+      default: () => { },
			
 
				+    },
			
 
				+  },
			
 
				+  mounted() {
			
 
				+    if (this.list.mkFileShareAttachList) {
			
 
				+      this.$refs.upload.attList = this.list.mkFileShareAttachList;
			
 
				+      this.list.mkFileShareAttachList.map((item) => {
			
 
				+        item.name = item.fileName;
			
 
				+      });
			
 
				+    }
			
 
				+  },
			
 
				+  created() {
			
 
				+    this.form = this.list;
			
 
				+    this.copyRule = this.rule;
			
 
				+    console.log(this.form);
			
 
				+  },
			
 
				+
			
 
				+  methods: {
			
 
				+    uploadBack(v) {
			
 
				+      if (this.form.mkFileShareAttachList) {
			
 
				+        this.form.mkFileShareAttachList = [];
			
 
				+        this.form.mkFileShareAttachList = v;
			
 
				+      } else {
			
 
				+        let mkFileShareAttachList = [];
			
 
				+        mkFileShareAttachList = v;
			
 
				+        this.$set(this.form, "mkFileShareAttachList", mkFileShareAttachList);
			
 
				+      }
			
 
				+    },
			
 
				+    delloadBack(v) {
			
 
				+      this.form.mkFileShareAttachList = v;
			
 
				+      this.$http({
			
 
				+        url: "/market/zfpzProcess/update",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: this.form,
			
 
				+      }).then((res) => {
			
 
				+        console.log(res);
			
 
				+        // if (res.data.result === 0) {
			
 
				+        //   this.$message.success("工作流更新成功");
			
 
				+        // }
			
 
				+      });
			
 
				+    },
			
 
				+    download() {
			
 
				+      console.log(123);
			
 
				+      if (this.form.mkFileShareAttachList.length > 1) {
			
 
				+        this.$http({
			
 
				+          url: "/market/waf/downAllFile",
			
 
				+          method: "post",
			
 
				+          headers: {
			
 
				+            "Content-Type": "application/json",
			
 
				+          },
			
 
				+          responseType: "blob",
			
 
				+          data: { mkFileShareAttachList: this.form.mkFileShareAttachList },
			
 
				+        }).then((response) => {
			
 
				+          if (window.navigator && window.navigator.msSaveOrOpenBlob) {
			
 
				+            let blob = new Blob([response.data], {
			
 
				+              type: "application/vnd.ms-excel",
			
 
				+            });
			
 
				+            window.navigator.msSaveOrOpenBlob(
			
 
				+              blob,
			
 
				+              new Date().getTime().toString() + ".zip"
			
 
				+            );
			
 
				+          } else {
			
 
				+            /* 火狐谷歌的文件下载方式 */
			
 
				+            var blob = new Blob([response.data]);
			
 
				+            var downloadElement = document.createElement("a");
			
 
				+            var href = window.URL.createObjectURL(blob);
			
 
				+            downloadElement.href = href;
			
 
				+            downloadElement.download = this.form.needName + ".zip";
			
 
				+            document.body.appendChild(downloadElement);
			
 
				+            downloadElement.click();
			
 
				+            document.body.removeChild(downloadElement);
			
 
				+            window.URL.revokeObjectURL(href);
			
 
				+          }
			
 
				+          if (this.infolist.authType === "3") {
			
 
				+            this.dialogCli(10);
			
 
				+          }
			
 
				+        });
			
 
				+      } else {
			
 
				+        console.log(this.form.mkFileShareAttachList);
			
 
				+        let list = {
			
 
				+          id: this.form.mkFileShareAttachList[0].fileCode,
			
 
				+          fileName: this.form.mkFileShareAttachList[0].name,
			
 
				+        };
			
 
				+        this.$http({
			
 
				+          url: "/market/waf/downFile",
			
 
				+          method: "post",
			
 
				+          headers: {
			
 
				+            "Content-Type": "application/json",
			
 
				+          },
			
 
				+          responseType: "blob",
			
 
				+          data: list,
			
 
				+        }).then((response) => {
			
 
				+          console.log(response);
			
 
				+          if (window.navigator && window.navigator.msSaveOrOpenBlob) {
			
 
				+            let blob = new Blob([response.data], {
			
 
				+              type: "application/vnd.ms-excel",
			
 
				+            });
			
 
				+            //window.navigator.msSaveOrOpenBlob(blob, this.form.needName);
			
 
				+            window.navigator.msSaveOrOpenBlob(
			
 
				+              blob,
			
 
				+              this.form.mkFileShareAttachList[0].name
			
 
				+            );
			
 
				+          } else {
			
 
				+            /* 火狐谷歌的文件下载方式 */
			
 
				+            var blob = new Blob([response.data]);
			
 
				+            var downloadElement = document.createElement("a");
			
 
				+            var href = window.URL.createObjectURL(blob);
			
 
				+            downloadElement.href = href;
			
 
				+            downloadElement.download = this.form.mkFileShareAttachList[0].name;
			
 
				+            document.body.appendChild(downloadElement);
			
 
				+            downloadElement.click();
			
 
				+            document.body.removeChild(downloadElement);
			
 
				+            window.URL.revokeObjectURL(href);
			
 
				+          }
			
 
				+        });
			
 
				+      }
			
 
				+    },
			
 
				+  },
			
 
				+  watch: {
			
 
				+    "form.operationType": {
			
 
				+      handler(newVal) {
			
 
				+        console.log(newVal);
			
 
				+        if (newVal === "资费修改") {
			
 
				+          this.newPostAge = false;
			
 
				+          this.postEdit = true;
			
 
				+        } else {
			
 
				+          this.postEdit = false;
			
 
				+          this.newPostAge = true;
			
 
				+        }
			
 
				+      },
			
 
				+    },
			
 
				+    "remindMmsg": {
			
 
				+      handler(newVal) {
			
 
				+        this.form.remindMmsg = newVal;
			
 
				+        if (newVal.length === 0) {
			
 
				+          this.checkBoxStatus = false;
			
 
				+          this.checkBoxNone = false;
			
 
				+        }
			
 
				+        newVal.map((item) => {
			
 
				+          if (item === '无') {
			
 
				+            this.checkBoxStatus = !this.checkBoxNone;
			
 
				+            console.log(this.checkBoxStatus);
			
 
				+          } else {
			
 
				+            this.checkBoxNone = !this.checkBoxStatus
			
 
				+          }
			
 
				+
			
 
				+
			
 
				+        })
			
 
				+
			
 
				+      }
			
 
				+    },
			
 
				+    "form.costPayWay": {
			
 
				+      handler(newVal) {
			
 
				+        console.log(newVal);
			
 
				+        if (newVal === '其他') {
			
 
				+          this.rule = { ...this.rule, ...this.costPayWayInputRule }
			
 
				+
			
 
				+        } else {
			
 
				+          this.rule = this.copyRule
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    "form.gratuity": {
			
 
				+      handler(newVal) {
			
 
				+        console.log(newVal);
			
 
				+        if (newVal === '有') {
			
 
				+          this.rule = { ...this.rule, ...this.gratuityInputRule }
			
 
				+          console.log(this.rule);
			
 
				+        } else {
			
 
				+          this.rule = this.copyRule
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    "form.reportForm": {
			
 
				+      handler(newVal) {
			
 
				+        if (newVal === '有') {
			
 
				+          this.rule = { ...this.rule, ...this.reportFormInputRule }
			
 
				+
			
 
				+        } else {
			
 
				+          this.rule = this.copyRule
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+::v-deep .el-row{
			
 
				+  margin-top: 16px;
			
 
				+}
			
 
				+a {
			
 
				+  text-decoration: none;
			
 
				+}
			
 
				+
			
 
				+::v-deep .el-upload-list {
			
 
				+  width: 23rem;
			
 
				+}
			
 
				+
			
 
				+.flex-title {
			
 
				+  text-align: center;
			
 
				+  font-size: 24px;
			
 
				+  line-height: 60px;
			
 
				+
			
 
				+  font-weight: bold;
			
 
				+}
			
 
				+
			
 
				+.flex-header {
			
 
				+  margin-top: 20px;
			
 
				+  display: flex;
			
 
				+  //   justify-content: space-between;
			
 
				+
			
 
				+  ::v-deep .el-form-item {
			
 
				+    width: 20%;
			
 
				+    margin-right: 60px;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.flex-upload {
			
 
				+  ::v-deep .el-form-item {
			
 
				+    width: 100%;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.flex-input-tare {
			
 
				+  ::v-deep .el-form-item {
			
 
				+    width: 100%;
			
 
				+    margin-right: 5%;
			
 
				+  }
			
 
				+
			
 
				+  ::v-deep .el-form-item__label {
			
 
				+    width: 9rem !important;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.flex-textarea {
			
 
				+  width: 70.5%;
			
 
				+}
			
 
				+
			
 
				+.el-upload__tip {
			
 
				+  color: red;
			
 
				+}
			
 
				+
			
 
				+// ::v-deep .el-input--suffix .el-input__inner {
			
 
				+//   width: 119% !important;
			
 
				+// }
			
 
				+::v-deep .el-input__inner {
			
 
				+  color: black !important;
			
 
				+}
			
 
				+
			
 
				+::v-deep .el-textarea.is-disabled .el-textarea__inner {
			
 
				+  color: black !important;
			
 
				+}
			
 
				+
			
 
				+::v-deep .el-form-item {
			
 
				+  display: flex;
			
 
				+}
			
 
				+
			
 
				+::v-deep .el-form-item__label {
			
 
				+  // width:100%;
			
 
				+  height: 50px;
			
 
				+  line-height: 40px !important;
			
 
				+  width: 130px;
			
 
				+  font-size: 0.5rem;
			
 
				+}
			
 
				+
			
 
				+::v-deep .el-form-item__content {
			
 
				+  width: 100%;
			
 
				+  margin-left: 0% !important;
			
 
				+}
			
 
				+
			
 
				+.el-select,
			
 
				+::v-deep.el-input_inner {
			
 
				+  width: 100%;
			
 
				+}
			
 
				+
			
 
				+::v-deep.el-form-item.foldLabel .el-form-item__label {
			
 
				+  white-space: pre-line;
			
 
				+  /*换行显示*/
			
 
				+  height: 10px;
			
 
				+  /*设置lable高度，input高度一样*/
			
 
				+  line-height: 30px !important;
			
 
				+}
			
 
				+</style>
			
--- a/src/pages/main/postage/index.vue
+++ b/src/pages/main/postage/index.vue
@@ -0,0 +1,924 @@
 
				+<template>
			
 
				+  <div class="flex-box">
			
 
				+    <!-- v-show="lable.name === 'first'" -->
			
 
				+    <div class="flex-header" :span="24">
			
 
				+      <Tabs :tabList="tabList" @status="clickTabTops" />
			
 
				+      <el-button type="primary" @click="clickNewTag">+新建</el-button>
			
 
				+    </div>
			
 
				+    <div class="flex-count">
			
 
				+      <Table @clickDemand="clickDemand" :list="lableTable" ref="TableList" @num="getNum" @changeNum="changeNum">
			
 
				+      </Table>
			
 
				+    </div>
			
 
				+    <el-dialog :title="'需求'" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
			
 
				+      v-if="dialogStatus" style="display: flex; flex-direction: column" :destroy-on-close="true">
			
 
				+      <!-- 后期维护 -->
			
 
				+      <div style="position: fixed; z-index: 10000">
			
 
				+        <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
			
 
				+        <el-button type="primary" @click="handleClose">关闭</el-button>
			
 
				+        <el-button type="primary" @click="clickSave" v-if="saveStatus">保存</el-button>
			
 
				+      </div>
			
 
				+
			
 
				+      <FormTable :list="fromList" :disabled="disabled" class="flex-form" ref="formTable" />
			
 
				+      <div>
			
 
				+        <div class="table-title">流程追踪</div>
			
 
				+        <div v-if="abc == true">
			
 
				+          <Tables :list="lables"></Tables>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <div>
			
 
				+        <!-- <div class="table-title">流程追踪</div>
			
 
				+        <div v-if="abc == true">
			
 
				+          <Tables :list="lables"></Tables>
			
 
				+        </div> -->
			
 
				+      </div>
			
 
				+    </el-dialog>
			
 
				+    <div v-if="destroy">
			
 
				+      <el-dialog title="处理操作" width="100%" :visible.sync="handleStatus" :before-close="handleCloses" :modal="false"
			
 
				+        v-if="handleStatus" :destroy-on-close="true">
			
 
				+        <Workflow ref="workflow" :list="fromList" v-if="isWorkflowStatus == true" @updateForm="beforeClose"
			
 
				+          :requestForm="requestForm" :adminResourceId="adminResourceId" />
			
 
				+        <WorkflowEntrance :list="fromList" v-else :lastManList="lastManList" @beforeClose="beforeClose"
			
 
				+          :requestForm="requestForm" />
			
 
				+
			
 
				+        <!-- 后期维护 -->
			
 
				+      </el-dialog>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import Workflow from "../../../components/workflowBase";
			
 
				+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 FormTable from "./formTable.vue";
			
 
				+import { updateBase } from "../../../http/api.js";
			
 
				+import {
			
 
				+  getTodoBase,
			
 
				+  getDoneBase,
			
 
				+  getInitiateBase,
			
 
				+} from "../../../http/api.js";
			
 
				+export default {
			
 
				+  components: {
			
 
				+    Tabs,
			
 
				+    Table,
			
 
				+    Tables,
			
 
				+    FormTable,
			
 
				+    Workflow,
			
 
				+    WorkflowEntrance,
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      abc: true,
			
 
				+      disabled: false,
			
 
				+      total: "",
			
 
				+      lableTable: {}, //传给子组件table
			
 
				+      pageSize: "1",
			
 
				+      requestForm: {
			
 
				+        // fresourceId: "91e8c4fd-33ed-11ed-a6ed-02427ba2d388", // 本地环境
			
 
				+        fresourceId: "bf79721c-33f3-11ed-ba0b-00505687dcd3", //测试环境
			
 
				+        // fresourceId:'81455799-600d-11ed-b399-e00084564cce',//生产环境
			
 
				+        processDefinitionKey: "zfpz_pro_process",
			
 
				+      },
			
 
				+      adminResourceId: "", //多人处理最后人id
			
 
				+      isWorkflowStatus: true, //真假工作流权限
			
 
				+      destroy: false, //工作流组件
			
 
				+      phone: "", //用户电话号
			
 
				+      disabled: false, //表单权限控制
			
 
				+      saveStatus: true, //保存按钮权限
			
 
				+      startStatus: true, // 处理按钮权限
			
 
				+      fromList: {}, //表单数据
			
 
				+      dialogStatus: false, //表单状态控制
			
 
				+      tabList: [
			
 
				+        {
			
 
				+          index: "first",
			
 
				+          label: "我的待办",
			
 
				+          number: "",
			
 
				+          name: "prosss_key",
			
 
				+        },
			
 
				+        {
			
 
				+          index: "two",
			
 
				+          label: "我的已办",
			
 
				+          number: "",
			
 
				+        },
			
 
				+        {
			
 
				+          index: "three",
			
 
				+          label: "我发起的",
			
 
				+          number: "",
			
 
				+        },
			
 
				+      ],
			
 
				+      firstTable: {
			
 
				+        name: "first",
			
 
				+        height: "600",
			
 
				+        titledata: [
			
 
				+          {
			
 
				+            label: "文件标题",
			
 
				+            prop: "need_name",
			
 
				+            width: 300,
			
 
				+            color: "#0682CD",
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起部门",
			
 
				+            prop: "applydept",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起科室",
			
 
				+            prop: "applydepartment",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起人",
			
 
				+            prop: "proposer",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+
			
 
				+          {
			
 
				+            label: "发起时间",
			
 
				+            prop: "proposer_time",
			
 
				+            width: 250,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "上一步处理人",
			
 
				+            prop: "predealman",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "状态",
			
 
				+            prop: "taskName",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+        ], //表格头
			
 
				+        data: [], //内容数据
			
 
				+        loading: true,
			
 
				+        pageData: {
			
 
				+          total: 100, // 总条数
			
 
				+          pageSize: 10, // 每页数量
			
 
				+          pageNum: 1, // 页码
			
 
				+        },
			
 
				+        isSelection: false, // 表格有多选时设置
			
 
				+        isOperation: false, // 表格有操作列时设置
			
 
				+        isIndex: false, // 列表序号
			
 
				+        operation: {
			
 
				+          // 表格有操作列时设置
			
 
				+          label: "操作", // 列名
			
 
				+          width: "50", // 根据实际情况给宽度
			
 
				+          data: [
			
 
				+            {
			
 
				+              label: "操作", // 操作名称
			
 
				+              type: "", //按钮类型
			
 
				+              handleRow: (e, r, o) => { }, // 自定义事件
			
 
				+            },
			
 
				+          ],
			
 
				+        },
			
 
				+      },
			
 
				+      twoTable: {
			
 
				+        name: "two",
			
 
				+        height: "600",
			
 
				+        titledata: [
			
 
				+          {
			
 
				+            label: "文件标题",
			
 
				+            prop: "need_name",
			
 
				+            width: 300,
			
 
				+            color: "#0682CD",
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起部门",
			
 
				+            prop: "applydept",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起科室",
			
 
				+            prop: "applydepartment",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起人",
			
 
				+            prop: "proposer",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+
			
 
				+          {
			
 
				+            label: "发起时间",
			
 
				+            prop: "proposer_time",
			
 
				+            width: 250,
			
 
				+          },
			
 
				+
			
 
				+          {
			
 
				+            label: "状态",
			
 
				+            prop: "taskName",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+        ], //表格头
			
 
				+        data: [], //内容数据
			
 
				+        loading: true,
			
 
				+        pageData: {
			
 
				+          total: 100, // 总条数
			
 
				+          pageSize: 10, // 每页数量
			
 
				+          pageNum: 1, // 页码
			
 
				+        },
			
 
				+        isSelection: false, // 表格有多选时设置
			
 
				+        isOperation: false, // 表格有操作列时设置
			
 
				+        isIndex: false, // 列表序号
			
 
				+        operation: {
			
 
				+          // 表格有操作列时设置
			
 
				+          label: "操作", // 列名
			
 
				+          width: "50", // 根据实际情况给宽度
			
 
				+          data: [
			
 
				+            {
			
 
				+              label: "操作", // 操作名称
			
 
				+              type: "", //按钮类型
			
 
				+              handleRow: (e, r, o) => { }, // 自定义事件
			
 
				+            },
			
 
				+          ],
			
 
				+        },
			
 
				+      },
			
 
				+      threeTable: {
			
 
				+        name: "three",
			
 
				+        height: "600",
			
 
				+        titledata: [
			
 
				+          {
			
 
				+            label: "文件标题",
			
 
				+            prop: "need_name",
			
 
				+            width: 300,
			
 
				+            color: "#0682CD",
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起部门",
			
 
				+            prop: "applydept",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起科室",
			
 
				+            prop: "applydepartment",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起人",
			
 
				+            prop: "proposer",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "发起时间",
			
 
				+            prop: "proposer_time",
			
 
				+            width: 250,
			
 
				+          },
			
 
				+          {
			
 
				+            label: "状态",
			
 
				+            prop: "taskName",
			
 
				+            width: 200,
			
 
				+          },
			
 
				+        ], //表格头
			
 
				+        data: [], //内容数据
			
 
				+        loading: true,
			
 
				+        pageData: {
			
 
				+          total: 100, // 总条数
			
 
				+          pageSize: 10, // 每页数量
			
 
				+          pageNum: 1, // 页码
			
 
				+        },
			
 
				+        isSelection: false, // 表格有多选时设置
			
 
				+        isOperation: false, // 表格有操作列时设置
			
 
				+        isIndex: false, // 列表序号
			
 
				+        operation: {
			
 
				+          // 表格有操作列时设置
			
 
				+          label: "操作", // 列名
			
 
				+          width: "50", // 根据实际情况给宽度
			
 
				+          data: [
			
 
				+            {
			
 
				+              label: "操作", // 操作名称
			
 
				+              type: "", //按钮类型
			
 
				+              handleRow: (e, r, o) => { }, // 自定义事件
			
 
				+            },
			
 
				+          ],
			
 
				+        },
			
 
				+      },
			
 
				+      request_form: {
			
 
				+        userId: "",
			
 
				+        userName: "",
			
 
				+        path: this.$router.currentRoute.name,
			
 
				+        userCode: JSON.parse(window.sessionStorage.userInfo).loginNo,
			
 
				+        title: "title",
			
 
				+        businessKey: "288",
			
 
				+        processDefinitionKey: "zfpz_pro_process",
			
 
				+      },
			
 
				+      lables: {
			
 
				+        height: "400",
			
 
				+        titledata: [
			
 
				+          {
			
 
				+            id: 1,
			
 
				+            label: "环节名称",
			
 
				+            prop: "taskName",
			
 
				+            width: 300,
			
 
				+          },
			
 
				+          {
			
 
				+            id: 2,
			
 
				+            label: "处理人",
			
 
				+            prop: "assignee",
			
 
				+            width: 300,
			
 
				+          },
			
 
				+          {
			
 
				+            id: 3,
			
 
				+            label: "到达时间",
			
 
				+            prop: "startTime",
			
 
				+            width: 300,
			
 
				+          },
			
 
				+          {
			
 
				+            id: 4,
			
 
				+            label: "处理时间",
			
 
				+            prop: "endTime",
			
 
				+            width: 300,
			
 
				+          },
			
 
				+          {
			
 
				+            id: 5,
			
 
				+            label: "回复意见",
			
 
				+            prop: "content",
			
 
				+            width: 300,
			
 
				+          },
			
 
				+        ], //表格头
			
 
				+        data: [], //内容数据
			
 
				+        loading: true,
			
 
				+        pageData: {
			
 
				+          total: 0, // 总条数
			
 
				+          pageSize: 10, // 每页数量
			
 
				+          pageNum: 1, // 页码
			
 
				+        },
			
 
				+        isSelection: false, // 表格有多选时设置
			
 
				+        isOperation: false, // 表格有操作列时设置
			
 
				+        isIndex: true, // 列表序号
			
 
				+        operation: {
			
 
				+          // 表格有操作列时设置
			
 
				+          label: "操作", // 列名
			
 
				+          width: "50", // 根据实际情况给宽度
			
 
				+          data: [
			
 
				+            {
			
 
				+              label: "操作", // 操作名称
			
 
				+              type: "", //按钮类型
			
 
				+              handleRow: function () { }, // 自定义事件
			
 
				+            },
			
 
				+          ],
			
 
				+        },
			
 
				+      },
			
 
				+      clickTagNameTop: "first",
			
 
				+      totalPage: "1",
			
 
				+    };
			
 
				+  },
			
 
				+  created() {
			
 
				+    this.getQueryList();
			
 
				+    this.getMeLaunch();
			
 
				+    this.getQueryDone();
			
 
				+    this.lableTable = this.firstTable;
			
 
				+  },
			
 
				+  mounted() {
			
 
				+    this.getUserPhone();
			
 
				+  },
			
 
				+  methods: {
			
 
				+    clickTabTops(e) {
			
 
				+      console.log(e);
			
 
				+      this.$refs.TableList.page = 1;
			
 
				+      this.totalPage = "1";
			
 
				+      this.clickTagNameTop = e;
			
 
				+      // this.pageNo = 1
			
 
				+      // this.$refs.TableList.page = 1;
			
 
				+      if (this.clickTagNameTop == "first") {
			
 
				+        this.lableTable = this.firstTable;
			
 
				+        this.getQueryList();
			
 
				+      } else if (this.clickTagNameTop == "two") {
			
 
				+        this.lableTable = this.twoTable;
			
 
				+        this.getQueryDone();
			
 
				+      } else {
			
 
				+        this.lableTable = this.threeTable;
			
 
				+        this.getMeLaunch();
			
 
				+      }
			
 
				+    },
			
 
				+    //我的待办
			
 
				+    getQueryList() {
			
 
				+      let list = {
			
 
				+        tableName: this.request_form.processDefinitionKey,
			
 
				+      };
			
 
				+      getTodoBase(this.totalPage, "", list).then((res) => {
			
 
				+        this.lableTable.data = res.data.data;
			
 
				+        // this.tableData.map((item) => {
			
 
				+        //   item.status = "1";
			
 
				+        // });
			
 
				+        this.tabList[0].number = res.data.totalRecord;
			
 
				+        this.lableTable.pageData.total = res.data.totalRecord;
			
 
				+        // this.loading = false;
			
 
				+      });
			
 
				+    },
			
 
				+    getQueryDone() {
			
 
				+      let list = {
			
 
				+        tableName: this.request_form.processDefinitionKey,
			
 
				+      };
			
 
				+      getDoneBase(this.totalPage, "", list).then((res) => {
			
 
				+        this.lableTable.data = res.data.data;
			
 
				+        this.lableTable.pageData.total = res.data.totalRecord;
			
 
				+        // this.tableData.map((item) => {
			
 
				+        //   item.status = "2";
			
 
				+        // });
			
 
				+        this.tabList[1].number = res.data.totalRecord;
			
 
				+        this.total = res.data.totalRecord;
			
 
				+        this.loading = false;
			
 
				+      });
			
 
				+    },
			
 
				+    getMeLaunch() {
			
 
				+      let list = {
			
 
				+        tableName: this.request_form.processDefinitionKey,
			
 
				+      };
			
 
				+      getInitiateBase(this.totalPage, "", list).then((res) => {
			
 
				+        this.lableTable.data = res.data.data;
			
 
				+        this.lableTable.pageData.total = res.data.totalRecord;
			
 
				+        this.tabList[2].number = res.data.totalRecord;
			
 
				+        // this.tableData.map((item) => {
			
 
				+        //   if (item.taskName === "起草") {
			
 
				+        //     item.status = "1";
			
 
				+        //   } else {
			
 
				+        //     item.status = "2";
			
 
				+        //   }
			
 
				+        // });
			
 
				+        this.total = res.data.totalRecord;
			
 
				+        this.loading = false;
			
 
				+      });
			
 
				+    },
			
 
				+    async getLastName() {
			
 
				+      console.log(this.fromList);
			
 
				+      let list = {
			
 
				+        procinstid: this.fromList.processId,
			
 
				+        taskid: this.fromList.taskId,
			
 
				+
			
 
				+        // taskId:e.taskId
			
 
				+      };
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: this.$url.formList.getLastName, //流程追踪接口
			
 
				+        data: list,
			
 
				+        // status: "form",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+      };
			
 
				+
			
 
				+      let res = await this.common.httpPost(obj, success);
			
 
				+      function success(data) {
			
 
				+        console.log(data);
			
 
				+        if (data.lastMan == true) {
			
 
				+          _this.adminResourceId = data.adminResourceId;
			
 
				+        }
			
 
				+        _this.destroy = true;
			
 
				+        _this.handleStatus = true;
			
 
				+        _this.isWorkflowStatus = data.lastMan == false ? false : true;
			
 
				+        _this.lastManList = data;
			
 
				+
			
 
				+        // console.log(_this.isWorkflowStatus);
			
 
				+      }
			
 
				+    },
			
 
				+    //生成随机编号
			
 
				+    getProjectNum() {
			
 
				+      const time = new Date();
			
 
				+      const year = time.getFullYear();
			
 
				+      const Mouth = time.getMonth() + 1;
			
 
				+      const Day = time.getDate();
			
 
				+      let currentDate = year;
			
 
				+      if (Mouth >= 10) {
			
 
				+        currentDate += Mouth;
			
 
				+      } else {
			
 
				+        currentDate += "0" + Mouth;
			
 
				+      }
			
 
				+      if (Day >= 10) {
			
 
				+        currentDate += Day;
			
 
				+      } else {
			
 
				+        currentDate += "0" + Day;
			
 
				+      }
			
 
				+      return currentDate;
			
 
				+    },
			
 
				+    getUserPhone() {
			
 
				+      this.$http({
			
 
				+        url: "/market/tygdProProcess/getPhone",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: {},
			
 
				+      }).then((res) => {
			
 
				+        this.phone = res.data;
			
 
				+      });
			
 
				+    },
			
 
				+    //获取用户部门名称
			
 
				+    getDepartmentName() {
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/queryDept",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: {},
			
 
				+      }).then((res) => {
			
 
				+        let list = {
			
 
				+          applydept: res.data,
			
 
				+          applydepartment: JSON.parse(window.sessionStorage.userInfo).groupName,
			
 
				+          proposer: JSON.parse(window.sessionStorage.userInfo).loginName,
			
 
				+          fileno: this.getProjectNum() + Math.floor(Math.random() * 100000),
			
 
				+          proposerTime: new Date(),
			
 
				+          phone: this.phone,
			
 
				+        };
			
 
				+        this.fromList = list;
			
 
				+        if (this.$refs.formTable) {
			
 
				+          this.$refs.formTable.form = list;
			
 
				+        }
			
 
				+      });
			
 
				+    },
			
 
				+    setForm(e) {
			
 
				+      this.request_form.title = this.$refs.formTable.form.needName;
			
 
				+      this.$http({
			
 
				+        url: "/market/zfpzProcess/add",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: this.$refs.formTable.form,
			
 
				+      }).then((res) => {
			
 
				+        console.log(res);
			
 
				+        this.request_form.businessKey = res.data.body;
			
 
				+        this.clickHandle(res.data.body);
			
 
				+      });
			
 
				+    },
			
 
				+    getUserIds() {
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/queryRoleByName",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: {
			
 
				+          userCode: JSON.parse(window.sessionStorage.userInfo).loginNo,
			
 
				+        },
			
 
				+      }).then((res) => {
			
 
				+        console.log(res);
			
 
				+        this.request_form.userName = res.data.data.rows[0].name;
			
 
				+        this.request_form.userId = res.data.data.rows[0].userCode;
			
 
				+      });
			
 
				+    },
			
 
				+    async clickHandle(e) {
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: this.$url.formList.startWork, //开始工作流接口
			
 
				+        data: _this.request_form,
			
 
				+        status: "form",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/x-www-form-urlencoded",
			
 
				+        },
			
 
				+      };
			
 
				+
			
 
				+      let res = await this.common.httpPost(obj, success);
			
 
				+      function success(data) {
			
 
				+        console.log(data);
			
 
				+        _this.fromList.processId = data.data;
			
 
				+        _this.taskId = data.data;
			
 
				+        let list = {
			
 
				+          id: e,
			
 
				+          // taskId:_this.formId,
			
 
				+          tableName: _this.request_form.processDefinitionKey,
			
 
				+          processId: _this.fromList.processId,
			
 
				+          // resourceId: _this.nextPath.currentShape[0].resourceId,
			
 
				+        };
			
 
				+        _this.setUpdate(list);
			
 
				+      }
			
 
				+    },
			
 
				+    setUpdate(e) {
			
 
				+      updateBase(e).then((res) => {
			
 
				+        this.fromList.taskId = res.data.body[0].taskId;
			
 
				+        // this.fromList.taskId = '1111111111';
			
 
				+        this.fromList.taskName = res.data.body[0].taskName;
			
 
				+        // this.fromList = concat;
			
 
				+      });
			
 
				+    },
			
 
				+    setUpdateCopy(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/zfpzProcess/update",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: e
			
 
				+      }).then((res) => {
			
 
				+        console.log(res);
			
 
				+        this.$message.success(res.data.desc)
			
 
				+      });
			
 
				+
			
 
				+    },
			
 
				+    //点击保存
			
 
				+    clickSave() {
			
 
				+      // if (this.fromList.id) {
			
 
				+      //   let list = this.$refs.formTable.form;
			
 
				+      //   // list.tableName = this.request_form.processDefinitionKey;
			
 
				+      //   // list.processId = null
			
 
				+      //   // list.taskId = null
			
 
				+      //   this.setUpdateCopy(list)
			
 
				+      // } else {
			
 
				+      //   this.getUserIds();
			
 
				+      //   this.setForm();
			
 
				+      // }
			
 
				+
			
 
				+      this.$refs.formTable.$refs.form.validate((valid) => {
			
 
				+        if (valid) {
			
 
				+          console.log(this.fromList);
			
 
				+          if (this.fromList.id) {
			
 
				+            this.setUpdateCopy(this.$refs.formTable.form)
			
 
				+          } else {
			
 
				+            this.getUserIds();
			
 
				+            this.setForm();
			
 
				+          }
			
 
				+        } else {
			
 
				+          this.$message.error("请完善表单信息");
			
 
				+          return false;
			
 
				+        }
			
 
				+      });
			
 
				+    },
			
 
				+    //点击新建
			
 
				+    async clickNewTag() {
			
 
				+
			
 
				+      this.dialogStatus = true;
			
 
				+      this.lables.data = [];
			
 
				+      this.disabled = false;
			
 
				+      this.saveStatus = true;
			
 
				+      this.startStatus = true;
			
 
				+      console.log();
			
 
				+      this.fromList = {}
			
 
				+      await this.getDepartmentName();
			
 
				+    },
			
 
				+    //处理按钮,开始工作流接口
			
 
				+    clickHandles() {
			
 
				+      this.getNextPath(this.fromList.resourceId || "");
			
 
				+    },
			
 
				+    //查询form表单数据
			
 
				+    getFromQuery(e) {
			
 
				+      this.$http({
			
 
				+        url: "/market/zfpzProcess/query",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: { id: e.id },
			
 
				+      }).then((res) => {
			
 
				+        // this.dialogStatus = true;
			
 
				+        this.fromList = res.data
			
 
				+        this.fromList.resourceId = e.resourceId
			
 
				+        this.fromList.taskId = e.taskId
			
 
				+        this.fromList.createId = e.createId
			
 
				+        this.fromList.mkFileShareAttachList = res.data.mkFileShareAttachList;
			
 
				+        this.dialogStatus = true;
			
 
				+      });
			
 
				+    },
			
 
				+    getNextPath(e) {
			
 
				+      let list = {
			
 
				+        fresourceId: this.requestForm.fresourceId, // 本地环境
			
 
				+        processId: this.requestForm.processDefinitionKey,
			
 
				+      };
			
 
				+      if (e) {
			
 
				+        list.resourceId = e;
			
 
				+      }
			
 
				+      this.$http({
			
 
				+        url: "/market/waf/queryPath",
			
 
				+        method: "post",
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+        data: list,
			
 
				+      }).then((res) => {
			
 
				+        if (res.data.body.nextShapes[0].multi) {
			
 
				+          if (res.data.body.nextShapes[0].multi.multi === "true") {
			
 
				+            this.getLastName();
			
 
				+          } else {
			
 
				+            this.adminResourceId = "";
			
 
				+          }
			
 
				+        } else {
			
 
				+          this.adminResourceId = "";
			
 
				+
			
 
				+          // this.destroy = true;
			
 
				+          // this.handleStatus = true;
			
 
				+        }
			
 
				+        if (this.fromList.processId || this.fromList.taskId) {
			
 
				+          this.destroy = true;
			
 
				+          this.handleStatus = true;
			
 
				+        } else {
			
 
				+          this.$message.error("请先点击保存按钮");
			
 
				+        }
			
 
				+      });
			
 
				+    },
			
 
				+    async clickForm(e) {
			
 
				+      console.log(e);
			
 
				+      let list = {
			
 
				+        processInstanceId: e.process_id,
			
 
				+        // taskId:e.taskId
			
 
				+      };
			
 
				+      let _this = this;
			
 
				+      let obj = {
			
 
				+        url: this.$url.formList.getCommentsByProcessId, //流程追踪接口
			
 
				+        data: list,
			
 
				+        headers: {
			
 
				+          "Content-Type": "application/json",
			
 
				+        },
			
 
				+      };
			
 
				+
			
 
				+      let res = await this.common.httpPost(obj, success);
			
 
				+      function success(data) {
			
 
				+        console.log("[ 接口返回值第一曾 ] >", data);
			
 
				+        let list = [];
			
 
				+        list = data.data.data;
			
 
				+        if (data.data.lastmandata.length != 0) {
			
 
				+          data.data.lastmandata.map((item, index) => {
			
 
				+            item.id = index + 22;
			
 
				+          });
			
 
				+        }
			
 
				+        list.map((item, index) => {
			
 
				+          item.startTime = _this.$util.datetimeFormat(item.startTime);
			
 
				+          item.endTime = _this.$util.datetimeFormat(item.endTime);
			
 
				+          item.id = index + 1;
			
 
				+          item.children = [];
			
 
				+          if (data.data.lastmandata.length != 0) {
			
 
				+            let indexs = data.data.lastmandata.findIndex((items) => {
			
 
				+              if (items.taskId == item.taskId) {
			
 
				+                item.children.push(items);
			
 
				+              }
			
 
				+            });
			
 
				+          }
			
 
				+        });
			
 
				+
			
 
				+        _this.lables.data = list;
			
 
				+        console.log("[ _this.lables.data ] >", _this.lables.data);
			
 
				+        _this.abc = true;
			
 
				+      }
			
 
				+    },
			
 
				+    clickDemand(e, res) {
			
 
				+      console.log(this.clickTagNameTop);
			
 
				+      if (e === "工单状态" || e === "文件标题") {
			
 
				+        if (this.clickTagNameTop === "first") {
			
 
				+          // this.disabled = true;
			
 
				+          // this.dialogTitle = "查看";
			
 
				+          if (res.taskName === "起草") {
			
 
				+            console.log(123);
			
 
				+            this.disabled = false;
			
 
				+            this.saveStatus = true;
			
 
				+          } else {
			
 
				+            console.log(456);
			
 
				+            this.disabled = true;
			
 
				+            this.saveStatus = false;
			
 
				+          }
			
 
				+          // setTimeout(() => {
			
 
				+          //   // this.getBtnStatus(res);
			
 
				+          // }, 500);
			
 
				+        }
			
 
				+        if (this.clickTagNameTop === "two") {
			
 
				+          this.disabled = true;
			
 
				+          this.startStatus = false;
			
 
				+          this.saveStatus = false;
			
 
				+          // this.forwardStatus = false;
			
 
				+          // this.exportBtnStatus = false;
			
 
				+        }
			
 
				+        if (this.clickTagNameTop === "three") {
			
 
				+          if (res.taskName === "起草") {
			
 
				+            this.startStatus = true;
			
 
				+            this.disabled = false;
			
 
				+            this.saveStatus = true;
			
 
				+          } else {
			
 
				+            this.startStatus = false;
			
 
				+            this.disabled = true;
			
 
				+            this.saveStatus = false;
			
 
				+          }
			
 
				+        }
			
 
				+        // console.log('[ res ] >', res)
			
 
				+        // res.needName = res.need_name;
			
 
				+        // this.fromList = res;
			
 
				+
			
 
				+        // console.log(res);
			
 
				+        // this.disabled = true
			
 
				+
			
 
				+        this.clickForm(res);
			
 
				+        this.getFromQuery(res);
			
 
				+      }
			
 
				+    },
			
 
				+    getNum() { },
			
 
				+    getCurrentPageList(e) {
			
 
				+      this.totalPage = Math.ceil(e.length / this.pageSize);
			
 
				+      this.totalPage = this.totalPage == 0 ? 1 : this.totalPage;
			
 
				+      let begin = (this.currentPage - 1) * this.pageSize;
			
 
				+      let end = this.currentPage * this.pageSize;
			
 
				+      this.currentPageList = e.slice(begin, end);
			
 
				+      return this.currentPageList;
			
 
				+    },
			
 
				+    //获取页码
			
 
				+    changeNum(e) {
			
 
				+      console.log(e);
			
 
				+      this.totalPage = e;
			
 
				+      if (this.clickTagNameTop === "first") {
			
 
				+        this.getQueryList();
			
 
				+      } else if (this.clickTagNameTop === "two") {
			
 
				+        this.getQueryDone();
			
 
				+      } else if (this.clickTagNameTop === "three") {
			
 
				+        this.getMeLaunch();
			
 
				+      }
			
 
				+    },
			
 
				+    //表单详情状态控制
			
 
				+    handleClose() {
			
 
				+      this.handleCloses();
			
 
				+      // console.log(123);
			
 
				+      // this.dialogStatus = false;
			
 
				+      // this.forwardStatus = false;
			
 
				+      // // this.exportBtnStatus = false;
			
 
				+      // this.saveStatus = false;
			
 
				+      // this.startStatus = true;
			
 
				+      // this.closeStatus = true;
			
 
				+      // this.abc = false;
			
 
				+      // this.handleCloses();
			
 
				+      // this.getQueryList();
			
 
				+      // this.getMeLaunch();
			
 
				+      // this.getQueryDone();
			
 
				+    },
			
 
				+    handleCloses() {
			
 
				+      this.treeList = [];
			
 
				+      this.textarea = "";
			
 
				+      this.handleStatus = false;
			
 
				+      this.destroy = false;
			
 
				+      this.dialogStatus = false;
			
 
				+      this.saveStatus = false;
			
 
				+      this.startStatus = true;
			
 
				+      // this.closeStatus = true;
			
 
				+    },
			
 
				+    beforeClose() {
			
 
				+      this.dialogStatus = false;
			
 
				+      this.handleCloses();
			
 
				+      this.getQueryList();
			
 
				+      this.getMeLaunch();
			
 
				+      this.getQueryDone();
			
 
				+    },
			
 
				+  },
			
 
				+  watch: {
			
 
				+    fromList: {
			
 
				+      handler(newVal) {
			
 
				+        console.log(newVal);
			
 
				+      },
			
 
				+    },
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+//设置子组件样式
			
 
				+::v-deep .el-tabs__item {
			
 
				+  padding: 0;
			
 
				+  margin-right: 20px;
			
 
				+  width: 166px;
			
 
				+  text-align: center;
			
 
				+  background-color: #d8eaf6;
			
 
				+  color: black;
			
 
				+}
			
 
				+
			
 
				+::v-deep .is-active {
			
 
				+  color: #fff;
			
 
				+  background-color: #0583cd;
			
 
				+}
			
 
				+
			
 
				+::v-deep .el-tabs__active-bar {
			
 
				+  display: none;
			
 
				+}
			
 
				+
			
 
				+::v-deep .el-tabs__nav-wrap::after {
			
 
				+  display: none !important;
			
 
				+}
			
 
				+
			
 
				+.flex-form {
			
 
				+  margin-top: 50px;
			
 
				+}
			
 
				+
			
 
				+.flex-box {
			
 
				+  display: flex;
			
 
				+  // overflow: auto;
			
 
				+  overflow-y: auto;
			
 
				+  overflow-x: hidden;
			
 
				+  width: calc(100% - 40px);
			
 
				+  border-radius: 20px;
			
 
				+  background-color: #fff;
			
 
				+  margin: 0 auto;
			
 
				+  margin-top: 20px;
			
 
				+  position: relative;
			
 
				+  flex-direction: column;
			
 
				+
			
 
				+  // height: 100%;
			
 
				+  .flex-header {
			
 
				+    display: flex;
			
 
				+    width: 100%;
			
 
				+    position: relative;
			
 
				+    height: 60px;
			
 
				+    margin: 1%;
			
 
				+    border-bottom: 1px solid #e1e1e1;
			
 
				+    justify-content: space-between;
			
 
				+
			
 
				+    .el-button {
			
 
				+      width: 150px;
			
 
				+      float: right;
			
 
				+      height: 40px !important;
			
 
				+      margin-right: 30px;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+</style>
			
--- a/src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue
+++ b/src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue
@@ -220,10 +220,9 @@ export default {
 
				             },
			
 
				             requestForm: {
			
 
				                 // fresourceId: "a682dc9f-2fea-11ed-a6ed-02427ba2d388", // 本地环境
			
 
				-                // fresourceId: "db26384e-b984-11ed-afb6-e00084564cce", // 生产环境
			
 
				+                // fresourceId: "canvas", // 生产环境
			
 
				                 // fresourceId: "33b0af93-b1ce-11ed-be6b-00505687dcd3", //测试91环境
			
 
				-
			
 
				-                fresourceId: getConfig().provincialWorkOrderAreafresourceId, 
			
 
				+                fresourceId: getConfig().provincialWorkOrderAreafresourceId, //测试91环境
			
 
				                 processDefinitionKey: "tygd_cit_process",
			
 
				             },
			
 
				             dialogStatus: false, //dialog显示
			
--- a/src/pages/main/workingCon/configUration.vue
+++ b/src/pages/main/workingCon/configUration.vue
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -214,12 +214,39 @@ const routes = [{
 
				             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/organizaStructure/roleManage.vue'], resolve)
			
 
				         },
			
 
				         {
			
 
				+            meta: { name:  '收补预存款', keepAlive: false },
			
 
				+            path: '/closeFill',
			
 
				+            name: 'closeFill',
			
 
				+            component: (resolve) => require( /* webpackChunkName: "system" */
			
 
				+                ['../pages/main/closeFill/advanceDeposit.vue'], resolve)
			
 
				+        },
			
 
				+        {
			
 
				+            meta: { name:  '工号配置', keepAlive: false },
			
 
				+            path: '/workingCon',
			
 
				+            name: 'workingCon',
			
 
				+            component: (resolve) => require( /* webpackChunkName: "system" */
			
 
				+                ['../pages/main/workingCon/configUration.vue'], resolve)
			
 
				+        },
			
 
				+        {
			
 
				             meta: { name: '组织架构管理', keepAlive: false },
			
 
				             path: '/organization',
			
 
				             name: 'organization',
			
 
				             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/organizaStructure/organization.vue'], resolve)
			
 
				         },
			
 
				         {
			
 
				+            meta: { name: '验收打分单', keepAlive: false },
			
 
				+            path: '/materialAppNum',
			
 
				+            name: 'materialAppNum',
			
 
				+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materialAppNum.vue'], resolve)
			
 
				+        },
			
 
				+        {
			
 
				+            meta: { name: '宣传物料制作费用明细', keepAlive: false },
			
 
				+            path: '/materialAppMessage',
			
 
				+            name: 'materialAppMessage',
			
 
				+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materialAppMessage.vue'], resolve)
			
 
				+        },
			
 
				+
			
 
				+        {
			
 
				             meta: { name: '人员信息', keepAlive: false },
			
 
				             path: '/personinfo',
			
 
				             name: 'personinfo',
			
@@ -558,18 +585,6 @@ const routes = [{
 
				             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/index.vue'], resolve)
			
 
				         },
			
 
				         {
			
 
				-            meta: { name: '验收打分单', keepAlive: false },
			
 
				-            path: '/materialAppNum',
			
 
				-            name: 'materialAppNum',
			
 
				-            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materialAppNum.vue'], resolve)
			
 
				-        },
			
 
				-        {
			
 
				-            meta: { name: '宣传物料制作费用明细', keepAlive: false },
			
 
				-            path: '/materialAppMessage',
			
 
				-            name: 'materialAppMessage',
			
 
				-            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materialAppMessage.vue'], resolve)
			
 
				-        },
			
 
				-        {
			
 
				             meta: { name: '宣传费台账', keepAlive: false },
			
 
				             path: '/publicity',
			
 
				             name: 'publicity',
			
@@ -618,6 +633,12 @@ const routes = [{
 
				             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materialApplication.vue'], resolve)
			
 
				         },
			
 
				         {
			
 
				+            meta: { name: '宣传物料管理地市', keepAlive: false },
			
 
				+            path: '/materialApplicationds',
			
 
				+            name: 'materialApplicationds',
			
 
				+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materialApplicationds.vue'], resolve)
			
 
				+        },
			
 
				+        {
			
 
				             meta: { name: '宣传物料管理', keepAlive: false },//地市
			
 
				             path: '/materialApplicationc',
			
 
				             name: 'materialApplicationc',
			
@@ -2117,7 +2138,6 @@ const routes = [{
 
				                 ['../pages/main/leader/demand/supportState.vue'], resolve)
			
 
				         },
			
 
				         {
			
 
				-
			
 
				             meta: {
			
 
				                 name: '在线文档',
			
 
				                 keepAlive: false
			
@@ -2228,7 +2248,7 @@ const routes = [{
 
				             name: 'riskMaterials',
			
 
				             component: (resolve) => require( /* webpackChunkName: "system" */
			
 
				                 ['../pages/main/leader/risk/riskMaterials.vue'], resolve)
			
 
				-        }, {
			
 
				+        },{
			
 
				             meta: { name: '风险防控管理', keepAlive: false },
			
 
				             path: '/riskManagement',
			
 
				             name: 'riskManagement',
			
@@ -2236,6 +2256,13 @@ const routes = [{
 
				                 ['../pages/main/leader/risk/riskManagement.vue'], resolve)
			
 
				         },
			
 
				         {
			
 
				+            meta: { name: '资费管理', keepAlive: false },
			
 
				+            path: '/postage',
			
 
				+            name: 'postage',
			
 
				+            component: (resolve) => require( /* webpackChunkName: "system" */
			
 
				+                ['../pages/main/postage/index.vue'], resolve)
			
 
				+        },
			
 
				+        {
			
 
				             meta: { name: '新文件收集与审批', keepAlive: false },
			
 
				             path: '/documentCollectionApprovalHome',
			
 
				             name: 'documentCollectionApprovalHome',
			
@@ -2243,7 +2270,8 @@ const routes = [{
 
				             component: (resolve) => require( /* webpackChunkName: "system" */
			
 
				                 ['../pages/main/documentCollection/home.vue'], resolve),
			
 
				             children: [
			
 
				-                {
			
 
				+                { 
			
 
				+                    
			
 
				                     meta: { name: '文件收集与审批我接收的', keepAlive: false },
			
 
				                     path: '/documentCollectionApproval',
			
 
				                     name: 'documentCollectionApproval',
			
@@ -2283,6 +2311,13 @@ const routes = [{
 
				             name: 'provincialWorkOrderArea',
			
 
				             component: resolve => require(['../pages/main/provincialWorkOrder/provincialWorkOrderArea.vue'], resolve),
			
 
				             meta: { title: '地市-通用工单' }
			
 
				+        },
			
 
				+        {
			
 
				+            meta: { name: '备份数据恢复申请流程', keepAlive: false },
			
 
				+            path: '/bfsjList',
			
 
				+            name: 'bfsjList',
			
 
				+            component: (resolve) => require( /* webpackChunkName: "system" */
			
 
				+                ['../pages/main/bfsj/bfsjList.vue'], resolve)
			
 
				         }
			
 
				 
			
 
				 
			
--- a/vue.config.js
+++ b/vue.config.js
@@ -135,7 +135,15 @@ module.exports = {
 
				                     "^/market": "",
			
 
				                 },
			
 
				             },
			
 
				-            // 开发环境变化可注释 
			
 
				+            // "/api": {
			
 
				+            //     target: "http://43.138.50.94:7777",
			
 
				+            //     ws: false,
			
 
				+            //     changeOrigin: true,
			
 
				+            //     pathRewrite: {
			
 
				+            //         "^/api": "",
			
 
				+            //     },
			
 
				+            // },
			
 
				+            // 开发环境变化可注释 ⬆️⬆️
			
 
				             "/": {
			
 
				                 // target: 'http://192.168.2.145:9600/spfm',
			
 
				                 // target: 'http://192.168.2.149:9600',
			
--- a/yarn.lock
+++ b/yarn.lock
@@ -3184,7 +3184,7 @@ console-browserify@^1.1.0:
 
				 
			
 
				 console@^0.7.2:
			
 
				   version "0.7.2"
			
 
				-  resolved "https://registry.yarnpkg.com/console/-/console-0.7.2.tgz#f9a4331249291591b7bf9bffa8e205356f20a9f0"
			
 
				+  resolved "https://registry.npmmirror.com/console/-/console-0.7.2.tgz#f9a4331249291591b7bf9bffa8e205356f20a9f0"
			
 
				   integrity sha512-+JSDwGunA4MTEgAV/4VBKwUHonP8CzJ/6GIuwPi6acKFqFfHUdSGCm89ZxZ5FfGWdZfkdgAroy5bJ5FSeN/t4g==
			
 
				 
			
 
				 consolidate@^0.15.1: