From fdd1d95d189f9adf8d9c5d441f42abd8084f51af Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 17 Aug 2026 17:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=A1=AE=E8=AE=A4=E3=80=81?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=86=B2=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 1 + components/GridDetail.vue | 39 ++- components/ReceiveDetail.vue | 306 ++++++++++++++++ pages.json | 6 + pages/home/home.vue | 18 +- pages/login/login.vue | 6 +- pages/management/outsource-outbound.vue | 259 ++++++++++++++ pages/management/receive-confirm_4.vue | 424 +++++++++++++++++++++++ pages/management/receive-confirm_new.vue | 2 +- utils/getData2.js | 55 ++- utils/mork2.js | 164 +++++++++ 11 files changed, 1255 insertions(+), 25 deletions(-) create mode 100644 components/ReceiveDetail.vue create mode 100644 pages/management/outsource-outbound.vue create mode 100644 pages/management/receive-confirm_4.vue diff --git a/common/style/layout.css b/common/style/layout.css index 92a4531..2b8c52a 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -218,6 +218,7 @@ uni-toast .uni-toast { line-height: 28px; width: 80px; height: 28px; + margin: 0 auto; } .td_input .uni-input-input { font-size: 12px; diff --git a/components/GridDetail.vue b/components/GridDetail.vue index ae6790e..cfeaa8c 100644 --- a/components/GridDetail.vue +++ b/components/GridDetail.vue @@ -525,30 +525,39 @@ line-height: 18px; margin-bottom: 10px; font-family: 'YouSheBiaoTiHei'; + &:not(:first-child) + margin-top 20px .detail_table - border-collapse: separate; + border-collapse: collapse; border-spacing: 0; width 100% - border-top 1px solid #ebeef5 - border-left 1px solid #ebeef5 - border-right 1px solid #ebeef5 td + font-size: 12px; + line-height: 13px; + color: #333; + word-break: break-all; vertical-align middle text-align center padding 5px 2px - border-bottom 1px solid #ebeef5 + border 1px solid #ebeef5 &:nth-child(1) width 32% - font-size: 12px; - line-height: 13px; - color: #333; - font-weight: bold; - border-right 1px solid #ebeef5 - word-break: break-all; + font-weight 700 &:nth-child(2) width 68% - font-size: 12px; - line-height: 13px; - color: #333; - word-break: break-all; +.add_detail_table + border-collapse: collapse; + border-spacing 0 + width 100% + th, td + text-align center + font-size: 12px; + line-height: 13px; + color: #333; + border 1px solid #ebeef5 + padding 5px 2px + th + font-weight: bold; + padding 8px 2px + background-color #f5f7fa \ No newline at end of file diff --git a/components/ReceiveDetail.vue b/components/ReceiveDetail.vue new file mode 100644 index 0000000..eb92dc6 --- /dev/null +++ b/components/ReceiveDetail.vue @@ -0,0 +1,306 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 318ff1e..1a70d83 100644 --- a/pages.json +++ b/pages.json @@ -81,6 +81,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/management/outsource-outbound", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/home/home.vue b/pages/home/home.vue index 55d59a2..aa35159 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -14,7 +14,7 @@ - + + + + 收货确认 + + + + + 委外冲销 + @@ -48,8 +58,8 @@ }; }, onLoad () { - this._getBillsCount() - this.timerFun(this._getBillsCount, this.interTime)() + // this._getBillsCount() + // this.timerFun(this._getBillsCount, this.interTime)() }, beforeDestroy () { if (this.intervalId !== null) { @@ -160,7 +170,7 @@ .menu-wrap flex-wrap wrap justify-content flex-start - align-content center + align-content flex-start height 100% .menu-item position relative diff --git a/pages/login/login.vue b/pages/login/login.vue index 3cd61de..be7b71a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -32,7 +32,7 @@ - 升级版本 + @@ -136,9 +136,9 @@ return } try { - let res = await handLogin(this.loginname, RSAencrypt(this.password)) + let res = await handLogin(this.loginname, this.password) this.$store.dispatch('saveUserInfo', JSON.stringify(res.user.user)) - this.$store.dispatch('saveToken', res.token) + // this.$store.dispatch('saveToken', res.token) this.$store.dispatch('saveLoginName', this.loginname) uni.redirectTo({ url: '/pages/home/home' diff --git a/pages/management/outsource-outbound.vue b/pages/management/outsource-outbound.vue new file mode 100644 index 0000000..08c3313 --- /dev/null +++ b/pages/management/outsource-outbound.vue @@ -0,0 +1,259 @@ + + + + + diff --git a/pages/management/receive-confirm_4.vue b/pages/management/receive-confirm_4.vue new file mode 100644 index 0000000..2025c43 --- /dev/null +++ b/pages/management/receive-confirm_4.vue @@ -0,0 +1,424 @@ + + + + + diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue index b50b7ae..181323c 100644 --- a/pages/management/receive-confirm_new.vue +++ b/pages/management/receive-confirm_new.vue @@ -227,7 +227,7 @@ import ScanInput from '@/components/ScanInput.vue' import Pagination from '@/components/Pagination.vue' import GridDetail from '@/components/GridDetail.vue' - import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync, inWarehouseCommit, easOutInBillDelete} from '@/utils/getData2.js' + import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync, inWarehouseCommit, easOutInBillDelete} from '@/utils/mork2.js' export default { components: { NavBar, diff --git a/utils/getData2.js b/utils/getData2.js index 2526b82..8d5d2e2 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -2,7 +2,7 @@ import request from './request.js' // 登录 export const handLogin = (user, password) => request({ - url:'mobile/auth/login', + url:'wms/sap_services/maintain/login', data: { username: user, password: password @@ -318,4 +318,55 @@ export const easOutInBillSync = (type) => request({ export const easOutInBillDelete = (type, arr) => request({ url:'api/easOutInBill/delete', data: {type: type, djids: arr} -}) \ No newline at end of file +}) + +/** + * 收货确认-四期 + */ +// 1.查询交货单-主表格 +export const querySapJhd = (fuzzy, page, size) => request({ + url:'wms/sap_services/maintain/querySapJhd', + data: { + fuzzy: fuzzy, + page: page, + size: size + } +}) +// 2.查询交货单明细-副表格 +export const querySapJhdMx = (fuzzy, id, page, size) => request({ + url:'wms/sap_services/maintain/querySapJhdMx', + data: { + fuzzy: fuzzy, + receiptBillId: id, + page: page, + size: size + } +}) +// 3.收货确认 +export const feedbackSapJhd = (arr) => request({ + url:'wms/sap_services/maintain/feedbackSapJhd', + data: arr +}) +// 4.修改交货单明细组件数量 +export const updateSapJhdMx = (obj) => request({ + url:'wms/sap_services/maintain/updateSapJhdMx', + data: obj +}) + +/** + * 委外出库单-四期 + */ +// 1.查询交货单-主表格 +export const querySapWwJhdCx = (fuzzy, page, size) => request({ + url:'wms/sap_services/maintain/querySapWwJhdCx', + data: { + fuzzy: fuzzy, + page: page, + size: size + } +}) +// 2.收货确认 +export const feedbackSapWwJhdCx = (arr) => request({ + url:'wms/sap_services/maintain/feedbackSapWwJhdCx', + data: arr +}) diff --git a/utils/mork2.js b/utils/mork2.js index b0f0fbc..7071a1d 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -2458,4 +2458,168 @@ export const checkDtlByCheckCode = () => { } ] return res +} + +export const querySapJhd = () => { + let res = { + "pageNum": 1, // 当前页码 + "pageSize": 10, // 每页条数 + "totalPage": 1, // 总页数 + "totalElements": 2, // 总记录数 + "result": [ + { + "id": "SAP-RB-20260812-002", // 收货单头ID（主键） + "vbeln": "0080000052", // 交货单号 + "bldat": "2026-08-09", // 凭证日期 + "lifnr": "V0001002", // 供应商编码 + "wadat": "2026-08-10", // 计划交货日期 + "lfdat": "2026-08-10", // 交货日期（实际/期望） + "wadatIst": null, // 实际收货日期（null表示未收货） + "djzt": "1", // 单据状态（1=已创建/已过账） + "updateId": null, // 最后更新人ID + "updateName": null, // 最后更新人姓名 + "updateTime": null // 最后更新时间 + }, + { + "id": "SAP-RB-20260812-001", // 收货单头ID（主键） + "vbeln": "0080000051", // 交货单号 + "bldat": "2026-08-08", // 凭证日期 + "lifnr": "V0001001", // 供应商编码 + "wadat": "2026-08-09", // 计划交货日期 + "lfdat": "2026-08-09", // 交货日期（实际/期望） + "wadatIst": null, // 实际收货日期（null表示未收货） + "djzt": "1", // 单据状态（1=已创建/已过账） + "updateId": null, // 最后更新人ID + "updateName": null, // 最后更新人姓名 + "updateTime": null // 最后更新时间 + } + ], + "code": 1, // 响应码（1=成功） + "desc": "查询成功" // 响应描述 + } + return res +} +export const querySapJhdMx = () => { + let res = { + "pageNum": 1, // 当前页码 + "pageSize": 200, // 每页条数 + "totalPage": 1, // 总页数 + "totalElements": 2, // 总记录数 + "result": [ + { + "id": "SAP-RBD-20260812-001-20", // 接收单明细ID（主键） + "receiptBillId": "SAP-RB-20260812-001", // 接收单头ID + "vbeln": "0080000051", // 交货单号（SAP内向交货单） + "posnr": "000020", // 交货单行项目号 + "ebeln": "4500012346", // 采购订单号 + "material": "940200600040", // 物料号 + "matlDesc": "委外成品B", // 物料描述 + "delivQty": 50.000000, // 交货数量 + "unit": "PCS", // 单位（件） + "poNumber": "4500012346", // 采购订单号 + "poItem": "00020", // 采购订单行项目 + "werks": "01.09.04", // 工厂编码 + "lgort": "3.03.001", // 库存地点 + "ntgew": 15.000000, // 净重 + "brgew": 16.500000, // 毛重 + "gewei": "KG", // 重量单位 + "volum": 0.300000, // 体积 + "voleh": "M3", // 体积单位 + "uebtk": "X", // 过量交货容差标识（X=允许） + "uebto": 5.000000, // 过量交货容差上限（百分比） + "untto": 0.000000, // 交货不足容差下限（百分比） + "lifexpos": "000000", // 外部标识/供应商批次 + "rsItems": '[{"atnr1": "920100100006", "bdmng": "58", "rspos": 1}, {"atnr1": "920100100007", "bdmng": 100, "rspos": 2}]', // 组件清单JSON（atnr1:组件号, bdmng:数量, rspos:行号） + "assignQty": 0.000000, // 已分配/已消耗数量 + "sysl": 50.000000, // 系统库存可用量 + "czsl": 0.000000, // 差异数量 + "updateId": "1", // 最后更新人ID + "updateName": "管理员", // 最后更新人姓名 + "updateTime": "2026-08-12 14:23:32" // 最后更新时间 + }, + { + "id": "SAP-RBD-20260812-001-10", // 接收单明细ID（主键） + "receiptBillId": "SAP-RB-20260812-001", // 接收单头ID + "vbeln": "0080000051", // 交货单号 + "posnr": "000010", // 交货单行项目号 + "ebeln": "4500012345", // 采购订单号 + "material": "940200600030", // 物料号 + "matlDesc": "测试物料A", // 物料描述 + "delivQty": 100.000000, // 交货数量 + "unit": "PCS", // 单位（件） + "poNumber": "4500012345", // 采购订单号 + "poItem": "00010", // 采购订单行项目 + "werks": "01.09.04", // 工厂编码 + "lgort": "3.03.001", // 库存地点 + "ntgew": 20.000000, // 净重 + "brgew": 22.000000, // 毛重 + "gewei": "KG", // 重量单位 + "volum": 0.500000, // 体积 + "voleh": "M3", // 体积单位 + "uebtk": "", // 过量交货容差标识（空=不允许） + "uebto": 0.000000, // 过量交货容差上限 + "untto": 0.000000, // 交货不足容差下限 + "lifexpos": "000000", // 外部标识/供应商批次 + "rsItems": null, // 组件清单（空表示无组件） + "assignQty": 0.000000, // 已分配/已消耗数量 + "sysl": 100.000000, // 系统库存可用量 + "czsl": 0.000000, // 差异数量 + "updateId": "system", // 最后更新人ID + "updateName": "SAP测试数据", // 最后更新人姓名 + "updateTime": "2026-08-12 13:58:40" // 最后更新时间 + } + ], + "code": 1, // 响应码（1=成功） + "desc": "查询成功" // 响应描述 + } + return res +} +export const feedbackSapJhd = (arr) => { + let res = {"code":0,"desc":"未配置 SAP_URL","result":null} + return res +} + +export const updateSapJhdMx = (obj) => { + let res = {"code":1,"desc":"未配置 SAP_URL","result":null} + return res +} + +export const querySapWwJhdCx = (fuzzy, page, size) => { + let res = { + "pageNum": 1, // 当前页码 + "pageSize": 10, // 每页条数 + "totalPage": 1, // 总页数 + "totalElements": 2, // 总记录数 + "result": [ + { + "id": "SAP-RB-20260812-002", // 收货单头ID（主键） + "vbeln": "0080000052", // 交货单号 + "bldat": "2026-08-09", // 凭证日期 + "lifnr": "V0001002", // 供应商编码 + "wadat": "2026-08-10", // 计划交货日期 + "lfdat": "2026-08-10", // 交货日期（实际/期望） + "wadatIst": null, // 实际收货日期（null表示未收货） + "djzt": "1", // 单据状态（1=已创建/已过账） + "updateId": null, // 最后更新人ID + "updateName": null, // 最后更新人姓名 + "updateTime": null // 最后更新时间 + }, + { + "id": "SAP-RB-20260812-001", // 收货单头ID（主键） + "vbeln": "0080000051", // 交货单号 + "bldat": "2026-08-08", // 凭证日期 + "lifnr": "V0001001", // 供应商编码 + "wadat": "2026-08-09", // 计划交货日期 + "lfdat": "2026-08-09", // 交货日期（实际/期望） + "wadatIst": null, // 实际收货日期（null表示未收货） + "djzt": "1", // 单据状态（1=已创建/已过账） + "updateId": null, // 最后更新人ID + "updateName": null, // 最后更新人姓名 + "updateTime": null // 最后更新时间 + } + ], + "code": 1, // 响应码（1=成功） + "desc": "查询成功" // 响应描述 + } + return res } \ No newline at end of file