From 5f3f8cf19fcaa62f7c8f0ed2bc7515f7825fa7e0 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 8 Aug 2024 15:50:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inStorage/receivingGoods.js | 8 +- .../warehouses/warehouse/warehouseAdd.vue | 2 +- src/views/inStorage/deliveryNotice/index.vue | 156 ++++++-- .../inStorage/receivingGoods/inStorageAdd.vue | 280 ++++++++++++++ .../receivingGoods/inStorageInfo.vue | 181 +++++++++ src/views/inStorage/receivingGoods/index.vue | 357 ++++++++++++------ src/views/system/userManage/userManageAdd.vue | 4 +- 7 files changed, 818 insertions(+), 170 deletions(-) create mode 100644 src/views/inStorage/receivingGoods/inStorageAdd.vue create mode 100644 src/views/inStorage/receivingGoods/inStorageInfo.vue diff --git a/src/api/inStorage/receivingGoods.js b/src/api/inStorage/receivingGoods.js index 0055285..9f9cbc9 100644 --- a/src/api/inStorage/receivingGoods.js +++ b/src/api/inStorage/receivingGoods.js @@ -6,7 +6,7 @@ export default { // 入库单列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/purchaseInStorage/listPage', + url: '/wms/apiadmin/purchaseinventorybill/listPage', method: 'post', data: params, headers: { @@ -18,7 +18,7 @@ export default { // 根据入库单sid获取明细 selectByBillSid: function(data) { return request({ - url: '/wms/apiadmin/purchaseInStorage/selectByBillSid/' + data, + url: '/wms/apiadmin/purchaseinventorybill/selectByBillSid/' + data, method: 'get' }); }, @@ -26,7 +26,7 @@ export default { // 获取组织下所有的预约单 getReservationBill: function(params) { return request({ - url: '/wms/apiadmin/purchaseInStorage/getReservationBill', + url: '/wms/apiadmin/WmsAnsBill/listPageAns', method: 'post', data: params, headers: { @@ -39,7 +39,7 @@ export default { // 生成入库单 createInStorageBill: function(data) { return request({ - url: '/wms/apiadmin/purchaseInStorage/createInStorageBill', + url: '/wms/apiadmin/purchaseinventorybill/confirm', method: 'post', data: data, headers: { diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue index 22df2be..7bdf049 100644 --- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue +++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue @@ -186,7 +186,7 @@ manager: '', longitude: '', latitude: '', - usageStatus: "1", + usageStatus: 1, address: '', squareMeter: '', sortNo: '', diff --git a/src/views/inStorage/deliveryNotice/index.vue b/src/views/inStorage/deliveryNotice/index.vue index 418dc57..979da49 100644 --- a/src/views/inStorage/deliveryNotice/index.vue +++ b/src/views/inStorage/deliveryNotice/index.vue @@ -89,10 +89,10 @@ @@ -123,7 +123,91 @@ :limit.sync="queryParams.size" class="pagination" @pagination="loadList" /> --> - +
+ + + + + + + + + + + + + + + + + + + +
姓名
+ {{ formobj.contactName }} + + +
省
+ {{ formobj.province }} + + +
市
+ {{ formobj.city }} + + +
县
+ {{ formobj.county }} + + + + +
村镇
+ + + +
详细地址
+ {{ formobj.address }} + + +
邮编
+ {{ formobj.zipCode }} + + + + +
手机
+ {{ formobj.contactMobile }} + + +
电话
+ {{ formobj.contactTelePhone }} + + +
邮箱
+ {{ formobj.email }} + + +
+ + + + + + + + + + + + + + +
+ + + @@ -244,6 +317,7 @@ }, data() { return { + activeName: "first", activeIndex: '1', dialogVisible: false, formobj: {}, @@ -384,35 +458,37 @@ rowItemClick(row) { console.log("row", row); this.rowItemSid = row.sid - this.handleSelect(this.activeIndex) - }, - handleSelect(val) { - console.log("val", val); - this.activeIndex = val - - if (val == '1') { // 商品明细 - req.selectByBillSid(this.rowItemSid).then((resp) => { - this.goodsDetailList = resp.data - }).catch(() => {}) + if (this.rowItemSid == '') { + this.$message({ + type: 'warning', + showClose: true, + message: '暂无数据' + }) + return } - if (val == '2') { // 发货人信息 - req.fetchDetailsBySid(this.rowItemSid).then((resp) => { - this.formobj = resp.data - }).catch(() => {}) - } + req.selectByBillSid(this.rowItemSid).then((resp) => { + this.goodsDetailList = resp.data + }).catch(() => {}) - if (val == '3') { // 操作记录 - var parpams = { - sid: this.rowItemSid - } - req.operationrecordDetails(parpams).then((resp) => { - this.operateList = resp.data - }).catch(() => {}) + req.fetchDetailsBySid(this.rowItemSid).then((resp) => { + this.formobj = resp.data + }).catch(() => {}) + + var parpams = { + sid: this.rowItemSid } + req.operationrecordDetails(parpams).then((resp) => { + this.operateList = resp.data + }).catch(() => {}) + // this.handleSelect() }, + + // handleSelect() { + + // }, selectionLineChangeHandle(val) { console.log("val", val); @@ -497,7 +573,7 @@ this.formobj = {} this.operateList = [] this.rowItemClick(data.records[0]) - this.handleSelect('1') + } else { // 根据resp.code进行异常情况处理 this.dataList = [] @@ -561,7 +637,7 @@ const choose = this.warehouseRackList2.filter((item) => item.sid == val) console.log('>>>>>>>>>selectWarehouseAreaCode', choose) - row.warehouseRackName = choose[0].rackName + row.warehouseRackCode = choose[0].rackCode row.warehouseRackSid = choose[0].sid var query = { diff --git a/src/views/inStorage/receivingGoods/inStorageAdd.vue b/src/views/inStorage/receivingGoods/inStorageAdd.vue new file mode 100644 index 0000000..30ab524 --- /dev/null +++ b/src/views/inStorage/receivingGoods/inStorageAdd.vue @@ -0,0 +1,280 @@ + + + + diff --git a/src/views/inStorage/receivingGoods/inStorageInfo.vue b/src/views/inStorage/receivingGoods/inStorageInfo.vue new file mode 100644 index 0000000..6e8a7a8 --- /dev/null +++ b/src/views/inStorage/receivingGoods/inStorageInfo.vue @@ -0,0 +1,181 @@ + + + + diff --git a/src/views/inStorage/receivingGoods/index.vue b/src/views/inStorage/receivingGoods/index.vue index 7548f13..5bd92f6 100644 --- a/src/views/inStorage/receivingGoods/index.vue +++ b/src/views/inStorage/receivingGoods/index.vue @@ -10,34 +10,38 @@
- + - + - + - - + + + + + - 至 - - + - + @@ -72,21 +76,21 @@ 查看 - + - - - - - - - + + + + + + + - + - - - + + +
@@ -98,7 +102,62 @@ :limit.sync="queryParams.size" class="pagination" @pagination="loadList" /> --> - +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
买家留言
+ {{ billRemarks.buyerMessage }} + + +
备注
+ {{ billRemarks.reamrks }} + + +
系统备注
+ {{ billRemarks.systemRemarks }} + + + + + + + + + + + + + + + +
+ + + - + - @@ -173,7 +230,8 @@ - + @@ -187,13 +245,13 @@ 至 - - + @@ -214,33 +272,34 @@ - - + + - + - - - + + +
@@ -255,14 +314,14 @@