|
@@ -39,7 +39,7 @@
|
|
|
<jimureportBrowse
|
|
<jimureportBrowse
|
|
|
:businessId="row.id"
|
|
:businessId="row.id"
|
|
|
businessCode="eommaintenance"
|
|
businessCode="eommaintenance"
|
|
|
- v-if="row.orderStatus==3"
|
|
|
|
|
|
|
+ v-if="row.orderStatus == 3"
|
|
|
></jimureportBrowse>
|
|
></jimureportBrowse>
|
|
|
<el-link
|
|
<el-link
|
|
|
v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
|
|
v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
|
|
@@ -156,6 +156,9 @@
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 120,
|
|
minWidth: 120,
|
|
|
formatter: (row) => {
|
|
formatter: (row) => {
|
|
|
|
|
+ if (row.executeGroupName) {
|
|
|
|
|
+ return row.executeGroupName;
|
|
|
|
|
+ }
|
|
|
if (row.executeUserType == 0) {
|
|
if (row.executeUserType == 0) {
|
|
|
return row.executeUsers.map((i) => i.groupName).join(',');
|
|
return row.executeUsers.map((i) => i.groupName).join(',');
|
|
|
}
|
|
}
|
|
@@ -168,6 +171,9 @@
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
formatter: (row) => {
|
|
formatter: (row) => {
|
|
|
|
|
+ if (row.executeUserName) {
|
|
|
|
|
+ return row.executeUserName;
|
|
|
|
|
+ }
|
|
|
if (row.executeUserType == 0) {
|
|
if (row.executeUserType == 0) {
|
|
|
return row.executeUsers.map((i) => i.userName).join(',');
|
|
return row.executeUsers.map((i) => i.userName).join(',');
|
|
|
}
|
|
}
|
|
@@ -303,7 +309,7 @@
|
|
|
data.deviceList = data.deviceList.map((item) => {
|
|
data.deviceList = data.deviceList.map((item) => {
|
|
|
return item.substance;
|
|
return item.substance;
|
|
|
});
|
|
});
|
|
|
- console.log(3333333333333,111)
|
|
|
|
|
|
|
+ console.log(3333333333333, 111);
|
|
|
this.$refs.edit.open(data, 'add');
|
|
this.$refs.edit.open(data, 'add');
|
|
|
},
|
|
},
|
|
|
goDetail({ id }) {
|
|
goDetail({ id }) {
|