姜永辉 %!s(int64=2) %!d(string=hai) anos
pai
achega
50eaca4659

+ 6 - 1
api/pages/ivt/inboundOther.js

@@ -19,7 +19,12 @@ module.exports = {
     inboundOther: {
       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'  },
 
     }
   }

+ 35 - 0
api/pages/ivt/inboundProcessing.js

@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息:
+ *		1.程序名称:
+ *		2.功能描述:待办入库入库
+ * 编辑履历:
+ *		作者				日期					版本				修改内容
+ *		姜永辉		 2024-1-19  		1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+  inboundProcessingService: {
+      // 前缀
+      prefix: 'mdm-server-dkic-b1/ivt/inbound/',  
+      purchaseInboundInsert:'purchase_inbound_insert',
+      purchaseHandleInbound:'purchase_handle_inbound'
+
+  },
+
+  routeUrl: {
+    inboundProcessing: { 
+      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'  },
+    
+    }
+  } 
+};

+ 4 - 1
app.js

@@ -35,6 +35,9 @@ const basicData = require('./api/pages/mst/basicData.js');
 const customerMst = require('./api/pages/mst/customer.js');
 const purchase = require('./api/pages/pur/purchase.js');
 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 moneyAccount = require('./api/pages/mst/moneyAccount.js');
 const intoReturn = require('./api/pages/ivt/intoReturn.js');
 const intoReturnItem = require('./api/pages/ivt/intoReturnItem.js');
@@ -42,7 +45,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,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,moneyAccount,intoReturn,intoReturnItem,cusFollow,order]
 
 const util = require('./utils/util.js')
 const baseMethod = require('./api/pages/baseMethod.js')

+ 2 - 1
app.json

@@ -96,7 +96,7 @@
                 "pages/outbound-processing/choose-product/choose-product",
                 "pages/outbound-processing/detail/detail",
                 "pages/other-outbound/other-outbound",
-                "pages/choose-storage-object/choose-storage-object",
+                
                 "pages/inventory-adjustment/inventory-adjustment",
                 "pages/inventory-adjustment/add/add",
                 "pages/inventory-adjustment/detail/detail",
@@ -194,6 +194,7 @@
             "name": "package-base-select",
             "pages": [
                 "pages/base-test/base-test",
+                "pages/select-storage-object/select-storage-object",
                 "pages/select-staff-right/select-staff-right",
                 "pages/select-staff-purview/select-staff-purview",
                 "pages/select-customers/select-customers",

+ 1037 - 0
package-base-select/pages/select-storage-object/select-storage-object.js

@@ -0,0 +1,1037 @@
+const app = getApp();
+const api = require('@/utils/api.js');
+const Constants = require('@/utils/Constants');
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  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
+    },
+    ],
+    statusItem: {
+      text: '客户',
+      value: 2
+    },
+    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 = {}
+    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
+      }
+    ]
+    this.setData({
+      list: tList
+    })
+    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
+    //   })
+
+    //   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
+    //     })
+    //   }
+    // })
+  },
+
+  /**
+   * @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
+   */
+  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 : 生命周期函数--监听页面加载
+   * @author : 于继渤
+   * @date : 2022/6/02 09:16
+   */
+  onLoad: function (options) {
+    //加载数据
+    this.doSearch()
+  },
+
+})

+ 4 - 0
package-base-select/pages/select-storage-object/select-storage-object.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText":"选择对象"
+  }

+ 114 - 0
package-base-select/pages/select-storage-object/select-storage-object.wxml

@@ -0,0 +1,114 @@
+<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>
+
+</van-sticky>
+
+
+<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.objName}}"></dk-text>
+          </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>
+            </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%;">
+            <van-divider />
+          </view>
+        </view>
+
+        <view class="table-row-right">
+          <view style="display: flex;">
+            <van-icon name="location" color="#1B365D" />
+            <dk-text fontSize="13px" fontWeight="nomal" value="{{ wxmlUtil.addressToIndexOf(item.addressFull ? item.addressFull :'')}}"></dk-text>
+          </view>
+
+        </view>
+      </view>
+    </view>
+
+  </view>
+</view>
+<view style="height: 250rpx;"></view>
+<van-empty wx:if="{{list.length<=0}}" description="暂无数据" />
+
+<!--  保存 -->
+<view class="bottom-class-1">
+  <view class="bottom-class">
+    <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>

+ 87 - 0
package-base-select/pages/select-storage-object/select-storage-object.wxss

@@ -0,0 +1,87 @@
+/* pages/billing/sale-order/choose-goods/choose-goods.wxss */
+.test-class{
+	color:red;
+	position: fixed;
+	top: 88rpx;
+	z-index: 100;
+	width:100%;
+  }
+  
+  .left-class{
+	color:red;
+	position: fixed;
+	top: 196rpx;
+	z-index: 100;
+	width:20% !important;
+  }
+  
+  .tags-class>van-sticky{
+	position: fixed !important;
+	width:100%;
+	z-index: 99;
+	top:0;
+  }
+  
+  .checkbox-class{
+	text-align: right;
+  }
+  
+  .value-class {
+	flex: none !important;
+  }
+  
+  .width-70{
+	width:80%;
+	/* float:right; */
+  }
+  
+  .sidebar-item{
+	padding: 20rpx 10rpx 20rpx 10rpx !important;
+	font-size:4vw !important;
+  }
+  .van-search__content {
+	background: #F8F9FD;
+	border: 1px solid #D6E4FF;
+	border-radius: 15rpx !important;
+  }
+  /*列表右侧样式*/
+  .table-row-right{
+	margin-top: 12rpx;
+	display: flex;
+	justify-content: space-between;
+	width: 90%;
+	margin-left: 10%;
+  }
+  
+  /**底部的样式*/
+  .bottom-class{
+	position: fixed;
+	bottom:45rpx;
+	width: 100%;
+	align-items: center;
+	justify-content: center;
+	
+	z-index: 2;
+	display: flex;
+  }
+  
+  /**底部保存按钮的样式*/
+  .save-button-class{
+	width: 640rpx;
+	background: #1B365D !important;
+	border-radius: 15rpx !important;
+	color:#fff !important;
+	font-size: 16px !important;
+	font-weight: 500 !important;
+  }
+  .bottom-class-1{
+	background:#fff;
+	position:fixed;
+	bottom:0;
+	width:100%;
+	height: 182rpx; 
+	border-top:1px solid #efefef;
+	z-index: 7;
+	box-shadow: 0px -8rpx 24rpx rgba(0, 16, 39, 0.1);
+	border-radius: 30rpx 30rpx 0rpx 0rpx;
+  }

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

@@ -92,7 +92,7 @@ Page({
                     name: 'intoObjectName',
                     title: '入库对象',
                     type: 'choose',
-                    urlKey: 'intoObject'
+                    urlKey: 'chooseStorageObject'
                 },
             ],
 

+ 1 - 2
package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -159,8 +159,7 @@ Page({
     },
 
     // 弹出按钮
-    buttonList: [
-       
+    buttonList: [       
       {
         name: 'customerRefundList',
         title: mixins.$t('invaidOrder'),