Browse Source

入库出库

姜永辉 2 years ago
parent
commit
39d53f96e8

+ 1162 - 3
package-inventory/pages/outbound-processing/outbound-processing.js

@@ -234,9 +234,9 @@
     * @date : 2023年8月21日
     */
    getData(e) {
-     this.setData({
-       loading: true
-     })
+    //  this.setData({
+    //    loading: true
+    //  })
      let searchForm = this.data.searchForm
      //日期相关
      var createtime = this.selectComponent('#createtime');
@@ -277,6 +277,1165 @@
      this.setData({
         loading: false
       })
+      let tList =
+      [
+        {
+          "addressArea": null,
+          "addressFull": "辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1",
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": null,
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": "",
+          "contactPhones": "",
+          "contractNo": "",
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": "XIAO6",
+          "customerPhone": "14132141212",
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": "2023-11-01 16:10:45",
+          "deliveryType": "仓库送货",
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": "销售订单",
+          "doneTime": null,
+          "doneUser": null,
+          "doneUserName": null,
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-11-01",
+          "makingTime": "2023/11/01 16:21:39",
+          "makingUser": 643,
+          "makingUserName": "王英杰",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-11-01 16:21:38",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 643,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.187.79\"}",
+          "opTimestamp": "2023-11-01 16:21:39",
+          "opUpdateTime": "2023-11-01 16:21:38",
+          "opUpdateUserId": 643,
+          "orderAnnexPaths": null,
+          "orderId": 8795,
+          "orderNo": "SA-0726-555-202311010KKQ",
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": "2023-11-01",
+          "outId": 1317,
+          "outKind": "出库类型-销售",
+          "outKindName": "销售出库",
+          "outNo": "WO-0726-555-202311010KKY",
+          "outObjectId": 3515,
+          "outObjectName": "XIAO6",
+          "outObjectType": 1,
+          "outReason": null,
+          "outReasonName": null,
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": "",
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": null,
+          "sale2EntryWhId": null,
+          "sale2Id": null,
+          "sale2OpeMode": "分销模式-自营",
+          "salesChannel": null,
+          "salesChannelCode": "false",
+          "soutId": null,
+          "staffId": 643,
+          "staffName": "王英杰",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 1,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": null,
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-26 14:32:44",
+          "doneUser": 937,
+          "doneUserName": "张德亮",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-26",
+          "makingTime": "2023/10/26 14:32:44",
+          "makingUser": 937,
+          "makingUserName": "张德亮",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-26 14:32:45",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 937,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.141.91\"}",
+          "opTimestamp": "2023-10-26 14:32:45",
+          "opUpdateTime": "2023-10-26 14:32:45",
+          "opUpdateUserId": 937,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": "2023-10-26",
+          "outId": 1190,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310260K6W",
+          "outObjectId": 114,
+          "outObjectName": "怀化辰溪恒洁卫浴-供应商",
+          "outObjectType": 2,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 937,
+          "staffName": "张德亮",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 0,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": 114,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": null,
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-25 08:45:28",
+          "doneUser": 937,
+          "doneUserName": "张德亮",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-25",
+          "makingTime": "2023/10/25 08:45:28",
+          "makingUser": 937,
+          "makingUserName": "张德亮",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-25 08:45:28",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 937,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.141.91\"}",
+          "opTimestamp": "2023-10-25 08:45:28",
+          "opUpdateTime": "2023-10-25 08:45:28",
+          "opUpdateUserId": 937,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": "2023-10-25",
+          "outId": 1140,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310250K2D",
+          "outObjectId": null,
+          "outObjectName": null,
+          "outObjectType": null,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 937,
+          "staffName": "张德亮",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 0,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": "辽宁省沈阳市浑南区辽宁心选网络科技有限公司1111B🙄",
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": null,
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": null,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": "2023-10-25 13:43:54",
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": "分销订单",
+          "doneTime": null,
+          "doneUser": null,
+          "doneUserName": null,
+          "erpOutNo": "CWSAYYY23102400001",
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": false,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-24",
+          "makingTime": "2023/10/24 14:10:12",
+          "makingUser": 634,
+          "makingUserName": "姜宁",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "48849faf-8bbb-4a29-9548-0ba1c3df963f",
+          "opCreateTime": "2023-10-24 14:10:12",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 254,
+          "opDbUser": "{\"usesysid\":\"140217\",\"usename\":\"hgscrm_test\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"120.53.222.149\"}",
+          "opTimestamp": "2023-10-24 14:10:12",
+          "opUpdateTime": "2023-10-24 14:10:12",
+          "opUpdateUserId": 254,
+          "orderAnnexPaths": null,
+          "orderId": 8477,
+          "orderNo": "PA-0726-726-202310240K1E",
+          "orderOutItemResponseList": null,
+          "orgId": null,
+          "orgName": null,
+          "outDate": null,
+          "outId": 1125,
+          "outKind": "出库类型-ERP",
+          "outKindName": "ERP销售出库",
+          "outNo": "OS-0726-000-202310240K1M",
+          "outObjectId": 1022,
+          "outObjectName": null,
+          "outObjectType": 1,
+          "outReason": null,
+          "outReasonName": null,
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": "11",
+          "soutId": null,
+          "staffId": null,
+          "staffName": null,
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 2,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": null,
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-17 14:45:36",
+          "doneUser": 643,
+          "doneUserName": "王英杰",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-17",
+          "makingTime": "2023/10/17 16:35:26",
+          "makingUser": 643,
+          "makingUserName": "王英杰",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-17 14:06:23",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 937,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.167.23\"}",
+          "opTimestamp": "2023-10-17 16:35:26",
+          "opUpdateTime": "2023-10-17 16:35:26",
+          "opUpdateUserId": 643,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": "2023-10-17",
+          "outId": 1055,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310170JRP",
+          "outObjectId": null,
+          "outObjectName": null,
+          "outObjectType": null,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 4,
+          "outStatusName": "出库暂存",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 937,
+          "staffName": "张德亮",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 1,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": null,
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-17 14:00:23",
+          "doneUser": 937,
+          "doneUserName": "张德亮",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-17",
+          "makingTime": "2023/10/17 14:00:23",
+          "makingUser": 937,
+          "makingUserName": "张德亮",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-17 14:00:24",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 937,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.167.23\"}",
+          "opTimestamp": "2023-10-17 14:00:54",
+          "opUpdateTime": "2023-10-17 14:00:54",
+          "opUpdateUserId": 937,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": null,
+          "outId": 1052,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310170JRM",
+          "outObjectId": null,
+          "outObjectName": null,
+          "outObjectType": null,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 937,
+          "staffName": "张德亮",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 1,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": null,
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-17 13:57:52",
+          "doneUser": 937,
+          "doneUserName": "张德亮",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-17",
+          "makingTime": "2023/10/17 13:57:52",
+          "makingUser": 937,
+          "makingUserName": "张德亮",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-17 13:57:53",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 937,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.167.23\"}",
+          "opTimestamp": "2023-10-17 13:58:19",
+          "opUpdateTime": "2023-10-17 13:58:19",
+          "opUpdateUserId": 937,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": null,
+          "outId": 1051,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310170JRK",
+          "outObjectId": null,
+          "outObjectName": null,
+          "outObjectType": null,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 937,
+          "staffName": "张德亮",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 1,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": null,
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-17 13:50:08",
+          "doneUser": 937,
+          "doneUserName": "张德亮",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-17",
+          "makingTime": "2023/10/17 13:50:08",
+          "makingUser": 937,
+          "makingUserName": "张德亮",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-17 13:50:09",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 937,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.167.23\"}",
+          "opTimestamp": "2023-10-17 13:50:31",
+          "opUpdateTime": "2023-10-17 13:50:31",
+          "opUpdateUserId": 937,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": null,
+          "outId": 1048,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310170JRF",
+          "outObjectId": null,
+          "outObjectName": null,
+          "outObjectType": null,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 937,
+          "staffName": "张德亮",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 1,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": "香港特别行政区东区1 Salon111",
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [
+            {
+              "createTime": "2023-10-17 13:33:51",
+              "name": "48dbc1bf-7313-4a20-884f-445de7e17f0a.jpg",
+              "type": "image",
+              "url": "test/t_order/annex_paths/2023-10-17/48dbc1bf-7313-4a20-884f-445de7e17f0a.jpg"
+            }
+          ],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": "0726自己的客户",
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-17 13:35:43",
+          "doneUser": 937,
+          "doneUserName": "张德亮",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-17",
+          "makingTime": "2023/10/17 13:35:43",
+          "makingUser": 937,
+          "makingUserName": "张德亮",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-17 13:33:12",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 937,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.167.23\"}",
+          "opTimestamp": "2023-10-17 13:42:48",
+          "opUpdateTime": "2023-10-17 13:42:48",
+          "opUpdateUserId": 937,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": null,
+          "outId": 1047,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310170JRB",
+          "outObjectId": 3454,
+          "outObjectName": "0726自己的客户",
+          "outObjectType": 1,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": "你猜",
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 937,
+          "staffName": "张德亮",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 1,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        },
+        {
+          "addressArea": null,
+          "addressFull": null,
+          "addressGcj02": null,
+          "addressName": null,
+          "addressNo": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "annexPaths": [],
+          "ascpId": 29039,
+          "ascpName": "怀化辰溪恒洁卫浴",
+          "categoryQuantity": 1,
+          "contactName": null,
+          "contactPhones": null,
+          "contractNo": null,
+          "cpId": 20834,
+          "customerFrom": null,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryDate": null,
+          "deliveryTime": null,
+          "deliveryType": null,
+          "deliveryTypeName": null,
+          "deliveryUser": null,
+          "deliveryUserName": null,
+          "docCode": null,
+          "doneTime": "2023-10-17 08:48:20",
+          "doneUser": 643,
+          "doneUserName": "王英杰",
+          "erpOutNo": null,
+          "erpPushResult": null,
+          "erpPushStatus": null,
+          "erpPushStatusName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "flgAllowReverse": null,
+          "flgAllowTodone": null,
+          "flgToErp": null,
+          "flgValid": true,
+          "fromName": null,
+          "hgcrmPushResult": null,
+          "hgcrmPushStatus": null,
+          "hgcrmPushStatusName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "installUser": null,
+          "installUserName": null,
+          "makingDate": "2023-10-17",
+          "makingTime": "2023/10/17 08:48:20",
+          "makingUser": 643,
+          "makingUserName": "王英杰",
+          "opApiId": "ebf22701-3e48-48b6-8bdd-703a58bc4e42",
+          "opAppId": "e8d25036-4b95-48d6-a77b-1cfb077dd3e6",
+          "opCreateTime": "2023-10-17 08:48:21",
+          "opCreateTimeEnd": null,
+          "opCreateTimeStart": null,
+          "opCreateUserId": 643,
+          "opDbUser": "{\"usesysid\":\"6376246\",\"usename\":\"hgscrm\",\"application_name\":\"PostgreSQL JDBC Driver\",\"client_addr\":\"113.225.167.23\"}",
+          "opTimestamp": "2023-10-17 08:48:21",
+          "opUpdateTime": "2023-10-17 08:48:21",
+          "opUpdateUserId": 643,
+          "orderAnnexPaths": null,
+          "orderId": null,
+          "orderNo": null,
+          "orderOutItemResponseList": null,
+          "orgId": 30883,
+          "orgName": "辰溪县金海店",
+          "outDate": "2023-10-17",
+          "outId": 1045,
+          "outKind": "出库类型-其他",
+          "outKindName": "其他出库",
+          "outNo": "WO-0726-000-202310170JQ5",
+          "outObjectId": null,
+          "outObjectName": null,
+          "outObjectType": null,
+          "outReason": 194,
+          "outReasonName": "库存盘亏",
+          "outServiceType": null,
+          "outStatus": 2,
+          "outStatusName": "出库中",
+          "rejectId": null,
+          "rejectNo": null,
+          "remarks": null,
+          "remarksInside": null,
+          "returnAddressFull": null,
+          "returnContactName": null,
+          "returnContactPhone": null,
+          "sale1Id": 20834,
+          "sale2EntryWhId": null,
+          "sale2Id": 29039,
+          "sale2OpeMode": null,
+          "salesChannel": null,
+          "salesChannelCode": null,
+          "soutId": null,
+          "staffId": 643,
+          "staffName": "王英杰",
+          "sumAmount": null,
+          "sumOutAmount": 0,
+          "sumOutGoingAmount": 0,
+          "sumOutGoingQuantity": 1,
+          "sumOutQuantity": 0,
+          "sumQuantity": null,
+          "sumRejectAmount": 0,
+          "sumRejectQuantity": 0,
+          "supplierId": null,
+          "supplierName": null,
+          "toiletCount": null,
+          "toiletCountName": null
+        }
+      ]
+
+               this.setData({
+           totallength: 10, //合计
+           selectTotallength: 10, //数量
+           list: tList
+         })
+         this.setData({
+           selectlength: this.data.list.length, //单数
+         })
     //  api.request(Constants.ORDER_OUT + 'list_by', 'POST', param).then(res => {
     //    this.setData({
     //      loading: false

+ 1734 - 144
package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -1,192 +1,1782 @@
-// package5/pages/purchase-order/purchase-order.js
-Page({
+  /*******************************************************************************
+   * Copyright(c) 2021 dongke All rights reserved. / Confidential
+   * 类的信息:
+   *		1.程序名称:
+   *		2.功能描述:出库办理
+   * 编辑履历:
+   *		作者				日期					版本				修改内容 
+   *		王英杰		  2023年8月17日		     1.00		   	    一览
+   *******************************************************************************/
+  const app = getApp()
+  const Constants = require('../../../utils/Constants.js');
+  const api = require('../../../utils/api.js');
+  import Dialog from '../../../dist/dialog/dialog.js'
+  const util = require('../../../utils/util.js')
+  const common = require('../../../utils/common.js')
+  Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-      tableData: [],
       active: 0,
-      selectTotallength: 12,
-      selectlength: 5,
-      totallength: 234999,
       createTimeType: {
-        text: '本月',
-        value: 3
+        text: '近30天',
+        value: 5
+      },
+      //筛选字段
+      searchForm: {
+        checked: false,
+        entryKinds: [],
+        entryReasons: [],
+        customerName: '',
+        customerPhone: '',
+        addressFullReturn: '',
+        supplierName: '',
+        warehousingTime: '',
+        warehousingTimeList: [],
+        deliveryTime: '',
+        deliveryTimeList: [],
+      },
+      outStatus: 0,
+      list: [],
+      totallength: 0, //合计
+      selectlength: 0,
+      selectTotallength: 0,
+      pageInfo: {
+        pageSize: 10,
+        currentPage: 1
+      },
+      searchText: '',
+      form: {
+        deliveryTime: ''
       },
-      statusItem: { text: '审批状态', value: -1 },
     },
-  
+    /**查找冲正数据监听切换事件  */
+    onCheckboxChange(event) {
+      let searchForm = this.data.searchForm
+      searchForm.checked = event.detail
+      this.setData({
+        searchForm: searchForm
+      })
+    },
+    /**
+     * @desc : 单据状态点击事件
+     * @author : 王英杰
+     * @date : 2023年10月12日
+     */
+    dropdowncommit(e) {
+      this.selectComponent("#statusItem").toggle(false) //取消选中样式
+      console.log("dropdowncommit", e)
+
+      let dataList = e.detail.dataList
+      let type = e.currentTarget.dataset.type
+      this.setData({
+        objectType: e.detail.values
+      })
+
+
+      this.doSearch()
+
+    },
+    /**
+     * @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')
+    },
+    /**跳转入库撤回 */
+    toOutboundWithdrawal(e) {
+      wx.navigateTo({
+        url: '/package6/pages/received-order/received-order?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=outbound-processing',
+      })
+
+    },
+    // 明细数据
     toDetail(e) {
+      //待出库
+      if (this.data.active == 0) {
+        this.toOutboundProcessing(e)
+      } else {
+        this.toRevokel(e)
+      }
+
+    },
+    /**
+     * @desc : 跳转扫码入库
+     * @author : 王英杰
+     * @date : 2023年9月5日
+     */
+    toScanProcessing(e) {
+      this.setData({
+        showShare: false
+      })
       let item = e.currentTarget.dataset.item
-      if(item.displayStatus == '暂存'){
+      if (item.entryKindName == "其他入库") {
         wx.navigateTo({
-          url: './add/add?orderType=edit',
+          url: '/package7/pages/scan-show-other-warehousing/scan-show-other-warehousing?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=scan-Warehousing-processing',
         })
-      }else{
+      } else if (item.entryKindName == "采购入库") {
         wx.navigateTo({
-          url: './purchase-order-detail/purchase-order-detail',
+          url: '/package7/pages/scan-show-purchase-entry/scan-show-purchase-entry?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)),
         })
-      }   
-      console.log(e)
-    },
-    /**
-    * @desc : 列表右上角三个点关闭触发事件
-    * @author : 于继渤
-    * @date : 2022/5/28 08:50
-    */
-   onCloseShare() {
-    this.setData({
-      showShare: false
-    })
-  },
-    toAdd(){
-      wx.navigateTo({
-        url: './add/add',
+      } else if (item.entryKindName == "销售回库") {
+        wx.navigateTo({
+          url: '/package7/pages/sales-return-reversal/sales-return-reversal?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=sales-return-reversal-add'+ '&scanflag=true',
+        })
+      }
+     
+    },
+    /**
+     * @desc : 跳转入库办理
+     * @author : 王英杰
+     * @date : 2023年9月5日
+     */
+    toOutboundProcessing(e) {
+      this.setData({
+        showShare: false
+      })
+      let item = e.currentTarget.dataset.item
+      if (item.entryKindName == "其他入库") {
+        wx.navigateTo({
+          url: '/package7/pages/scan-show-other-warehousing/scan-show-other-warehousing?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=Warehousing-processing',
+        })
+      } else if (item.entryKindName == "采购入库") {
+        wx.navigateTo({
+          url: '/package7/pages/scan-show-purchase/scan-show-purchase?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=scan-show-purchase',
+        })
+      } else if (item.entryKindName == "销售回库") {
+        wx.navigateTo({
+          url: '/package7/pages/sales-return-reversal/sales-return-reversal?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=sales-return-reversal-add',
+        })
+      }
+
+    },
+    //入库撤回
+    toRevokel(e) {
+      this.setData({
+        showShare: false
       })
+      let item = e.currentTarget.dataset.item
+      if (item.entryKindName == "其他入库") {
+        wx.navigateTo({
+          url: '/package7/pages/receipt-rollback/receipt-rollback?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=outbound-withdrawal',
+        })
+      } else if (item.entryKindName == "采购入库") {
+        wx.navigateTo({
+          url: '/package7/pages/scan-show-purchase/scan-show-purchase?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=scan-show-purchase',
+        })
+      } else if (item.entryKindName == "销售回库") {
+        wx.navigateTo({
+          url: '/package7/pages/sales-return-details/sales-return-details?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=sales-return-details',
+        })
+      }
+
+
     },
-    toReturnAndExchange(){
-      wx.navigateTo({
-        url: './purchase-return-repla-sup/purchase-return-repla-sup',
+    /**
+     * @desc : 列表右上角三个点触发事件
+     * @author : 王英杰
+     * @date : 2023年8月21日
+     */
+    onclik(e) {
+      this.setData({
+        bottomItem: e.currentTarget.dataset.item,
+        showShare: true
+      })
+    },
+    /** 复制事件 */
+    toCopy(e) {
+      let copyValue = e.currentTarget.dataset.text
+      if (!copyValue) return;
+      wx.setClipboardData({
+        data: copyValue,
+        success: res => {
+          wx.showToast({
+            title: "出库单号" +
+              '已复制',
+            duration: 1000,
+          })
+        }
+      })
+    },
+    /**
+     * @desc : 列表右上角三个点关闭触发事件
+     * @author : wangyingjie
+     * @date : 2023年8月21日
+     */
+    onCloseShare() {
+      this.setData({
+        showShare: false
       })
     },
-   /**
-    * @desc : 列表右上角三个点触发事件
-    * @author : 于继渤
-    * @date : 2022/5/28 08:50
-    */
-   onclik(e) {
-  
-    let item = e.currentTarget.dataset.item;
-    
-    this.setData({
-  
-      showShare: true
-    })
-  },
-  
-   // 采购退货
-   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',
-    })
-  },
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+      //订单新建
+      let ORDER_OUTBOUND = common.hasButtonRight(Constants.ORDER_OUTBOUND)
       this.setData({
-        tableData: [
-          {
-            supplierName: '佛山恒洁-顺德加盟商',
-            orderNo: 'FQ202207061423001',
-            displayStatus: '暂存',
-            makingTime: '2022-06-12',
-            deliveryTime: '2022-08-08',
-            contactName: '张暖暖',
-            contactPhones: '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: '张暖暖',
-            contactPhones: '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: '张暖暖',
-            contactPhones: '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: '张暖暖',
-            contactPhones: '156 5678 5643',
-            addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
-            categoryQuantity: 1,
-            tsumQuantity: 2,
-            sumAmount: 9999
-          }
-        ]
+        ORDER_OUTBOUND: true,
       })
     },
-  
+    onShow(options) {
+      this.selectComponent("#pick").toggle(false) //取消选中样式
+      this.doSearch();
+    },
     /**
-     * 生命周期函数--监听页面初次渲染完成
+     * @desc : 小程序出库办理查询
+     * @author : 王英杰
+     * @date : 2023年8月21日
      */
-    onReady() {
-  
+    doSearch() {
+
+      let pageInfo = this.data.pageInfo;
+      pageInfo.pageSize = 10;
+      pageInfo.currentPage = 1;
+      this.setData({
+        show: false,
+        noMore: false,
+        pageInfo: pageInfo,
+        totallength: 0, //合计
+        selectlength: 0, //单数
+        list: [],
+      })
+
+      this.getData()
     },
-  
     /**
-     * 生命周期函数--监听页面显示
+     * @desc : 小程序出库办理分页查询
+     * @author : 王英杰
+     * @date : 2023年8月21日
      */
-    onShow() {
+    getData(e) {
   
+      //日期相关
+      var createtime = this.selectComponent('#createtime');
+      this.setData({
+        createTimeSearch: [createtime.data.dataDefaultSearch[0].replaceAll('/', '-'), createtime.data.dataDefaultSearch[1].replaceAll('/', '-')]
+      })
+      let searchForm = this.data.searchForm
+      let pageInfo = this.data.pageInfo
+      let param = { 
+        pageSize: pageInfo.pageSize,
+        currentPage: pageInfo.currentPage
+      }
+
+      param.screenCondition = this.data.searchText ? this.data.searchText : '' //查询框 
+      param.opCreateTimeStart = this.data.createTimeSearch[0] ? this.data.createTimeSearch[0] + ' 00:00:00' : '' // 开始时间
+      param.opCreateTimeEnd = this.data.createTimeSearch[1] ? this.data.createTimeSearch[1] + ' 23:59:59' : '' //结束时间
+      //判断是否选择入库选中的时间
+      if (searchForm.deliveryTimeList.length > 0) {
+        param.deliveryTimeStart = searchForm.deliveryTimeList[0] ? searchForm.deliveryTimeList[0]  : ''
+        param.deliveryTimeEnd = searchForm.deliveryTimeList[1] ? searchForm.deliveryTimeList[1]  : ''
+      }
+      if (searchForm.warehousingTimeList.length > 0) {
+        param.entryDateStart = searchForm.warehousingTimeList[0] ? searchForm.warehousingTimeList[0]  : ''
+        param.entryDateEnd = searchForm.warehousingTimeList[1] ? searchForm.warehousingTimeList[1]  : ''
+      }
+      if (this.data.active == 0) { //待出库
+        if (searchForm.checked) { //筛选--选择查看冲正数据
+          param.entryStatuses = [-1]
+        } else {
+          param.entryStatuses = [2, 4]
+        }
+
+      } else { //已出库
+        if (searchForm.checked) { //筛选--选择查看冲正数据
+          param.entryStatuses = [-2]
+        } else {
+          param.entryStatuses = [3]
+        }
+
+      }
+      param.entryKinds = searchForm.entryKinds
+      param.entryReasons = searchForm.entryReasons
+      param.customerNameEntry = searchForm.customerName
+      param.customerPhoneEntry = searchForm.customerPhone
+      param.addressFullEntry = searchForm.addressFullReturn
+      param.supplierName = searchForm.supplierName
+      let tList = 
+      [
+        {
+          "entryId": 523,
+          "customerId": 1022,
+          "customerName": "怀化辰溪恒洁卫浴",
+          "customerPhone": "15096295820",
+          "contactName": "营养快线",
+          "contactPhones": "17642008208",
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-726-202310270KDB",
+          "supplierId": 114,
+          "orderId": 8680,
+          "orderNo": "PA-0726-726-202310270KD9",
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 300,
+          "sumEntryGoingAmount": 500000,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": "AAAA",
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-27 15:22:15",
+          "opCreateUserId": 254,
+          "opUpdateTime": "2023-11-14 16:42:55",
+          "opUpdateUserId": 74,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-采购",
+          "entryReason": null,
+          "sale1OutId": 1263,
+          "staffId": 634,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": null,
+          "responsibleName": null,
+          "entryDate": null,
+          "sale1OutDate": "2023-10-27",
+          "entryWhId": 585,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": "辽宁省沈阳市浑南区辽宁心选网络科技有限公司1111B🙄",
+          "sale2IvtType": null,
+          "whName": "1",
+          "makingUser": 74,
+          "salesChannelCode": null,
+          "doneUser": 74,
+          "doneTime": "2023-11-14 16:41:19",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": "怀化辰溪恒洁卫浴",
+          "erpOutNo": "CSSAYYY23102700002",
+          "categoryQuantity": null,
+          "staffName": "姜宁",
+          "sale1ErpOutDoneNo": "CSIDYYY23102700002",
+          "flgAllowTodone": null,
+          "flgAllowReverse": true,
+          "entryObjectId": 1022,
+          "entryObjectType": 1,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "采购入库",
+          "supplierName": "怀化辰溪恒洁卫浴-供应商",
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "常皓宁",
+          "doneUserName": null,
+          "makingTime": "2023/11/14 16:41:19",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [
+            {
+              "url": "https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/test/t_order_entry/annex_paths/2023-11-02/6042cfcb-323e-4d35-8ca7-2cc0634f115a.jpg"
+            },
+            {
+              "url": "https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/test/t_order_entry/annex_paths/2023-11-02/a363d70b-ef4d-4fef-a69d-5f2d2b3c831d.png"
+            },
+            {
+              "url": "https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/test/t_order_entry/annex_paths/2023-11-02/e4e40703-68a3-414a-926f-dd52475955b6.jpg"
+            }
+          ],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": -2,
+          "sumRejectAmount": -5000,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 486,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310260K7I",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 1,
+          "sumEntryGoingAmount": 0,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": null,
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-26 15:20:31",
+          "opCreateUserId": 937,
+          "opUpdateTime": "2023-10-26 15:20:31",
+          "opUpdateUserId": 937,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 193,
+          "sale1OutId": null,
+          "staffId": 937,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "库存盘盈",
+          "responsibleName": null,
+          "entryDate": "2023-10-26",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 937,
+          "salesChannelCode": null,
+          "doneUser": 937,
+          "doneTime": "2023-10-26 15:20:31",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "张德亮",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "张德亮",
+          "doneUserName": null,
+          "makingTime": "2023/10/26 15:20:31",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 418,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310180JT6",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 1,
+          "sumEntryGoingAmount": 0,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": null,
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-18 10:58:31",
+          "opCreateUserId": 643,
+          "opUpdateTime": "2023-10-18 10:58:31",
+          "opUpdateUserId": 643,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 192,
+          "sale1OutId": null,
+          "staffId": 643,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "其他采购",
+          "responsibleName": null,
+          "entryDate": "2023-10-18",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 643,
+          "salesChannelCode": null,
+          "doneUser": 643,
+          "doneTime": "2023-10-18 10:58:30",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "王英杰",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "王英杰",
+          "doneUserName": null,
+          "makingTime": "2023/10/18 10:58:30",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 416,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310170JSR",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 1,
+          "sumEntryGoingAmount": 0,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": null,
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-17 17:21:13",
+          "opCreateUserId": 643,
+          "opUpdateTime": "2023-10-17 17:21:13",
+          "opUpdateUserId": 643,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 193,
+          "sale1OutId": null,
+          "staffId": 643,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "库存盘盈",
+          "responsibleName": null,
+          "entryDate": "2023-10-17",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 643,
+          "salesChannelCode": null,
+          "doneUser": 643,
+          "doneTime": "2023-10-17 17:21:12",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "王英杰",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "王英杰",
+          "doneUserName": null,
+          "makingTime": "2023/10/17 17:21:12",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 368,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310130JN5",
+          "supplierId": 114,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 1,
+          "sumEntryGoingAmount": 588,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": " 他",
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-13 10:37:59",
+          "opCreateUserId": 937,
+          "opUpdateTime": "2023-10-13 13:09:00",
+          "opUpdateUserId": 643,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 192,
+          "sale1OutId": null,
+          "staffId": 937,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "其他采购",
+          "responsibleName": null,
+          "entryDate": "2023-10-13",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 937,
+          "salesChannelCode": null,
+          "doneUser": 937,
+          "doneTime": "2023-10-13 11:46:28",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": "怀化辰溪恒洁卫浴-供应商",
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "张德亮",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": 114,
+          "entryObjectType": 2,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": "怀化辰溪恒洁卫浴-供应商",
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "张德亮",
+          "doneUserName": null,
+          "makingTime": "2023/10/13 11:46:28",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [
+            {
+              "createTime": "2023-10-13 10:37:53",
+              "name": "f6672812-9b82-450f-bfdb-ef6646d7772c.jpg",
+              "type": "image",
+              "url": "test/t_order/annex_paths/2023-10-13/f6672812-9b82-450f-bfdb-ef6646d7772c.jpg"
+            },
+            {
+              "createTime": "2023-10-13 11:46:19",
+              "name": "37a58869-4b71-4207-a1a2-888931684745.jpg",
+              "type": "image",
+              "url": "test/t_order/annex_paths/2023-10-13/37a58869-4b71-4207-a1a2-888931684745.jpg"
+            }
+          ],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 366,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310130JMX",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 1,
+          "sumEntryGoingAmount": 1,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": null,
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-13 10:16:51",
+          "opCreateUserId": 963,
+          "opUpdateTime": "2023-10-13 10:16:51",
+          "opUpdateUserId": 963,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 192,
+          "sale1OutId": null,
+          "staffId": 963,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "其他采购",
+          "responsibleName": null,
+          "entryDate": null,
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 963,
+          "salesChannelCode": null,
+          "doneUser": null,
+          "doneTime": null,
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "付斌",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "付斌",
+          "doneUserName": null,
+          "makingTime": "2023/10/13 10:16:19",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 297,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310110JJQ",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 3,
+          "sumEntryGoingAmount": 220,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": null,
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-11 13:42:43",
+          "opCreateUserId": 937,
+          "opUpdateTime": "2023-10-11 13:45:15",
+          "opUpdateUserId": 937,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 192,
+          "sale1OutId": null,
+          "staffId": 937,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "其他采购",
+          "responsibleName": null,
+          "entryDate": "2023-10-11",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 937,
+          "salesChannelCode": null,
+          "doneUser": 937,
+          "doneTime": "2023-10-11 13:44:59",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "张德亮",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "张德亮",
+          "doneUserName": null,
+          "makingTime": "2023/10/11 13:44:59",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 221,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310090JFG",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 1,
+          "sumEntryGoingAmount": 1,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": "1",
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-09 14:28:57",
+          "opCreateUserId": 643,
+          "opUpdateTime": "2023-10-09 14:28:57",
+          "opUpdateUserId": 643,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 192,
+          "sale1OutId": null,
+          "staffId": 643,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "其他采购",
+          "responsibleName": null,
+          "entryDate": "2023-10-09",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 643,
+          "salesChannelCode": null,
+          "doneUser": 643,
+          "doneTime": "2023-10-09 14:28:57",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "王英杰",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "王英杰",
+          "doneUserName": null,
+          "makingTime": "2023/10/09 14:28:57",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": [
+            {
+              "createTime": "2023-10-09 14:28:57",
+              "name": "40d9a681-6edf-4fa6-a3f7-ff12338e3ab5.jpg",
+              "type": "image",
+              "url": "test/t_order/annex_paths/2023-10-09/40d9a681-6edf-4fa6-a3f7-ff12338e3ab5.jpg"
+            }
+          ],
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 177,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310090JEU",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 4,
+          "sumEntryGoingQuantity": 1,
+          "sumEntryGoingAmount": 1,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": "111",
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-09 10:22:51",
+          "opCreateUserId": 643,
+          "opUpdateTime": "2023-10-09 10:39:26",
+          "opUpdateUserId": 643,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 192,
+          "sale1OutId": null,
+          "staffId": 643,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "其他采购",
+          "responsibleName": null,
+          "entryDate": "2023-10-09",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 643,
+          "salesChannelCode": null,
+          "doneUser": 643,
+          "doneTime": "2023-10-09 10:39:26",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库暂存",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "王英杰",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "王英杰",
+          "doneUserName": null,
+          "makingTime": "2023/10/09 10:39:26",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": null,
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        },
+        {
+          "entryId": 163,
+          "customerId": null,
+          "customerName": null,
+          "customerPhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "salesChannel": null,
+          "orgId": 30883,
+          "entryNo": "WE-0726-555-202310080JE1",
+          "supplierId": null,
+          "orderId": null,
+          "orderNo": null,
+          "entryStatus": 2,
+          "sumEntryGoingQuantity": 4,
+          "sumEntryGoingAmount": 4000,
+          "sumEntryQuantity": 0,
+          "sumEntryAmount": 0,
+          "remarks": null,
+          "flgValid": true,
+          "cpId": 20834,
+          "opCreateTime": "2023-10-08 14:58:06",
+          "opCreateUserId": 38,
+          "opUpdateTime": "2023-10-08 14:58:06",
+          "opUpdateUserId": 38,
+          "sale1Id": 20834,
+          "sale2Id": 29039,
+          "ascpId": 29039,
+          "entryKind": "入库类型-其他",
+          "entryReason": 196,
+          "sale1OutId": null,
+          "staffId": 643,
+          "rejectId": null,
+          "rejectNo": null,
+          "orgName": "辰溪县金海店",
+          "entryReasonName": "测试其他采购",
+          "responsibleName": null,
+          "entryDate": "2023-10-08",
+          "sale1OutDate": null,
+          "entryWhId": null,
+          "addressArea": null,
+          "addressName": null,
+          "addressGcj02": null,
+          "addressFull": null,
+          "sale2IvtType": null,
+          "whName": null,
+          "makingUser": 38,
+          "salesChannelCode": null,
+          "doneUser": 38,
+          "doneTime": "2023-10-08 14:58:05",
+          "orderEntryItemList": null,
+          "entryStatusName": "入库中",
+          "entryObjectName": null,
+          "erpOutNo": null,
+          "categoryQuantity": 1,
+          "staffName": "王英杰",
+          "sale1ErpOutDoneNo": null,
+          "flgAllowTodone": null,
+          "flgAllowReverse": null,
+          "entryObjectId": null,
+          "entryObjectType": null,
+          "sale2Name": null,
+          "procureOrderNo": null,
+          "invoiceDate": null,
+          "entryKindName": "其他入库",
+          "supplierName": null,
+          "statusName": null,
+          "inOutStatus": null,
+          "inOutDate": null,
+          "sumQuantity": null,
+          "sumAmount": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "takeOverAddress": null,
+          "makingUserName": "姜永辉",
+          "doneUserName": null,
+          "makingTime": "2023/10/08 14:58:05",
+          "totalRemarks": null,
+          "entryStatusString": null,
+          "nonStandardCode": null,
+          "annexPaths": null,
+          "supplierContactName": null,
+          "supplierContactPhone": null,
+          "supplierAddressFull": null,
+          "outNo": null,
+          "outId": null,
+          "outTime": null,
+          "receiverName": null,
+          "receiverPhone": null,
+          "receiverAddress": null,
+          "editTime": null,
+          "saveAscpId": null,
+          "addressNo": null,
+          "contractNo": null,
+          "customerFrom": null,
+          "toiletCount": null,
+          "toiletCountName": null,
+          "houseType": null,
+          "houseTypeName": null,
+          "fitupType": null,
+          "fitupTypeName": null,
+          "fitupStyle": null,
+          "fitupStyleName": null,
+          "ageComposition": null,
+          "ageCompositionName": null,
+          "decisionMaker": null,
+          "decisionMakerName": null,
+          "deliveryTypeName": null,
+          "fromName": null,
+          "sumRejectQuantity": 0,
+          "sumRejectAmount": 0,
+          "docCode": null,
+          "sale2OpeMode": null,
+          "sentryId": null
+        }
+      ]
+      this.setData({
+        totallength: 10, //合计
+        selectTotallength: 10, //数量
+        list: tList
+      })
+      this.setData({
+        selectlength: this.data.list.length, //单数
+      })
+
+      // api.request(Constants.OTHER_IN + 'list_by', '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)
+
+      //     let sumAmountTotal = 0
+      //     let sumQuantityTotal = 0
+      //     tList.forEach(res => {
+      //       let num1 = util.numAdd(Number(res.sumEntryAmount), Number(sumAmountTotal))
+      //       let num2 = util.numAdd(Number(res.sumEntryGoingQuantity), Number(sumQuantityTotal))
+      //       sumAmountTotal = num1
+      //       sumQuantityTotal = num2
+      //     })
+      //     if (tList.length > 0) {
+      //       tList.forEach(item => {
+      //         if (item.addressFull == 'undefined') {
+      //           item.addressFull = null
+      //         }
+      //         if (item.makingTime) {
+      //           item.makingTime = (item.makingTime).replace(/\-/g, "/")
+      //         }
+      //       });
+      //     }
+      //     this.setData({
+      //       totallength: sumQuantityTotal, //合计
+      //       selectTotallength: sumQuantityTotal, //数量
+      //       list: tList
+      //     })
+      //     this.setData({
+      //       selectlength: this.data.list.length, //单数
+      //     })
+      //   }
+      // })
+    },
+    changField(e) {
+      let searchForm = this.data.searchForm
+      searchForm[e.currentTarget.dataset.key] = e.detail
+      this.setData({
+        searchForm: searchForm
+      })
     },
-  
     /**
-     * 生命周期函数--监听页面隐藏
+     * @desc : 日期组件后的回调
+     * @author : wyj
+     * @date : 2023年8月17日
      */
-    onHide() {
-  
+    dateCommit(e) {
+      let dateType = e.detail.dateType
+      if (dateType === 'createtime') {
+        let data = e.detail.date
+        this.setData({
+          createTimeSearch: data,
+          createTimeType: e.detail.dateDefault
+        })
+        this.selectComponent('#create-time-type').toggle();
+      }
+      this.doSearch()
     },
-  
     /**
-     * 生命周期函数--监听页面卸载
+     * @desc : 筛选抽屉打开
+     * @author : 王英杰
+     * @date : 2023年8月17日
      */
-    onUnload() {
-  
+    openSearchPop() {
+      this.setData({
+        show: true
+      })
     },
-  
     /**
-     * 页面相关事件处理函数--监听用户下拉动作
+     * @desc : 抽屉离焦关闭
+     * @author : 王英杰
+     * @date : 2023年8月17日
      */
-    onPullDownRefresh() {
-  
+    onClose() {
+      this.setData({
+        show: false
+      })
+      this.selectComponent("#pick").toggle(false) //取消选中样式
     },
-  
     /**
-     * 页面上拉触底事件的处理函数
+     * @desc : 抽屉确定
+     * @author : 王英杰
+     * @date : 2023年8月17日
      */
-    onReachBottom() {
-  
+    doSearchData(e) {
+      this.selectComponent("#pick").toggle(false) //取消选中样式
+      this.setData({
+        show: false,
+        searchFormNumber: e.detail.searchFormNumber
+      })
+      // 查询数据 
+      this.doSearch()
     },
-  
     /**
-     * 用户点击右上角分享
+     * @desc : 筛选抽屉关闭
+     * @author : 于继渤
+     * @date : 2022/5/27 12:16
      */
-    onShareAppMessage() {
-  
-    }
+    closeSearchPop() {
+      this.selectComponent("#pick").toggle(false) //取消选中样式
+      this.setData({
+        show: false
+      })
+
+    },
+    /**
+     * @desc : 筛选重置事件
+     * @author : 王英杰
+     * @date : 2023年8月17日
+     */
+    clearSearchForm() {
+      let searchForm = {
+        checked: false,
+        entryKinds: [],
+        entryReasons: [],
+        customerName: '',
+        customerPhone: '',
+        addressFullReturn: '',
+        supplierName: '',
+        warehousingTime: '',
+        warehousingTimeList: [],
+        deliveryTime: '',
+        deliveryTimeList: [],
+      }
+      this.selectComponent("#receiptType").clearForm()
+      this.selectComponent("#receiptReason").clearForm()
+      this.setData({
+        searchForm: searchForm
+      })
+    },
+    /**
+     * @desc : 筛选数据源组件点击事件
+     * @author : 于继渤
+     * @date : 2022/5/31 08:59
+     */
+    onClickTag(e) {
+      console.log("onClickTag", e)
+      let key = e.detail.key
+      let dataList = e.detail.dataList
+      let searchForm = this.data.searchForm
+      if (key === 'receiptType') { //入库类型
+        searchForm.entryKinds = dataList
+      }
+      if (key === 'receiptReason') { //入库原因
+        searchForm.entryReasons = dataList
+      }
+      this.setData({
+        searchForm
+      })
+    },
+    /**
+     * @desc : 筛选时间打开事件
+     * @author :王英杰
+     * @date : 2023年8月21日
+     */
+    onClickTime(e) {
+      let key = e.currentTarget.dataset.key 
+      if (key === 'deliveryTime') {
+        this.setData({
+          deliveryTimeDefaultSearch: new Date().getTime() + 100,
+          deliveryFlag: true
+        })
+      }
+      //入库日期
+      if (key === 'warehousingTime') {
+        this.setData({
+          warehousingTimeDefaultSearch: new Date().getTime() + 100,
+          warehousingFlag: true
+        })
+      }
+    },
+    /**
+     * 时间
+     * @param {} e 
+     */
+    onConfirmChooseDate(e) {
+      let searchForm = this.data.searchForm
+      let deliveryTime = searchForm.deliveryTime
+      deliveryTime = e.detail.date[0] + '-' + e.detail.date[1]
+      searchForm.deliveryTime = deliveryTime
+      searchForm.deliveryTimeList = e.detail.date;
+      this.setData({
+        searchForm: searchForm,
+      })
+    },
+    /**
+     * 时间
+     * @param {} e 
+     */
+    onConfirmChooseWarehousingDate(e) {
+      let searchForm = this.data.searchForm
+      let warehousingTime = searchForm.warehousingTime
+      warehousingTime = e.detail.date[0] + '-' + e.detail.date[1]
+      searchForm.warehousingTime = warehousingTime
+      searchForm.warehousingTimeList = e.detail.date;
+      this.setData({
+        searchForm: searchForm,
+      })
+    },
+    onChangeTabs(e) {
+      let title = e.detail.title
+      console.log("qeaqwewa", e)
+      this.setData({
+        active: e.detail.name
+      })
+      this.doSearch()
+    },
+    /** 跳转其他入库 */
+    submit() {
+      wx.navigateTo({
+        url: './choose-sku-product?sourcePage=' + 'warehousingProcessing' + '&title=其他出库',
+      })
+
+
+      //   wx.navigateTo({
+      //     url: './detail/detail?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)),
+      // })
+    },
+    //冲正重开
+    toReverse(e) {
+      if (this.data.loading) {
+        return
+      }
+      let item = e.currentTarget.dataset.item
+      if (item.entryKindName == "其他入库") {
+        this.otherOutboundReversal(item)
+      }
+    
+    },
+ 
+    //其他出库冲正
+    otherOutboundReversal(item) {
+      let param = {
+        sale1Id: app.globalData.user.sale1Id,
+        sale2Id: app.globalData.user.sale2Id,
+        cpId: app.globalData.user.cpId,
+        ascpId: app.globalData.user.ascpId,
+        entryId: item.entryId
+      }
+      this.setData({
+        loading: true
+      })
+      api.request(Constants.OTHER_IN + 'order_entry_other_reverse', 'POST', param).then(res => {
+        this.setData({
+          loading: false
+        })
+
+        if (res.data.code === 200) {
+          this.doSearch()
+          this.setData({
+            showShare: false
+          })
+        }
+      })
+    },
   })

+ 217 - 121
package-inventory/pages/warehousing-processing/warehousing-processing.wxml

@@ -1,55 +1,108 @@
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+
+
 <van-sticky scroll-top="0">
-  <van-search model:value="{{ searchText }}" bind:change="onSearchText" bind:search="doSearch" placeholder="输入收货人/地址/电话/商品名称/商品编码/唯一编码/备注"> </van-search>
+  <view style="display:flex;">
+    <view style="width:75%;    padding-left: 23rpx;">
+      <van-search bind:search="doSearch" custom-class="search-class" model:value="{{ searchText }}" placeholder="输入单号/商品名称/商品编码/唯一编码" use-right-icon-slot="{{true}}" placeholder-style="color:#95A8CB">
+      </van-search>
+    </view>
+    <view style="width:25%; background:#F8F9FD;">
+      <view class="scan-class">
+        <image class="scan-image" fit="fill" src="/static/img/Group.png"></image>
+      </view>
+    </view>
+  </view>
   <van-dropdown-menu active-color="#1B365D">
     <!-- 创建时间 -->
     <van-dropdown-item id="create-time-type" title="{{createTimeType.text}}">
       <dk-dropdown-date id="createtime" dateType="createtime" blankFlag="{{false}}" defaultValue='{{createTimeType.value}}' bind:dateCommit='dateCommit'></dk-dropdown-date>
     </van-dropdown-item>
-    <!-- 状态 -->
-    <van-dropdown-item id="statusItem" title="{{ statusItem.text }}">
-      <dk-dropdown-switch dataList="{{statusList}}" bind:commit='dropdowncommit'></dk-dropdown-switch>
-    </van-dropdown-item>
+
+
     <!-- 筛选 -->
     <van-dropdown-item id='pick' title="{{'筛选'+ (searchFormNumber ? '['+searchFormNumber+']' : '')}}" bind:open='openSearchPop' bind:close='closeSearchPop' data-type="pick" />
-
   </van-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 title="待入库">
     </van-tab>
-    <van-tab title="成交">
+    <van-tab title="已入库">
     </van-tab>
   </van-tabs>
 </van-sticky>
 
+<!-- 筛选抽屉 -->
+<dk-side-pull-menu show_p="{{show}}" searchForm="{{searchForm}}" bind:clearSearchForm="clearSearchForm" bind:doSearchData="doSearchData" bind:onClose="onClose">
+  <dk-label-multiple-select show="{{show}}" id="receiptType" typeName="receiptType" bind:onClickTag="onClickTag"></dk-label-multiple-select>
+  <dk-label-multiple-select show="{{show}}" id="receiptReason" typeName="receiptReason" bind:onClickTag="onClickTag"></dk-label-multiple-select>
+
+  <van-field title-width="150rpx" input-class="time-value-class" label-class="title-class" maxlength="100" data-key="customerName" value="{{ searchForm.customerName }}" input-align="right" label="收货人" placeholder="请输入收货人" autosize border="{{ false }}" readonly="{{false}}" bind:change="changField">
+  </van-field>
+
+  <van-field title-width="150rpx" input-class="time-value-class" label-class="title-class" maxlength="100" data-key="customerPhone" value="{{ searchForm.customerPhone }}" input-align="right" label="收货人电话" placeholder="请输入收货人电话" autosize border="{{ false }}" readonly="{{false}}" bind:change="changField">
+  </van-field>
+
+  <van-field title-width="150rpx" input-class="time-value-class" label-class="title-class" maxlength="100" data-key="addressFullReturn" value="{{ searchForm.addressFullReturn }}" input-align="right" label="收货地址" placeholder="请输入收货地址" autosize border="{{ false }}" readonly="{{false}}" bind:change="changField">
+  </van-field>
+
+  <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.deliveryTime}}" is-link border="{{ false }}" label="发货日期" placeholder="请选择发货日期" data-key="deliveryTime" catchtap="onClickTime" color="#95A8CB" readonly="{{true}}"></van-field>
+
+  <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.warehousingTime}}" is-link border="{{ false }}" label="入库日期" placeholder="请选择入库日期" data-key="warehousingTime" catchtap="onClickTime" color="#95A8CB" readonly="{{true}}"></van-field>
+
+  <van-field title-width="150rpx" input-class="time-value-class" label-class="title-class" maxlength="100" data-key="supplierName" value="{{ searchForm.supplierName }}" input-align="right" label="供应商" placeholder="请输入供应商" autosize border="{{ false }}" readonly="{{false}}" bind:change="changField">
+  </van-field>
 
-<van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
+  <van-cell border="{{ false }}" title-width="410rpx">
+    <view slot="title" style="font-size: 14px;color: #2E3853 !important;font-weight: 500;">
+      查看冲正数据
+    </view>
+    <view Cell Slot="value">
+      <view style="display: flex; justify-content: center; align-items: center;">
+        <van-checkbox style="background: white;border-radius: 100%;" shape="round" value="{{  searchForm.checked }}" bind:change="onCheckboxChange"></van-checkbox>
+      </view>
+    </view>
+  </van-cell>
+
+</dk-side-pull-menu>
+
+<!-- 暂无数据 -->
+<van-empty wx:if="{{list.length<=0}}" description="暂无数据" />
 
-<view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class">
-  <!-- 列表上半部分 -->
-  <view class="main-foot" style="position: relative;border-radius: 15rpx;">
+<!--  列表 -->
+<view wx:for="{{list}}" data-item="{{item}}" wx:key="index" class="main-class">
+
+  <!-- 上半部分 -->
+  <view class="main-foot" style="position: relative;border-radius:  15rpx;">
 
     <view class="table-content" bind:tap="toDetail" data-item="{{item}}">
       <view class="table-content-row">
-        <view class="order-and-status">
+        <view class="order-and-status" style="align-items: center;">
           <view catchtap="toCustomer" style="width: 39rpx;height: 39rpx;background-color: #95A8CB;border-radius:50%;margin-top: 5rpx;">
             <view style="width: 39rpx; height: 39rpx;text-align: center;">
-              <van-image round width="28rpx" height="28rpx" src="/static/img/purchase-order-icon.png" />
+              <van-image round width="20rpx" height="24rpx" src="/static/img/Vector.png" />
             </view>
           </view>
-          <!-- 供应商 -->
-          <view catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;">
-            <dk-text bind:tap="toCustomer" data-item="{{item}}" textDecoration="underline" fontSize="15px" value="{{item.supplierName ? item.supplierName : ''}}"></dk-text>
+          <!-- 其他入库类型。标题为客户 -->
+          <view wx:if="{{item.entryKindName !='其他入库'}}" catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;align-items: center;">
+            <dk-text bind:tap="toCustomer" data-item="{{item}}" fontSize="15px" value="{{item.customerName}}"></dk-text>
+          </view>
+          <!-- 其他入库类型。标题为责任人 -->
+          <view wx:if="{{item.entryKindName =='其他入库'}}" catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;align-items: center;">
+            <dk-text bind:tap="toCustomer" data-item="{{item}}" fontSize="15px" value="{{item.staffName}}"></dk-text>
           </view>
 
-
-          <!-- 状态 -->
-          <view style="width: calc(20%); height: 49rpx;padding-right:0rpx;" data-item="{{item}}" >
-            <view style="{{item.displayStatus == '暂存'  ?  'height: 49rpx;border-radius: 6rpx;background-color: #E4002B;text-align: center;' : 'height: 49rpx;border-radius: 6rpx;background-color: #77C5D5;text-align: center;'}}">
-              <text style=" font-size: 13px;color:  #FFFFFF;">{{item.displayStatus }}</text>
+          <view style="width: calc(50%); height: 49rpx;padding-right:21rpx;" data-item="{{item}}" catchtap="onDesign">
+            <view style="height: 49rpx; display: flex; align-items: center; justify-content: center; border-radius: 6rpx; background-color: #77C5D5; text-align: center;">
+              <text style=" font-size: 13px;color:  #FFFFFF;">{{item.entryKindName}}</text>
             </view>
           </view>
+          <!-- 状态 -->
+          <!-- <view style="width: calc(40%); height: 49rpx;padding-right:34rpx;" data-item="{{item}}" catchtap="toOrderStatusApvResult">
+            <view style="height: 49rpx; display: flex; align-items: center; justify-content: center; border-radius: 6rpx; background-color: #77C5D5; text-align: center;">
+              <text style="font-size: 13px; color: #FFFFFF;">{{item.entryKindName}}</text>
+            </view>
+
+          </view> -->
           <!-- 三个小点 -->
           <view class="oas-title-value" data-item="{{item}}" catchtap="onclik">
             <van-icon size="25" name="ellipsis" color="#1B365D" />
@@ -58,146 +111,217 @@
       </view>
 
       <!-- 日期 -->
-      <view style="display: flex; width: 100%;text-align: right;height: 47rpx">
+      <view wx:if="{{item.entryKind =='其他入库'}}" style="display: flex; width: 100%;text-align: right;height: 47rpx">
         <view style="width:  calc(100% - 210rpx);text-align: left;padding-left: 30rpx;">
-          <!-- {{item.erpPushStatus}} -->
-          <view wx:if="{{item.erpPushStatus == 3}}">
-            <dk-van-tag catchtap="toOrderStatusApvResult" data-item="{{item}}" color="red" roundFlag="{{true}}" size="medium" value="推送异常"></dk-van-tag>
-          </view>
+
         </view>
         <view style="height: 47rpx;background-color: #EAF1FF;border-radius: 0px 0px 0px 30px;width: 210rpx;text-align: center;">
-          <text style="font-size: 14px;color: #808080;">{{item.makingTime}}</text>
+          <text style="font-size: 14px;color: #808080;">{{item.makingDate?item.makingDate:''}}</text>
         </view>
       </view>
 
-      <!-- 订单单号 -->
+      <!-- 入库单号 -->
       <view class="table-content-row">
         <view style="display: flex;">
           <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="订单编号" copyValue="{{item.orderNo}}"></dk-text>
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="入库单号" copyValue="{{item.entryNo}}"></dk-text>
           </view>
           <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
-            {{item.orderNo}}
+            {{item.entryNo}}
+            <view catchtap="toCopy" data-text="{{item.entryNo}}" style="border:1px solid #cecece;background-color:white;color:#cecece;border-radius:5rpx;padding:2px;">
+              复制
+            </view>
+
           </view>
         </view>
       </view>
-      <!-- 收货信息 -->
-      <view class="table-content-row">
+      <!--业务类型  -->
+      <!-- <view class="table-content-row">
         <view style="display: flex;">
           <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收货信息"></dk-text>
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="业务类型" copyValue="{{item.entryKindName}}"></dk-text>
           </view>
           <view class="table-content-class">
-            {{item.contactName ? item.contactName : ''}} | {{item.contactPhones ? item.contactPhones : ''}}
+            {{item.entryKindName?item.entryKindName:''}}
           </view>
         </view>
-      </view>
+      </view> -->
 
 
+      <!-- 客户电话 -->
+      <view wx:if="{{item.entryKindName =='销售回库'}}" class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户电话" copyValue="{{item.customerPhone}}"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.customerPhone?item.customerPhone:''}}
+          </view>
+        </view>
+      </view>
 
+      <!-- 客户地址 -->
+      <view wx:if="{{item.entryKindName =='销售回库'}}" class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户地址" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
+          </view>
+          <view class="table-content-class">
+            <!-- {{item.addressFull ? item.addressFull : ''}} -->
+            {{ wxmlUtil.addressFullIsUndefined(item.addressFull)}}
+          </view>
+        </view>
+      </view>
 
-      <!-- 收货地址 -->
-      <view class="table-content-row">
+      <!-- 门店信息 -->
+      <view wx:if="{{item.entryKindName =='销售回库'}}" class="table-content-row">
         <view style="display: flex;">
           <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收货地址" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店信息" copyValue="{{item.orgName}} | 业务员 {{item.staffName}}"></dk-text>
           </view>
           <view class="table-content-class">
- 
-            {{ item.addressFull}}
+            {{item.orgName}} | 业务员 {{item.staffName}}
           </view>
         </view>
       </view>
 
-      <!-- 预计收货日期 -->
+      <!-- 收货信息 -->
+      <view wx:if="{{item.entryKindName =='采购入货'}}" class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收货信息" copyValue="{{item.returnContactName}} | {{item.returnContactPhone}}"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.returnContactName}} | {{item.returnContactPhone}}
+          </view>
+        </view>
+      </view>
+      <!-- 收货地址 -->
+      <view wx:if="{{item.entryKindName =='采购入货'}}" class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收货地址"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.returnAddressFull?item.returnAddressFull:''}}
+          </view>
+        </view>
+      </view>
+      <!-- 入库原因 -->
+      <view wx:if="{{item.entryKindName =='其他入库'}}" class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="入库原因"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.entryReasonName?item.entryReasonName:''}}
+          </view>
+        </view>
+      </view>
+      <!-- 责任人 -->
+      <view wx:if="{{item.entryKindName =='其他入库'}}" class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="责任人" copyValue="{{item.orgName}} | {{item.staffName}}"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.orgName}} | 业务员 {{item.staffName}}
+          </view>
+        </view>
+      </view>
+      <!-- 入库对象 -->
+      <view wx:if="{{item.entryKindName =='其他入库'}}" class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="入库对象"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.entryObjectName?item.entryObjectName:''}}
+          </view>
+        </view>
+      </view>
+      <!-- 入库日期 -->
       <view class="table-content-row">
         <view style="display: flex;">
           <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="预计收货日期"></dk-text>
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="入库日期"></dk-text>
           </view>
           <view class="table-content-class">
-            {{item.deliveryTime}}
+            {{item.entryDate?item.entryDate:''}}
           </view>
         </view>
       </view>
-
       <!--分割线-->
       <view style="padding-left:32rpx;padding-right:32rpx;">
         <view style="border: 1rpx solid #E9F0FE;height: 0px;"></view>
       </view>
 
-      <view style="padding: 20rpx 32rpx 20rpx 32rpx;border-radius: 16rpx;">
-        <view style="display: flex;">
-          <view class="category-class">
-            {{item.categoryQuantity + '品类 共'+ item.tsumQuantity+'件'}}
+      <view class="table-content-row" style="padding-top: 0rpx;">
+        <view style="display:flex;place-items: center;">
+          <view wx:if="{{item.entryKindName =='其他入库'}}" class="category-class">
+            {{item.categoryQuantity+ '品类 共'+ item.sumEntryGoingQuantity+'件'}}
+          </view>
+          <view wx:else class="category-class">
+            {{ item.sumEntryGoingQuantity+'件'}}
           </view>
           <view class="totalamount-class">
-            <dk-cell  fontSize="15" contentFontSize="17" contentColor="#CAA977" titleColor="#1B365D;" contentFontWeight="bold" title="共计金额" content="{{item.sumAmount}}"></dk-cell>
-           
+            <dk-cell fontSize="15" contentFontSize="17" contentColor="#CAA977" titleColor="#1B365D;" contentFontWeight="bold" title="合计金额:" content="{{item.sumEntryGoingAmount}}"></dk-cell>
           </view>
         </view>
       </view>
 
-
     </view>
   </view>
-</view>
 
+</view>
+<view style="height: 25vw;"></view>
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
-<view style="height: 220rpx;"></view>
+
+<!-- 其他chu库按钮 -->
+<dk-save-bottom flagTypeName="other-warehousing" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{numberFormat.toThousandCents(totallength)}}" bind:submit="submit" submitFlag="{{true}}" />
+
+<!-- 日期选择控件 -->
+<dk-dropdown-date-day show="{{deliveryFlag}}" defaultValue="{{deliveryTimeDefaultSearch}}" bind:dateCommit="onConfirmChooseDate"></dk-dropdown-date-day>
+
+<!-- 日期选择控件 -->
+<dk-dropdown-date-day show="{{warehousingFlag}}" defaultValue="{{warehousingTimeDefaultSearch}}" bind:dateCommit="onConfirmChooseWarehousingDate"></dk-dropdown-date-day>
+
+<van-dialog id="van-dialog" />
 
 <!-- 卡片右上角 -->
 <van-popup show="{{showShare}}" position="bottom" bind:close="onCloseShare" custom-class="function-pop-class">
   <van-cell-group border="{{false}}" custom-class="function-cell-group">
     <van-grid square border="{{false}}" icon-size="42px">
 
-      <!--采购作废-->
-      <van-grid-item wx:if="{{bottomItem.orderStatus === '订单状态-暂存'}}" use-slot catchtap="toAbolitionPurchases" data-item="{{bottomItem}}">
+      <!--回库办理-->
+      <van-grid-item wx:if="{{active == 0}}" use-slot catchtap="toOutboundProcessing" data-item="{{bottomItem}}">
         <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-orders-follow.png"></van-image>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/warehousing-processing-tag.png"></van-image>
         </view>
         <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="采购作废"></dk-text>
+          <dk-text fontSize="12px" fontWeight="400" value="入库办理"></dk-text>
         </view>
       </van-grid-item>
-      <!-- 退换补单 -->
-      <van-grid-item wx:if="{{bottomItem.orderStatus !== '订单状态-暂存'}}" use-slot catchtap="toReturnAndExchange" data-item="{{bottomItem}}">
+      <!--扫码入库-->
+      <van-grid-item wx:if="{{active == 0}}" use-slot catchtap="toScanProcessing" data-item="{{bottomItem}}">
         <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/follow.png"></van-image>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/scanbarcode.png"></van-image>
         </view>
         <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="退换补单"></dk-text>
+          <dk-text fontSize="12px" fontWeight="400" value="扫码入库"></dk-text>
         </view>
       </van-grid-item>
-
-      <!--采购退货-->
-      <van-grid-item wx:if="{{bottomItem.orderStatus !== '订单状态-暂存'}}" use-slot catchtap="toPurchaseReturns" data-item="{{bottomItem}}">
+      <!--回库撤回-->
+      <van-grid-item wx:if="{{active == 1}}" use-slot catchtap="toRevokel" data-item="{{bottomItem}}">
         <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/return.png"></van-image>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/warehousing-withdrawal.png"></van-image>
         </view>
         <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="采购退货"></dk-text>
+          <dk-text fontSize="12px" fontWeight="400" value="入库撤回"></dk-text>
         </view>
       </van-grid-item>
-
-
-
-
-
-      <!--采购退货冲正-->
-      <!-- <van-grid-item wx:if="{{bottomItem.orderStatus !== '订单状态-暂存'}}" use-slot catchtap="toPurchaseReturnReversal" data-item="{{bottomItem}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/reverse-purchase-order.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="采购退货冲正"></dk-text>
-        </view>
-      </van-grid-item> -->
-
-
-
-      <!-- 冲正重开 -->
-      <van-grid-item wx:if="{{bottomItem.displayStatus == '成交'}}" use-slot catchtap="toReinstated" data-item="{{bottomItem}}">
+      <!--冲正重开-->
+      <van-grid-item wx:if="{{bottomItem.entryKindName =='其他入库'}}" use-slot catchtap="toReverse" data-item="{{bottomItem}}">
         <view>
           <van-image custom-class="function-pop-image" fit="fill" src="/static/img/reverse.png"></van-image>
         </view>
@@ -205,47 +329,19 @@
           <dk-text fontSize="12px" fontWeight="400" value="冲正重开"></dk-text>
         </view>
       </van-grid-item>
-
-      <!-- 订单推送 -->
-      <van-grid-item use-slot catchtap="toSync" data-item="{{bottomItem}}" wx:if="{{bottomItem.displayStatus !== '暂存'}}">
+      <!--打印票据-->
+      <van-grid-item use-slot catchtap="toSaleReturn" data-item="{{bottomItem}}">
         <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-orders-push.png"></van-image>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/print-tickets.png"></van-image>
         </view>
         <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="订单推送"></dk-text>
+          <dk-text fontSize="12px" fontWeight="400" value="打印票据"></dk-text>
         </view>
       </van-grid-item>
-    <!--订单打印-->
-    <van-grid-item use-slot catchtap="toOrderPrint" data-item="{{bottomItem}}" 
-  >
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-order-print.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="订单打印"></dk-text>
-        </view>
-      </van-grid-item>
-
-
-
-
-
-
-
-
-
-
     </van-grid>
-
-
-
-
   </van-cell-group>
   <view class="popup-button">
     <van-button type="default" custom-class="pop-button-class" size="large" catchtap="onCloseShare">取消
     </van-button>
   </view>
-</van-popup>
-
-<!-- 新建按钮 -->
-<dk-save-bottom purchasePriceFlag="{{false}}" flagTypeName="order-add" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{totallength}}" bind:submit="toAdd" submitFlag="{{true}}" />
+</van-popup>

+ 51 - 352
package-inventory/pages/warehousing-processing/warehousing-processing.wxss

@@ -1,374 +1,48 @@
 page {
 	background: #F5F5F5;
   }
-  
-  .list {
-	width: calc(100%-20rpx);
-	padding: 20rpx;
-  }
-  
-  .van-cell__value {
-	width: 72% !important;
-	text-align: left !important;
-	-webkit-flex: auto !important;
-	flex: auto !important;
-  }
-  
-  .van-cell__title {
-	width: 28% !important;
-	-webkit-flex: auto !important;
-	flex: auto !important;
-	color: #6f7071 !important;
-  }
-  
-  .date-and-amount {
-	margin-top: 7rpx;
-	display: flex;
-	width: 100%;
-	justify-content: space-around;
-  }
-  
-  .daa-date {
-	width: 45%;
-	margin-top: 7rpx;
-	font-size: 3.5vw;
-	color: #808080;
-	line-height: 60rpx;
-	text-align: right;
-  }
-  
-  .order-and-status {
-	display: flex;
-	width: 100%;
-	justify-content: space-around;
-  }
-  
-  .order-and-status-sales{
-	display: flex;
-	margin-left: 70rpx;
-	width: calc(100% - 70rpx);
-	justify-content: space-around;
-  }
-  
-  .oas-no {
-	width: 50%;
-	font-size: 3.8vw;
-	color: #3b3b3b;
-	text-align: left;
-  }
-  
-  .oas-status {
-	width: 30%;
-	font-size: 3.5vw;
-	color: #1989fa;
-	text-align: right;
-  
-  }
-  
-  .daa-amount {
-	margin-top: 7rpx;
-	width: 75%;
-	font-size: 4vw;
-	color: #e97e04;
-	text-align: right;
-	line-height: 60rpx;
-  }
-  
-  .daa-amount-cun {
-	margin-top: 7rpx;
-	width: 40%;
-	font-size: 4vw;
-	color: #1989FA;
-	text-align: right;
-	line-height: 60rpx;
-  }
-  
-  .horizontal-bar {
-	display: flex;
-	justify-content: space-between;
-	width: 100%;
-  }
-  
-  .customer-name {
-	width: 80% !important;
-	font-size: 3.5vw;
-	line-height: 50rpx;
-	margin-top: 7rpx;
-	color: #323233;
-  }
-  
-  .btn-to-cun {
-	margin-top: 7rpx;
-	width: 50%;
-	text-align: right;
-  }
-  
-  
-  .van-picker__toolbar {
-	display: none !important;
-  }
-  
-  /*新加的弹窗样式*/
-  .van-field__label {
-	color: #6f7071 !important;
-  }
-  
-  .van-field__input {
-	color: #6f7071 !important;
-  }
-  
-  .pop-search-view {
-	float: right;
-	margin-right: 20rpx;
-	color: #ffffff;
-	font-size: 44rpx;
+  .search-class {
+	height: 78rpx;
   }
-  
-  .pop-search-item-content {
-	padding: 0 3% 0 3%;
+  .van-tab{
+	background: #F5F5F5;
   }
-  
-  .pop-search-item-content-button {
+  /**扫一扫**/
+  .scan-class {
+	position: fixed;
+	top: 9rpx;
+	right: 34rpx;
+	width: 122rpx;
+	height: 65rpx;
+	background: #1B365D;
+	border-radius: 15rpx;
 	display: flex;
 	align-items: center;
-	justify-content: space-around;
-  }
-  
-  .pop-search-item-content-button-custom {
-	border: 0 !important;
-	margin: 0 !important;
-	color: #CC3333;
-	background-color: white;
-  }
-  
-  .pop-search-item-content-button-custom::after {
-	border: 1rpx solid #CC3333 !important;
-	background: transparent !important;
-  }
-  
-  .pop-search-item-content-button-custom-gray {
-	border: 0 !important;
-	margin: 0 !important;
-	color: #c1c1c1;
-	background-color: white;
-  }
-  
-  .pop-search-item-content-button-custom-gray::after {
-	border: 1rpx solid #c1c1c1 !important;
-	background: transparent !important;
-  }
-  
-  .scroll {
-	height: calc(100%);
-  }
-  
-  .table-row-custom {
-	display: flex;
-	width: 100%;
-	flex-direction: row;
-	margin-top: 1px;
-  
-  }
-  
-  .cn-a-b {
-	display: flex;
-	justify-content: space-between;
-	width: 100%;
-  }
-  
-  .customer-name {
-	width: 50%;
-	font-size: 4vw;
-	line-height: 50rpx;
-	color: #323233;
-	word-break: break-all;
-  }
-  
-  .customer-name2 {
-	width: 100%;
-	font-size: 4vw;
-	line-height: 50rpx;
-	color: #323233;
-	word-break: break-all;
-  }
-  
-  .btn-to-cun {
-	display: inline;
-	width: 100%;
-	text-align: right;
-  
-  }
-  
-  .telephone {
-	display: flex;
-	margin-top: 7rpx;
-	font-size: 3.5vw;
-	line-height: 50rpx;
-	color: #323233;
-	width: 55%;
-  
-  }
-  
-  .category {
-	display: flex;
-	margin-top: 7rpx;
-	font-size: 3.5vw;
-	line-height: 50rpx;
-	color: #323233;
-	width: 45%;
-  }
-  
-  .address {
-	margin-top: 7rpx;
-	word-break: break-all;
-	white-space: pre-wrap;
-	font-size: 3.5vw;
-	line-height: 50rpx;
-	color: #323233;
-	width: 89%;
-  }
-  
-  .staffname {
-	margin-top: 7rpx;
-	font-size: 3.5vw;
-	line-height: 50rpx;
-	color: #323233;
-	width: 100%;
-	text-align: right;
-  }
-  
-  .address-staffname {
-	display: flex;
-	margin-top: 7rpx;
-	width: 100%;
+	justify-content: center;
   }
   
-  .image-small {
-	color: #b3b3b3;
-	font-size: 14px;
+  .scan-image {
+	width: 48rpx;
+	height: 36rpx;
   }
   
-  .hr {
-	width: 100%;
-	height: 2rpx;
-	margin-top: 15rpx;
-	margin-bottom: 15rpx;
-	/* margin-left: 37.5rpx; */
-	background-color: var(--divider-text-color, #e0e1e2);
+  /** 查询**/
+  .van-search {
+	background: #F8F9FD !important;
+	padding-left: 0 !important;
   }
-  
-  
-  
-  
-  
-  
-  
-  
-  .oas-title-value {
-	width: 80rpx;
-	font-size: 5px;
-	text-align: right;
-	padding-left: 5rpx;
-	color: #1989fa;
-  }
-  
-  
-  .value-class {
-	text-align: right !important;
-	font-size: 26rpx !important;
+  .time-value-class {
+	color: #1B365D !important;
+	font-weight: 400;
   }
-  
   .title-class .van-field__label{
 	font-size: 14px;
 	color:#2E3853 !important;
 	font-weight: 500;
   }
-  
-  .oas-status-two {
-	width: 40%;
-	font-size: 3.8vw;
-	color: #1989fa;
-	text-align: center;
-  }
-  
-  .time-value-class {
-	color: #1B365D !important;
-	font-weight: 400;
-  }
-  
-  
-  
-  /* 字体设置 */
-  .font-setting {
-	font-size: 3.9vw;
-  }
-  .bottom-bar{
-	border-radius: 15px;
-	display: flex;
-  }
-  
-  
-  
-  
-  /* 2022/07/25 样式引用*/
-  
-  
-  .van-tabs__scroll{
-	background-color: #F5F5F5 !important;
-  }
-  
-  .van-dropdown-menu__title{
-	color: #1B365D !important;
-  }
-  
   .van-tabs-class{
 	background: #fff !important;
-  }
-  
-  .dk-font{
-	font-size: 13px;
-	color: #1B365D;
-	font-weight: bold;
-  }
-  
-  /**品类*/
-  .category-class{
-	width: 40%;
-	font-size: 15px;
-	color: #95A8CB;
-	align-items: center;
-	display: flex;
-  }
-  /**合计金额*/
-  .totalamount-class{
-	width: 60%;
-	text-align: right !important;
-  }
-  .modal-app {
-	width: 80%;
-	border-radius: 15rpx;
-  }
-  
-  .modal-button {
-	width: 50%;
-  }
-  .button-pop-cell-class{
-	border-radius: 15rpx !important;
-  }
-  
-  .button-pop-class{
-	width: 640rpx !important;
-	height: 88rpx !important;
-	background: #1B365D !important;
-	border-radius: 15rpx !important;
-	border: none !important;
-  }
-  
-  .input-class{
-	text-align: left !important;
-	height: 70px !important;
-	color: #1B365D !important;
-  }
+  } 
   .corner-view {
 	position: absolute;
 	/* 扇形弧度 */
@@ -391,4 +65,29 @@ page {
 	  font-size: 24rpx;
 	  font-weight: 600;
 	  font-size: 26rpx;
-  }
+  }
+  .order-and-status-sales{
+	display: flex;
+	margin-left: 70rpx;
+	width: calc(100% - 70rpx);
+	justify-content: space-around;
+  }
+  .order-and-status {
+	display: flex;
+	width: 100%;
+	justify-content: space-around;
+  }
+  /**品类*/
+  .category-class{
+	width: 40%;
+	font-size: 15px;
+	color: #95A8CB;
+	align-items: center;
+	display: flex;
+  }
+  /**合计金额*/
+  .totalamount-class{
+	width: 60%;
+	text-align: right !important;
+  }
+