代码提交

src/pages/main/demandDevelop/index.vue

@@ -28,9 +28,11 @@
           style="width: 100%"
           v-loading="loading"
         >
-          <el-table-column prop="woTitle" label="业务名称"> </el-table-column>
-          <el-table-column prop="opName" label="申请姓名"> </el-table-column>
-          <el-table-column prop="createTime" label="申请时间">
+          <el-table-column prop="busiSubject" label="业务名称">
+          </el-table-column>
+          <el-table-column prop="createName" label="申请姓名">
+          </el-table-column>
+          <el-table-column prop="createTimeStr" label="申请时间">
           </el-table-column>
           <el-table-column prop="stsDesc" label="状态">
             <template slot-scope="scope">
@@ -70,7 +72,6 @@
         </el-pagination>
       </div>
     </div>
-
     <el-dialog
       :title="titname"
       :visible.sync="dialogStatus"
@@ -80,6 +81,7 @@
       :close-on-click-modal="false"
       :before-close="closedia"
       :fullscreen="true"
+      :key="number"
     >
       <div v-loading="loadinged">
         <el-form
@@ -100,11 +102,7 @@
             </el-form-item>
             <el-form-item>
               <span>需求编号</span>
-              <el-input
-                v-model="infolist.demandNo"
-                placeholder="需求编号"
-                disabled
-              >
+              <el-input v-model="infolist.woNo" placeholder="需求编号" disabled>
               </el-input>
             </el-form-item>
             <!-- <el-form-item prop="terminal">
@@ -211,7 +209,7 @@
             >
             </el-input>
           </el-form-item>
-
+          <!-- 附件展示 -->
           <div
             style="padding: 0 20px 0 120px; margin-bottom: 20px"
             v-if="disableStatus"
@@ -221,17 +219,28 @@
               :dialogStatus="uploadstatus"
             ></uploadDown>
           </div>
+          <!-- 附件上传 -->
           <div v-if="!disableStatus" class="info-line online">
             <span style="width: 80px">附件</span>
-            <myUpload
-              @uploadBack="uploadBack"
-              :fileInfo="fileInfo"
-              :fileList="fileInfo.fileList"
-              style="width: calc(100% - 80px)"
+            <el-upload
+              :limit="3"
+              action=""
+              :on-preview="handlePreview"
+              :on-remove="handleRemove"
+              :http-request="handleSuccess"
+              :file-list="file"
+              drag
+              multiple
             >
-            </myUpload>
+              <div class="upload">
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或<em>点击上传</em>
+                </div>
+              </div>
+            </el-upload>
           </div>
-
+          <!-- 信息补填的情况 -->
           <myUpload
             v-if="vision == '信息补填'"
             style="float: right; margin-bottom: 20px"
@@ -291,7 +300,6 @@
               </el-table-column>
             </el-table>
           </div>
-
           <el-form-item class="info-line online" v-if="visionsts == '2'">
             <span>审批说明</span>
             <el-input
@@ -306,7 +314,7 @@
 
           <div
             style="margin-bottom: 20px; padding: 0 20px"
-            v-if="titname != '添加'"
+            v-if="titname !== '添加'"
           >
             <el-table
               class="com-table"
@@ -316,13 +324,13 @@
               border
               style="width: 100%"
             >
-              <el-table-column prop="taskId" label="编号"> </el-table-column>
-              <el-table-column prop="taskName" label="环节"> </el-table-column>
-              <el-table-column prop="assigneeName" label="处理人">
+              <el-table-column prop="logNo" label="编号"> </el-table-column>
+              <el-table-column prop="stepName" label="环节"> </el-table-column>
+              <el-table-column prop="processName" label="处理人">
               </el-table-column>
-              <el-table-column prop="assigneeNo" label="处理人工号">
+              <el-table-column prop="processWorkNo" label="处理人工号">
               </el-table-column>
-              <el-table-column prop="opTime" label="处理时间">
+              <el-table-column prop="updateTimeStr" label="处理时间">
               </el-table-column>
               <el-table-column prop="remark" label="备注"> </el-table-column>
             </el-table>
@@ -330,7 +338,16 @@
         </el-form>
 
         <div slot="footer" class="dialog-footer myfooter">
-          <el-button
+          <div v-if="titname === '添加'">
+            <el-button type="primary" @click="handleApprove('送部门人员审核')"
+              >送部门人员审核</el-button
+            >
+            <el-button type="primary" @click="handleApprove('送领导审核')"
+              >送领导审核</el-button
+            >
+            <el-button @click="handleApprove('取消')">取消</el-button>
+          </div>
+          <!-- <el-button
             v-if="titname != '查看' && vision == '流程发起'"
             type="primary"
             @click="checkexa = true"
@@ -372,7 +389,7 @@
           <el-button v-if="titname == '查看'" @click="dialogCli(3)"
             >确 定</el-button
           >
-          <el-button @click="dialogCli(3)">取 消</el-button>
+          <el-button @click="dialogCli(3)">取 消</el-button> -->
         </div>
       </div>
     </el-dialog>
@@ -409,12 +426,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" style="text-align: right; padding-bottom: 20px">
-          <el-button type="primary" @click="dialogCliadd" v-if="!visionchonly"
-            >确 定</el-button
-          >
-          <el-button type="primary" @click="dialogCli(2)" v-if="visionchonly"
-            >确 定</el-button
-          >
+          <el-button type="primary" @click="formSubmit">确 定</el-button>
           <el-button @click="checkexa = false">取 消</el-button>
         </div>
       </div>
@@ -445,45 +457,34 @@ export default {
     deptTreeOnly,
   },
   data() {
-    const demandName = (rule, value, callback) => {
-      if (!this.infolist.demandName) {
-        callback(new Error("不能为空"));
-      } else {
-        callback();
-      }
-    };
-    const terminal = (rule, value, callback) => {
-      if (!this.terminal) {
-        callback(new Error("不能为空"));
-      } else {
-        callback();
-      }
-    };
     return {
       rules: {
         demandName: [
           {
             required: true,
             trigger: "blur",
-            validator: demandName,
-          },
-        ],
-        terminal: [
-          {
-            required: true,
-            trigger: "change",
-            validator: terminal,
+            message: "不能为空",
           },
         ],
       },
       tooltit: "线上渠道业务需求",
       fullscreen: false,
       total: 0,
-      pageSize: 1,
-      tableData: [{}],
-      dialogStatus: false,
-      disableStatus: false,
+      // pageSize: 1,
+      tableData: [],
+      disableStatus: true,
+      // 查看 审批 添加   弹出层 状态
+      page: 1,
+      pageSize: 10,
+      file: [], // 附件数组
       titname: "",
+      dialogStatus: false,
+      number: 0,
+      // 按钮标识
+      type: "",
+      // 联系人
+      checkexa: false,
+      // 信息回显
       infolist: {},
       userInfo: {},
       params: {},
@@ -542,7 +543,6 @@ export default {
       ],
       demandTypeopt: [],
       carryChannelopt: [],
-      checkexa: false,
       treeList: [],
       treeListonly: {},
       defaultList: [],
@@ -560,17 +560,166 @@ export default {
     };
   },
   watch: {
-    tempSave(value) {
-      if (value) {
-        // 监听编辑状态，每20秒请求一次，注意函数不加（）
-        this.timer = window.setInterval(this.temp, 20000);
-      } else {
-        // 停止监听
-        clearInterval(this.timer);
-      }
-    },
+    // tempSave(value) {
+    //   if (value) {
+    //     // 监听编辑状态，每20秒请求一次，注意函数不加（）
+    //     this.timer = window.setInterval(this.temp, 20000);
+    //   } else {
+    //     // 停止监听
+    //     clearInterval(this.timer);
+    //   }
+    // },
   },
   methods: {
+    // 新的处理方法
+    handlePreview(file) {
+      console.log(file, "Preview");
+    },
+    handleRemove(file) {
+      this.file = this.file.filter((el) => el.uid !== file.uid);
+    },
+    handleSuccess({ file }) {
+      this.file.push(file);
+    },
+    handleApprove(type) {
+      this.$refs.infolist.validate((val) => {
+        if (val) {
+          switch (type) {
+            case "送部门人员审核":
+              this.checkexa = true;
+              this.type = "0";
+              console.log("送部门人员审核");
+              break;
+            case "送领导审核":
+              this.type = "1";
+              console.log("送领导审核");
+              break;
+            case "取消":
+              this.dialogStatus = false;
+              this.disableStatus = false;
+              this.number++;
+              this.infolist = {};
+              break;
+          }
+        }
+      });
+    },
+    // 表单提交
+    formSubmit() {
+      if (!this.treeList.length) {
+        this.$message.error("请选择审核人员");
+        return;
+      }
+      console.log(this.treeList, "dadada");
+      let request = 0;
+      let formData = new FormData();
+      let params = {
+        ...this.infolist,
+        carryChannelCode: this.infolist.carryChannelCode.join(","),
+        busiStartTime: this.busiTime[0]
+          ? this.$formatDate(this.busiTime[0], "YYYY-MM-DD HH:mm:ss")
+          : "",
+        busiEndTime: this.busiTime[1]
+          ? this.$formatDate(this.busiTime[1], "YYYY-MM-DD HH:mm:ss")
+          : "",
+        // 按钮类型
+        loginNameList: this.treeList.map((el) => {
+          return el.label;
+        }),
+        loginNoList: this.treeList.map((el) => {
+          return el.loginNoStr;
+        }),
+        type: this.type,
+        // fileList: this.file,
+      };
+      // 处理其他参数
+      for (let key in params) {
+        formData.append(key, params[key]);
+      }
+      // 这是处理文件的参数
+      if (this.file.length) {
+        this.file.forEach((el, index) => {
+          if (el.constructor.name === "File") {
+            formData.append(`file${index + 1}`, el);
+          }
+        });
+      }
+      request = 1;
+      if (request) {
+        this.$http({
+          url: "/market/mkOnlineChannel/saveOrUpdate",
+          method: "post",
+          headers: {
+            "Content-Type": "multipart/form-data",
+          },
+          data: formData,
+        }).then(({ data }) => {
+          if (data && data.desc === "操作成功") {
+            this.$message({
+              type: "success",
+              message: data.desc,
+            });
+            this.dialogStatus = false;
+            this.disableStatus = false;
+            this.checkexa = false;
+            this.infolist = {};
+          }
+        });
+      }
+    },
+    // 初始化列表接口
+    handleInit() {
+      this.$http({
+        url: "/market/mkOnlineChannel/queryPage",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: {
+          page: this.page,
+          pageSize: this.pageSize,
+        },
+      }).then(
+        ({
+          data: {
+            body: { data },
+          },
+        }) => {
+          this.tableData = data;
+        }
+      );
+    },
+    // 查看详情接口封装
+    queryDetails(id) {
+      this.$http({
+        url: "/market/mkOnlineChannel/getMkOnlineChannelById",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: id,
+      }).then(
+        ({
+          data: {
+            body: { mkOnlineChannel },
+          },
+        }) => {
+          this.infolist = {
+            ...mkOnlineChannel,
+            carryChannelCode: mkOnlineChannel.carryChannelCode.split(","),
+          };
+          this.busiTime = [
+            mkOnlineChannel.busiStartTime,
+            mkOnlineChannel.busiEndTime,
+          ];
+          this.rovaList = mkOnlineChannel.logList
+          this.datalist.attList =  mkOnlineChannel.attList
+          // this.infodatas = mkOnlineChannel.logList
+          this.disableStatus = true;
+        }
+      );
+    },
+    // 老方法
     temp() {
       if (JSON.stringify(this.infolist) == "{}") {
         return;
@@ -605,7 +754,9 @@ export default {
     },
     deletes(v) {
       // this.treeListonly = {};
-      this.treeList = this.treeList.filter((el) => el.loginNoStr !== v.loginNoStr);
+      this.treeList = this.treeList.filter(
+        (el) => el.loginNoStr !== v.loginNoStr
+      );
       this.closeList = !this.closeList;
     },
     treeCheckonly(v) {
@@ -625,6 +776,7 @@ export default {
       this.fileInfo.fileList = [];
       this.dialogStatus = false;
       this.checkexa = false;
+      this.busiTime = []
     },
     //获取列表
     getList(v, n) {
@@ -651,177 +803,177 @@ export default {
       this.pageSize = v;
       this.getList(this.params, this.pageSize);
     },
-    //申请
-    dialogCheck(v, n) {
+    //申请  // 打开弹出层
+    dialogCheck(type, data) {
       this.dialogStatus = true;
-      let infolist = Object.assign({}, n);
+      // let infolist = Object.assign({}, n);
       this.vision = "";
       this.visionsts = "";
       this.infodatas = [{}, {}];
-      if (v === 1) {
+      if (type === 1) {
         this.titname = "查看";
-        this.disableStatus = true;
-      } else if (v === 2) {
+        this.queryDetails(data.woNo);
+      } else if (type === 2) {
         this.titname = "审批";
         this.disableStatus = true;
-      } else if (v === 3) {
-        this.$http({
-          url: "/market/bpmTemp/query",
-          method: "post",
-          headers: { "Content-Type": "application/json" },
-          data: { bpmType: "1" },
-        }).then((res) => {
-          if (res.data) {
-            let content = JSON.parse(res.data.content);
-            this.infolist = content.infolist;
-            this.attList = content.attList;
-            this.fileInfo.fileList = content.fileList;
-          }
-          this.tempSave = true;
-          this.titname = "添加";
-          this.visionchonly = false;
-          this.disableStatus = false;
-        });
-        return;
-      }
-      this.$http({
-        url: "/bpm/api/taskInit",
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        data: {
-          woNo: n.woNo,
-        },
-      }).then((res) => {
-        // this.infolist = Object.assign({}, res.data);
-        this.terminal = infolist.procId;
-        this.opname = res.data.opName;
-        this.opno = res.data.opNo;
-        this.infolist = JSON.parse(res.data.params.terminalRes);
-        res.data.params.fillList
-          ? (this.infodatas = JSON.parse(res.data.params.fillList))
-          : "";
-        this.infolist.procId = infolist.procId;
-        this.infolist.procVersion = infolist.procVersion;
-        this.remark = infolist.remark;
-        this.infolist.stepId = infolist.stepId;
-        this.infolist.taskId = infolist.taskId;
-        this.infolist.taskName = infolist.taskName;
-        this.infolist.opName = infolist.opName;
-        this.infolist.opNo = infolist.opNo;
-        this.infolist.opTime = infolist.opTime;
-        this.infolist.woNo = infolist.woNo;
-        this.busiTime = [];
-        this.busiTime[0] = this.infolist.busiStartTime;
-        this.busiTime[1] = this.infolist.busiEndTime;
+      } else if (type === 3) {
+        this.titname = "添加";
         this.visionchonly = false;
-        if (
-          res.data.taskList[res.data.taskList.length - 1].taskName == "流程发起"
-        ) {
-          this.vision = "流程发起";
-          if (this.titname == "审批") {
-            this.disableStatus = false;
-          }
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-          "科室主任初审"
-        ) {
-          this.vision = "科室主任初审";
-          this.visionsts = "2";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-          "部门副主任复审"
-        ) {
-          this.vision = "部门副主任复审";
-          this.visionsts = "2";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-            "主管副总终审" ||
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-            "部门副主任终审"
-        ) {
-          this.vision = "主管副总终审";
-          this.visionsts = "2";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-          "需求预评估"
-        ) {
-          this.vision = "需求预评估";
-          this.visionsts = "2";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-          "需求预评估初审"
-        ) {
-          this.vision = "需求预评估初审";
-          this.visionsts = "2";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-          "需求预评估复审"
-        ) {
-          this.vision = "需求预评估复审";
-          this.visionsts = "2";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName ==
-          "渠道经理会签"
-        ) {
-          this.vision = "渠道经理会签";
-          this.visionsts = "2";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName == "需求确认"
-        ) {
-          this.vision = "需求确认";
-          this.visionsts = "3";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName == "上线管理"
-        ) {
-          this.vision = "上线管理";
-          this.visionsts = "3";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName == "上线验证"
-        ) {
-          this.vision = "上线验证";
-          this.visionsts = "3";
-          this.visionchonly = true;
-        } else if (
-          res.data.taskList[res.data.taskList.length - 1].taskName == "信息补填"
-        ) {
-          this.vision = "信息补填";
-          this.visionsts = "4";
-        }
-        this.datalist.attList = JSON.parse(res.data.params.attList);
-        this.attList = [];
-        this.fileInfo.fileList = [];
-        this.datalist.attList.forEach((item) => {
-          item.id = item.attchFileId;
-          this.fileInfo.fileList.push({
-            name: item.fileName,
-            url: "",
-            id: item.id,
-            attchFileId: item.attchFileId,
-            fileName: item.fileName,
-          });
-          this.attList.push({
-            name: item.fileName,
-            url: "",
-            id: item.id,
-            attchFileId: item.attchFileId,
-            fileName: item.fileName,
-          });
-        });
-        this.rovaList = res.data.taskList;
-        this.uploadstatus = true;
-      });
+        this.disableStatus = false;
+        // this.$http({
+        //   url: "/market/bpmTemp/query",
+        //   method: "post",
+        //   headers: { "Content-Type": "application/json" },
+        //   data: { bpmType: "1" },
+        // }).then((res) => {
+        //   if (res.data) {
+        //     let content = JSON.parse(res.data.content);
+        //     this.infolist = content.infolist;
+        //     this.attList = content.attList;
+        //     this.fileInfo.fileList = content.fileList;
+        //   }
+        //   // this.tempSave = true;
+        // });
+        // return;
+      }
+      // this.$http({
+      //   url: "/bpm/api/taskInit",
+      //   method: "post",
+      //   headers: {
+      //     "Content-Type": "application/json",
+      //   },
+      //   data: {
+      //     woNo: n.woNo,
+      //   },
+      // }).then((res) => {
+      //   // this.infolist = Object.assign({}, res.data);
+      //   this.terminal = infolist.procId;
+      //   this.opname = res.data.opName;
+      //   this.opno = res.data.opNo;
+      //   this.infolist = JSON.parse(res.data.params.terminalRes);
+      //   res.data.params.fillList
+      //     ? (this.infodatas = JSON.parse(res.data.params.fillList))
+      //     : "";
+      //   this.infolist.procId = infolist.procId;
+      //   this.infolist.procVersion = infolist.procVersion;
+      //   this.remark = infolist.remark;
+      //   this.infolist.stepId = infolist.stepId;
+      //   this.infolist.taskId = infolist.taskId;
+      //   this.infolist.taskName = infolist.taskName;
+      //   this.infolist.opName = infolist.opName;
+      //   this.infolist.opNo = infolist.opNo;
+      //   this.infolist.opTime = infolist.opTime;
+      //   this.infolist.woNo = infolist.woNo;
+      //   this.busiTime = [];
+      //   this.busiTime[0] = this.infolist.busiStartTime;
+      //   this.busiTime[1] = this.infolist.busiEndTime;
+      //   this.visionchonly = false;
+      //   if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName == "流程发起"
+      //   ) {
+      //     this.vision = "流程发起";
+      //     if (this.titname == "审批") {
+      //       this.disableStatus = false;
+      //     }
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //     "科室主任初审"
+      //   ) {
+      //     this.vision = "科室主任初审";
+      //     this.visionsts = "2";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //     "部门副主任复审"
+      //   ) {
+      //     this.vision = "部门副主任复审";
+      //     this.visionsts = "2";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //       "主管副总终审" ||
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //       "部门副主任终审"
+      //   ) {
+      //     this.vision = "主管副总终审";
+      //     this.visionsts = "2";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //     "需求预评估"
+      //   ) {
+      //     this.vision = "需求预评估";
+      //     this.visionsts = "2";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //     "需求预评估初审"
+      //   ) {
+      //     this.vision = "需求预评估初审";
+      //     this.visionsts = "2";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //     "需求预评估复审"
+      //   ) {
+      //     this.vision = "需求预评估复审";
+      //     this.visionsts = "2";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName ==
+      //     "渠道经理会签"
+      //   ) {
+      //     this.vision = "渠道经理会签";
+      //     this.visionsts = "2";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName == "需求确认"
+      //   ) {
+      //     this.vision = "需求确认";
+      //     this.visionsts = "3";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName == "上线管理"
+      //   ) {
+      //     this.vision = "上线管理";
+      //     this.visionsts = "3";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName == "上线验证"
+      //   ) {
+      //     this.vision = "上线验证";
+      //     this.visionsts = "3";
+      //     this.visionchonly = true;
+      //   } else if (
+      //     res.data.taskList[res.data.taskList.length - 1].taskName == "信息补填"
+      //   ) {
+      //     this.vision = "信息补填";
+      //     this.visionsts = "4";
+      //   }
+      //   this.datalist.attList = JSON.parse(res.data.params.attList);
+      //   this.attList = [];
+      //   this.fileInfo.fileList = [];
+      //   this.datalist.attList.forEach((item) => {
+      //     item.id = item.attchFileId;
+      //     this.fileInfo.fileList.push({
+      //       name: item.fileName,
+      //       url: "",
+      //       id: item.id,
+      //       attchFileId: item.attchFileId,
+      //       fileName: item.fileName,
+      //     });
+      //     this.attList.push({
+      //       name: item.fileName,
+      //       url: "",
+      //       id: item.id,
+      //       attchFileId: item.attchFileId,
+      //       fileName: item.fileName,
+      //     });
+      //   });
+      //   this.rovaList = res.data.taskList;
+      //   this.uploadstatus = true;
+      // });
     },
     //审批
     dialogCli(v) {
@@ -1157,7 +1309,9 @@ export default {
     },
   },
   mounted() {
-    this.getList({}, 1);
+    // 调用初始化接口
+    this.handleInit();
+    // this.getList({}, 1);
     this.getUser();
     this.getTermianl();
     this.getsaleChnl();
@@ -1182,7 +1336,15 @@ export default {
     }
   }
 }
-
+.upload {
+  position: relative;
+  left: 200px;
+  top: 0px;
+  line-height: 100px;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+}
 .tabbox {
   margin-top: 15px;
 }
@@ -1201,7 +1363,6 @@ export default {
     width: 50%;
     display: inline-block;
   }
-
   span {
     width: 100px;
     display: inline-block;
@@ -1257,7 +1418,7 @@ export default {
     p {
       background: #f4f4f4;
       padding: 0 20px;
-      margin-bottom: 5px;
+      border-bottom: 1px solid #fff;
     }
   }
 
@@ -1272,7 +1433,7 @@ export default {
     p {
       display: inline-block;
       padding: 0 20px;
-      margin-bottom: 5px;
+      // margin-bottom: 5px;
     }
   }
 }

src/pages/main/performance/components/sheet.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-01-18 20:44:14
+ * @LastEditTime: 2022-01-20 18:03:26
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 
@@ -223,7 +223,7 @@
       <template v-if="id" v-slot:footer><div></div></template>
     </simple-dialog>
     <simpleDialog
-      title="审批"
+      title="提交"
       :visible="manager_approve"
       :modal="false"
       @cancel="handleApprove"
@@ -231,12 +231,8 @@
       <template v-slot:footer>
         <div>
           <el-button @click.prevent="handleApprove('1')">结束</el-button>
-          <el-button @click.prevent="handleApprove('4')" type="primary"
-            >转副总审批</el-button
-          >
-          <el-button @click.prevent="handleApprove('3')" type="primary"
-            >转总经理审批</el-button
-          >
+          <el-button @click.prevent="handleApprove('4')" type="primary">转副总审批</el-button>
+          <el-button @click.prevent="handleApprove('3')" type="primary">转总经理审批</el-button>
         </div>
       </template>
     </simpleDialog>

src/pages/main/performance/department.vue

@@ -80,7 +80,9 @@
           :id="edit_form.id"
           :type="
             edit_visible &&
-            (((edit_form.status === '1' || edit_form.status === '2') &&
+            (((edit_form.status === '1' ||
+              edit_form.status === '2' ||
+              edit_form.status === '5') &&
               duty === '9') ||
               edit_form.status === '0')
               ? 'edit'
@@ -484,10 +486,26 @@ export default {
           control: "viewFlag",
         },
         {
+          label: "当前处理人",
+          props: "currentReceiverName",
+        },
+        {
+          label: "发起时间",
+          props: "createTime",
+        },
+        {
           label: "状态",
           props: "status",
           type: "dictionary",
-          dictionary: { '-1':'已撤回', 0: "待处理", 1: "待汇总", 2: "待审批", 3: "已完成" },
+          dictionary: {
+            "-1": "已撤回",
+            0: "待处理",
+            1: "待汇总",
+            2: "待审批",
+            3: "已完成",
+            4: "已提交",
+            5: "未提交",
+          },
         },
       ],
     };