修改商品搜索及完善批次页面

miniprogram/pages/other/batch/batch.ts

@@ -112,9 +112,9 @@ Page({
     const index = data.index;
     const item = this.data.list[index];
     wx.navigateTo({
-      url: `/pages/other/goodsDetail/goodsDetail?goods_id=${
-        item.goods_id
-      }&title=${encodeURIComponent(item.goods_name)}`,
+      url: `/pages/other/batchDetail/batchDetail?batch_id=${
+        item.batch_id
+      }&title=${encodeURIComponent(item.batch_no)}`,
     });
   },
 

miniprogram/pages/other/batch/batch.wxml

@@ -44,7 +44,7 @@
       <card-item-plugin label="创建日期" value="{{item.create_date}}" />
     </view>
     <view slot="footer" class="card-plugin-footer">
-      <t-button size="small" theme="primary" bind:tap="onDetail" data-index="{{index}}">子商品
+      <t-button size="small" theme="primary" bind:tap="onDetail" data-index="{{index}}">查看
       </t-button>
     </view>
   </card-plugin>

miniprogram/pages/other/batchDetail/batchDetail.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",
+    "select-plugin": "/pages/components/select-plugin/select-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",
+    "search-input": "/pages/components/search-input/search-input"
+  },
+  "navigationBarTitleText": "批次详情"
+}

miniprogram/pages/other/batchDetail/batchDetail.ts

@@ -0,0 +1,153 @@
+import { loginStatus, post } from '@/utils/https';
+import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+
+const defaultParams = { curr_page: 1, page_count: 20, batch_id: '' };
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    params: cloneLite(defaultParams) as any,
+    list: [] as any[],
+    count: 0,
+    sort: [{ label: '创建日期', value: 'create_date' }],
+    depots: [] as any[],
+    depotsObj: {} as any,
+  },
+  handleLogin(e: any) {
+    this.setData({ isLogin: e.detail });
+    if (e.detail) {
+      this.init();
+    }
+  },
+  init() {
+    this.setData({ authInfo: getAuthInfo() });
+    this.getList();
+    this.getData();
+  },
+  searchChange(e: any) {
+    const key = getDataSet(e).key;
+    this.data.params[key] = e.detail.value;
+    this.setData({ params: this.data.params });
+  },
+  searchChange2(e: any) {
+    const key = getDataSet(e).key;
+    const val = `${e.detail.value || ''}`.trim();
+    if (val) {
+      this.data.params[key] = val;
+    } else {
+      delete this.data.params[key];
+    }
+    this.setData({ params: this.data.params });
+  },
+  onOptionChange(e: any) {
+    const key = getDataSet(e).key;
+    this.data.params[key] = e.detail.value;
+    this.setData({ params: this.data.params });
+  },
+  datePickerConfirm(e: any) {
+    const data = getDataSet(e);
+    this.data.params[data.key] = e.detail.value;
+    this.setData({ params: this.data.params });
+  },
+  searchOk() {
+    this.getList(1);
+  },
+  searchReset() {
+    this.data.params = cloneLite(defaultParams);
+    this.getList(1);
+  },
+  onSort(e: any) {
+    this.data.params.order = e.detail.value;
+    this.setData({ params: this.data.params });
+    this.getList(1);
+  },
+  paginationChange(e: any) {
+    this.getList(e.detail.curr_page);
+  },
+  getData() {
+    post('ErpDepot/ajaxDepotList').then((res: any) => {
+      const depots = toArray(res.data).map((el) => {
+        this.data.depotsObj[el.depot_id] = el.depot_name;
+        return { label: el.depot_name, value: el.depot_id };
+      });
+      this.setData({
+        depots,
+        depotsObj: this.data.depotsObj,
+      });
+    });
+  },
+  getList(curr: number = 1) {
+    this.data.params.curr_page = curr;
+    this.setData({ params: this.data.params });
+    const temp = cloneLite(this.data.params);
+
+    post('GoodsBatch/getBatchLogList', temp).then((res: any) => {
+      const list = toArray(res.data);
+      if (list.length == 0 && this.data.params.curr_page > 1) {
+        this.getList(this.data.params.curr_page - 1);
+      }
+      this.setData({
+        count: toNumber(res.count),
+        list: list,
+      });
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    const { batch_id, title } = options;
+    this.data.params.batch_id = batch_id;
+    if (title) {
+      wx.setNavigationBarTitle({ title });
+    }
+    this.setData({ loading: true });
+    loginStatus()
+      .then(() => {
+        this.setData({ isLogin: true, loading: false });
+        this.init();
+      })
+      .catch((err) => {
+        this.setData({ isLogin: false, loading: false });
+        console.log('调用登录状态请求失败', err);
+      });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {},
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {},
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {},
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {},
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {},
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {},
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {},
+});

miniprogram/pages/other/batchDetail/batchDetail.wxml

@@ -0,0 +1,30 @@
+<page-plugin isAuth="{{authInfo['SF_ERP_GOODS_BATCH_VIEW']}}" loading="{{loading}}"
+  is-login="{{isLogin}}" bind:handleLogin="handleLogin">
+  <search-popup placeholder="输入单据编号" bind:change="searchChange" bind:ok="searchOk"
+    bind:reset="searchReset" value="{{params.rel_bill_no}}" data-key="rel_bill_no">
+  </search-popup>
+
+  <count-plugin count="{{count}}">
+    <!-- <sort-plugin options="{{sort}}" bind:ok="onSort" value="{{params.order}}" slot="right" /> -->
+  </count-plugin>
+  <empty-plugin wx:if="{{list.length == 0}}" />
+  <card-plugin wx:for="{{ list }}" wx:key="stock_log_id">
+    <view slot="header" style="width: 100%;display: flex;justify-content: space-between;">
+      <view>{{ item.rel_bill_no }}</view>
+      <view style="font-weight: normal;">{{item.type}}</view>
+    </view>
+    <view slot="content">
+      <!-- <card-item-plugin label="业务类型" value="{{item.type}}" /> -->
+      <card-item-plugin label="商品名称" value="{{item.goods_name}}" />
+      <card-item-plugin label="数量" value="{{item.stock}}" />
+      <card-item-plugin label="商品编码" value="{{item.goods_code}}" />
+      <card-item-plugin label="商品属性" value="{{item.attr_name}}" />
+      <card-item-plugin label="仓库" value="{{depotsObj[item.depot_id]}}" />
+
+      <!-- <card-item-plugin label="备注" value="{{item.comments}}" /> -->
+      <card-item-plugin label="创建日期" value="{{item.create_date}}" />
+    </view>
+  </card-plugin>
+  <pagination-plugin curr_page="{{params.curr_page}}" page_count="{{params.page_count}}"
+    total="{{count}}" bind:change="paginationChange" />
+</page-plugin>

miniprogram/pages/other/goods/goods.ts

@@ -66,6 +66,52 @@ Page({
   paginationChange(e: any) {
     this.getList(e.detail.curr_page);
   },
+  /**
+   * 根据父级ID排序树形结构的一维数组
+   */
+  sortTreeArrayByParentId(
+    arr: any[],
+    rootParentId = 0,
+    idKey = 'cate_id',
+    parentIdKey = 'parent_cate_id',
+  ) {
+    // 1. 构建映射表，快速查找子节点
+    const nodeMap = new Map();
+    arr.forEach((node) => {
+      nodeMap.set(node[idKey], { ...node, children: [] });
+    });
+
+    // 2. 构建树形结构
+    const tree: any[] = [];
+    arr.forEach((node) => {
+      const currentNode = nodeMap.get(node[idKey]);
+      const parentNode = nodeMap.get(node[parentIdKey]);
+
+      if (parentNode) {
+        // 有父节点，添加到父节点的children中
+        parentNode.children.push(currentNode);
+      } else if (node[parentIdKey] === rootParentId) {
+        // 根节点，直接加入树形结构
+        tree.push(currentNode);
+      }
+    });
+
+    // 3. 递归扁平化树形结构，按层级输出
+    function flattenTree(nodes: any[]) {
+      const result: any[] = [];
+      nodes.forEach((node) => {
+        // 先加入当前节点
+        result.push({ ...node, children: undefined }); // 移除children属性，还原原始结构
+        // 递归处理子节点
+        if (node.children && node.children.length > 0) {
+          result.push(...flattenTree(node.children));
+        }
+      });
+      return result;
+    }
+
+    return flattenTree(tree);
+  },
   getData() {
     post('ErpDepot/list').then((res: any) => {
       const depots = toArray(res.data?.list).map((el) => {
@@ -74,10 +120,14 @@ Page({
       this.setData({ depots });
     });
     post('GoodsCategory/list').then((res: any) => {
-      const goodsClass = toArray(res.data?.list).map((el) => {
+      // const goodsClass = toArray(res.data?.list).map((el) => {
+      //   return { label: el.cate_name, value: el.cate_id };
+      // });
+      const sortedArray = this.sortTreeArrayByParentId(toArray(res.data?.list)).map((el) => {
         return { label: el.cate_name, value: el.cate_id };
       });
-      this.setData({ goodsClass });
+
+      this.setData({ goodsClass: sortedArray });
     });
   },
   getList(curr: number = 1) {