diff --git a/src/api/request2.js b/src/api/request2.js
index 581912e8..b65693b1 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -3029,6 +3029,57 @@ export function customerReturnRecordSubmit(params) {
});
}
+/**
+ * 客户退货 记录列表
+ * @param {*} params
+ */
+export function getCustomerReturnRecordList(params) {
+ return request({
+ url: baseApi + "/wms/customerreturn-record-detail/senior",
+ method: "post",
+ data: params,
+ });
+}
+
+/**
+ * 客户退货 记录详情
+ * @param {*} params
+ */
+
+export function getCustomerReturnRecordDetail(id) {
+ return request({
+ url: baseApi + "/wms/customerreturn-record-detail/page?masterId=" + id,
+ method: "get",
+ data: {},
+ });
+}
+
+/**
+ * 客户退货 拒收
+ * @param {*} params
+ */
+
+export function customerReturnRecordRefuse(id) {
+ return request({
+ url: baseApi + "/wms/customerreturn-record-main/refuse?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 客户退货 接收
+ * @param {*} params
+ */
+
+export function customerReturnRecordReceive(id) {
+ return request({
+ url: baseApi + "/wms/customerreturn-record-main/receive?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
/**
* 调拨入库 任务
* status 任务状态
@@ -3694,6 +3745,59 @@ export function productionReturnRecordSubmit(params) {
});
}
+/**
+ * 生产隔离退料 记录列表
+ * @param {*} params
+ */
+export function getProductionReturnRecordList(params) {
+ return request({
+ url: baseApi + "/wms/productionreturn-record-detail-hold/senior",
+ method: "post",
+ data: params,
+ });
+}
+
+/**
+ * 生产隔离退料 记录详情
+ * @param {*} params
+ */
+
+export function getProductionReturnRecordDetail(id) {
+ return request({
+ url: baseApi + "/wms/productionreturn-record-detail/page?masterId=" + id,
+ method: "get",
+ data: {},
+ });
+}
+
+/**
+ * 生产隔离退料 拒收
+ * @param {*} params
+ */
+
+export function productionReturnRecordRefuse(id) {
+ return request({
+ url: baseApi + "/wms/productionreturn-record-main/refuse?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 生产隔离退料 接收
+ * @param {*} params
+ */
+
+export function productionReturnRecordReceive(id) {
+ return request({
+ url: baseApi + "/wms/productionreturn-record-main/receive?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+
+
/**
* 计划外出库申请
@@ -4495,6 +4599,21 @@ export function planReceiptSubmit(params) {
});
}
+/**
+ * 按计划完工提交 李达明
+ * @param {*}
+ */
+
+export function createByPlanSubmit(params) {
+ return request({
+ url: baseApi + "/wms/productreceipt-record-main/createByPlanToSenior",
+ method: "post",
+ data: params
+ });
+}
+
+
+
/**
* @param {Object} params 创建计划完工后调用上架申请 number
*/
@@ -4612,6 +4731,57 @@ export function getBalanceByBusinessType(params) {
});
}
+/**
+ * 物料隔离 记录列表
+ * @param {*} params
+ */
+export function getInventoryMoveRecordList(params) {
+ return request({
+ url: baseApi + "/wms/inventorymove-record-detail/senior",
+ method: "post",
+ data: params,
+ });
+}
+
+/**
+ * 物料隔离 记录详情
+ * @param {*} params
+ */
+
+export function getInventoryMoveRecordDetail(id) {
+ return request({
+ url: baseApi + "/wms/inventorymove-record-detail/page?masterId=" + id,
+ method: "get",
+ data: {},
+ });
+}
+
+/**
+ * 物料隔离 拒收
+ * @param {*} params
+ */
+
+export function inventoryMoveRecordRefuse(id) {
+ return request({
+ url: baseApi + "/wms/inventorymove-record-main/refuse?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 物料隔离 接收
+ * @param {*} params
+ */
+
+export function inventoryMoveRecordReceive(id) {
+ return request({
+ url: baseApi + "/wms/inventorymove-record-main/receive?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
diff --git a/src/common/directory.js b/src/common/directory.js
index 3c2a8980..369ed7ed 100644
--- a/src/common/directory.js
+++ b/src/common/directory.js
@@ -1,4 +1,5 @@
let jobStatusList = [];
+let receiveStatusList = [];
let itemStatusList = [];
let itemTypeList = [];
let locationTypeList = [];
@@ -42,6 +43,7 @@ export function getBusinessTypeDesc(type) {
//获取字典信息
export function clearCacheData() {
jobStatusList = [];
+ receiveStatusList=[];
itemStatusList = [];
itemTypeList = [];
locationTypeList = [];
@@ -138,6 +140,22 @@ export function getJobStateInfo(value) {
return resultInfo
}
+export function getReceiveStateInfo(value) {
+ var resultInfo = "";
+ if (receiveStatusList.length == 0) {
+ receiveStatusList = getDirectoryInfo("receive_status")
+ }
+ if (receiveStatusList.length > 0) {
+ for (let item of receiveStatusList) {
+ if (item.value == value) {
+ resultInfo = item
+ break;
+ }
+ }
+ }
+ return resultInfo
+}
+
//获取任务状态样式
export function getJobStateStyle(value) {
let item = getJobStateInfo(value);
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 49e6e35f..a2d135ee 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2308,6 +2308,30 @@ button::after {
border-radius: 10rpx;
}
+.receive_state_no_ok {
+ font-size: 28rpx;
+ background: rgba(236, 156, 0, 0.2);
+ color: #EC9C00;
+ padding: 10rpx 20rpx 10rpx 20rpx;
+ border-radius: 10rpx;
+}
+
+.receive_state_ok {
+ font-size: 28rpx;
+ background: rgba(95, 203, 148, 0.2);
+ color: #22AF68;
+ padding: 10rpx 20rpx 10rpx 20rpx;
+ border-radius: 10rpx;
+}
+
+.receive_state_reject {
+ font-size: 28rpx;
+ background: rgba(95, 203, 148, 0.2);
+ color: #22AF68;
+ padding: 10rpx 20rpx 10rpx 20rpx;
+ border-radius: 10rpx;
+}
+
.pop_detail {
background-color: #fff;
width: 100%;
diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 69717a16..2f624835 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -13,7 +13,7 @@
-
+
@@ -67,6 +67,11 @@
type: Boolean,
default: true
},
+ isShowToLocation: {
+ type: Boolean,
+ default: false
+ },
+
locationAreaTypeList: {
type: Array,
default: null
diff --git a/src/mycomponents/receive/receiveBottom.vue b/src/mycomponents/receive/receiveBottom.vue
new file mode 100644
index 00000000..5559629b
--- /dev/null
+++ b/src/mycomponents/receive/receiveBottom.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ {{dataContent.creator}}
+
+
+
+ {{formatDate(dataContent.createTime)}}
+
+
+
+
+
+
+
+
diff --git a/src/mycomponents/receive/receiveNumber.vue b/src/mycomponents/receive/receiveNumber.vue
new file mode 100644
index 00000000..94a38499
--- /dev/null
+++ b/src/mycomponents/receive/receiveNumber.vue
@@ -0,0 +1,36 @@
+
+
+
+ {{number}}
+
+
+
+
+
+
+
+
+
diff --git a/src/mycomponents/receive/receiveStatus.vue b/src/mycomponents/receive/receiveStatus.vue
new file mode 100644
index 00000000..9694538c
--- /dev/null
+++ b/src/mycomponents/receive/receiveStatus.vue
@@ -0,0 +1,46 @@
+
+
+
+ {{ receiveStatusInfo.label}}
+
+
+
+
+
+
+
+
diff --git a/src/mycomponents/receive/receiveTop.vue b/src/mycomponents/receive/receiveTop.vue
new file mode 100644
index 00000000..4fc902fe
--- /dev/null
+++ b/src/mycomponents/receive/receiveTop.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mycomponents/receive/recordComDetailCard.vue b/src/mycomponents/receive/recordComDetailCard.vue
new file mode 100644
index 00000000..0a0fe46e
--- /dev/null
+++ b/src/mycomponents/receive/recordComDetailCard.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/mycomponents/receive/recordComMainCard.vue b/src/mycomponents/receive/recordComMainCard.vue
new file mode 100644
index 00000000..34f3c6e0
--- /dev/null
+++ b/src/mycomponents/receive/recordComMainCard.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 8b2ceaba..86ae76ec 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1010,6 +1010,42 @@
}
},
+ {
+ "path": "pages/productionReturn/record/returnToHoldRecordList",
+ "style": {
+ "navigationBarTitleText": "隔离退料接收确认",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/productionReturn/record/returnToHoldRecordListDetail",
+ "style": {
+ "navigationBarTitleText": "隔离退料接收确认详情",
+ "enablePullDownRefresh": false
+ }
+ },
+
{
"path": "pages/productionReturn/request/returnToStoreRequest",
"style": {
@@ -1051,6 +1087,7 @@
"enablePullDownRefresh": false
}
},
+
{
"path": "pages/deliver/job/deliverJob",
"style": {
@@ -1592,6 +1629,39 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/customerReturn/record/recordList",
+ "style": {
+ "navigationBarTitleText": "客户退货接收确认",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ },
+ {
+
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/customerReturn/record/recordListDetail",
+ "style": {
+ "navigationBarTitleText": "客户退货接收确认详情",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/customerReturn/request/customerReturnRequest",
@@ -1633,6 +1703,7 @@
"enablePullDownRefresh": false
}
},
+
{
"path": "pages/productReceipt/job/completeReceiveJob",
"style": {
@@ -2487,6 +2558,39 @@
"navigationBarTitleText": "无计划报工",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "pages/itemHold/record/recordList",
+ "style": {
+ "navigationBarTitleText": "物料隔离接收确认",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ },
+ {
+
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/itemHold/record/recordListDetail",
+ "style": {
+ "navigationBarTitleText": "物料隔离接收确认详情",
+ "enablePullDownRefresh": false
+ }
}
],
"globalStyle": {
diff --git a/src/pages/customerReturn/coms/comReturnRecordCard.vue b/src/pages/customerReturn/coms/comReturnRecordCard.vue
new file mode 100644
index 00000000..b109c42a
--- /dev/null
+++ b/src/pages/customerReturn/coms/comReturnRecordCard.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/customerReturn/record/recordList.vue b/src/pages/customerReturn/record/recordList.vue
new file mode 100644
index 00000000..c59f4018
--- /dev/null
+++ b/src/pages/customerReturn/record/recordList.vue
@@ -0,0 +1,355 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/customerReturn/record/recordListDetail.vue b/src/pages/customerReturn/record/recordListDetail.vue
new file mode 100644
index 00000000..f9711e93
--- /dev/null
+++ b/src/pages/customerReturn/record/recordListDetail.vue
@@ -0,0 +1,419 @@
+
+
+
+
+
+
+ 整单接收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 1fa86ce7..0fb9ea53 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -363,7 +363,7 @@
"inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason",
"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
- "count_stage", "inspect_result", "area_type","count_scope_type","priority"
+ "count_stage", "inspect_result", "area_type","count_scope_type","priority","receive_status",
]
}
getDictionaryItem(params).then(res => {
diff --git a/src/pages/itemHold/coms/comDetailCard.vue b/src/pages/itemHold/coms/comDetailCard.vue
new file mode 100644
index 00000000..2f624835
--- /dev/null
+++ b/src/pages/itemHold/coms/comDetailCard.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/itemHold/coms/comMoveRecordCard.vue b/src/pages/itemHold/coms/comMoveRecordCard.vue
new file mode 100644
index 00000000..55f3759b
--- /dev/null
+++ b/src/pages/itemHold/coms/comMoveRecordCard.vue
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/itemHold/record/recordList.vue b/src/pages/itemHold/record/recordList.vue
new file mode 100644
index 00000000..c4558f64
--- /dev/null
+++ b/src/pages/itemHold/record/recordList.vue
@@ -0,0 +1,354 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/itemHold/record/recordListDetail.vue b/src/pages/itemHold/record/recordListDetail.vue
new file mode 100644
index 00000000..eff60b19
--- /dev/null
+++ b/src/pages/itemHold/record/recordListDetail.vue
@@ -0,0 +1,425 @@
+
+
+
+
+
+
+ 整单接收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/productionReturn/record/returnToHoldRecordList.vue b/src/pages/productionReturn/record/returnToHoldRecordList.vue
new file mode 100644
index 00000000..4e3f2d6a
--- /dev/null
+++ b/src/pages/productionReturn/record/returnToHoldRecordList.vue
@@ -0,0 +1,353 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue b/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue
new file mode 100644
index 00000000..478c9878
--- /dev/null
+++ b/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue
@@ -0,0 +1,424 @@
+
+
+
+
+
+
+ 整单接收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file