添加请购单. 采购单详情页

miniprogram/app.json

@@ -11,13 +11,15 @@
     "pages/orders/orderSort/orderSort",
     "pages/orders/ordersList/orderPayment/orderPayment",
     "pages/orders/ordersList/orderDetail/orderDetail",
+    "pages/purchase/requestOrder/requestOrder",
+    "pages/purchase/requestOrderDetail/requestOrderDetail",
     "pages/purchase/buyOrder/buyOrder",
+    "pages/purchase/buyOrderDetail/buyOrderDetail",
     "pages/purchase/buyInOrder/buyInOrder",
     "pages/finance/outcome/outcome",
     "pages/finance/income/income",
     "pages/finance/giro/giro",
     "pages/finance/flow/flow",
-    "pages/purchase/requestOrder/requestOrder",
     "pages/purchase/backOrder/backOrder",
     "pages/base/supplier/supplier",
     "pages/base/customer/customer",

miniprogram/pages/orders/ordersList/orderDetail/orderDetail.wxml

@@ -2,55 +2,22 @@
   is-login="{{isLogin}}" bind:handleLogin="handleLogin">
 
   <total-bar-plugin customStyle="flex-direction: column;">
-    <view class="item">
+    <card-item-plugin label="经销商" value="{{info.custom_name}}" />
-      <text class="item-label">经销商：</text>
+    <card-item-plugin label="单据日期" value="{{info.document_date}}" />
-      <text class="item-value">{{info.custom_name}}</text>
+    <card-item-plugin label="自定义单号" value="{{info.custom_order_no}}" />
-    </view>
+    <card-item-plugin label="销售人员" value="{{info.sales_name}}" />
-    <view class="item">
+    <card-item-plugin label="客户名称" value="{{info.end_user_name}}" />
-      <text class="item-label">单据日期：</text>
+    <card-item-plugin label="客户手机" value="{{info.end_user_phone}}" />
-      <text class="item-value">{{info.document_date}}</text>
+    <card-item-plugin label="客户地址" value="{{info.end_user_address}}" />
-    </view>
+    <card-item-plugin label="备注" value="{{info.comments}}" />
-    <view class="item">
+    <card-item-plugin label="优惠率" value="{{info.discount_rate}}%" />
-      <text class="item-label">自定义单号：</text>
+    <card-item-plugin label="收款优惠" value="{{info.discount_money}}" />
-      <text class="item-value">{{info.custom_order_no}}</text>
+    <card-item-plugin label="优惠后金额" value="{{info.discount_last_money}}" />
-    </view>
-    <view class="item">
-      <text class="item-label">销售人员：</text>
-      <text class="item-value">{{info.sales_name}}</text>
-    </view>
-    <view class="item">
-      <text class="item-label">客户名称：</text>
-      <text class="item-value">{{info.end_user_name}}</text>
-    </view>
-    <view class="item">
-      <text class="item-label">客户手机：</text>
-      <text class="item-value">{{info.end_user_phone}}</text>
-    </view>
-    <view class="item">
-      <text class="item-label">客户地址：</text>
-      <text class="item-value">{{info.end_user_address}}</text>
-    </view>
-    <view class="item">
-      <text class="item-label">备注：</text>
-      <text class="item-value">{{info.comments}}</text>
-    </view>
-    <view class="item">
-      <text class="item-label">优惠率：</text>
-      <text class="item-value">{{info.discount_rate}}%</text>
-    </view>
-    <view class="item">
-      <text class="item-label">收款优惠：</text>
-      <text class="item-value">{{info.discount_money}}</text>
-    </view>
-    <view class="item">
-      <text class="item-label">优惠后金额：</text>
-      <text class="item-value">{{info.discount_last_money}}</text>
-    </view>
   </total-bar-plugin>
 
-  <!-- <t-cell title="Excel附件" left-icon="file-excel"
+  <t-cell title="Excel附件" left-icon="file-excel"
     custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;" arrow
-    bind:tap="onPreview2" /> -->
+    bind:tap="onPreview2" />
 
   <t-cell title="附件" left-icon="file"
     custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" />

miniprogram/pages/orders/ordersList/orderDetail/orderDetail.wxss

@@ -1,15 +0,0 @@
-.item {
-  display: inline-flex;
-  align-items: center;
-}
-
-.item-label {
-  width: 6em;
-  display: inline-flex;
-  justify-content: flex-end;
-  flex-shrink: 0;
-}
-
-.item-value {
-  word-break: break-all;
-}

miniprogram/pages/orders/ordersList/ordersList.wxml

@@ -81,7 +81,7 @@
       <t-button size="small" theme="primary" bind:tap="onOrderDetail" data-index="{{index}}">详情
       </t-button>
       <t-button wx:if="{{authInfo['SF_ERP_SALE_ORDERS_PAY']}}" size="small" theme="primary"
-        bind:tap="onOrderPay" data-index="{{index}}">收付款</t-button>
+        bind:tap="onOrderPay" data-index="{{index}}">收款</t-button>
       <t-button wx:if="{{authInfo['SF_ERP_SALE_ORDERS_DEL']}}" size="small" theme="danger"
         bind:tap="onOrderDel" data-index="{{index}}">删除</t-button>
       <t-button wx:if="{{item.file_cnt}}" size="small" bind:tap="onViewAttachment"

miniprogram/pages/produce/orderTask/orderTask.ts

@@ -84,6 +84,10 @@ Page({
     const item = this.data.list[index];
     const item2 = item?.produce_info[index2] || {};
     // console.log(index, index2, item);
+    const produce_info_process = toArray(item2.produce_info_process);
+    if (produce_info_process.length == 0) {
+      return;
+    }
     this.setData({
       detail: {
         show: true,

miniprogram/pages/produce/orderTask/orderTask.wxml

@@ -54,7 +54,8 @@
       <t-cell-group title="产品名称">
         <block wx:for="{{item.produce_info}}" wx:key="index" wx:for-item="produce">
           <t-cell title="{{produce.goods_name}}" bind:tap="onDetail" data-index="{{i}}"
-            data-index2="{{index}}" hover arrow />
+            data-index2="{{index}}" hover="{{!!produce.produce_info_process.length}}"
+            arrow="{{!!produce.produce_info_process.length }}" style="padding-right: 0;" />
         </block>
       </t-cell-group>
     </view>

miniprogram/pages/produce/processManageDetail/processManageDetail.wxss

@@ -1,6 +1,8 @@
 .tabs {
   display: inline-flex;
   margin-bottom: 32rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
 }
 
 .tabs-item {

miniprogram/pages/purchase/buyOrder/buyOrder.ts

@@ -98,6 +98,14 @@ Page({
       });
     });
   },
+  onOrderDetail(e: any) {
+    const data = getDataSet(e);
+    const index = data.index;
+    const item = this.data.list[index];
+    wx.navigateTo({
+      url: `/pages/purchase/buyOrderDetail/buyOrderDetail?head_id=${item.head_id}`,
+    });
+  },
   onViewAttachment(e: any) {
     const data = getDataSet(e);
     const index = data.index;

miniprogram/pages/purchase/buyOrder/buyOrder.wxml

@@ -48,6 +48,8 @@
       <card-item-plugin label="创建日期" value="{{item.create_date}}" />
     </view>
     <view slot="footer" class="card-plugin-footer">
+      <t-button size="small" theme="primary" bind:tap="onOrderDetail" data-index="{{index}}">查看
+      </t-button>
       <t-button wx:if="{{authInfo['SF_ERP_PURCHASE_ORDER_DEL']}}" size="small" theme="danger"
         bind:tap="onOrderDel" data-index="{{index}}">删除</t-button>
       <t-button wx:if="{{item.total_att}}" size="small" bind:tap="onViewAttachment"

miniprogram/pages/purchase/buyOrderDetail/buyOrderDetail.json

@@ -0,0 +1,16 @@
+{
+  "usingComponents": {
+    "search-popup": "/pages/components/search-popup/search-popup",
+    "card-plugin": "/pages/components/card-plugin/card-plugin",
+    "card-item-plugin": "/pages/components/card-item-plugin/card-item-plugin",
+    "option-cell-plugin": "/pages/components/option-cell-plugin/option-cell-plugin",
+    "date-picker-plugin": "/pages/components/date-picker-plugin/date-picker-plugin",
+    "sort-plugin": "/pages/components/sort-plugin/sort-plugin",
+    "count-plugin": "/pages/components/count-plugin/count-plugin",
+    "total-bar-plugin": "/pages/components/total-bar-plugin/total-bar-plugin",
+    "pagination-plugin": "/pages/components/pagination-plugin/pagination-plugin",
+    "t-cell": "tdesign-miniprogram/cell/cell",
+    "search-input": "/pages/components/search-input/search-input"
+  },
+  "navigationBarTitleText": "采购订单详情"
+}

miniprogram/pages/purchase/buyOrderDetail/buyOrderDetail.ts

@@ -0,0 +1,113 @@
+import { OSSBaseUrl } from '@/utils/config';
+import { loginStatusPage, post } from '@/utils/https';
+import {
+  cloneLite,
+  formatFileSize,
+  getAuthInfo,
+  getDataSet,
+  getFileType,
+  mediaPreview,
+  toArray,
+  toObject,
+} from '@/utils/util';
+
+const defaultParams = { head_id: '' };
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    params: cloneLite(defaultParams) as any,
+    list: [] as any[],
+    count: 0,
+    info: {} as any,
+    files: [] as any,
+    detail: [] as any,
+  },
+  handleLogin(e: any) {
+    this.setData({ isLogin: e.detail });
+    if (e.detail) {
+      this.init();
+    }
+  },
+  init() {
+    this.setData({ authInfo: getAuthInfo() });
+    this.getList();
+  },
+
+  getList() {
+    this.setData({ params: this.data.params });
+    const temp = cloneLite(this.data.params);
+    post('ErpDepot/info', temp).then((res: any) => {
+      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() {},
+});

miniprogram/pages/purchase/buyOrderDetail/buyOrderDetail.wxml

@@ -0,0 +1,41 @@
+<page-plugin isAuth="{{authInfo['SF_ERP_SALE_ORDERS_VIEW']}}" loading="{{loading}}"
+  is-login="{{isLogin}}" bind:handleLogin="handleLogin">
+
+  <total-bar-plugin customStyle="flex-direction: column;">
+    <card-item-plugin label="供应商" value="{{info.crm_name}}" />
+    <card-item-plugin label="单据编号" value="{{info.bill_no}}" />
+    <card-item-plugin label="单据日期" value="{{info.bill_date}}" />
+    <card-item-plugin label="关联单据" value="{{info.rel_bill_no}}" />
+    <card-item-plugin label="备注" value="{{info.comments}}" />
+  </total-bar-plugin>
+
+  <t-cell title="Excel附件" left-icon="file-excel"
+    custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;" arrow
+    bind:tap="onPreview2" />
+
+  <t-cell title="附件" left-icon="file"
+    custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" />
+  <view style="border: 1px solid #ddd;border-radius: 8rpx;padding: 8rpx;">
+    <block wx:for="{{files}}" wx:key="index">
+      <t-cell title="{{item.file_name}}" hover="{{item._file_type != 'file'}}"
+        arrow="{{item._file_type != 'file'}}" bind:tap="onPreview" data-index="{{index}}" />
+    </block>
+  </view>
+
+  <t-cell wx:if="{{ detail.length }}" title="订单明细" left-icon="article" note="{{detail.length}}条"
+    custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" />
+  <card-plugin wx:for="{{ detail }}" wx:key="detail_id">
+    <view slot="header">{{ item.goods_name }}</view>
+    <view slot="content">
+      <card-item-plugin label="编码" value="{{item.goods_code}}" />
+      <card-item-plugin label="属性" value="{{item.attr_name}}" />
+      <card-item-plugin label="数量" value="{{item.item_quantity}}" />
+      <card-item-plugin label="单位" value="{{item.goods_unit}}" />
+      <card-item-plugin label="单价" value="{{item.item_price}}" />
+      <card-item-plugin label="金额" value="{{item.all_price}}" />
+      <card-item-plugin label="税率" value="{{item.tax_rate}}%" />
+      <card-item-plugin label="价税合计" value="{{item.tax_last_money}}" />
+      <card-item-plugin label="备注" value="{{item.comments}}" />
+    </view>
+  </card-plugin>
+</page-plugin>

miniprogram/pages/purchase/requestOrder/requestOrder.ts

@@ -85,6 +85,18 @@ Page({
       });
     });
   },
+  onOrderDetail(e: any) {
+    const data = getDataSet(e);
+    const index = data.index;
+    const item = this.data.list[index];
+    wx.navigateTo({
+      url: `/pages/purchase/requestOrderDetail/requestOrderDetail?head_id=${item.head_id}`,
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据
+        res.eventChannel.emit('requestOrderDetail', { data: item });
+      },
+    });
+  },
   onOrderDel(e: any) {
     const data = getDataSet(e);
     const index = data.index;

miniprogram/pages/purchase/requestOrder/requestOrder.wxml

@@ -45,6 +45,8 @@
       <card-item-plugin label="创建日期" value="{{item.create_date}}" />
     </view>
     <view slot="footer" class="card-plugin-footer">
+      <t-button size="small" theme="primary" bind:tap="onOrderDetail" data-index="{{index}}">查看
+      </t-button>
       <t-button wx:if="{{authInfo['SF_ERP_PURCHASE_REQUEST_DEL']}}" size="small" theme="danger"
         bind:tap="onOrderDel" data-index="{{index}}">删除</t-button>
       <t-button wx:if="{{item.total_att}}" size="small" bind:tap="onViewAttachment"

miniprogram/pages/purchase/requestOrderDetail/requestOrderDetail.json

@@ -0,0 +1,16 @@
+{
+  "usingComponents": {
+    "search-popup": "/pages/components/search-popup/search-popup",
+    "card-plugin": "/pages/components/card-plugin/card-plugin",
+    "card-item-plugin": "/pages/components/card-item-plugin/card-item-plugin",
+    "option-cell-plugin": "/pages/components/option-cell-plugin/option-cell-plugin",
+    "date-picker-plugin": "/pages/components/date-picker-plugin/date-picker-plugin",
+    "sort-plugin": "/pages/components/sort-plugin/sort-plugin",
+    "count-plugin": "/pages/components/count-plugin/count-plugin",
+    "total-bar-plugin": "/pages/components/total-bar-plugin/total-bar-plugin",
+    "pagination-plugin": "/pages/components/pagination-plugin/pagination-plugin",
+    "t-cell": "tdesign-miniprogram/cell/cell",
+    "search-input": "/pages/components/search-input/search-input"
+  },
+  "navigationBarTitleText": "请购订单详情"
+}

miniprogram/pages/purchase/requestOrderDetail/requestOrderDetail.ts

@@ -0,0 +1,122 @@
+import { OSSBaseUrl } from '@/utils/config';
+import { loginStatusPage, post } from '@/utils/https';
+import {
+  cloneLite,
+  formatFileSize,
+  getAuthInfo,
+  getDataSet,
+  getFileType,
+  mediaPreview,
+  toArray,
+  toObject,
+} from '@/utils/util';
+
+const defaultParams = { head_id: '', head_type: '' };
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    params: cloneLite(defaultParams) as any,
+    list: [] as any[],
+    count: 0,
+    info: {} as any,
+    files: [] as any,
+    detail: [] as any,
+  },
+  handleLogin(e: any) {
+    this.setData({ isLogin: e.detail });
+    if (e.detail) {
+      this.init();
+    }
+  },
+  init() {
+    this.setData({ authInfo: getAuthInfo() });
+    this.getList();
+  },
+
+  getList() {
+    this.setData({ params: this.data.params });
+    const temp = cloneLite(this.data.params);
+    post('ErpDepot/depotItemList', temp).then((res: any) => {
+      this.setData({ detail: toArray(res.data) });
+    });
+    post('ErpDepot/fileList', { head_id: temp.head_id }).then((res: any) => {
+      this.setData({
+        files: toArray(res.data).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;
+        }),
+      });
+    });
+  },
+  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.excel_path}`;
+    // console.log(path);
+    mediaPreview([path], path);
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    const { head_id } = options;
+    this.data.params.head_id = head_id;
+    const eventChannel: any = this.getOpenerEventChannel();
+    if (eventChannel) {
+      eventChannel.on('requestOrderDetail', (res: any) => {
+        const record = toObject(res.data);
+        wx.setNavigationBarTitle({ title: `${record.bill_no} 详情` });
+        this.setData({ info: record });
+        loginStatusPage(this);
+      });
+    } else {
+      loginStatusPage(this);
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {},
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {},
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {},
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {},
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {},
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {},
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {},
+});

miniprogram/pages/purchase/requestOrderDetail/requestOrderDetail.wxml

@@ -0,0 +1,39 @@
+<page-plugin isAuth="{{authInfo['SF_ERP_SALE_ORDERS_VIEW']}}" loading="{{loading}}"
+  is-login="{{isLogin}}" bind:handleLogin="handleLogin">
+
+  <total-bar-plugin customStyle="flex-direction: column;">
+    <card-item-plugin label="单据编号" value="{{info.bill_no}}" />
+    <card-item-plugin label="单据日期" value="{{info.bill_date}}" />
+    <card-item-plugin label="备注" value="{{info.comments}}" />
+  </total-bar-plugin>
+
+  <!-- <t-cell title="Excel附件" left-icon="file-excel"
+    custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;" arrow
+    bind:tap="onPreview2" /> -->
+
+  <t-cell title="附件" left-icon="file"
+    custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" />
+  <view style="border: 1px solid #ddd;border-radius: 8rpx;padding: 8rpx;">
+    <block wx:for="{{files}}" wx:key="index">
+      <t-cell title="{{item.file_name}}" hover="{{item._file_type != 'file'}}"
+        arrow="{{item._file_type != 'file'}}" bind:tap="onPreview" data-index="{{index}}">
+        <!-- <block wx:if="{{item._file_type != 'image'}}">
+          <t-icon slot="left-icon" name="{{fileIcon[item._file_type]}}" color="#999" size="96rpx" />
+        </block> -->
+      </t-cell>
+    </block>
+  </view>
+
+  <t-cell wx:if="{{ detail.length }}" title="订单明细" left-icon="article" note="{{detail.length}}条"
+    custom-style="padding-left:0;padding-right:0;position: sticky;top: 0;z-index:1" />
+  <card-plugin wx:for="{{ detail }}" wx:key="detail_id">
+    <view slot="header">{{ item.goods_name }}</view>
+    <view slot="content">
+      <card-item-plugin label="编码" value="{{item.goods_code}}" />
+      <card-item-plugin label="多属性" value="{{item.attr_name}}" />
+      <card-item-plugin label="数量" value="{{item.item_quantity}}" />
+      <card-item-plugin label="单位" value="{{item.goods_unit}}" />
+      <card-item-plugin label="备注" value="{{item.comments}}" />
+    </view>
+  </card-plugin>
+</page-plugin>