|
@@ -115,16 +115,18 @@ export default {
|
|
return (
|
|
return (
|
|
((item.isImportExcel &&
|
|
((item.isImportExcel &&
|
|
item.orderType != 'INSTALL' &&
|
|
item.orderType != 'INSTALL' &&
|
|
- (['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) ||
|
|
|
|
- (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
|
|
- !userInfo.workerNumber))) ||
|
|
|
|
|
|
+ ['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item))) ||
|
|
// ---------------
|
|
// ---------------
|
|
(item.isImportExcel &&
|
|
(item.isImportExcel &&
|
|
item.orderType != 'INSTALL' &&
|
|
item.orderType != 'INSTALL' &&
|
|
['YWG'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
['YWG'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
this.isTodayOrYesterday(item.overTime)) ||
|
|
this.isTodayOrYesterday(item.overTime)) ||
|
|
// ---------------
|
|
// ---------------
|
|
- (!item.isImportExcel && ['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)))) &&
|
|
|
|
|
|
+ (!item.isImportExcel && ['DYY'].includes(this.orderStatus_v_zh(item.orderStatus, item))) ||
|
|
|
|
+ // ---------------
|
|
|
|
+ (!item.isImportExcel &&
|
|
|
|
+ ['FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
|
|
+ item.orderType != 'INSTALL')) &&
|
|
(item.isImportExcel ? item.isMeet : true)
|
|
(item.isImportExcel ? item.isMeet : true)
|
|
)
|
|
)
|
|
},
|
|
},
|
|
@@ -136,11 +138,6 @@ export default {
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
(item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
|
|
(item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
|
|
// ---------------
|
|
// ---------------
|
|
- (item.isImportExcel &&
|
|
|
|
- ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
|
|
- item.orderType != 'INSTALL' &&
|
|
|
|
- !userInfo.workerNumber) ||
|
|
|
|
- // ---------------
|
|
|
|
(!item.isImportExcel &&
|
|
(!item.isImportExcel &&
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
(item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))) &&
|
|
(item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))) &&
|
|
@@ -154,11 +151,6 @@ export default {
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
(item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
|
|
(item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
|
|
//----------
|
|
//----------
|
|
- (item.isImportExcel &&
|
|
|
|
- ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
|
|
- item.orderType != 'INSTALL' &&
|
|
|
|
- !userInfo.workerNumber) ||
|
|
|
|
- //----------
|
|
|
|
(!item.isImportExcel &&
|
|
(!item.isImportExcel &&
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
!!userInfo.workerNumber) ||
|
|
!!userInfo.workerNumber) ||
|
|
@@ -178,9 +170,7 @@ export default {
|
|
return (
|
|
return (
|
|
((item.isImportExcel &&
|
|
((item.isImportExcel &&
|
|
item.orderType != 'INSTALL' &&
|
|
item.orderType != 'INSTALL' &&
|
|
- (['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) ||
|
|
|
|
- (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
|
|
- !userInfo.workerNumber))) ||
|
|
|
|
|
|
+ ['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item))) ||
|
|
//----------
|
|
//----------
|
|
(!item.isImportExcel &&
|
|
(!item.isImportExcel &&
|
|
item.orderType != 'INSTALL' &&
|
|
item.orderType != 'INSTALL' &&
|
|
@@ -198,13 +188,10 @@ export default {
|
|
(item.isImportExcel ? item.isMeet : true)
|
|
(item.isImportExcel ? item.isMeet : true)
|
|
)
|
|
)
|
|
},
|
|
},
|
|
|
|
+ // 过程反馈
|
|
GUOCHENFANKUI(item, userInfo) {
|
|
GUOCHENFANKUI(item, userInfo) {
|
|
return (
|
|
return (
|
|
- (['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) ||
|
|
|
|
- (item.isImportExcel &&
|
|
|
|
- item.orderType != 'INSTALL' &&
|
|
|
|
- !userInfo.workerNumber &&
|
|
|
|
- ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(this.orderStatus_v_zh(item.orderStatus, item)))) &&
|
|
|
|
|
|
+ ['DYY', 'FWZ'].includes(this.orderStatus_v_zh(item.orderStatus, item)) &&
|
|
(item.isImportExcel ? item.isMeet : true)
|
|
(item.isImportExcel ? item.isMeet : true)
|
|
)
|
|
)
|
|
}
|
|
}
|