From 62b5fceac5e1560db3e4cd10fc89c25c6a77e628 Mon Sep 17 00:00:00 2001 From: zhengw <247276359@qq.com> Date: Tue, 10 Feb 2026 10:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E5=92=8C?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.json | 15 +++ miniprogram/app.json | 10 +- .../ordersList/orderDetail/orderDetail.wxml | 7 +- .../pages/other/batchDetail/batchDetail.wxml | 2 +- miniprogram/pages/other/outbound/outbound.ts | 9 +- .../pages/other/outbound/outbound.wxml | 2 + .../other/outboundDetail/outboundDetail.json | 16 +++ .../other/outboundDetail/outboundDetail.ts | 113 ++++++++++++++++++ .../other/outboundDetail/outboundDetail.wxml | 40 +++++++ .../other/outboundDetail/outboundDetail.wxss | 0 miniprogram/pages/other/transfer/transfer.ts | 9 +- .../pages/other/transfer/transfer.wxml | 2 + .../other/transferDetail/transferDetail.json | 16 +++ .../other/transferDetail/transferDetail.ts | 113 ++++++++++++++++++ .../other/transferDetail/transferDetail.wxml | 42 +++++++ .../other/transferDetail/transferDetail.wxss | 0 .../pages/purchase/backOrder/backOrder.ts | 8 ++ .../pages/purchase/backOrder/backOrder.wxml | 2 + .../backOrderDetail/backOrderDetail.json | 16 +++ .../backOrderDetail/backOrderDetail.ts | 113 ++++++++++++++++++ .../backOrderDetail/backOrderDetail.wxml | 50 ++++++++ .../backOrderDetail/backOrderDetail.wxss | 0 .../pages/purchase/buyInOrder/buyInOrder.ts | 8 ++ .../pages/purchase/buyInOrder/buyInOrder.wxml | 2 + .../buyInOrderDetail/buyInOrderDetail.json | 16 +++ .../buyInOrderDetail/buyInOrderDetail.ts | 113 ++++++++++++++++++ .../buyInOrderDetail/buyInOrderDetail.wxml | 49 ++++++++ .../buyInOrderDetail/buyInOrderDetail.wxss | 0 .../buyOrderDetail/buyOrderDetail.wxml | 18 ++- .../requestOrderDetail.wxml | 18 +-- 30 files changed, 787 insertions(+), 22 deletions(-) create mode 100644 miniprogram/pages/other/outboundDetail/outboundDetail.json create mode 100644 miniprogram/pages/other/outboundDetail/outboundDetail.ts create mode 100644 miniprogram/pages/other/outboundDetail/outboundDetail.wxml create mode 100644 miniprogram/pages/other/outboundDetail/outboundDetail.wxss create mode 100644 miniprogram/pages/other/transferDetail/transferDetail.json create mode 100644 miniprogram/pages/other/transferDetail/transferDetail.ts create mode 100644 miniprogram/pages/other/transferDetail/transferDetail.wxml create mode 100644 miniprogram/pages/other/transferDetail/transferDetail.wxss create mode 100644 miniprogram/pages/purchase/backOrderDetail/backOrderDetail.json create mode 100644 miniprogram/pages/purchase/backOrderDetail/backOrderDetail.ts create mode 100644 miniprogram/pages/purchase/backOrderDetail/backOrderDetail.wxml create mode 100644 miniprogram/pages/purchase/backOrderDetail/backOrderDetail.wxss create mode 100644 miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.json create mode 100644 miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.ts create mode 100644 miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.wxml create mode 100644 miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.wxss diff --git a/components.d.json b/components.d.json index a49cf09..a38eedd 100644 --- a/components.d.json +++ b/components.d.json @@ -112,6 +112,21 @@ "size": { "type": "String" } } }, + "t-cell": { + "description": "图标", + "attributes": { + "custom-style": { "type": "String" }, + "description": { "type": "String" }, + "image": { "type": "String" }, + "left-icon": { "type": "String" }, + "note": { "type": "String" }, + "right-icon": { "type": "String" }, + "title": { "type": "String" }, + "arrow": { "type": "Boolean" }, + "bordered": { "type": "Boolean" }, + "hover": { "type": "Boolean" } + } + }, "search-input": { "description": "搜索input", "attributes": { diff --git a/miniprogram/app.json b/miniprogram/app.json index 65cdde3..73e844e 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -16,11 +16,13 @@ "pages/purchase/buyOrder/buyOrder", "pages/purchase/buyOrderDetail/buyOrderDetail", "pages/purchase/buyInOrder/buyInOrder", + "pages/purchase/buyInOrderDetail/buyInOrderDetail", + "pages/purchase/backOrder/backOrder", + "pages/purchase/backOrderDetail/backOrderDetail", "pages/finance/outcome/outcome", "pages/finance/income/income", "pages/finance/giro/giro", "pages/finance/flow/flow", - "pages/purchase/backOrder/backOrder", "pages/base/supplier/supplier", "pages/base/customer/customer", "pages/base/account/account", @@ -31,13 +33,15 @@ "pages/logs/loginLog/loginLog", "pages/logs/operateLog/operateLog", "pages/manage/staff/staff", - "pages/other/transfer/transfer", "pages/other/goods/goods", "pages/other/goodsDetail/goodsDetail", "pages/other/batch/batch", "pages/other/batchDetail/batchDetail", "pages/base/viewAttachment/viewAttachment", - "pages/other/outbound/outbound" + "pages/other/outbound/outbound", + "pages/other/outboundDetail/outboundDetail", + "pages/other/transfer/transfer", + "pages/other/transferDetail/transferDetail" ], "window": { "navigationBarTextStyle": "black", diff --git a/miniprogram/pages/orders/ordersList/orderDetail/orderDetail.wxml b/miniprogram/pages/orders/ordersList/orderDetail/orderDetail.wxml index 6029352..3cd7134 100644 --- a/miniprogram/pages/orders/ordersList/orderDetail/orderDetail.wxml +++ b/miniprogram/pages/orders/ordersList/orderDetail/orderDetail.wxml @@ -20,7 +20,9 @@ bind:tap="onPreview2" /> + custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" + bordered="{{false}}" /> + + custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" + bordered="{{false}}" /> {{ item.goods_name }} diff --git a/miniprogram/pages/other/batchDetail/batchDetail.wxml b/miniprogram/pages/other/batchDetail/batchDetail.wxml index e0fb5b2..9e6303c 100644 --- a/miniprogram/pages/other/batchDetail/batchDetail.wxml +++ b/miniprogram/pages/other/batchDetail/batchDetail.wxml @@ -1,7 +1,7 @@ + bind:reset="searchReset" value="{{params.rel_bill_no}}" data-key="rel_bill_no" hideMore="1"> diff --git a/miniprogram/pages/other/outbound/outbound.ts b/miniprogram/pages/other/outbound/outbound.ts index dd13757..fb3f53a 100644 --- a/miniprogram/pages/other/outbound/outbound.ts +++ b/miniprogram/pages/other/outbound/outbound.ts @@ -91,7 +91,14 @@ Page({ }); }); }, - + onOrderDetail(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + wx.navigateTo({ + url: `/pages/other/outboundDetail/outboundDetail?head_id=${item.head_id}`, + }); + }, onOrderDel(e: any) { const data = getDataSet(e); const index = data.index; diff --git a/miniprogram/pages/other/outbound/outbound.wxml b/miniprogram/pages/other/outbound/outbound.wxml index 6c5eb6d..7303077 100644 --- a/miniprogram/pages/other/outbound/outbound.wxml +++ b/miniprogram/pages/other/outbound/outbound.wxml @@ -42,6 +42,8 @@ + 查看 + 删除 { + const info = toObject(res.info); + wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` }); + this.setData({ + files: toArray(res.files).map((el) => { + el._file_type = getFileType(el.file_name); + el.file_path = `${OSSBaseUrl}${el.file_path}`; + el._file_size = formatFileSize(el.file_size); + return el; + }), + detail: toArray(res.rows), + info: info, + }); + }); + }, + onPreview(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.files[index]; + if (item._file_type != 'file') { + mediaPreview([item.file_path], item.file_path); + } + }, + onPreview2() { + const path = `${OSSBaseUrl}${this.data.info.file_name}`; + // console.log(path); + mediaPreview([path], path); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { head_id } = options; + this.data.params.head_id = head_id; + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() {}, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/other/outboundDetail/outboundDetail.wxml b/miniprogram/pages/other/outboundDetail/outboundDetail.wxml new file mode 100644 index 0000000..9be84f3 --- /dev/null +++ b/miniprogram/pages/other/outboundDetail/outboundDetail.wxml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + {{ item.goods_name }} + + + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/other/outboundDetail/outboundDetail.wxss b/miniprogram/pages/other/outboundDetail/outboundDetail.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/other/transfer/transfer.ts b/miniprogram/pages/other/transfer/transfer.ts index 152312f..268201c 100644 --- a/miniprogram/pages/other/transfer/transfer.ts +++ b/miniprogram/pages/other/transfer/transfer.ts @@ -90,7 +90,14 @@ Page({ }); }); }, - + onOrderDetail(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + wx.navigateTo({ + url: `/pages/other/transferDetail/transferDetail?head_id=${item.head_id}`, + }); + }, onOrderDel(e: any) { const data = getDataSet(e); const index = data.index; diff --git a/miniprogram/pages/other/transfer/transfer.wxml b/miniprogram/pages/other/transfer/transfer.wxml index 5df7ed2..0c80074 100644 --- a/miniprogram/pages/other/transfer/transfer.wxml +++ b/miniprogram/pages/other/transfer/transfer.wxml @@ -39,6 +39,8 @@ + 查看 + 删除 { + const info = toObject(res.info); + wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` }); + this.setData({ + files: toArray(res.files).map((el) => { + el._file_type = getFileType(el.file_name); + el.file_path = `${OSSBaseUrl}${el.file_path}`; + el._file_size = formatFileSize(el.file_size); + return el; + }), + detail: toArray(res.rows), + info: info, + }); + }); + }, + onPreview(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.files[index]; + if (item._file_type != 'file') { + mediaPreview([item.file_path], item.file_path); + } + }, + onPreview2() { + const path = `${OSSBaseUrl}${this.data.info.file_name}`; + // console.log(path); + mediaPreview([path], path); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { head_id } = options; + this.data.params.head_id = head_id; + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() {}, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/other/transferDetail/transferDetail.wxml b/miniprogram/pages/other/transferDetail/transferDetail.wxml new file mode 100644 index 0000000..7cf66c6 --- /dev/null +++ b/miniprogram/pages/other/transferDetail/transferDetail.wxml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + {{ item.goods_name }} + + + + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/other/transferDetail/transferDetail.wxss b/miniprogram/pages/other/transferDetail/transferDetail.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/purchase/backOrder/backOrder.ts b/miniprogram/pages/purchase/backOrder/backOrder.ts index 1fd095d..ee81c51 100644 --- a/miniprogram/pages/purchase/backOrder/backOrder.ts +++ b/miniprogram/pages/purchase/backOrder/backOrder.ts @@ -99,6 +99,14 @@ Page({ }); }); }, + onOrderDetail(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + wx.navigateTo({ + url: `/pages/purchase/backOrderDetail/backOrderDetail?head_id=${item.head_id}`, + }); + }, onViewAttachment(e: any) { const data = getDataSet(e); const index = data.index; diff --git a/miniprogram/pages/purchase/backOrder/backOrder.wxml b/miniprogram/pages/purchase/backOrder/backOrder.wxml index a721d30..cdb16c5 100644 --- a/miniprogram/pages/purchase/backOrder/backOrder.wxml +++ b/miniprogram/pages/purchase/backOrder/backOrder.wxml @@ -48,6 +48,8 @@ + 查看 + 删除 { + const info = toObject(res.info); + wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` }); + this.setData({ + files: toArray(res.files).map((el) => { + el._file_type = getFileType(el.file_name); + el.file_path = `${OSSBaseUrl}${el.file_path}`; + el._file_size = formatFileSize(el.file_size); + return el; + }), + detail: toArray(res.rows), + info: info, + }); + }); + }, + onPreview(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.files[index]; + if (item._file_type != 'file') { + mediaPreview([item.file_path], item.file_path); + } + }, + onPreview2() { + const path = `${OSSBaseUrl}${this.data.info.file_name}`; + // console.log(path); + mediaPreview([path], path); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { head_id } = options; + this.data.params.head_id = head_id; + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() {}, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/purchase/backOrderDetail/backOrderDetail.wxml b/miniprogram/pages/purchase/backOrderDetail/backOrderDetail.wxml new file mode 100644 index 0000000..f2ffce8 --- /dev/null +++ b/miniprogram/pages/purchase/backOrderDetail/backOrderDetail.wxml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.goods_name }} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/purchase/backOrderDetail/backOrderDetail.wxss b/miniprogram/pages/purchase/backOrderDetail/backOrderDetail.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts b/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts index 3e050b8..466f775 100644 --- a/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts +++ b/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts @@ -95,6 +95,14 @@ Page({ }); }); }, + onOrderDetail(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + wx.navigateTo({ + url: `/pages/purchase/buyInOrderDetail/buyInOrderDetail?head_id=${item.head_id}`, + }); + }, onViewAttachment(e: any) { const data = getDataSet(e); const index = data.index; diff --git a/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml b/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml index 92d3ec5..cc038d0 100644 --- a/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml +++ b/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml @@ -48,6 +48,8 @@ + 查看 + 删除 { + const info = toObject(res.info); + wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` }); + this.setData({ + files: toArray(res.files).map((el) => { + el._file_type = getFileType(el.file_name); + el.file_path = `${OSSBaseUrl}${el.file_path}`; + el._file_size = formatFileSize(el.file_size); + return el; + }), + detail: toArray(res.rows), + info: info, + }); + }); + }, + onPreview(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.files[index]; + if (item._file_type != 'file') { + mediaPreview([item.file_path], item.file_path); + } + }, + onPreview2() { + const path = `${OSSBaseUrl}${this.data.info.file_name}`; + // console.log(path); + mediaPreview([path], path); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { head_id } = options; + this.data.params.head_id = head_id; + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() {}, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.wxml b/miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.wxml new file mode 100644 index 0000000..12dd223 --- /dev/null +++ b/miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.wxml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.goods_name }} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.wxss b/miniprogram/pages/purchase/buyInOrderDetail/buyInOrderDetail.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/purchase/buyOrderDetail/buyOrderDetail.wxml b/miniprogram/pages/purchase/buyOrderDetail/buyOrderDetail.wxml index a33f641..ab5a5be 100644 --- a/miniprogram/pages/purchase/buyOrderDetail/buyOrderDetail.wxml +++ b/miniprogram/pages/purchase/buyOrderDetail/buyOrderDetail.wxml @@ -1,4 +1,4 @@ - @@ -6,6 +6,9 @@ + + + @@ -14,7 +17,9 @@ bind:tap="onPreview2" /> + custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" + bordered="{{false}}" /> + - + custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" + bordered="{{false}}" /> + {{ item.goods_name }} - - + + diff --git a/miniprogram/pages/purchase/requestOrderDetail/requestOrderDetail.wxml b/miniprogram/pages/purchase/requestOrderDetail/requestOrderDetail.wxml index ccb5490..19716a8 100644 --- a/miniprogram/pages/purchase/requestOrderDetail/requestOrderDetail.wxml +++ b/miniprogram/pages/purchase/requestOrderDetail/requestOrderDetail.wxml @@ -1,4 +1,4 @@ - @@ -12,7 +12,8 @@ bind:tap="onPreview2" /> --> + custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" + bordered="{{false}}" /> - + custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" + bordered="{{false}}" /> + {{ item.goods_name }} - - - - + + + + \ No newline at end of file