diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index b476955..9b11503 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -137,6 +137,7 @@ export const saveCheckOrderReport = data => createAPI(`/pms/eam/saveCheckOrderRe
export const changeOrderOperator = data => createAPI(`/pms/eam/changeOrderOperator`,'post',data)
export const saveOrderReportForDefect= data => createAPI(`/pms/eam/saveOrderReportForDefect`,'post',data)
export const checkWorkOrder= data => createAPI(`/pms/eam/checkWorkOrder`,'post',data)
+export const returnWorkOrder= data => createAPI(`/pms/eam/returnWorkOrder`,'post',data)
export const selectNameByMes= data => createAPI(`/pms/eam/selectNameByMes`,'post',data)
export const submitDefect= data => createAPI(`/pms/eam/submitDefect`,'post',data)
export const submitDefects= data => createAPI(`/pms/eam/submitDefects`,'post',data)
diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index d9a687f..72cd8e9 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -194,6 +194,7 @@
取消审核
审核
+ 退回
@@ -397,6 +398,7 @@
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import excel from "@/utils/excel-util.js";
+ import {returnWorkOrder} from "../../../api/eam/eam";
export default {
components: {
Chooselist
@@ -1490,6 +1492,29 @@
})
}
},
+ returnModal(){
+ let mesUser = this.$store.state.user.name
+ this.submitData.site = this.saveData.site
+ this.submitData.buNo = this.saveData.buNo
+ this.submitData.orderNo = this.saveData.orderNo
+ this.submitData.planID = this.saveData.planID
+ this.submitData.objectID = this.saveData.objectID
+ this.submitData.checker = this.saveData.checker
+ this.submitData.checkerName = this.saveData.checkerName
+ this.submitData.status = this.saveData.status
+ if (!this.submitData.checker.split(';').includes(mesUser)){
+ this.$message.warning('审核人员与计划不符！')
+ return
+ }
+ //先保存
+ this.updateWorkOrder()
+ //退回操作
+ returnWorkOrder(this.submitData).then(({data})=>{
+ if (data && data.code === 0) {
+ this.getDataList()
+ }
+ })
+ },
// 批量审核按钮
checkModals () {
diff --git a/src/views/modules/ecss/ecssTemplate.vue b/src/views/modules/ecss/ecssTemplate.vue
index 457d70e..3d5668c 100644
--- a/src/views/modules/ecss/ecssTemplate.vue
+++ b/src/views/modules/ecss/ecssTemplate.vue
@@ -119,54 +119,54 @@
-
+
- 品名
+ 品名
- 合同
+ 合同
- UPC
+ UPC
- SO
+ SO
- 货物明细
+ 货物明细
- Hs Code
+ Hs Code
-
- 是否维护纯FSC纸重量损耗
+
+ 是否维护纯FSC纸重量损耗
-
+
中文
英文
-
+
序号
栈板号
@@ -190,12 +190,7 @@
-
-
-
-
-
-
+
@@ -205,7 +200,7 @@
-
+
@@ -214,7 +209,11 @@
-
+
+
+
+
+
@@ -256,7 +255,7 @@
-
+
diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue
index fad9664..b5abd96 100644
--- a/src/views/modules/part/quicklyCreateBom.vue
+++ b/src/views/modules/part/quicklyCreateBom.vue
@@ -1372,6 +1372,7 @@ export default {
this.attributeFlag1 = true
this.inventoryPartTable = 'part_item'
this.getNodeTree()
+ this.getPartItem()
} else {
this.previousCodeNo = this.searchData.codeNo
}
@@ -3549,6 +3550,7 @@ export default {
partDesc: row.partDesc,
printUnit: row.printUnit,
printUnitName: row.printUnitName,
+ processUnit: row.processUnit,
bomType: 'Manufacturing',
nodeId: this.currentNode.nodeId,
offFlag: '2'
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index e4a73c9..d2cd2d4 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -54,6 +54,12 @@
+
+
+
+
+
+
查询
{{'导出'}}
@@ -135,10 +141,13 @@
value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="到达时间">
+
+
+
-
+
@@ -598,7 +607,8 @@
page: 1,
limit: 10,
searchType: 'reportMaintenance',
- checkType: ''
+ checkType: '',
+ isReturn: 'N'
},
height: 200,
pageIndex: 1,
@@ -2078,6 +2088,7 @@
},
reportModal (row) {
+ console.log(row)
this.saveData = {
site: row.site,
buNo: row.buNo,
@@ -2089,7 +2100,9 @@
remark: '',
mesUser: this.$store.state.user.name,
itemList: [],
- checkResult: '',
+ isReturn: row.isReturn,
+ checkResult: row.checkResult,
+ disposalMeasures: row.disposalMeasures,
operator: row.operator,
operatorName: row.operatorName,
functionType: 'B',
@@ -2131,6 +2144,7 @@
}
}
this.saveData.itemList = JSON.parse(JSON.stringify(this.detailList))
+ console.log(this.saveData)
await saveCheckOrderReport(this.saveData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()