|
@@ -27,9 +27,9 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="mini" type="primary" @click="dialogCheck(scope.row,1)">查看</el-button>
|
|
|
<!--<el-button size="mini" type="danger" v-if="scope.row.sts==3"-->
|
|
|
- <el-button size="mini" type="danger" v-if="userInfo.loginName != scope.row.opName||scope.row.sts==3"
|
|
|
+ <el-button size="mini" type="danger" v-if="advstatus == 0 && (userInfo.loginName != scope.row.opName || scope.row.sts==0)"
|
|
|
@click="dialogCheck(scope.row,2)">审核</el-button>
|
|
|
- <el-button v-if="userInfo.loginName == scope.row.opName&&scope.row.sts=='1'" size="mini"
|
|
|
+ <el-button v-if="userInfo.loginName == scope.row.opName&&scope.row.sts=='3'" size="mini"
|
|
|
type="primary" @click="advSure(scope.row)">归档
|
|
|
</el-button>
|
|
|
</template>
|
|
@@ -113,6 +113,8 @@
|
|
|
typeList: [],
|
|
|
advtype: '',
|
|
|
dgid: '',
|
|
|
+ singleTable: {},
|
|
|
+ shParam:{}
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -145,6 +147,7 @@
|
|
|
});
|
|
|
},
|
|
|
getSts(v){
|
|
|
+ // console.log(v);
|
|
|
this.$http({
|
|
|
url: '/bpm/api/taskInit',
|
|
|
method: "post",
|
|
@@ -156,6 +159,8 @@
|
|
|
woNo: v.id
|
|
|
},
|
|
|
}).then((res) => {
|
|
|
+ this.shParam = res.data;
|
|
|
+ console.log(this.shParam);
|
|
|
if(res.data.taskName == '需求部门'){
|
|
|
v.sts = '1'
|
|
|
return
|
|
@@ -195,6 +200,9 @@
|
|
|
let _this = this;
|
|
|
this.dialogStatusc = true;
|
|
|
this.dgid = v.id;
|
|
|
+ // this.singleTable = v;
|
|
|
+ // console.log(v, this.tableData);
|
|
|
+ this.getSts(v);
|
|
|
},
|
|
|
dialogCli(v) {
|
|
|
let _this = this;
|
|
@@ -206,13 +214,25 @@
|
|
|
advTypeName = this.typeList[i].dataName;
|
|
|
}
|
|
|
}
|
|
|
- let param = {
|
|
|
+ // let param = {
|
|
|
+ // woNo: this.dgid,
|
|
|
+ // advTypeName: advTypeName,
|
|
|
+ // advType: this.advtype
|
|
|
+ // }
|
|
|
+ let gdParam = {
|
|
|
woNo: this.dgid,
|
|
|
advTypeName: advTypeName,
|
|
|
advType: this.advtype
|
|
|
}
|
|
|
+
|
|
|
+ this.shParam.params.terminalRes = JSON.stringify(Object.assign(JSON.parse(this.shParam.params.terminalRes) , gdParam))
|
|
|
+
|
|
|
+ let param = this.shParam
|
|
|
+ // console.log(param);
|
|
|
+
|
|
|
this.$http({
|
|
|
- url: "/market/cadv/mkConfirmAdv",
|
|
|
+ // url: "/market/cadv/mkConfirmAdv",
|
|
|
+ url: "/bpm/api/submitTask",
|
|
|
method: "post",
|
|
|
headers: {
|
|
|
"Content-Type": "application/json",
|