|
@@ -55,7 +55,10 @@
|
|
|
(edit_form.status === '2' ||
|
|
|
edit_form.status === '6' ||
|
|
|
edit_form.status === '7') &&
|
|
|
- (duty === '8' ||duty === '7' || duty === '3' || duty === '4') &&
|
|
|
+ (duty === '8' ||
|
|
|
+ duty === '7' ||
|
|
|
+ duty === '3' ||
|
|
|
+ duty === '4') &&
|
|
|
reviewType === duty
|
|
|
"
|
|
|
@click="handleApprove"
|
|
@@ -126,21 +129,25 @@
|
|
|
<template v-slot:footer
|
|
|
><div>
|
|
|
<div v-if="type === '1'">
|
|
|
- <el-button @click="handleTurn('finish')" type="primary">结束</el-button>
|
|
|
- <el-button @click="handleTurn('transfer')"
|
|
|
- >转副总审批</el-button
|
|
|
+ <el-button @click="handleTurn('finish')" type="primary"
|
|
|
+ >结束</el-button
|
|
|
>
|
|
|
+ <el-button @click="handleTurn('transfer')">转副总审批</el-button>
|
|
|
<el-button @click="handleTurn('transfermanger')"
|
|
|
>转总经理审批</el-button
|
|
|
>
|
|
|
</div>
|
|
|
<div v-else-if="type === '2'">
|
|
|
- <el-button @click="handleTurn('finish')" type="primary">结束</el-button>
|
|
|
- <el-button @click="handleTurn('return')" type="primary">退回</el-button>
|
|
|
- <el-button @click="handleTurn('back')" type="primary">打回</el-button>
|
|
|
- <el-button @click="handleTurn('transfer')"
|
|
|
- >转总经理审批</el-button
|
|
|
+ <el-button @click="handleTurn('finish')" type="primary"
|
|
|
+ >结束</el-button
|
|
|
+ >
|
|
|
+ <el-button @click="handleTurn('return')" type="primary"
|
|
|
+ >退回</el-button
|
|
|
+ >
|
|
|
+ <el-button @click="handleTurn('back')" type="primary"
|
|
|
+ >打回</el-button
|
|
|
>
|
|
|
+ <el-button @click="handleTurn('transfer')">转总经理审批</el-button>
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<el-button @click="handleTurn('back')">打回</el-button>
|
|
@@ -228,6 +235,9 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<div>
|
|
|
+ <!-- <el-button class="margin-right-10" @click="newSave()" type="primary"
|
|
|
+ >保存修改</el-button
|
|
|
+ > -->
|
|
|
<el-button
|
|
|
class="margin-right-10"
|
|
|
@click.prevent="handleCharge('add')"
|
|
@@ -295,6 +305,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ // rowList: [],
|
|
|
page: 1,
|
|
|
idx: "",
|
|
|
rows: 10,
|
|
@@ -413,7 +424,7 @@ export default {
|
|
|
],
|
|
|
},
|
|
|
trackList: [],
|
|
|
- creatloginNameStr:"",//发起人name
|
|
|
+ creatloginNameStr: "", //发起人name
|
|
|
// 顶部form
|
|
|
table_form: [
|
|
|
{
|
|
@@ -608,7 +619,7 @@ export default {
|
|
|
...this.table_search,
|
|
|
page: this.page,
|
|
|
pageSize: this.rows,
|
|
|
- id : this.getUrlKey("id")//获取地址栏参数
|
|
|
+ id: this.getUrlKey("id"), //获取地址栏参数
|
|
|
});
|
|
|
// 职位
|
|
|
this.duty = JSON.parse(sessionStorage.userInfo).duty;
|
|
@@ -695,8 +706,8 @@ export default {
|
|
|
},
|
|
|
// 编辑按钮
|
|
|
handleEdit(row) {
|
|
|
- console.log(row.loginNameStr)
|
|
|
- this.creatloginNameStr=row.loginNameStr
|
|
|
+ console.log(row.loginNameStr);
|
|
|
+ this.creatloginNameStr = row.loginNameStr;
|
|
|
this.visible = true;
|
|
|
this.edit_visible = true;
|
|
|
this.edit_form = row;
|
|
@@ -970,7 +981,10 @@ export default {
|
|
|
}).then(({ data }) => {
|
|
|
this.transfer_list_orgin = data
|
|
|
.filter((el) => {
|
|
|
- return el.loginNoStr !== loginNoStr&&el.loginNameStr !== this.creatloginNameStr;
|
|
|
+ return (
|
|
|
+ el.loginNoStr !== loginNoStr &&
|
|
|
+ el.loginNameStr !== this.creatloginNameStr
|
|
|
+ );
|
|
|
})
|
|
|
.map((el) => ({
|
|
|
...el,
|
|
@@ -1179,6 +1193,51 @@ export default {
|
|
|
this.receiver_table_list = data;
|
|
|
});
|
|
|
},
|
|
|
+ // newSave() {
|
|
|
+ // const sheet_name = window.luckysheet.getSheet().name;
|
|
|
+ // const data = window.luckysheet.getSheet(sheet_name);
|
|
|
+ // const workbook_name = window.luckysheet.getWorkbookName();
|
|
|
+ // console.log(sheet_name);
|
|
|
+ // console.log(data);
|
|
|
+ // console.log(workbook_name);
|
|
|
+ // // 经理提交
|
|
|
+ // this.rowList.shift();
|
|
|
+ // let reqdata = {
|
|
|
+ // rowIndex: [...new Set(this.rowList)]
|
|
|
+ // .sort(function (a, b) {
|
|
|
+ // return a - b;
|
|
|
+ // })
|
|
|
+ // .join(","),
|
|
|
+ // rowContent: [...new Set(this.rowList)]
|
|
|
+ // .sort(function (a, b) {
|
|
|
+ // return a - b;
|
|
|
+ // })
|
|
|
+ // .map((el) => {
|
|
|
+ // return data.data[el];
|
|
|
+ // }),
|
|
|
+ // };
|
|
|
+ // this.$http({
|
|
|
+ // url: "/market/CMKIssued/CMKIssuedSubmit", // 提交
|
|
|
+ // method: "post",
|
|
|
+ // headers: {
|
|
|
+ // "Content-Type": "application/json",
|
|
|
+ // },
|
|
|
+ // data: {
|
|
|
+ // id: this.template_id,
|
|
|
+ // templateContent: JSON.stringify(data),
|
|
|
+ // templateName: workbook_name,
|
|
|
+ // issuedId: this.edit_form.id,
|
|
|
+ // // rowJson: JSON.stringify(reqdata),
|
|
|
+ // },
|
|
|
+ // });
|
|
|
+ // },
|
|
|
+ // updated: function ({ range }) {
|
|
|
+ // const middle = range.map((el) => {
|
|
|
+ // return that.paramsArr(el.row[0], el.row[1]);
|
|
|
+ // });
|
|
|
+ // let changedList = middle.join(",").split(",");
|
|
|
+ // this.rowList.push(...changedList);
|
|
|
+ // },
|
|
|
// 关闭方法
|
|
|
handleCancel(data) {
|
|
|
switch (data) {
|