Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

api/pages/ivt/inbound.js

@@ -12,7 +12,7 @@ module.exports = {
       // 前缀
       prefix: 'mdm-server/ivt/inbound/', 
       selectInboundAndItem:'select_inbound_and_item',
-      purchaseInboundInsert:'purchase_inbound_insert',
+      purchaseInboundInsert:'purchase_inbound',
       purchaseHandleInbound:'purchase_handle_inbound'
 
   },

api/pages/ivt/inboundOther.js

@@ -25,6 +25,7 @@ module.exports = {
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-choose-org/select-choose-org' }, 
       chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-warehouse/select-warehouse'  },      
       chooseStorageObject: { key: 'chooseStorageObject', url: '/package-base-select/pages/select-storage-object/select-storage-object'  },
+      chooseStorageInReason: { key: 'chooseStorageInReason', url: '/package-base-select/pages/select-storage-in-reason/select-storage-in-reason'  },
 
     }
   }

api/pages/ivt/outboundOther.js

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.功能描述：其他出库
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		姜永辉		  	     2024-1-19       			1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+  outboundOtherService: {
+    // 前缀
+    prefix: 'mdm-server-dkic-b1/ivt/outbound_other/',
+    otheroutBoundInsert: 'other_inbound_insert',
+    otherHandleOutBound: 'other_handle_outbound'
+  },
+
+  routeUrl: {
+    outBounddOther: {
+      detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail' },
+      add: { key: 'add', url: '/package-inventory/pages/other-warehousing/other-warehousing' },
+      chooseSupplier: { key: 'chooseSupplier', url: '/package-base-select/pages/select-suppliers/select-suppliers'  },
+      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-choose-staff/select-choose-staff'  },
+      staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add'  },
+      chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-choose-org/select-choose-org' }, 
+      chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-warehouse/select-warehouse'  },      
+      chooseStorageObject: { key: 'chooseStorageObject', url: '/package-base-select/pages/select-storage-object/select-storage-object'  },
+      chooseStorageOutReason: { key: 'chooseStorageOutReason', url: '/package-base-select/pages/select-storage-out-reason/select-storage-out-reason'  },
+
+    }
+  }
+};

api/pages/ivt/outboundProcessing.js

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.功能描述：待办出库
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		姜永辉		 2024-1-19  		1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+  outboundProcessingService: {
+      // 前缀
+      prefix: 'mdm-server-dkic-b1/ivt/inbound/',   
+
+  },
+
+  routeUrl: {
+    outboundProcessing: { 
+      detailInProcessing: { key: 'detailInProcessing', url: '/package-inventory/pages/warehousing-processing/detail/detail' , },
+      detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail'  },
+      add: { key: 'add', url: '/package-purchase/pages/purchase-receipt/add/add'  },
+      edit: { key: 'edit', url: '/package-inventory/pages/warehousing-processing/detail/detail'  },
+      addOther: { key: 'addOther', url: '/package-inventory/pages/other-warehousing/other-warehousing'  },
+      chooseSupplier: { key: 'chooseSupplier', url: '/package-base-select/pages/select-suppliers/select-suppliers'  },
+      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-choose-staff/select-choose-staff'  },
+      staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add'  },
+      chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-choose-org/select-choose-org' }, 
+      chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-warehouse/select-warehouse'  },
+      choosePurchaseOrder: { key: 'choosePurchaseOrder', url: '/package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order'  },
+    
+    }
+  } 
+};

api/pages/ivt/outboundPurchaseReturn.js

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.功能描述：采购退货出库
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		姜永辉		  	     2024-1-19       			1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+  outboundPurchaseReturnService: {
+      // 前缀
+      prefix: 'mdm-server-dkic-b1/ivt/inbound_sale_return/',  
+      saleReturnInboundInsert:'sale_return_inbound_insert',
+      saleReturnHandleInbound:'sale_return_handle_inbound'
+
+  },
+
+  routeUrl: {
+    outboundPurchaseReturn: {       
+      detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail'  },
+      add: { key: 'add', url: '/package-purchase/pages/purchase-receipt/add/add'  },
+      addOther: { key: 'addOther', url: '/package-inventory/pages/other-warehousing/other-warehousing'  },
+      chooseSupplier: { key: 'chooseSupplier', url: '/package-purchase/pages/purchase-receipt/choose-supplier/choose-supplier'  },
+      chooseStaff: { key: 'chooseStaff', url: '/package-purchase/pages/purchase-receipt/choose-staff/choose-staff'  },
+      staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add'  },
+      chooseOrg: { key: 'chooseOrg',url: '/package-purchase/pages/purchase-receipt/choose-org/choose-org' }, 
+      chooseWh: { key: 'chooseWh', url: '/package-basic-data/pages/product-file/warehouse-archives/warehouse-archives'  },
+      choosePurchaseOrder: { key: 'choosePurchaseOrder', url: '/package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order'  },
+      
+    }
+  } 
+};

app.js

@@ -38,6 +38,9 @@ const inbound = require('./api/pages/ivt/inbound.js');
 const inboundOther = require('./api/pages/ivt/inboundOther.js');
 const inboundProcessing = require('./api/pages/ivt/inboundProcessing.js');
 const inboundSaleReturn = require('./api/pages/ivt/inboundSaleReturn.js');
+const outboundOther = require('./api/pages/ivt/outboundOther.js');
+const outboundProcessing = require('./api/pages/ivt/outboundProcessing.js');
+const outboundPurchaseReturn = require('./api/pages/ivt/outboundPurchaseReturn.js');
 const moneyAccount = require('./api/pages/mst/moneyAccount.js');
 const intoReturn = require('./api/pages/ivt/intoReturn.js');
 const intoReturnItem = require('./api/pages/ivt/intoReturnItem.js');
@@ -45,7 +48,7 @@ const cusFollow = require('./api/pages/mst/cusFollow.js');
 const order = require('./api/pages/sale/order.js');
 
 // api服务路由文件
-var apiList = [common, oauth,setting, company, wechatPay,user, staff, staffRight, staffPurview, settingValue, customer, role, roleFun, org, roleSensitive, goodsBrand, goodsCategory, goodsSeries, unit, supplier, warehouse, saleChannel, goodsSku, basicData,customerMst,purchase,inbound,inboundOther,inboundProcessing,inboundSaleReturn,moneyAccount,intoReturn,intoReturnItem,cusFollow,order]
+var apiList = [common, oauth,setting, company, wechatPay,user, staff, staffRight, staffPurview, settingValue, customer, role, roleFun, org, roleSensitive, goodsBrand, goodsCategory, goodsSeries, unit, supplier, warehouse, saleChannel, goodsSku, basicData,customerMst,purchase,inbound,inboundOther,inboundProcessing,inboundSaleReturn,outboundOther,outboundProcessing,outboundPurchaseReturn,moneyAccount,intoReturn,intoReturnItem,cusFollow,order]
 
 const util = require('./utils/util.js')
 const baseMethod = require('./api/pages/baseMethod.js')

app.json

@@ -195,6 +195,7 @@
             "pages": [
                 "pages/base-test/base-test",
                 "pages/select-storage-object/select-storage-object",
+                "pages/select-storage-in-reason/select-storage-in-reason",
                 "pages/select-staff-right/select-staff-right",
                 "pages/select-staff-purview/select-staff-purview",
                 "pages/select-customers/select-customers",

package-base-select/pages/select-storage-in-reason/select-storage-in-reason.js

@@ -0,0 +1,202 @@
+const app = getApp();
+const api = require('@/utils/api.js');
+const Constants = require('@/utils/Constants.js')
+const mixins = require('@/mixins/index.js')
+Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 查询条件
+    searchContent: [
+      {
+        code: 'supplier-customer',
+        title: '选择对象',
+        searchType: Constants.searchType.switch,
+        list:
+          [{ code: 'supplier', title: '供应商' },
+          { code: 'customer', title: '客户' }]
+      },
+
+    ],
+    list: [],   
+    objectType: '',
+  },
+  /**
+   * @desc : 单据状态点击事件
+   * @author : 于继渤
+   * @date : 2022/5/24 12:16
+   */
+  dropdowncommit(e) {
+    this.selectComponent("#statusItem").toggle(false) //取消选中样式
+    console.log("dropdowncommit", e)
+
+    let dataList = e.detail.dataList
+    let type = e.currentTarget.dataset.type
+    let statusItem = this.data.statusItem
+    statusItem.text = dataList.join(", "); // 使用逗号和空格作为分隔符
+    this.setData({
+      objectType: e.detail.values,
+      statusItem
+    })
+
+
+    this.doSearch()
+
+  },
+
+  /**
+   * @desc : 确定事件
+   * @author : 于继渤
+   * @date : 2022/6/02 09:16
+   */
+  submit() {
+
+    let list = this.data.list
+
+
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2]; //上一个页面
+    let objItem = {}
+    list.forEach(element => {
+      if (element.checked) {
+        objItem = element
+        delete objItem.cpId
+        delete objItem.ascpId
+        delete objItem.sale1Id
+        delete objItem.sale2Id
+        delete objItem.orgCode
+        delete objItem.orgId
+        delete objItem.orgName
+        delete objItem.whId
+        delete objItem.whName
+        delete objItem.remarks
+      }
+    });
+
+
+    prevPage.setData({
+      objItem
+    })
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+
+  /**
+   * @desc : checkbox点击事件
+   * @author : 于继渤
+   * @date : 2022/5/23 15:16
+   */
+  catchtapCheck(e) {
+    let item = e.currentTarget.dataset.item
+    let list = this.data.list
+    list.forEach(res => {
+      if (res.objId === item.objId) {
+        res.checked = true
+      } else {
+        res.checked = false
+      }
+    })
+    this.setData({
+      list: list
+    })
+  },
+
+  /**
+   * @desc : 小程序销售订单选客户分页查询
+   * @author : 于继渤
+   * @date : 2022/5/23 15:16
+   */
+  getData(e) { 
+    this.setData({
+      loading: true
+    })
+    let param = {
+      dataSourceCode:'baseData',
+      dictCode:'基础资料-入库'
+    } 
+    api.request(Constants.BASIC_COMMON_API + 'get_init_data', 'POST', param).then(res => {
+      this.setData({
+        loading: false
+      })
+console.log("get_init_data",res);
+      if (res.data.code === 200) {
+        let tList = this.data.list;
+        let list = res.data.data; //后台返回数据
+        if (!list || list.length == 0) {
+          // 如果不是翻页，需要清空
+          if (e != 'more') {
+            this.setData({
+              list: [],
+              noMore: false
+            })
+          } else {
+            this.setData({
+              noMore: true
+            })
+          }
+          return
+        }
+        if (list.length < this.data.pageInfo.pageSize) {
+          this.setData({
+            noMore: false
+          })
+        }
+        tList = tList.concat(list)
+        this.setData({
+          list: tList
+        })
+      }
+    })
+  },
+
+  /**
+   * @desc : 查询
+   * @author : 于继渤
+   * @date : 2022/5/24 08:49
+   */
+  doSearch() {
+    let pageInfo = this.data.pageInfo;
+    pageInfo.pageSize = 6;
+    pageInfo.currentPage = 1;
+    this.setData({
+      show: false,
+      noMore: false,
+      pageInfo: pageInfo,
+      list: []
+    })
+    this.getData()
+  },
+
+  /**
+   * @desc : 页面上拉触底事件的处理函数
+   * @author : 于继渤
+   * @date : 2022/5/24 08:49
+   */
+  onReachBottom: function () {
+    if (this.data.loading || this.data.noMore) {
+      return;
+    }
+    this.setData({
+      pageInfo: {
+        pageSize: this.data.pageInfo.pageSize,
+        currentPage: this.data.pageInfo.currentPage + 1
+      }
+    })
+    this.getData('more')
+  },
+
+
+
+  /**
+   * @desc : 生命周期函数--监听页面加载
+   * @author : 于继渤
+   * @date : 2022/6/02 09:16
+   */
+  onLoad: function (options) {
+   
+  },
+
+})

package-base-select/pages/select-storage-in-reason/select-storage-in-reason.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText":"选择入库原因"
+  }

package-base-select/pages/select-storage-in-reason/select-storage-in-reason.wxml

@@ -0,0 +1,35 @@
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+ 
+
+<view wx:for="{{list}}" data-item="{{item}}" wx:for-index="childindex" wx:key="index" class="main-class">
+  <view class="main-foot">
+    <view class="table">
+      <view data-index="{{index}}" data-item="{{item}}" catchtap="catchtapCheck">
+        <view class="table-row-right">
+          <view>
+            <dk-text fontSize="13px" fontWeight="nomal" value="{{item.dataValue}}"></dk-text>
+          </view>
+          <view style="font-size: 27rpx;  text-align: right;display: flex;">
+            <view style="padding-right: 15rpx;padding-top:5rpx;">
+             
+            </view>
+            <view>
+              <dk-text fontSize="13px" fontWeight="nomal" value="{{item.phone ? item.phone :''}}"></dk-text>
+            </view>
+          </view>
+        </view>
+       
+
+        
+      </view>
+    </view>
+  </view>
+</view>
+<view style="height: 250rpx;"></view>
+<!-- 暂无数据 -->
+<van-empty wx:if="{{dataList.length<=0}}" description="暂无数据" />
+
+<!--  保存 -->
+ 
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>

package-base-select/pages/select-storage-in-reason/select-storage-in-reason.wxss

@@ -0,0 +1 @@
+/* package-base-select/pages/select-storage-in-reason/select-storage-in-reason.wxss */

package-base-select/pages/select-storage-object/select-storage-object.js

@@ -1,47 +1,26 @@
 const app = getApp();
 const api = require('@/utils/api.js');
-const Constants = require('@/utils/Constants');
+const Constants = require('@/utils/Constants.js')
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
-    show: false,
-    noMore: false,
-    loading: false,
-    pageInfo: {
-      pageSize: 6,
-      currentPage: 1
-    },
-    page: '',
-    list: [],
-    form: {
-      customerFrom: null,
-      salesChannel: null,
-      org: null,
-      staff: null,
-      orgName: '',
-      staffName: '',
-      customerFromName: '',
-      salesChannelName: '',
-    },
-    searchText: '',
-    statusList: [{
-      text: '供应商',
-      value: 1,
-      checked: true
-    },
-    {
-      text: '客户',
-      value: 2,
-      checked: false
-    },
+    // 查询条件
+    searchContent: [
+      {
+        code: 'supplier-customer',
+        title: '选择对象',
+        searchType: Constants.searchType.switch,
+        list:
+          [{ code: 'supplier', title: '供应商' },
+          { code: 'customer', title: '客户' }]
+      },
+
     ],
-    statusItem: {
-      text: '客户',
-      value: 2
-    },
+    list: [],   
     objectType: '',
   },
   /**
@@ -131,781 +110,49 @@ Page({
    * @date : 2022/5/23 15:16
    */
   getData(e) {
-    // this.setData({
-    //   loading: true
-    // })
-    let param = {}
-    param.searchText = this.data.searchText ? this.data.searchText : '' //查询条件
-
-    let tList = [
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市浑南区辽宁精研药物评价试验平台给你看",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": null,
-        "cpId": null,
-        "customerPhone": "15512319963",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "15512319963-1002TO",
-        "objId": 3660,
-        "objName": "😲",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "15512319963",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市皇姑区沈阳市轻工艺术学校S",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": null,
-        "deliveryPhone": "",
-        "cpId": null,
-        "customerPhone": "45545464666",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "45545464666-1002XT",
-        "objId": 3809,
-        "objName": "LA🎈🎈🎈",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "45545464666",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市浑南区浑南区沈阳国际软件园(高深东路南)111",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": "",
-        "cpId": null,
-        "customerPhone": "21212212125",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "11291129112-1002XR",
-        "objId": 3807,
-        "objName": "🍔1129",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "21212212125",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市浑南区浑南区沈阳国际软件园(高深东路南)可冷了",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": null,
-        "cpId": null,
-        "customerPhone": "55865856666",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "55865856666-1002R4",
-        "objId": 3568,
-        "objName": "110901",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "55865856666",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市沈北新区中国医科大学(沈北校区)功能里",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": "",
-        "cpId": null,
-        "customerPhone": "21212212125",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "21212212125-1002TQ",
-        "objId": 3662,
-        "objName": "🚔",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "21212212125",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": "",
-        "cpId": null,
-        "customerPhone": "13623432321",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "13623432321-1002QS",
-        "objId": 3556,
-        "objName": "ALI",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "13623432321",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市和平区皇寺路(地铁站)11",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": "",
-        "cpId": null,
-        "customerPhone": "13333333333",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "13333333333-1002RZ",
-        "objId": 3599,
-        "objName": "李四",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "13333333333",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市和平区全季酒店(沈阳西塔店)1",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": null,
-        "cpId": null,
-        "customerPhone": "12446454888",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "12446454888-1002PX",
-        "objId": 3525,
-        "objName": "110601",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "12446454888",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市和平区全季酒店(沈阳西塔店)1",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": null,
-        "cpId": null,
-        "customerPhone": "12446454888",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "12446454888-1002PY",
-        "objId": 3526,
-        "objName": "110601",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "12446454888",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市浑南区浑南区沈阳国际软件园(高深东路南)吧",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": "",
-        "cpId": null,
-        "customerPhone": "22555565856",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "22555565856-1002PZ",
-        "objId": 3527,
-        "objName": "110602",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "22555565856",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市沈河区市府广场东(公交站)去",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": "",
-        "cpId": null,
-        "customerPhone": "12122344564",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "12122344564-1002Q0",
-        "objId": 3528,
-        "objName": "110603",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "12122344564",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市沈河区市府广场东(公交站)去",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": null,
-        "deliveryPhone": null,
-        "cpId": null,
-        "customerPhone": "12122344564",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "12122344564-1002Q1",
-        "objId": 3529,
-        "objName": "110603",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "12122344564",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      },
-      {
-        "accountType": null,
-        "accountname": null,
-        "addressFull": "辽宁省沈阳市浑南区浑南区月星国际城(白塔河一路南) 他",
-        "ascpId": null,
-        "categoryCode": null,
-        "categoryId": null,
-        "categoryName": null,
-        "channelId": null,
-        "code": null,
-        "contactName": "",
-        "deliveryPhone": null,
-        "cpId": null,
-        "customerPhone": "15848454848",
-        "defSettlementType": 0,
-        "defWhId": null,
-        "erpOrgCode": null,
-        "erpStaffCode": null,
-        "flgStore": false,
-        "flgValid": true,
-        "id": null,
-        "imageReceiptCode": null,
-        "jobId": 0,
-        "keyWords": null,
-        "name": null,
-        "objCode": "15848454848-1002QL",
-        "objId": 3549,
-        "objName": "110701",
-        "objType": 2,
-        "objTypeName": "客户",
-        "orgAscpId": null,
-        "orgAscpName": null,
-        "orgCode": null,
-        "orgId": null,
-        "orgName": null,
-        "orgSale2Id": null,
-        "orgSale2Name": null,
-        "orgSalesChannel": null,
-        "orgSalesChannelName": null,
-        "parentId": null,
-        "phone": "15848454848",
-        "postId": null,
-        "postName": null,
-        "qvUserid": null,
-        "remarks": null,
-        "sale1Id": null,
-        "sale2Id": null,
-        "salesChannel": null,
-        "salesChannelName": null,
-        "sumAmount": null,
-        "toiletsNum": null,
-        "typeId": 0,
-        "typeName": null,
-        "whId": null,
-        "whName": null
-      }
-    ]
+    console.log(this.data.param,this.data.formData);
     this.setData({
-      list: tList
+      loading: true
     })
+    let param = {}
+    param.searchText = this.data.searchText ? this.data.searchText : '' //查询条件    
     param.pageSize = this.data.pageInfo.pageSize
     param.currentPage = this.data.pageInfo.currentPage
-    param.objectType = this.data.objectType ? this.data.objectType.split(",").map(Number) : [1]
-    // api.request(Constants.BASIC_COMMON_API + 'get_supplier_and_customer', 'POST', param).then(res => {
-    //   this.setData({
-    //     loading: false
-    //   })
+    // 供应商1 客户2 所有 传空
+    param.objType = ""
+    api.request(Constants.BASIC_COMMON_API + 'get_supplier_and_customer_by_page', 'POST', param).then(res => {
+      this.setData({
+        loading: false
+      })
 
-    //   if (res.data.code === 200) {
-    //     let tList = this.data.list;
-    //     let list = res.data.data.list; //后台返回数据
-    //     if (!list || list.length == 0) {
-    //       // 如果不是翻页，需要清空
-    //       if (e != 'more') {
-    //         this.setData({
-    //           list: [],
-    //           noMore: false
-    //         })
-    //       } else {
-    //         this.setData({
-    //           noMore: true
-    //         })
-    //       }
-    //       return
-    //     }
-    //     if (list.length < this.data.pageInfo.pageSize) {
-    //       this.setData({
-    //         noMore: false
-    //       })
-    //     }
-    //     tList = tList.concat(list)
-    //     this.setData({
-    //       list: tList
-    //     })
-    //   }
-    // })
+      if (res.data.code === 200) {
+        let tList = this.data.list;
+        let list = res.data.data.list; //后台返回数据
+        if (!list || list.length == 0) {
+          // 如果不是翻页，需要清空
+          if (e != 'more') {
+            this.setData({
+              list: [],
+              noMore: false
+            })
+          } else {
+            this.setData({
+              noMore: true
+            })
+          }
+          return
+        }
+        if (list.length < this.data.pageInfo.pageSize) {
+          this.setData({
+            noMore: false
+          })
+        }
+        tList = tList.concat(list)
+        this.setData({
+          list: tList
+        })
+      }
+    })
   },
 
   /**
@@ -945,84 +192,6 @@ Page({
   },
 
 
-  /**
-   * @desc : 下拉打开
-   * @author : 于继渤
-   * @date : 2022/6/02 09:16
-   */
-  openSearchPop(e) {
-    let type = e.currentTarget.dataset.type
-    if (type === 'customerFrom') {
-      this.setData({
-        customerSourceFlag: true
-      })
-    } else if (type === 'salesChannel') {
-      this.setData({
-        channelSourceFlag: true
-      })
-    } else if (type === 'org') {
-      this.setData({
-        orgSourceFlag: true
-      })
-    } else if (type === 'staff') {
-      this.setData({
-        staffSourceFlag: true
-      })
-    }
-
-  },
-
-  /**
-   * @desc : 下拉关闭事件
-   * @author : 于继渤
-   * @date : 2022/6/02 09:16
-   */
-  muticlose(e) {
-    let id = e.currentTarget.id
-    if (id === 'customerFrom') {
-      this.selectComponent("#customerFrom").toggle(false);
-    } else if (id === 'salesChannel') {
-      this.selectComponent("#salesChannel").toggle(false);
-    } else if (id === 'org') {
-      this.selectComponent("#org").toggle(false);
-    } else if (id === 'staff') {
-      this.selectComponent("#staff").toggle(false);
-    }
-
-  },
-  /**
-   * @desc : 组件单选确定
-   * @author : 于继渤
-   * @date : 2022/6/02 09:16
-   */
-  mutiSearch(e) {
-    let id = e.target.id
-    let form = this.data.form
-    if (id === 'customerFrom') {
-      // form.customerSourceName = e.detail.name
-      form.customerFrom = e.detail.id
-      form.customerFromName = e.detail.name
-      this.selectComponent("#customerFrom").toggle();
-    } else if (id === 'salesChannel') {
-      form.salesChannel = e.detail.id
-      form.salesChannelName = e.detail.name
-      this.selectComponent("#salesChannel").toggle();
-    } else if (id === 'staff') {
-      form.staff = e.detail.id
-      form.staffName = e.detail.name
-      this.selectComponent("#staff").toggle();
-    } else if (id === 'org') {
-      form.orgId = e.detail.id
-      form.orgName = e.detail.name
-      this.selectComponent("#org").toggle();
-    }
-
-    this.setData({
-      form: form
-    })
-    this.doSearch()
-  },
-
 
   /**
    * @desc : 生命周期函数--监听页面加载
@@ -1030,8 +199,7 @@ Page({
    * @date : 2022/6/02 09:16
    */
   onLoad: function (options) {
-    //加载数据
-    this.doSearch()
+   
   },
 
 })

package-base-select/pages/select-storage-object/select-storage-object.wxml

@@ -1,17 +1,9 @@
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-sticky scroll-top="0">
-  <van-search model:value="{{ searchText }}" placeholder="请输入名称/地址/电话" use-action-slot bind:search="doSearch">
-  </van-search>
-
-  <van-dropdown-menu>
-      <!-- 状态 -->
-      <van-dropdown-item id="statusItem" title="{{ statusItem.text }}">
-      <dk-dropdown-switch dataList="{{statusList}}" bind:commit='dropdowncommit'></dk-dropdown-switch>
-    </van-dropdown-item>
-  
-  </van-dropdown-menu>
-
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','supplierName','address','telephone'])}}">
+  </dk-dropdown-menu>
 </van-sticky>
 
 
@@ -25,19 +17,16 @@
           </view>
           <view style="font-size: 27rpx;  text-align: right;display: flex;">
             <view style="padding-right: 15rpx;padding-top:5rpx;">
-              <van-icon name="phone" />
+             
             </view>
             <view>
-              <dk-text fontSize="13px" fontWeight="nomal" value="{{item.customerPhone ? item.customerPhone :''}}"></dk-text>
+              <dk-text fontSize="13px" fontWeight="nomal" value="{{item.phone ? item.phone :''}}"></dk-text>
             </view>
 
           </view>
         </view>
-        <view style="width: 100%; display:flex;">
-          <view style="width:10%; margin-top:5px">
-            <van-checkbox value="{{item.checked}}" data-index="{{index}}" data-item="{{item}}" catchtap="catchtapCheck" checked-color="#1989FA" />
-          </view>
-          <view style="width:87%;">
+        <view style="width: 100%; display:flex;">           
+          <view style="width:100%;">
             <van-divider />
           </view>
         </view>
@@ -51,11 +40,11 @@
         </view>
       </view>
     </view>
-
   </view>
 </view>
 <view style="height: 250rpx;"></view>
-<van-empty wx:if="{{list.length<=0}}" description="暂无数据" />
+<!-- 暂无数据 -->
+<van-empty wx:if="{{dataList.length<=0}}" description="暂无数据" />
 
 <!--  保存 -->
 <view class="bottom-class-1">
@@ -63,52 +52,5 @@
     <van-button custom-class="save-button-class" loading="{{loading}}" bind:click="submit" type="default">确定
     </van-button>
   </view>
-
 </view>
-
-
-
-
-
-
-<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
-
-
-<van-popup show="{{showPick}}" position="right" bind:close="onClose" class="popup" custom-style="height:100%;width:80%">
-
-  <view class="pop-header">
-    <van-icon class="pop-header-x" catchtap="closeSearchPop" name="cross" />
-  </view>
-  <scroll-view scroll-y class="popup-scroll-view">
-    <van-cell-group customer-class="cell-group">
-
-      <van-field value="{{ searchForm.customerName }}" label-class="label-class" label="客户名称" data-title="customerName" placeholder="请输入客户名称" bind:change="onChange" />
-      <van-field value="{{ searchForm.customerCode }}" label-class="label-class" label="客户编码" data-title="customerCode" placeholder="请输入客户编码" bind:change="onChange" />
-    </van-cell-group>
-  </scroll-view>
-
-  <view style="height:120rpx;"></view>
-
-  <view class="popup-button">
-    <view class="popup-button-item">
-      <van-button type="default" size="large" custom-class="modal-button" catchtap="clearSearchForm">重置
-      </van-button>
-    </view>
-    <view class="popup-button-item">
-      <van-button type="danger" size="large" custom-class="modal-button" catchtap="doSearchData">确定</van-button>
-    </view>
-  </view>
-</van-popup>
-
-
-<!-- 业务部门 -->
-<dk-single-dropdown-item show="{{orgSourceFlag}}" docName="客户资料" contentID="{{form.orgId}}" id='org' typeName='org' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
-
-<!-- 业务员 -->
-<dk-single-dropdown-item show="{{staffSourceFlag}}" docName="客户资料" contentID="{{form.staff}}" id='staff' typeName='staff' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
-
-<!-- 渠道 -->
-<dk-single-dropdown-item show="{{channelSourceFlag}}" id='salesChannel' typeName='salesChannel' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
-
-<!-- 客户来源 -->
-<dk-single-dropdown-item show="{{customerSourceFlag}}" id='customerFrom' typeName='customerFrom' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>

package-inventory/pages/other-warehousing/other-warehousing.js

@@ -62,9 +62,9 @@ Page({
                 {
                     code: 'intoReason',
                     name: 'intoReasonName',
-                    type: 'drop',
-                    required: true,
-                    dropType: 'intoReason'
+                    type: 'choose',
+                    required: true, 
+                    urlKey: 'chooseStorageInReason'
                 },
                 {
                     code: 'staffId',

package-purchase/pages/purchase-based-sales/purchase-based-sales.js

@@ -8,40 +8,66 @@
  *		王英杰		  	     2024-1-19       			1.00		       	新建
  *******************************************************************************/
 const mixins = require('@/mixins/index.js')
+const common = require('@/utils/common.js')
 Page({
   mixins: [mixins],
-    /**
-     * 页面的初始数据
-     */
-    data: {
-      selectTotallength:0,
-      selectlength:0,
-      createTimeType: {
-        text: '本月',
-        value: 3
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    selectTotallength: 0,
+    selectlength: 0,
+    createTimeType: {
+      text: '本月',
+      value: 3
     },
     createTimeSearch: [new Date().getTime() + 100, new Date().getTime() + 100],
-    statusItem: { text: '审批状态', value: -1 },
-    statusItem_org: { text: '业务部门', value: -1 },
-
-     // 路由
-     routeObjName: 'order',
+    statusItem: {
+      text: '审批状态',
+      value: -1
+    },
+    statusItem_org: {
+      text: '业务部门',
+      value: -1
     },
+    // 弹出按钮
+    buttonList: [{
+      name: 'merge',
+      plain:true,
+      title: '取消'
+    }, {
+      name: 'merge',
+      title: '保存'
+    }],
+    contentList: [{
+      code: 'flag',
+      title: '全选',
+      type: 'checkbox'
+    }, { 
+      code: 'count',
+      type: 'count',
+      bill: 2,
+      quantity: 3
+    }],
+    btnFormData: null,
+    // 路由
+    routeObjName: 'order',
+  },
+
 
-  
-     /**
+  /**
    * @desc : 查询 purSaleListBy
    * @date : 2024/2/1 15:49
    * @author : 王英杰
    */
   getData(params) {
     return this.excute(this.data.service, this.data.service.purSaleListBy, params);
-  },  
-      /**
-  * @desc : 展开 显示更多商品
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
+  },
+  /**
+   * @desc : 展开 显示更多商品
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
   collapseFlagChange(e) {
     let index = e.currentTarget.dataset.index
     let list = this.data.tableData
@@ -50,5 +76,106 @@ Page({
       tableData: list
     })
   },
+  selectTotallength(list) {
+     
+    let chooseList = []
+    // let countindex = this.data.contentList.filter(it => it.code == 'count');
+    // contentList[countindex].bill
+    // contentList[countindex].quantity 
+    list.forEach(res => {
+      if (res.orderItemResponseList && res.orderItemResponseList.length > 0) {
+        let tempList = res.orderItemResponseList.filter(itt => {
+          return itt.checked
+        })
+        chooseList = chooseList.concat(tempList)
+      }
+    })
+    if (chooseList.length > 0) {
+      let selectlength = Number(0)
+      let selectTotallength = Number(0)
+      chooseList.forEach(item => {
+        selectlength += Number(item.itemQty)
+        selectTotallength += Number(item.itemAmt * item.itemQty)
+      })
+      this.setData({
+        selectlength: selectlength,
+        selectTotallength: common.toThousandCents(selectTotallength)
+      })
+    } else {
+      this.setData({
+        selectlength: 0,
+        selectTotallength: 0
+      })
+    }
+
+
+  },
+  /**
+   * @desc : 整个信息复选框
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  onListChange(e) {
+    console.log(e)
+    let index = e.currentTarget.dataset.index
+    let list = this.data.tableData
+    list[index].checked = !list[index].checked
+    if (list[index].orderItemResponseList && list[index].orderItemResponseList.length > 0) {
+      list[index].orderItemResponseList.forEach(res => {
+        res.checked = list[index].checked
+      })
+    }
+    this.selectTotallength(list)
+    this.setData({
+      tableData: list
+    })
+  },
 
+  /**
+   * @desc : 商品复选框
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  onListItemChange(e) {
+    let index_ = e.currentTarget.dataset.index_
+    let index = e.currentTarget.dataset.index
+    let list = this.data.tableData
+    let orderItemResponseList = list[index].orderItemResponseList
+    orderItemResponseList[index_].checked = !orderItemResponseList[index_].checked
+    this.selectTotallength(list)
+    this.setData({
+      tableData: list
+    })
+  },
+
+
+  /**
+   * @desc : 全选
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  onListAllChange(e) {
+    console.log(e)
+    this.setData({
+      checkedAllFlag: e.detail
+    })
+    let list = this.data.tableData
+    if (list && list.length > 0) {
+      list.forEach(res => {
+        res.checked = e.detail
+        res.orderItemResponseList = res.orderItemResponseList.map(item => ({
+          ...item,
+          checked: e.detail
+        }));
+      })
+    }
+    let goodsListLength = list.filter(itt => {
+      return itt.checked
+    })
+
+    this.setData({
+      tableData: list,
+      selectlength: e.detail ? goodsListLength.length : 0, //单数
+    })
+  },
 })

package-purchase/pages/purchase-based-sales/purchase-based-sales.wxml

@@ -154,43 +154,35 @@
 
 
 
-
 <!-- 确定区域 -->
-<view class="bottom-class-1">
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;">
-
-    <view style="width:50%;">
-
+<!-- <view class="bottom-class-1">
+  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;"> 
+    <view style="width:50%;"> 
       <view>
         <van-checkbox size="26rpx" value="{{ checkedAllFlag }}" bind:change="onListAllChange">
           <view style="color:#95A8CB;font-size: 26rpx;">全选</view>
         </van-checkbox>
       </view>
       <view style="font-size: 24rpx;color:#95A8CB;padding-top: 10rpx;">
-        <!-- <dk-cell fontSize="14" contentColor="#CAA977" titleColor="#1B365D;" contentRight="left" fontWeight="bold" title="合计金额" content="{{selectlength}}"></dk-cell> -->
+    
         <text decode>数量：{{selectlength}}&nbsp;合计金额：<text style="color:#CAA977;">{{selectTotallength }}</text></text>
-      </view>
-
-
-
-    </view>
-
-
-    <view style="width: 50%; display: flex;">
-
+      </view> 
+    </view> 
+    <view style="width: 50%; display: flex;"> 
       <view style="border-radius: 15rpx;width: 50%; height: 88rpx;font-size: 32rpx;">
         <van-button disabled="{{disabledFlag}}" plain round  size="large" color="" custom-style="height:88rpx;  background:#ffffff;border-radius: 15rpx;color:#1B365D;border: solid 2rpx #1B365D;font-size: 16px; font-weight: bold;" bind:click="allClean" type="default">取消
         </van-button>
-      </view>
-
-
+      </view> 
       <view style="border-radius: 15rpx;width: 50%; height: 88rpx;font-size: 32rpx;margin-left:19rpx;">
         <van-button disabled="{{disabledFlag}}"  round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">确定
         </van-button>
       </view>
     </view>
   </view>
-</view>
+</view> -->
+<!-- 新建按钮 -->
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
+
 
 
 <dk-dropdown-date-day show="{{makingTimeConverFlag}}" data-key="makingTimeConver" defaultValue="{{makingTimeConverDefaultSearch}}" bind:dateCommit="onConfirmChooseDate"></dk-dropdown-date-day>

package-purchase/pages/purchase-order/purchase-order.js

@@ -1,166 +1,240 @@
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		王英杰		 2024-1-24			1.00		    采购订单
+ *******************************************************************************/
 const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
+const app = getApp()
 Page({
   mixins: [mixins],
   /**
-   * 页面的初始数据
+   * 页面的初始数据 
    */
   data: {
+
+        // 弹出按钮
+        buttonList: [{
+          name: 'merge',
+          title: '保存'
+      }],
+      contentList: [{
+          code: 'flag',
+          title: '自动入库办理',
+          type: 'checkbox'
+      }, {
+          code: 'need',
+          title: '合集金额',
+          type: 'str'
+      }, {
+          code: 'amount',
+          content: 0,
+          type: 'number'
+      }],
+      btnFormData: null,
+    active:0,//默认查询入库中
     // 查询条件
-    searchContent: [{ code: 'createtime', title: '近30天', defaultValue: 5, searchType: Constants.searchType.date }, { code: 'staff', title: '审批状态', dropType: 'staff' }, { code: 'choose', title: '筛选', searchType: Constants.searchType.pick }],
+    searchContent: [{
+        code: 'createtime',
+        title: '近30天',
+        defaultValue: 5,
+        searchType: Constants.searchType.date
+      },
+
+      {
+        code: 'choose',
+        title: '筛选',
+        searchType: Constants.searchType.pick
+      }
+    ],
     // 查询条件-筛选
-    pullMenuList: [{ code: 'purchaseStatus', pullType: 'mSelect', typeName: 'purchaseStatus' },
-    { code: 'contactName', dataType: '' },
-    { code: 'deliveryPhone', dataType: '' },
-    { code: 'addressFull', dataType: '' },
-    { code: 'makingTime', dataType: 'date' }, { code: 'deliveryTime', dataType: 'date' }],
-    // 列表区（脚部金额）
-    footerAmount: { name: 'sumAmount', title: '合计金额' },
-    // 列表区（脚部信息）
-    footerInfo: [{ name: 'categoryQuantity', title: '品类 共' }, { name: 'tsumQuantity', title: '件' }],
-    // 列表区（内容）
-    contentList: [{ name: 'orderNo', title: '订单编号' },
-    { name: [{ name: 'contactName', title: '' }, { name: 'deliveryPhone', title: '' }], title: '收货信息' },
-    { name: 'addressFull', title: '收货地址' }, { name: 'deliveryTime', title: '预计收货日期' }],
+    pullMenuList: [{
+      code: 'outStatus',
+      pullType: 'mSelect',
+      typeName: 'outStatus'
+    }, {
+      code: 'receiveStatus',
+      pullType: 'mSelect',
+      typeName: 'receiveStatus'
+    }, {
+      code: 'followCount',
+      dataType: 'number'
+    }, {
+      code: 'nextFollowTime',
+      dataType: 'date'
+    }],
+    tagList: [ 
+       {
+      title: "全部单据"
+    }, {
+      title: "暂存"
+    },{
+      title: "成交"
+    }],
     contentObj: {
-      '暂存': [{ name: 'orderNo', title: '订单编号' },
-      { name: [{ name: 'contactName', title: '' }, { name: 'deliveryPhone', title: '' }], title: '收货信息' },
-      { name: 'addressFull', title: '收货地址' }, { name: 'deliveryTime', title: '预计收货日期' }],
-      '出库中': [{ name: 'orderNo', title: '订单编号' },
-      { name: [{ name: 'contactName', title: '' }, { name: 'deliveryPhone', title: '' }], title: '收货信息' },
-      { name: 'addressFull', title: '收货地址' }, { name: 'deliveryTime', title: '收货日期' }],
-      '待入库': [{ name: 'orderNo', title: '订单编号' },
-      { name: [{ name: 'contactName', title: '' }, { name: 'deliveryPhone', title: '' }], title: '收货信息' },
-      { name: 'addressFull', title: '收货地址' }, { name: 'deliveryTime', title: '收货日期' }],
-      '已入库': [{ name: 'orderNo', title: '订单编号' },
-      { name: [{ name: 'contactName', title: '' }, { name: 'deliveryPhone', title: '' }], title: '收货信息' },
-      { name: 'addressFull', title: '收货地址' }, { name: 'deliveryTime', title: '收货日期' }],
+      "暂存": [{ //[mixins.$t("procurementSupplier")]
+        name: 'purNo',
+        title: '订单编号' //订单编号
+      }, {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: ''
+        }],
+        title: '采购信息' //采购信息
+      }, {
+        name: 'whName',
+        title: '预计入库仓库' //预计入库仓库
+      }, {
+        name: 'pickupDate',
+        title: '预计入库日期' //预计入库日期
+      }],
+      '已入库': [{ //[mixins.$t("procurementSupplier")]
+        name: 'intoNo',
+        title: '订单编号' //订单编号
+      }, {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: ''
+        }],
+        title: '采购信息' //采购信息
+      }, {
+        name: 'whName',
+        title: '入库仓库' //入库仓库
+      }, {
+        name: 'intoDate',
+        title: '入库日期' //收货日期
+      }],
     },
-
-    // 弹出按钮
-    buttonList: [{ name: 'follow', title: '采购作废' }, { name: 'followTask', title: '冲正重开' }, { name: 'selectSourcePurchaseOrder', title: '采购退货' },
-    { name: 'collection', title: '采购退货冲正' }, { name: 'merge', title: '打印票据' }],
-
-    totallength: 234999, //视图下方提醒数量
-    selectTotallength: 12,
-    selectlength: 5,
+    // 列表区（脚部金额）
+    footerAmount: {
+      name: 'sumAmount',
+      title: '合计金额'
+    },
+    // 列表区（脚部信息）
+    footerInfo: [ {
+      prefix:'共计',
+      name: 'sumQuantity',
+      title: '件'
+    }],
+    purchaseService: app.globalData['purchaseService'],
     // 路由
     routeObjName: 'purchase',
-
-    tableData: [],
-    active: 0,
-  },
-  toTitle(e) {
-    console.log('t1', e);
-  },
-  toStatus(e) {
-    console.log('t2', e);
   },
+/**
+   * @desc : 详细页面 （编辑）
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
   toDetail(e) {
-    console.log(e)
-    let item = e.detail.item
-    if (item.displayStatus == '暂存') {
-      wx.navigateTo({
-        url: './add/add?orderType=edit',
-      })
-    } else {
-      wx.navigateTo({
-        url: './purchase-order-detail/purchase-order-detail',
-      })
-    }
-    console.log(e)
-  },
-
-  toAdd() {
+    let activity = this.data.active
+    let Id = e.detail.item.intoId
     wx.navigateTo({
-      url: './add/add',
+      url: this.data.route.detail.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          console.log("toDetail", e);
+        }
+      },
+      success: function (res) {
+        // formType ==0  是 查询采购订单   ==1 是采购入库单
+        res.eventChannel.emit('params', {
+          id: Id,
+          formMode: Constants.formMode.edit,
+          formType: activity+1
+        })
+      }
     })
   },
-  toReturnAndExchange() {
+
+    /**
+   * @desc : 新建
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  toAdd() {
     wx.navigateTo({
-      url: './purchase-return-repla-sup/purchase-return-repla-sup',
+      url: this.data.route.add.url,
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {})
+      }
     })
   },
-
-  getData() {
+  /**
+   * @desc : 切换  待出库  已出库
+   * @date : 2024年3月8日
+   * @author : 王英杰
+   */
+  onChangeTabs(e) {
+    let index = e.detail.detail.index
     this.setData({
-      tableData: [
-        {
-          supplierName: '佛山恒洁-顺德加盟商',
-          orderNo: 'FQ202207061423001',
-          displayStatus: '暂存',
-          makingTime: '2022-06-12',
-          deliveryTime: '2022-08-08',
-          contactName: '张暖暖',
-          deliveryPhone: '156 5678 5643',
-          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
-          categoryQuantity: 1,
-          tsumQuantity: 2,
-          backgroundColor: 'red',
-          sumAmount: 9999
-        },
-        {
-          supplierName: '佛山恒洁-顺德加盟商',
-          orderNo: 'FQ202207061423001',
-          displayStatus: '出库中',
-          makingTime: '2022-06-12',
-          deliveryTime: '2022-08-08',
-          contactName: '张暖暖',
-          deliveryPhone: '156 5678 5643',
-          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
-          categoryQuantity: 1,
-          tsumQuantity: 2,
-          sumAmount: 9999
-        },
-        {
-          supplierName: '佛山恒洁-顺德加盟商',
-          orderNo: 'FQ202207061423001',
-          displayStatus: '待入库',
-          makingTime: '2022-06-12',
-          deliveryTime: '2022-08-08',
-          contactName: '张暖暖',
-          deliveryPhone: '156 5678 5643',
-          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
-          categoryQuantity: 1,
-          tsumQuantity: 2,
-          sumAmount: 9999
-        },
-        {
-          supplierName: '佛山恒洁-顺德加盟商',
-          orderNo: 'FQ202207061423001',
-          displayStatus: '已入库',
-          makingTime: '2022-06-12',
-          deliveryTime: '2022-08-08',
-          contactName: '张暖暖',
-          deliveryPhone: '156 5678 5643',
-          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
-          categoryQuantity: 1,
-          tsumQuantity: 2,
-          sumAmount: 9999
-        }
-      ]
-    })
-  },
-  // 采购退货
-  toPurchaseReturns(e) {
-    // if(e.currentTarget.dataset.item.displayStatus != "入库完成" ){
-    //   wx.showToast({
-    //     title: '不允许进行采购退货',
-    //     icon: 'none'
-    //   })
-    //   return
-    // }
-    wx.navigateTo({
-      // url: '../purchase-return/?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)),
-      url: './select-source-sheet/select-source-sheet',
+      active: index,
     })
+    this.searchData()
   },
   /**
-   * 生命周期函数--监听页面加载
+   * @desc : 设置查询参数
+   * @date : 2024年3月8日
+   * @author : 王英杰
    */
-  onLoad(options) {
-
+  setSearchParams(params) {
+  if(this.data.active == 1){ //入库中的查询参数
+    params.intoStatus = '订单状态-暂存'
+    // params.purType = '单据类型-采购订单'
+   
+  }
+  if(this.data.active == 2){ //已入库的查询参数 
+    params.purStatus = '订单状态-成交'
+ 
+  }
+  params.purType = '单据类型-采购订单'
+    return params;
+  },
+  /** 
+   * @desc : 查询 入库单
+   * @date : 2024年3月8日
+   * @author : 王英杰
+   */
+  getData(params) {
+ 
+    return this.excute(this.data.service, this.data.service.selectByCond, params);
   },
 
+  /**
+   * @desc :   处理接口返回数据
+   * @date : 2024年3月8日
+   * @author : 王英杰
+   */
+  handleSearchData(tableData) {
+    let temp = tableData
+    temp.forEach(element => {
+      if (element.intoStatusName == '入库中') {
+        element.backgroundColor = "red"
+      }
+    });
+    let sumAmount = 0 //总的 合计金额
+    let sumNumber = 0 // 单数
+    let sumQty = 0 //总的 合集数量
+      sumAmount = tableData.sum('sumAmount') 
+      sumNumber = tableData.length
+      sumQty = tableData.sum('sumQuantity') 
+    this.setData({
+      tableData: temp,
+      sumAmount,
+      sumNumber,
+      sumQty
+    })
+  },
+  
 })

package-purchase/pages/purchase-order/purchase-order.wxml

@@ -1,29 +1,31 @@
-
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs>
+<loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
-  <!-- 查询条件 -->
-  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','telephone'])}}">
+  <!-- 查询条件 --> 
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','telephone'])}}">
   </dk-dropdown-menu>
-  <van-tabs color="#1989FD" nav-class="van-tabs-class" active="{{ active }}" bind:change="onChangeTabs" color="#DEC9A3;" title-active-color="#1B365D" title-inactive-color=" #96A7C5;">
-    <van-tab title="全部单据">
-    </van-tab>
-    <van-tab title="暂存">
-    </van-tab>
-    <van-tab title="成交">
-    </van-tab>
-  </van-tabs> 
+  <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>
-<!-- 输入收货人/地址/电话/商品名称/商品编码/唯一编码/备注 -->
+
 <!-- 暂无数据 -->
-<van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
+<van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}"  />
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" titleCorner="" title="supplierName" status="displayStatus" subTitle="makingTime" content="{{contentList}}" contentObj="{{contentObj}}" contentCol="displayStatus" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list   bind:toPoint="toPoint"   bind:toDetail="toDetail"
+   list="{{tableData}}" flgPoint = "{{true}}" title="supplierName" 
+    status="intoStatusName"  contentCol="intoStatusName"
+     contentObj="{{contentObj}}" footerAmount="{{footerAmount}}" 
+     footerInfo="{{footerInfo}}"   ></dk-list>
+
+<!-- 显示没用更多 -->
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 
-<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
+<!-- 垫高200rpx -->
 <view style="height: 200rpx;"></view>
 
+ 
+ 
 <!-- 新建按钮 -->
-<dk-save-bottom purchasePriceFlag="{{false}}" flagTypeName="order-add" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{totallength}}" bind:submit="toAdd" submitFlag="{{true}}" />
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>

package-purchase/pages/purchase-order/purchase-order.wxss

@@ -0,0 +1,4 @@
+.van-tabs__scroll{
+    background-color: #F5F5F5 !important;
+  }
+