diff --git a/klp-ui/src/views/wms/delivery/plan/index.vue b/klp-ui/src/views/wms/delivery/plan/index.vue
index 115156e1..d65e982b 100644
--- a/klp-ui/src/views/wms/delivery/plan/index.vue
+++ b/klp-ui/src/views/wms/delivery/plan/index.vue
@@ -54,7 +54,15 @@
{{ row.createBy }}({{ parseTime(row.updateTime, '{y}-{m}-{d}') }})
- 备注:
+
+
+
+
+ 备注:
+
+
+
+
{{ row.remark || '-' }}
@@ -118,6 +126,9 @@
placeholder="请选择计划日期">
+
+
+
@@ -175,6 +186,8 @@ export default {
form: {
planName: '',
planDate: '',
+ orderId: '',
+ remark: '',
},
// 表单校验
rules: {},
@@ -320,7 +333,8 @@ export default {
createTime: undefined,
createBy: undefined,
updateTime: undefined,
- updateBy: undefined
+ updateBy: undefined,
+ orderId: undefined,
};
this.resetForm("form");
},
diff --git a/klp-ui/src/views/wms/receive/detail/index.vue b/klp-ui/src/views/wms/receive/detail/index.vue
index 483fbec6..53c7f374 100644
--- a/klp-ui/src/views/wms/receive/detail/index.vue
+++ b/klp-ui/src/views/wms/receive/detail/index.vue
@@ -79,6 +79,7 @@
已收货
+ 已取消
未收货
@@ -87,7 +88,7 @@
签收
删除
+ @click="handleReject(scope.row)">拒签
@@ -262,6 +263,21 @@ export default {
this.open = false;
this.reset();
},
+ handleReject(row) {
+ this.$modal.confirm("确认拒签吗?", "拒签确认", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ updatePendingAction({
+ ...row,
+ actionStatus: 3, // 3表示拒签
+ }).then(response => {
+ this.$modal.msgSuccess("拒签成功");
+ this.getList();
+ });
+ });
+ },
// 表单重置
reset() {
this.form = {