From e04d2e926a3179c1b92a8ab12d83110008d34fc3 Mon Sep 17 00:00:00 2001 From: fengdong777 <1478994744@qq.com> Date: Thu, 1 Jun 2023 18:27:22 +0800 Subject: [PATCH] 6.1 --- .../oilTypeInAndOutBound.js | 24 ++ .../src/api/supplier/supplier.js | 12 + .../src/views/inventory/EnterRecord/index.vue | 7 +- .../src/views/inventory/OutRecord/index.vue | 346 +++++++++++++++++- .../views/supervise/EnterRegister/index.vue | 9 +- .../src/views/supervise/OutRegister/index.vue | 282 +++++++++++++- 6 files changed, 660 insertions(+), 20 deletions(-) diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js index 435c6992..24fcfd06 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js @@ -126,4 +126,28 @@ export default { } }) }, + // 查询入库记录 + storageListPage: function(params) { + return request({ + url: '/cyf/storage/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 查询出库记录 + outboundListPage: function(params) { + return request({ + url: '/cyf/outbound/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js index c9ac3283..09c789ce 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js @@ -58,5 +58,17 @@ export default { } }) }, + // 成品出库登记 + save: function(params) { + return request({ + url: '/cyf/outbound/save', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/EnterRecord/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/EnterRecord/index.vue index 2443d262..931f1efa 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/EnterRecord/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/EnterRecord/index.vue @@ -14,7 +14,7 @@ clearable /> - @@ -194,7 +194,7 @@ jmdListQuery: { contractNumber: "", - date: "" + warehousingDate: "" }, pickerOptions:{ disabledDate(time){ @@ -228,8 +228,9 @@ resetQuery() { this.jmdListQuery = { contractNumber: "", - date: "" + warehousingDate: "" } + this.loadLogList() }, // 右上角点击事件 btnHandle(btnKey) { diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/OutRecord/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/OutRecord/index.vue index 365c992e..38185fcb 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/OutRecord/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/OutRecord/index.vue @@ -1,13 +1,339 @@ - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/EnterRegister/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/EnterRegister/index.vue index ac4cf08d..be467903 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/EnterRegister/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/EnterRegister/index.vue @@ -29,7 +29,7 @@
入库日期: -
@@ -99,7 +99,12 @@ supplierSid: "", remarks: "", prodSid:'' - } + }, + pickerOptions:{ + disabledDate(time){ + return time.getTime()> Date.now();// 如果没有后面的-8.64e7就是不可以选择今天的 + } + } } }, created() { diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/OutRegister/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/OutRegister/index.vue index a0b27fc3..97375dfd 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/OutRegister/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/OutRegister/index.vue @@ -1,13 +1,285 @@ + \ No newline at end of file + } +