From 4294336caa5f7da16748f125d602998070d554b9 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 7 Jun 2024 10:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 12 +- pages/home/home.vue | 3 +- pages/login/login.vue | 4 +- pages/management/alloc-maintenance.vue | 79 +++--- pages/management/in-storage.vue | 18 +- pages/management/receive-confirm.vue | 7 +- utils/getData2.js | 5 +- utils/mork2.js | 348 ++++++++++++++++++++----- 8 files changed, 347 insertions(+), 129 deletions(-) diff --git a/common/style/layout.css b/common/style/layout.css index 009e95e..3ad38f3 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -214,6 +214,12 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { border: 1px solid #889dc7; box-shadow: 0 0 0 1px rgba(136, 157, 199,.2); } +.td_input_1 { + font-size: 12px; + line-height: 28px; + width: 80px; + height: 28px; +} .td_change { font-size: 12px; line-height: 26px; @@ -222,6 +228,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { border: 1px solid #4980BD; border-radius: 6px; } +.td_change_focus { + border: 1px solid #889dc7; + box-shadow: 0 0 0 1px rgba(136, 157, 199,.2); +} .td_scan_wraper { min-width: 120px; } @@ -521,8 +531,6 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { .zd-pop-td { background-color: RGBA(23, 123, 172, 0.4); border-bottom: 1px solid #177BAC; - height: 40px; - font-size: 12px; } .popChecked .zd-pop-td { background-color: RGBA(23, 123, 172, 1); diff --git a/pages/home/home.vue b/pages/home/home.vue index 16663a9..7c6f1b7 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -33,7 +33,8 @@ data() { return { intervalId: null, - interTime: this.$store.getters.setTime, + // interTime: this.$store.getters.setTime, + interTime: 60000, userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '', menuList: [] }; diff --git a/pages/login/login.vue b/pages/login/login.vue index 93f5ad8..31c7413 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -43,12 +43,12 @@ - + diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue index 986889d..2eca386 100644 --- a/pages/management/alloc-maintenance.vue +++ b/pages/management/alloc-maintenance.vue @@ -8,9 +8,6 @@ - - - @@ -24,11 +21,12 @@ 业务日期 调入组织 调出组织 - 调入仓库 - 调出仓库 + 调入仓库 + 调出仓库 状态 - 计划调入日期 + 计划调入日期 备注 + 审核结果 更多 @@ -38,11 +36,12 @@ {{e.ywrq}} {{e.drkcmc}} {{e.dckcmc}} - {{e.drckmc}} - {{e.dcckmc}} + {{e.drckmc}} + {{e.dcckmc}} {{e.djzt}} - {{e.jhdrrq}} + {{e.jhdrrq}} {{e.flbz}} + {{e.shjg}} @@ -57,7 +56,6 @@ 选择 物料编码 物料名称 - 规格型号 计里单位 库存类型 库存状态 @@ -84,12 +82,13 @@ {{el.wlbm}} {{el.wlmc}} - {{el.ggxh}} {{el.jldw}} {{el.kclx}} {{el.kczt}} - - + + + + {{el.drckbm}} @@ -101,7 +100,7 @@ - + {{el.dcckbm}} @@ -125,8 +124,11 @@ {{el.jhdcrq}} - - {{el.gzh}} + + + + + @@ -136,7 +138,6 @@ {{j+1}} {{el.wlbm}} {{el.wlmc}} - {{el.ggxh}} {{el.jldw}} {{el.kclx}} {{el.kczt}} @@ -177,7 +178,7 @@ - 修改{{modalObj.title}} + {{modalObj.title}} @@ -200,7 +201,7 @@ 库位 跟踪号 - + {{t+1}} {{ele.materialName}} {{ele.materialNo}} @@ -209,7 +210,7 @@ {{ele.lot}} {{ele.warehouseName}} {{ele.locationName}} - {{ele.trackNo}} + {{ele.trackno}} @@ -270,16 +271,15 @@ disabled: false, value1: '', range1: [], - value2: '', - range2: [], dataList3: [], - iid: '' + iid: '', + iobj: {}, + fstate: false }; }, created () { this._getWarehouseInfo() this._getOrganizationInfo() - this._getUserInfo() }, methods: { // 仓库下拉框 @@ -306,17 +306,6 @@ this.toSearch() } }, - // 仓管员下拉框 - async _getUserInfo () { - let res = await getUserInfo() - if (res.code === 1) { - this.range2 = [...res.result] - this.range2.map(e => { - this.$set(e, 'text', e.cgymc) - this.$set(e, 'value', e.cgybm) - }) - } - }, // 查询一级表格 toSearch () { this.queryParams1 = { @@ -330,7 +319,7 @@ }, // 一级表格接口 async _allocationPage () { - let res = await allocationPage(this.val1, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '') + let res = await allocationPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '') if (res.code === 1) { this.dataList1 = [...res.result] this.totalCount1 = Number(res.totalElements) @@ -409,6 +398,7 @@ }, // 二级表格详情修改接口 async _allocationBillUpdate (e) { + console.log(e) try { let res = await allocationBillUpdate(e) uni.showToast({ @@ -420,15 +410,16 @@ } }, // 根据跟踪号查询库存列表 - async _allocationBillInventoryInfo (id) { - let res = await allocationBillInventoryInfo(id) + async _allocationBillInventoryInfo (obj) { + let res = await allocationBillInventoryInfo(obj) if (res.code === 1) { this.dataList3 = [...res.result] } }, // 跟踪号查询库存列表选中一行 toCheck3 (e) { - this.iid = e.trackNo === this.iid ? '' : e.trackNo + this.iid = e.id === this.iid ? '' : e.id + this.iobj = e.id === this.iid ? e : {} }, // 修改调出仓库弹窗 checkWarehouse (type, title, e) { @@ -438,7 +429,9 @@ } else if (type === 2) { this.value = e.drckbm } else if (type === 5) { - this._allocationBillInventoryInfo(e.gzh) + let {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm} = {...e} + let obj = {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm} + this._allocationBillInventoryInfo(obj) } this.show = true }, @@ -470,7 +463,7 @@ } else if (this.modalObj.type === 5) { this.dataList2.map(e => { if (e.flid === this.modalObj.id) { - e.gzh = this.iid + e.gzh = this.iobj.trackno obj = e } }) @@ -558,10 +551,14 @@ .mgr30 margin-right 30rpx .select_wraper + /deep/ .uni-select__input-box + height 30px /deep/ .uni-select__selector z-index 11 /deep/ .uni-select height: 30px; + min-height: 30px; + line-height: 30px; padding: 0 2px 0 12px; border: 1px solid #4980bd; background-color: rgba(45,88,184,0.1); diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue index 850296a..47d9f94 100644 --- a/pages/management/in-storage.vue +++ b/pages/management/in-storage.vue @@ -23,9 +23,9 @@ 序号 选择 {{crType === 'IN'? '入库单号':'出库单号'}} - 来源部门 - 去向部门 - 仓库名称 + 来源部门 + 去向部门 + 仓库名称 状态 制单日期 制单人 @@ -33,7 +33,7 @@ 操作日期 操作人 仓管员 - 更多 + 更多 @@ -46,13 +46,13 @@ {{e.zzmc}} {{e.ckmc}} {{e.djzt}} - {{e.cjsj}} + {{e.cjsj}} {{e.cjr}} - {{e.ywrq}} - {{e.update_time}} + {{e.ywrq}} + {{e.update_time}} {{e.update_name}} {{e.cgymc}} - + @@ -184,7 +184,7 @@ import ScanInput from '@/components/ScanInput.vue' import Pagination from '@/components/Pagination.vue' import GridDetail from '@/components/GridDetail.vue' - // import {getWarehouseInfo, getUserInfo} from '@/utils/mork2.js' + // import {getWarehouseInfo, getUserInfo} from '@/utils/getData2.js' import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js' export default { components: { diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue index ab4f7a1..6e2b41f 100644 --- a/pages/management/receive-confirm.vue +++ b/pages/management/receive-confirm.vue @@ -57,7 +57,6 @@ 采购订单号 物料编码 物料名称 - 规格型号 单位 订单量 本次送货数量 @@ -81,7 +80,6 @@ {{el.cgbh}} {{el.wlbm}} {{el.wlmc}} - {{el.ggxh}} {{el.jldw}} {{el.ddsl}} {{el.bcshsl}} @@ -109,7 +107,6 @@ {{el.cgbh}} {{el.wlbm}} {{el.wlmc}} - {{el.ggxh}} {{el.jldw}} {{el.ddsl}} {{el.bcshsl}} @@ -423,10 +420,14 @@ .mgr30 margin-right 30rpx .select_wraper + /deep/ .uni-select__input-box + height 30px /deep/ .uni-select__selector z-index 11 /deep/ .uni-select height: 30px; + min-height: 30px; + line-height: 30px; padding: 0 2px 0 12px; border: 1px solid #4980bd; background-color: rgba(45,88,184,0.1); diff --git a/utils/getData2.js b/utils/getData2.js index f8fc687..68d45b2 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -84,7 +84,6 @@ export const allocationPage = (fuzzy, kczzbm, cgybm, page, size) => request({ data: { fuzzy: fuzzy, kczzbm: kczzbm, - cgybm: cgybm, page: page, size: size } @@ -109,9 +108,9 @@ export const allocationBillConfirm = (arr) => request({ data: arr }) // 6.根据跟踪号查询库存列表 -export const allocationBillInventoryInfo = (arr) => request({ +export const allocationBillInventoryInfo = (obj) => request({ url:'api/allocationBill/queryInventoryInfo', - data: arr + data: obj }) /** diff --git a/utils/mork2.js b/utils/mork2.js index 989994d..5acf470 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -101,13 +101,14 @@ export const easOutInBillPage = (size, page, fuzzy, djlx) => { "cjsj": "2024-04-25", "ywrq": "2024-04-25", "cjr": "系统", - "btbz": "04.2512804叉车线边库领料", + "bmmc": "04.2512804叉车线边库领料", "cksj": null, "llr": null, "djly": "1", "update_id": null, - "update_name": null, - "update_time": null + "update_name": 'admin', + "update_time": '2024-04-25', + "cgymc": '甲乙丙' }, { "id": "1783273986298351616", @@ -414,6 +415,13 @@ export const easOutInBillDetailPage = (djid, page, size) => { } return res } +export const easOutInBillUpdate = (arr) => { + let res = { + code: 1, + desc: 'ok' + } + return res +} export const queryInventoryInfo = (arr) => { let res = { "pageNum": 1, @@ -1086,71 +1094,275 @@ export const allocationBillConfirm = () => { return res } export const allocationBillInventoryInfo = () => { - let res = { - code: 1, - desc: 'ok', - result: [ - { - "locationNo": "01.09.07", - "locationName": "四期智能工厂", - "materialNo": "255025010002", - "materialName": "多路阀(三联晨光)", - "lot": '20201010', - "unitNo": "PCS", - "curStoreQty": "2", - "warehouseNo": "3.04.001", - "warehouseName": "智能原材料库", - "trackNo": '1' - }, - { - "locationNo": "01.09.07", - "locationName": "四期智能工厂", - "materialNo": "255025010002", - "materialName": "多路阀(三联晨光)", - "lot": '20201010', - "unitNo": "PCS", - "curStoreQty": "2", - "warehouseNo": "3.04.001", - "warehouseName": "智能原材料库", - "trackNo": '2' - }, - { - "locationNo": "01.09.07", - "locationName": "四期智能工厂", - "materialNo": "255025010002", - "materialName": "多路阀(三联晨光)", - "lot": '20201010', - "unitNo": "PCS", - "curStoreQty": "2", - "warehouseNo": "3.04.001", - "warehouseName": "智能原材料库", - "trackNo": '3' - }, - { - "locationNo": "01.09.07", - "locationName": "四期智能工厂", - "materialNo": "255025010002", - "materialName": "多路阀(三联晨光)", - "lot": '20201010', - "unitNo": "PCS", - "curStoreQty": "2", - "warehouseNo": "3.04.001", - "warehouseName": "智能原材料库", - "trackNo": '4' - }, - { - "locationNo": "01.09.07", - "locationName": "四期智能工厂", - "materialNo": "255025010002", - "materialName": "多路阀(三联晨光)", - "lot": '20201010', - "unitNo": "PCS", - "curStoreQty": "2", - "warehouseNo": "3.04.001", - "warehouseName": "智能原材料库", - "trackNo": '5' - } - ] + let res = { + "pageNum": null, + "pageSize": null, + "totalPage": null, + "totalElements": 0, + "result": [ + { + "materialNo": "508038510000", + "id": '1', + "materialName": "车架焊合(美540x1150)", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "2", + "trackno": "999", + "warehouseNo": "2.03.004", + "warehouseName": "三期喷涂半成品库" + }, + { + "materialNo": "2.03.651.SFH.1016KSJTYD", + "id": '2', + "materialName": "SFH-10-1.6快速移动带脚踏堆高车(焊) 轮子组件", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "4", + "trackno": "999", + "warehouseNo": "2.01.004", + "warehouseName": "特种喷涂半成品库(装备)" + }, + { + "materialNo": "2.03.651.3LB.3W220", + "id": '3', + "materialName": "3W220GGS堆高车(喷) 车架", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "64", + "trackno": "999", + "warehouseNo": "2.01.004", + "warehouseName": "特种喷涂半成品库(装备)" + }, + { + "materialNo": "2.03.651.3LB.3W220-1", + "id": '4', + "materialName": "3W220GGS堆高车(喷) 托盘", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "64", + "trackno": "999", + "warehouseNo": "2.01.004", + "warehouseName": "特种喷涂半成品库(装备)" + }, + { + "materialNo": "2.03.651.PS.0485-4", + "id": '5', + "materialName": "行李车板(喷) PS0485", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "1", + "trackno": "999", + "warehouseNo": "2.01.004", + "warehouseName": "特种喷涂半成品库(装备)" + }, + { + "materialNo": "454253020014", + "id": '6', + "materialName": "支撑板", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "770", + "trackno": "999", + "warehouseNo": "4.03.001", + "warehouseName": "三期委外库" + }, + { + "materialNo": "300523520008", + "id": '7', + "materialName": "止推板(喷锌)", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": "5期", + "locationName": "5期", + "curStoreQty": "1", + "trackno": "999", + "warehouseNo": "1.06.016", + "warehouseName": "国际配件仓（库位）" + }, + { + "materialNo": "505634010001", + "id": '8', + "materialName": "钥匙开关RF-S27380A31-0", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": "A17-1-01a", + "locationName": "A17-1-01a", + "curStoreQty": "476", + "trackno": "999", + "warehouseNo": "3.03.013", + "warehouseName": "三期原材料库" + }, + { + "materialNo": "534121510000", + "id": '9', + "materialName": "机体焊合", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "1", + "trackno": "999", + "warehouseNo": "2.04.005", + "warehouseName": "智能半成品销售库" + }, + { + "materialNo": "508024020101-T31", + "id": '10', + "materialName": "电机保护罩", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "2", + "trackno": "999", + "warehouseNo": "1.06.001", + "warehouseName": "销售配件仓" + }, + { + "materialNo": "508038520131-135", + "id": '11', + "materialName": "力臂块", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "2000", + "trackno": "999", + "warehouseNo": "9.09.02", + "warehouseName": "原材料销售专用库" + }, + { + "materialNo": "506738510009", + "id": '12', + "materialName": "推杆焊合(1220)", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "15", + "trackno": "999", + "warehouseNo": "2.03.004", + "warehouseName": "三期喷涂半成品库" + }, + { + "materialNo": "509938510021", + "id": '13', + "materialName": "车架焊合(685x1150)", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "1", + "trackno": "999", + "warehouseNo": "2.03.004", + "warehouseName": "三期喷涂半成品库" + }, + { + "materialNo": "507017510001", + "id": '14', + "materialName": "护臂焊合", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "1", + "trackno": "999", + "warehouseNo": "2.03.004", + "warehouseName": "三期喷涂半成品库" + }, + { + "materialNo": "508538530015", + "id": '15', + "materialName": "推杆焊合(2000)", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "2", + "trackno": "999", + "warehouseNo": "2.03.004", + "warehouseName": "三期喷涂半成品库" + }, + { + "materialNo": "452221510000", + "id": '16', + "materialName": "底板焊合", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "20", + "trackno": "999", + "warehouseNo": "2.03.001", + "warehouseName": "三期下料半成品库" + }, + { + "materialNo": "454421510001", + "id": '17', + "materialName": "连接板焊合(电器)", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "69", + "trackno": "999", + "warehouseNo": "2.03.002", + "warehouseName": "三期机加半成品库" + }, + { + "materialNo": "567717020001", + "id": '18', + "materialName": "隔套Ф32xФ25x20", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": "C-1-01a", + "locationName": "C-1-01a", + "curStoreQty": "253", + "trackno": "999", + "warehouseNo": "3.03.013", + "warehouseName": "三期原材料库" + }, + { + "materialNo": "450121510002", + "id": '19', + "materialName": "连接板焊合(电器)", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "11", + "trackno": "999", + "warehouseNo": "2.03.002", + "warehouseName": "三期机加半成品库" + }, + { + "materialNo": "456053020002", + "id": '20', + "materialName": "支撑板", + "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=", + "unitNo": "PCS", + "locationNo": null, + "locationName": null, + "curStoreQty": "57", + "trackno": "999", + "warehouseNo": "2.03.002", + "warehouseName": "三期机加半成品库" + } + ], + "code": 1, + "desc": "操作完成" } return res }