diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 7ef9f1a1b..61729ce42 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -218,7 +218,6 @@ export const InspectRequest = [ { label: "收货数量", prop: "receiveQty" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, - { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" }, { label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, { label: "库位", prop: 'locationCode' }, { label: "ERP库位", prop: 'locationErpCode' }, @@ -258,6 +257,7 @@ export const InspectRequest = [ { label: "尺寸", prop: 'volume' }, { label: "重量", prop: 'weight' }, { label: "其他属性", prop: 'otherPropertyJson' }, + // { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" }, // { label: "检验人姓名", prop: 'inspectUserName' }, // { label: "检验人电话", prop: 'inspectUserPhone' }, // { label: "检验人邮件", prop: 'inspectUserEmail' }, diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue index 5e4c7c742..0bd5be02a 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue @@ -91,7 +91,7 @@ export default { }, data () { return { - URL: 'wms/job/purchase-return-job', + URL: 'wms/store/purchase-return-job', //常用按钮数据 currenButtonData: [ this.defaultFieldSettingBtn(),//字段设置 diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index 3aaa3a2c8..d612a4ff2 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -737,6 +737,13 @@ export default { delete item.buttonHide } }) + // 成功清除检验!操作后,刷新明细列表 + this.loading = false + getDetailed(this.propsData.id, this.URL).then(res => { + this.propsData = res + }) + this.paging() + this.loading = false this.inspectNoticeDetailsTableLoading = false }).catch(err => { console.log(err) @@ -864,6 +871,13 @@ export default { item.buttonHide = false } }) + // 检验操作后,刷新明细列表 + this.loading = false + getDetailed(this.propsData.id, this.URL).then(res => { + this.propsData = res + }) + this.paging() + this.loading = false }).catch(err => { console.log(err) }) @@ -900,6 +914,13 @@ export default { item.buttonHide = false } }) + // 检验操作后,刷新明细列表 + this.loading = false + getDetailed(this.propsData.id, this.URL).then(res => { + this.propsData = res + }) + this.paging() + this.loading = false }).catch(err => { console.log(err) }) @@ -911,6 +932,7 @@ export default { } else if (val[0] == 2) { this.inspectShow = false } + }, // 检验 table添加按钮 inspectAddTable(val) {