diff --git a/src/api/knifemold/receive.js b/src/api/knifemold/receive.js
index 39daa79..49ccf91 100644
--- a/src/api/knifemold/receive.js
+++ b/src/api/knifemold/receive.js
@@ -30,5 +30,8 @@ export const saveFileAssociate = data => createAPI(`PRHeader/saveFileAssociate
// 获取打印数据
export const printToolData = data => createAPI(`toolMan/printToolData`,'POST',data)
+// 关闭接收
+export const closeReceiveStatus = data => createAPI(`toolMan/closeReceiveStatus`,'POST',data)
+
diff --git a/src/api/purchaseorder/procurementReview.js b/src/api/purchaseorder/procurementReview.js
index 60faffe..68c0cb4 100644
--- a/src/api/purchaseorder/procurementReview.js
+++ b/src/api/purchaseorder/procurementReview.js
@@ -8,6 +8,9 @@ export const getPRHeaderListReview = data => createAPI(`PRHeader/getPRHeaderList
// 获取信息
export const updatePRHeader = data => createAPI(`PRHeader/updatePRHeader`,'POST',data)
+// 批量审核
+export const updatePRHeaderList = data => createAPI(`PRHeader/updatePRHeaderList`,'POST',data)
+
// 获取信息
export const getTblBaseDataList = data => createAPI(`PRHeader/getTblBaseDataList`,'POST',data)
diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue
index 0d5a3d3..863e635 100644
--- a/src/views/modules/knifemold/receive.vue
+++ b/src/views/modules/knifemold/receive.vue
@@ -85,6 +85,7 @@
width="100"
:label="buttons.operating">
+ {{'关闭'}}
{{buttons.receive}}
{{buttons.appendixInfo}}
@@ -324,7 +325,8 @@
getFileList,
printTool,
saveFileAssociate,
- printToolData
+ printToolData,
+ closeReceiveStatus
} from "@/api/knifemold/receive.js"
import {
getToolDetailList,
@@ -1416,6 +1418,23 @@
// this.initLocationFlag(queryLocation)
}
},
+ // 关闭接收
+ closeReceive(row){
+ this.$confirm(`确定进行关闭接收操作?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ row.closeFlag = 'Y'
+ closeReceiveStatus(row).then(({data}) =>{
+ if (data.code == 0){
+ this.$message.success(data.msg)
+ this.initViewIfsTable('Y')
+ }
+ })
+ })
+
+ },
//保存接收信息
saveToolInstanceId() {
let status;
diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue
index b46d096..a976a62 100644
--- a/src/views/modules/purchaseorder/procurementReview.vue
+++ b/src/views/modules/purchaseorder/procurementReview.vue
@@ -7,10 +7,13 @@
- {{buttons.search}}
- {{buttons.defaultTable}}
+ {{ buttons.search }}
+
+ {{ '批量审核-通过' }}
+
+
+ {{ '批量审核-不通过' }}
- {{ buttons.settingTable}}
- {{buttons.download}}
+ {{ buttons.download }}
-
- {{ buttons.deleteList}}
-
@@ -46,7 +45,7 @@
- {{'供应商编码'}}
+ {{ '供应商编码' }}
@@ -61,32 +60,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -100,6 +73,7 @@
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;">
+
- {{scope.row[item.columnProp]}}
+ {{ scope.row[item.columnProp] }}
@@ -124,9 +98,9 @@
width="100"
:label="buttons.operating">
- {{buttons.audit}}
- {{buttons.audit}}
- {{buttons.appendixInfo}}
+ {{ buttons.audit }}
+ {{ buttons.audit }}
+ {{ buttons.appendixInfo }}
@@ -148,7 +122,8 @@
-
+
@@ -222,8 +197,6 @@
-
-
@@ -234,1104 +207,1168 @@
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index 691ca58..6bd37ad 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -1263,7 +1263,7 @@
})
},
initReapply(row) {
- this.currentPRDetailData.orderref1 = row.requisitionno``
+ this.currentPRDetailData.orderref1 = row.requisitionno
this.currentPRDetailData.orderref2 = row.itemno
this.initAddModel(null, 'Y')
},