|
|
@@ -1132,17 +1132,13 @@
|
|
|
},
|
|
|
async getDetail(id) {
|
|
|
getById(id).then((res) => {
|
|
|
+ console.log(res.data, 'res.data');
|
|
|
if (res.data.jobList?.length == 1) {
|
|
|
res.data.executeJobId = res.data.jobList[0].id;
|
|
|
res.data.executeJobName = res.data.jobList[0].name;
|
|
|
-
|
|
|
- // this.execute = res.data.jobList[0].userVOList;
|
|
|
}
|
|
|
this.form = res.data;
|
|
|
- console.log(this.form.qualityResults, '返回的结果');
|
|
|
- this.form.executeUserIdList = this.form.executeUserId
|
|
|
- ? this.form.executeUserId.split(',')
|
|
|
- : [];
|
|
|
+
|
|
|
console.log(this.form, 'this.form');
|
|
|
this.form.executeUserIdList = this.form.executeUserId
|
|
|
? this.form.executeUserId.split(',')
|
|
|
@@ -1531,17 +1527,7 @@
|
|
|
if (!valid) {
|
|
|
return false;
|
|
|
}
|
|
|
- // this.loading = true;
|
|
|
- // let URL =
|
|
|
- // this.type == 'add' ? save : this.type == 'edit' ? update : '';
|
|
|
-
|
|
|
- // this.form.qualityTimeStart = this.qualityTimeStart;
|
|
|
- // this.form.qualityId = this.form.qualityIdList.join(',');
|
|
|
|
|
|
- // delete this.form['qualityTimeEnd'];
|
|
|
-
|
|
|
- // this.form.executeUserId = '';
|
|
|
- // this.form.executeUserName = '';
|
|
|
let URL =
|
|
|
this.type == 'add' ? save : this.type == 'edit' ? update : '';
|
|
|
|
|
|
@@ -1758,8 +1744,8 @@
|
|
|
this.form.executeUserIdList.length > 1
|
|
|
? this.form.executeUserName +
|
|
|
',' +
|
|
|
- this.$store.state.user.info.userName
|
|
|
- : this.$store.state.user.info.userName;
|
|
|
+ this.$store.state.user.info.name
|
|
|
+ : this.$store.state.user.info.name;
|
|
|
}
|
|
|
this.form.executeUserId = this.form.executeUserIdList.join(',');
|
|
|
|
|
|
@@ -1780,6 +1766,8 @@
|
|
|
exeReportWork(params)
|
|
|
.then((msg) => {
|
|
|
this.loading = false;
|
|
|
+ console.log(params, 'paramsparams');
|
|
|
+
|
|
|
this.restForm();
|
|
|
this.$message.success(msg);
|
|
|
this.visible = false;
|