入库

package-inventory/pages/outbound-processing/choose-product/choose-product.js

@@ -12,7 +12,7 @@ Page({
     active: 0,
     categoryQuantity: 0,
     choosedGoodsList: [],
- 
+
     followFlag: false,
     form: {
       "whId": 610,
@@ -1390,7 +1390,7 @@ Page({
   submit() {
     let choosedGoodsList = this.data.choosedGoodsList
     wx.navigateTo({
-        url: '../../other-outbound/other-outbound?goodsList=' + encodeURIComponent(JSON.stringify(choosedGoodsList))  ,
+      url: '../../other-outbound/other-outbound?goodsList=' + encodeURIComponent(JSON.stringify(choosedGoodsList)),
     })
 
   },
@@ -1633,16 +1633,16 @@ Page({
     }
     let currentChoosedItemTemp = {
       ...this.data.currentChoosedItem
-  }
-  let choosedGoodsList = this.data.choosedGoodsList
-  choosedGoodsList.push(currentChoosedItemTemp)
-  this.setData({
+    }
+    let choosedGoodsList = this.data.choosedGoodsList
+    choosedGoodsList.push(currentChoosedItemTemp)
+    this.setData({
       choosedGoodsList,
-      showAdd:false
-  })
+      showAdd: false
+    })
+
 
 
-    
   },
   /**
    * @desc : 清空default

package-inventory/pages/warehousing-processing/add/add.js

@@ -1,178 +1,472 @@
-// package5/pages/purchase-order/add/add.js
+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')
+const config = require('@/config/config.js')
+
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-      activeNames: ['1'],
-      orderType: 'add'
-    },
-    /**
-     * @desc : 折叠面板
-     * @author : 于继渤
-     * @date : 2023/08/16 14:45
-     */
-    onChangeCollapse(e) {
-      this.setData({
-        activeNames: e.detail,
-      });
-    },
-    chooseSaleOrders() {
-      wx.navigateTo({
-        url: '../../purchase-based-sales/purchase-based-sales',
-      })
-    },
-    toChooseGoods(){
-      wx.navigateTo({
-        url: '../../purchase-order/purchase-order-selection-goods/purchase-order-selection-goods',
-      })
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    form: {
+      whId: '', //仓库ID
+      whName: '', //仓库名称
     },
+    item:{},
+    goodsList:[],
+    barList:[],
+    whNameFlag:false,
+    annexPaths:[],
+    fileList:[],
+    flgAllScan:true,
+  },
+
     /**
-      * @desc : 打开商品
-      * @author : 于继渤
-      * @date : 2022/5/26 12:16
-      */
-    openChoosedItemInfo(e) {
-      let item = e.currentTarget.dataset.item
-      let index = e.currentTarget.dataset.index
-      this.setData({
-        usedLocation: item.usedLocation,
-        ProductIndex: index,
-        currentChoosedItem: item,
-        showEditProduct: true,
-        EditProduct_priceSale_temp: item.itemAmount
-      })
-  
-      //非标淋浴房
-      if ((item.flgNonStandardType == 1 || item.flgNonStandardType == 2) || (item.nonGlassList && item.nonGlassList.length > 0)) {
-        // item.nonStandardList = []
-        //加载默认spu非标参数数据
-        let copyItem = util.copyObj(item)
-        this.getFlgNonStandardList(copyItem)
-        this.setData({
-          show7: true
+  * @desc : 扫码入库/入库回退
+  * @author : 常皓宁
+  * @date : 2023/9/5 8:44
+  */
+  deal(){
+    let data = this.data.item
+    Dialog.confirm({
+      message: '确认要进行该操作吗？',
+    }).then(() => {
+      let param ={
+        cpId: app.globalData.user.cpId,
+        entryId: data.entryId,
+        remarks:this.data.form.remarks,
+        entryWhId:this.data.form.whId,
+        annexPaths:this.data.annexPaths ? this.data.annexPaths : [],
+        fileList:this.data.fileList ? this.data.fileList : [],
+        orderId:data.orderId,
+      }
+      if(data.entryStatus == 3){
+        //已入库入库回退
+        api.request(Constants.ORDER_ENTRY_API + 'complete_revocation_entry', 'POST', param).then(res => {
+          if(res.data.code == 200){
+            wx.showToast({
+              title: '提交成功',
+              image: '/static/image/success.png',
+              duration: 1000
+            })
+              wx.navigateBack({
+                    delta: 1
+              })
+              var pages = getCurrentPages();
+              var prevPage = pages[pages.length - 2];
+              prevPage.setData({
+                  entryFlag: true
+              })
+          }
         })
-  
-        //  this.getSkuBySpuId(copyItem.spuId)
-        this.setData({
-          show6: true
+      }else {
+        //扫码入库TODO
+        wx.navigateTo({
+          url: '/package7/pages/scan-show-purchase-entry/scan-show-purchase-entry?item=' + encodeURIComponent(JSON.stringify(this.data.item)) + '&sourcePage=scan-Warehousing-processing',
         })
-      } else {
+        
+    }
+    }).catch(() => {
+    });
+  },
+  /**
+  * @desc : 入库办理/小编辑保存
+  * @author : 常皓宁
+  * @date : 2023/9/5 8:44
+  */
+  submit(){
+    let data = this.data.item
+    Dialog.confirm({
+      message: '确认要进行该操作吗？',
+    }).then(() => {
+      let param ={
+        cpId: app.globalData.user.cpId,
+        entryId: data.entryId,
+        remarks:this.data.form.remarks,
+        entryWhId:this.data.form.whId,
+        annexPaths:this.data.annexPaths ? this.data.annexPaths : [],
+        fileList:this.data.fileList ? this.data.fileList : [],
+        orderId:data.orderId,
+      }
+      //已入库小编辑
+      if(data.entryStatus == 3){
+        param.smallEdit = true
+        api.request(Constants.ORDER_ENTRY_API + 'purcase_entry_completed', 'POST', param).then(res => {
+          if(res.data.code == 200){
+            wx.showToast({
+              title: '提交成功',
+              image: '/static/image/success.png',
+              duration: 1000
+            })
+              wx.navigateBack({
+                    delta: 1
+              })
+              var pages = getCurrentPages();
+              var prevPage = pages[pages.length - 2];
+              prevPage.setData({
+                  entryFlag: true
+              })
+          }
+        })
+      }else {
+        //待入库入库办理
+        param.smallEdit = false
+        api.request(Constants.ORDER_ENTRY_API + 'purcase_entry_completed', 'POST', param).then(res => {
+          if(res.data.code == 200){
+            wx.showToast({
+              title: '提交成功',
+              image: '/static/image/success.png',
+              duration: 1000
+            })
+              wx.navigateBack({
+                    delta: 1
+              })
+              var pages = getCurrentPages();
+              var prevPage = pages[pages.length - 2];
+              prevPage.setData({
+                  entryFlag: true
+              })
+          }
+        })
+    }
+    }).catch(() => {
+    });
+  },
+    /**
+   * @desc : 组件单选下拉打开事件
+   * @author : 于继渤
+   * @date : 2022/5/26 17:16
+   */
+  openSingle(e) {
+    if(this.data.item.entryStatus != 3){
+      let type = e.currentTarget.dataset.type
+      if (type === 'whName') {
         this.setData({
-          show6: false,
-          show7: false
+          whFlag: true
         })
       }
-      //    this.getSelectStock(item)
-    },
-    /**
-  * @desc : 编辑商品关闭编辑备注事件
-  * @author : 于继渤
-  * @date : 2022/5/26 12:16
-  */
-    closeChoosedItemInfo() {
+    }
+  },
+   /**
+ * @desc : 下拉多选确定
+ * @author : 于继渤
+ * @date : 2022/5/26 12:16
+ */
+mutiSearch(e) {
+  let id = e.target.id
+  let form = this.data.form
+  if (id === 'warehouseTotal') {
+    form.whId = e.detail.id
+    form.whName = e.detail.name
+    this.setData({
+      whFlag: false,
+      form: form
+    })
+  }
+},
+  /**
+ * @desc : 下拉多选关闭
+ * @author : 于继渤
+ * @date : 2022/5/26 12:16
+ */
+muticlose(e) {
+  let id = e.currentTarget.id
+  if (id === 'entryWarehouse') {
+    this.setData({
+      whFlag: false
+    })
+  }
+},
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) { 
+    //敏感信息控制
+    
+    if (options.item) {
+      let item = JSON.parse(decodeURIComponent(options.item))
       this.setData({
-        showEditProduct: false
+        form: {
+          whId: item.entryWhId, //默认仓库ID
+          whName: item.whName, //默认仓库名称
+        }
       })
-    },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-      if (options.orderType == 'edit') {
+      let param = { 
+        entryId: item.entryId,
+      }
+
+
+      let fileList = []
+      let annexPaths = []
+      let goodsList =  [
+        {
+          "bomSkuId": null,
+          "brandName": "恒洁卫浴",
+          "canRejectQuantity": null,
+          "consignee": null,
+          "consigneePhone": null,
+          "contactName": null,
+          "contactPhones": null,
+          "cpId": 20826,
+          "customerId": null,
+          "entryAmount": 12000,
+          "entryDate": '2023-12-28',
+          "entryGoingAmount": 12000,
+          "entryGoingQuantity": 6,
+          "entryId": 1678,
+          "entryItemId": null,
+          "entryKindName": null,
+          "entryNo": null,
+          "entryQuantity": 6,
+          "entryStatus": 3,
+          "erpOutItemId": 1435402,
+          "erpOutNo": "CWSAH2123122800001",
+          "flgNonStandardType": null,
+          "flgScanCode": 0,
+          "flgValid": true,
+          "iconPath": null,
+          "iconThumPath": null,
+          "inOutDate": null,
+          "inOutStatus": null,
+          "invoiceDate": null,
+          "itemId": 3601,
+          "itemRemarks": null,
+          "ivtId": 209,
+          "ivtQty": null,
+          "makingTime": null,
+          "makingUserName": null,
+          "nonStandardArea": 1,
+          "nonStandardCode": "-",
+          "opCreateTime": "2023-12-28 09:36:22",
+          "opCreateUserId": 254,
+          "opUpdateTime": "2024-01-05 09:44:20",
+          "opUpdateUserId": 998,
+          "orderAmount": 12000,
+          "orderId": 11502,
+          "orderItemId": 34959,
+          "orderNo": null,
+          "orderPriceSale": 2000,
+          "orderQuantity": 6,
+          "originalDocumentNo": "PA-LWYD-665-202312280RBY",
+          "originalDocumentType": "采购订单",
+          "outGoingQty": null,
+          "outId": null,
+          "outItemId": null,
+          "pathType": 2,
+          "procureOrderNo": "PA-LWYD-665-202312280RBY",
+          "refCostAmt": null,
+          "refCostPrice": null,
+          "rejectAmount": -10000,
+          "rejectId": null,
+          "rejectItemId": null,
+          "rejectQuantity": -5,
+          "remarks": null,
+          "sale1ErpOutDoneNo": "CWIDH2123122800002",
+          "sale1OutItemId": 5998,
+          "sale2Name": null,
+          "sentryId": null,
+          "sentryItemId": null,
+          "skuCode": "EE920A00200B01",
+          "skuId": 9537580,
+          "skuModel": "HE920",
+          "skuName": "【已淘汰】智能盖板HE920",
+          "skuType": 0,
+          "skuTypeName": "智能马桶\\智能盖板",
+          "skuVolume": null,
+          "skuWeight": null,
+          "specsList": null,
+          "statusName": null,
+          "sumAmount": null,
+          "sumQuantity": null,
+          "sumRejectGoodsAmount": null,
+          "supplierName": null,
+          "takeOverAddress": null,
+          "totalRemarks": null,
+          "usableQty": null,
+          "whCode": null,
+          "whId": 610,
+          "whName": "武夷山1"
+        }
+      ]
+      
+      this.setData({
+        item:item,
+        activeNames: ['1'],
+        fileList:fileList,
+        annexPaths:item.annexPaths,
+        goodsList:goodsList,
+      })
+
+      api.request(Constants.ORDER_ENTRY_API + 'get_order_entry_item', 'POST', param).then(res => {
         this.setData({
-          orderType: 'edit'
+          loading: false
         })
-        wx.setNavigationBarTitle({
-          title: '编辑暂存采购订单',
+        if (res.data.code === 200) {
+         let tgoodsList = this.data.goodsList
+         tgoodsList = res.data.data.list
+         let numQuantity = 0
+         let numAmount = 0
+         tgoodsList.forEach(res =>{
+           let entryStatus = res.entryStatus
+           if(entryStatus == 3){
+            numQuantity += res.entryQuantity
+            numAmount += res.entryAmount
+           } else {
+            numQuantity += res.entryGoingQuantity
+            numAmount += res.entryGoingAmount
+           }
+         })
+         item.tSumQuantity = numQuantity
+         item.tSumAmount = numAmount
+         let fileList = []
+        if (item.annexPaths && item.annexPaths.length > 0) {
+          item.annexPaths.forEach(item => {
+            fileList.push({
+              url:  item.url,
+              FilePath: item.url,
+              deletable: true
+            })
+          })
+        }else{
+          item.annexPaths = []
+        }
+         this.setData({
+          item:item,
+          activeNames: ['1'],
+          fileList:fileList,
+          annexPaths:item.annexPaths,
+          goodsList:tgoodsList,
         })
-      }
+        }
+      })
+    
+    }
+  },
+  onChange(event) {
+    this.setData({
+      activeNames: event.detail,
+    });
+  },
+  //展开
+  collapseFlagChange(e) {
+    console.log(e.currentTarget.dataset.index)
+
+    this.setData({
+      collapseFlag: !this.data.collapseFlag
+    })
+  },
+  onClickScan(e){
+    let barList = this.data.barList
+    barList[e.currentTarget.dataset.index].checked = !barList[e.currentTarget.dataset.index].checked
+    this.setData({
+      barList: barList
+    })
+  },
+  openSacn(){
+    if(this.data.flgAllScan){
+      let barList = this.data.barList
       this.setData({
-        totallength: 15999,
-        form: {
-          categoryQuantity: 1,
-          sumQuantity: 2,
-          sumAmount: 15999,
-          remarks: '尽快送货',
-          customerForm: {
-            contactPhone: '156 5678 5643',
-            contactName: '王暖暖',
-            address: '北京市朝阳区和平西桥和平西苑20号楼一单元502室',
-            deliveryTime: '2022-05-22'
-          }
-        },
-        entryWh: {
-          entryWhName: '分销运营总仓'
-        },
-        goodsList: [
-          {
-            iconThumPath: 'https://hegii-hap.oss-cn-shenzhen.aliyuncs.com/haip/2022-08-31/95ce630a562b418d8c7b806faa1a6895.jpeg?Expires=1706080258&OSSAccessKeyId=LTAI5tDd2DXPjsSr4ta5fGp3&Signature=3%2F0%2FZkWt0NPaCxmvzC3enCYDWa4%3D',
-            titleTag: '恒洁卫浴',
-            title: 'HE900A 智能',
-            desc: 'HE900A 智能一体机盖板',
-            priceSale: 10000,
-            entryWhName: '分销运营仓',
-            itemQuantity: 1,
-          },
-          {
-            iconThumPath: 'https://hegii-hap.oss-cn-shenzhen.aliyuncs.com/haip/2022-08-31/95ce630a562b418d8c7b806faa1a6895.jpeg?Expires=1706080258&OSSAccessKeyId=LTAI5tDd2DXPjsSr4ta5fGp3&Signature=3%2F0%2FZkWt0NPaCxmvzC3enCYDWa4%3D',
-            titleTag: '恒洁卫浴',
-            title: 'HE900A 智能',
-            desc: 'HE900A 智能一体机盖板',
-            priceSale: 5999,
-            entryWhName: '分销运营仓',
-            itemQuantity: 1,
-          }]
+        sacnFlag: true,
+        barList:barList
       })
-    },
-  
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-  
-    },
-  
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-  
-    },
-  
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-  
-    },
-  
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-  
-    },
-  
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-  
-    },
-  
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-  
-    },
-  
+    }
+    // 补码
+    else {
+      //入库补码
+      let entryId = this.data.item.entryId
+      wx.navigateTo({
+        url: '/package7/pages/scan-show-purchase-complement/scan-show-purchase-complement?entryId=' + entryId,
+      })
+    }
+  },
+  closeChoosedItemInfo_scan(){
+    this.setData({
+      sacnFlag: false
+    })
+  },
+
     /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-  
+   * 输入框 文字改变监听事件
+   */
+  fieldChange(e) {
+    let form = this.data.form
+    let type = e.currentTarget.dataset.type
+
+    if (type === "remarks") {
+      form.remarks = e.detail
     }
-  })
+    this.setData({
+      form: form
+    })
+  },
+      /**
+   * @desc : 订单上传附件方法
+   * @author : 于继渤
+   * @date : 2022/6/02 16:16
+   */
+  afterRead(event) {
+    const _this = this;
+    const {
+        file
+    } = event.detail;
+    let annexPaths = _this.data.annexPaths
+    let arr = _this.data.fileList;
+    file.forEach(res => {
+        // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+        wx.uploadFile({
+            url: `${config.server_add}:${config.server_port}` + '/basic-server/file/upload',
+            filePath: res.path,
+            name: 'file',
+            formData: {
+                'folder': 't_order_enrty/annex_paths'
+            },
+            header: {
+                'Authorization': 'Bearer ' + app.globalData.token
+            },
+            success(res) {
+                let data = JSON.parse(res.data)
+                if (data.code === 200) {
+
+                    arr.push({
+                        url: data.data.absolutelyPath,
+                        FilePath: data.data.relativePath,
+                        deletable: true
+                    })
+                    let file = data.data.relativePath.split('/')
+                    annexPaths.push({
+                        url: data.data.absolutelyPath,
+                        type: 'image',
+                        docType:'采购入库',
+                        name: file[file.length - 1],
+                        createTime: util.formatDataTime(new Date())
+                    })
+                    _this.setData({
+                        fileList: arr,
+                        annexPaths: annexPaths
+                    })
+                }
+            },
+        })
+    })
+
+},
+
+    /**
+   * @desc : 删除图片
+   * @author : 于继渤
+   * @date : 2022/5/31 18:16
+   */
+  deleteImg(e) {
+    let index = e.detail.index;
+    let arr = this.data.annexPaths;
+    arr.splice(index, 1);
+    this.setData({
+      fileList: arr,
+      annexPaths:arr
+    })
+  },
+})

package-inventory/pages/warehousing-processing/add/add.json

@@ -1,4 +1,4 @@
 {
     "usingComponents": {},
     "navigationBarTitleText": "采购入库"
-}
+  }

package-inventory/pages/warehousing-processing/add/add.wxml

@@ -1,603 +1,305 @@
+<!-- 前台导入wxmlUtil.wxs -->
 <wxs src='../../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <wxs src='../../../../utils/numberFormat.wxs' module="numberFormat"></wxs>
-<wxs module="txtIndexOf">
-  function toIndexOf(value, value2) {
-    return value.indexOf(value2)
-  }
-</wxs>
 <van-dialog id="van-dialog" />
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
-<view style="margin-bottom: 15rpx;"></view>
-<view class="dk-card-outer-class">
-  <van-collapse value="{{ activeNames }}" bind:change="onChangeCollapse" custom-class="dk-collapse">
-    <van-collapse-item name="1">
-      <view slot="title" style="display: flex;">
-        <view class="dk-collapse-item" style="width: 30%;">收货信息</view>
-        <view wx:if="{{activeNames.length  == 0}}" style="width: 70%;">{{(form.customerForm.contactName ? form.customerForm.contactName : '') + ( form.customerForm.contactPhone ? '/' +form.customerForm.contactPhone : '')}}</view>
-      </view>
 
 
-      <view catchtap="changeContact">
-        <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="contactPhone" maxlength="50" value="{{ form.customerForm.contactName }}" input-align="right" label="收货人" placeholder="请输入收货人" autosize border="{{ false }}" readonly="{{true}}">
-        </van-field>
-        <!--收货电话-->
-        <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="contactPhone" maxlength="50" value="{{ form.customerForm.contactPhone }}" input-align="right" label="收货电话" placeholder="请输入收货电话" autosize border="{{ false }}" readonly="{{true}}" bind:change="changeCustomerFormField">
-        </van-field>
-        <!--收货地址-->
-        <van-field input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" data-key="address" maxlength="1000" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.customerForm.address) }}" label="收货地址" placeholder="请选择收货地址" autosize border="{{ false }}" color="#95A8CB" data-type='address' readonly="{{true}}">
-        </van-field>
+<!-- 蓝色信息相关 -->
+<view style="margin: 0px 34rpx 26rpx 34rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
+  <view style="flex-direction: column;justify-content: center;align-items: flex-start;background: linear-gradient(90.12deg, #718AC6 0.84%, #4A5E98 99.43%);border-radius: 15rpx;">
+    <!-- 供应商 -->
+    <view style="display: flex;padding-right: 32rpx;">
 
+      <view style="padding-left: 32rpx;padding-top: 19rpx;width: 39rpx;">
+        <view catchtap="toCustomer" style="width: 39rpx;height: 39rpx;background-color: #95A8CB;border-radius:50%;">
+          <view style="width: 39rpx; height: 39rpx;text-align: center;">
+            <van-image round width="20rpx" height="24rpx" src="/static/img/Vector.png" />
+          </view>
+        </view>
+      </view>
+      <view style="padding-left: 14rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
+        {{item.supplierName}}
       </view>
-      <van-field input-width="200rpx" input-align="left" label-class="nomal-label" input-class="dk-cell-value-class" value="{{ entryWh.entryWhName ? entryWh.entryWhName: '' }}" is-link border="{{ false }}" label="收货仓库" placeholder="请选择收货仓库" data-key="deliveryTime" catchtap="onClickDelivery" color="#95A8CB" readonly="{{true}}"></van-field>
-
-      <van-field input-width="200rpx" input-align="left" label-class="nomal-label" input-class="dk-cell-value-class" value="{{ form.customerForm.deliveryTime ? wxmlUtil.format(form.customerForm.deliveryTime) : '' }}" is-link border="{{ false }}" label="收货日期" placeholder="请选择收货日期" data-key="deliveryTime" catchtap="onClickDeliveryTime" color="#95A8CB" readonly="{{true}}"></van-field>
-
-
 
-    </van-collapse-item>
-  </van-collapse>
-</view>
+    </view>
+    <!-- 收货人 -->
+    <view style="display: flex;padding-right: 32rpx;">
 
+      <view style="padding-left: 32rpx;padding-top: 19rpx;width: 39rpx;">
+        <view catchtap="toCustomer" style="width: 39rpx;height: 39rpx;background-color: #95A8CB;border-radius:50%;">
+          <view style="width: 39rpx; height: 39rpx;text-align: center;">
+            <van-image round width="20rpx" height="24rpx" src="/static/img/Vector.png" />
+          </view>
+        </view>
+      </view>
+      <view style="padding-left: 14rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
+        {{item.contactName}}
+      </view>
 
+      <view style="padding-left: 22rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
+        {{item.contactPhones}}
+      </view>
 
 
-<!--选商品-->
-<view>
-  <view style="display:flex;height: 102rpx;margin: 40rpx 34rpx 10px 34rpx;">
-    <view class="choose-goods" bindtap="toChooseGoods">
-      <view class="choose-goods-image">
-        <van-image width="32rpx" height="34rpx" src="/static/img/choose-goods.png" />
+    </view>
+    <!-- 地址 -->
+    <view style="display: flex;padding-right: 32rpx;">
+      <view style="padding-left: 32rpx;padding-top: 15rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
+        {{ wxmlUtil.addressToIndexOf(item.addressFull)}}
       </view>
-      <view class="choose-goods-text">选商品</view>
     </view>
-    <view style="width: 22rpx;"></view>
-    <view class="scan-goods" bindtap="chooseSaleOrders">
-      <view class="choose-goods-image">
-        <van-image width="32rpx" height="34rpx" src="/static/img/scan-code.png" />
+    <!-- 日期 -->
+    <view style="display: flex;padding-left: 32rpx;padding-top: 16rpx;padding-bottom: 15rpx;padding-right: 32rpx;">
+      <view style="display: flex; width: 50%;line-height: 36rpx;" data-type='deliveryType'>
+        <view style="font-size: 24rpx;line-height: 36rpx;color: #FFFFFF;">
+          发货日期：{{ item.sale1OutDate }}
+        </view>
+      </view>
+      <view style="display: flex; width: 50%;line-height: 36rpx;" data-key="DeliveryFlag" catchtap="openData">
+        <view style="font-size: 24rpx;line-height: 36rpx;color: #FFFFFF;">
+          入库日期：{{ item.entryDate?item.entryDate:'' }}
+        </view>
       </view>
-      <view class="choose-goods-text">选订单</view>
     </view>
   </view>
 </view>
 
-<!--商品明细-->
-<view style="margin: 48rpx 32rpx 10px 32rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
-  <view style="  background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 15rpx;">
-    <view class="content-goods-info">商品明细</view>
+<!-- 收货仓库 -->
+<view style="margin: 26rpx 34rpx 26rpx 34rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;padding:10rpx;background-color: white;">
+     <!--收货仓库-->
+     <van-field input-width="200rpx" input-class="dk-cell-value-class"  label-class="red-label" input-align="left" data-key="gender" maxlength="25" type="text" value="{{ item.whName }}" label="收货仓库：" placeholder="请选择收货仓库" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" data-type='whName' catchtap="openSingle" readonly="{{true}}">
+    </van-field>
+  <!-- <van-cell title-width="160rpx" value-class="dk-value" title-class="dk-title" is-link title="收货仓库：" border="{{false}}" value="{{item.whName}}" type="whName" catchtap="openSingle"/> -->
+</view>
+
+
+<!-- 商品信息 -->
+<view style="margin: 26rpx 34rpx 26rpx 34rpx;box-shadow:2px 2px 5px #e5e5e6;">
+  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 15rpx 15rpx 0rpx 0rpx;">
+    <view style="padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 32rpx;display: flex;">
+      <view style="width: 50%;font-weight: bold;display: flex;"> 
+      <view>商品明细</view>
+      <view   class="goods-detail-title" style="{{item.entryStatus != 3 ? 'color:#E4002B;':''}}">{{(item.entryStatus == 3?'(已入库)':'(待入库)')}}</view>
+      </view>
+      <view style="width: 50%;font-size: 26rpx;display: flex; justify-content: flex-end;">
+        <view style="display: flex;justify-content: right;align-items: center;" wx:if="{{item.entryStatus == 3}}">
+          <view style="display: flex;" catchtap="openSacn">
+            <van-image width="32rpx" height="32rpx" src="/static/img/scan-code-p.png" />
+            <view style="padding-left: 10rpx;">{{flgAllScan?'查看条码':'添加条码'}}</view>
+          </view>
+        </view>
+
+
+      </view>
+
+    </view>
     <van-cell wx:if="{{goodsList.length==0}}" border="{{ false }}" style="border-radius: 15rpx;">
-      <van-empty description="暂未选择商品" />
+      <van-empty description="暂无明细" />
     </van-cell>
-    <view wx:for="{{goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" border="{{ false }}">
-      <van-swipe-cell right-width="{{ 65 }}" data-index="{{index}}" async-close bind:close="onCloseDel">
-        <van-card>
-          <view slot="thumb" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo">
-            <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+    <view wx:for="{{goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" border="{{ true }}">
+      <van-card wx:if="{{index < 2  || collapseFlag}}" data-item="{{item}}" data-index="{{index}}">
+        <view slot="thumb">
+          <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+        </view>
+        <view slot="title" style="display: flex;">
+          <!-- 标题 -->
+          <view style="display: flex;">
+            <dk-title titleTag="{{item.brandName}}" title="{{item.skuName}}"></dk-title>
           </view>
-          <view slot="title" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo" style="display: flex;">
-            <view style="display: flex;">
-              <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
-            </view>
-            <view wx:if="{{item.skuSpecsFlag }}" style="text-align: right;width: 30%;">
-              <dk-van-tag radius="10rpx" roundFlag="{{true}}" value="需设计" color="red"></dk-van-tag>
-            </view>
+
+        </view>
+        <!-- 描述 -->
+        <view slot="desc">
+          <view style="display:flex;width: 100%;">
+            <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+          </view>
+          <view wx:if="{{item.nonGlassListShow}}" style="padding-top: 15rpx; padding-bottom: 15rpx; width: 100%;">
+            <dk-text fontWeight="nomal" value="{{item.nonGlassListShow}}"></dk-text>
           </view>
-          <view slot="desc" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo">
-            <view style="display:flex;width: 100%;">
-              <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+
+        </view>
+        <view slot="price">
+          <view style="display: flex;width: 100%;flex-direction: row; ">
+            <view style="width: 100%;">
+              <dk-cell wx:if="{{purchasePriceFlag}}" contentFontSize="16" height="45rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{item.entryStatus == 3? item.entryAmount : item.entryGoingAmount}}"></dk-cell>
             </view>
-            <view wx:if="{{item.nonGlassListShow}}" style="padding-top: 15rpx; padding-bottom: 15rpx; width: 100%;">
-              <dk-text fontWeight="nomal" value="{{item.nonGlassListShow}}"></dk-text>
+            <view style="width: 100%;text-align: right;font-size:24rpx;color: #95A8CB;line-height: 34rpx;">
+            x {{item.entryStatus == 3? item.entryQuantity : item.entryGoingQuantity}}{{item.nonStandardArea ? (' * ' + item.nonStandardArea + 'm²'): ''}}
             </view>
           </view>
-          <view slot="tag" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo">
-            <dk-text fontWeight="nomal" value="{{item.nonGlassListShow}}"></dk-text>
-          </view>
-          <view slot="price">
-            <view style="display: flex;width: 100%;justify-content: center;align-items: center;">
-              <view style="width: 60%;">
-                <dk-cell  contentFontSize="16" height="25rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{ item.priceSale}}"></dk-cell>
+        </view>
+
+        <!-- 底部明细 -->
+        <view slot="footer">
+          <view style="margin-top: 15rpx;" wx:if="{{item.goodsSkuList.length > 0  || item.combinedList.length > 0}}">
+            <view style="width: 100%;display: flex;">
+              <view style="font-size:12px;color: #95A8CB;width: 50%;text-align: left;">
+                明细
               </view>
-              <view style="width: 40%;text-align: right;">
-                <van-stepper integer="{{true}}" value="{{item.itemQuantity}}" data-index="{{index}}" min="0" max="999999999" bind:change="changeItemQuantity" />
+              <view style="font-size:12px;color: #95A8CB;width: 50%;text-align: right;" data-item="{{item}}" data-index="{{index}}" catchtap="onChangeOpenGoodsList">
+                {{item.packageDetailsFlag ? '收起' :'展开'}}
+                <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
               </view>
             </view>
-          </view>
-          <view slot="footer">
-            <view style="margin-top:19rpx;margin-bottom:19rpx;" wx:if="{{item.goodsSkuList.length > 0  || item.combinedList.length > 0}}">
-              <view style="width: 100%;display: flex;font-size:12px;color: #95A8CB;">
-                <view style="width: 50%;text-align: left;">
-                  明细
-                </view>
-                <view style="width: 50%;text-align: right;" data-item="{{item}}" data-index="{{index}}" catchtap="onChangeOpenGoodsList">
-                  {{item.packageDetailsFlag ? '收起' :'展开'}}
-                  <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
-                </view>
-              </view>
-              <!--子件-->
-              <view class="goods-class" wx:if="{{item.packageDetailsFlag}}">
-                <view wx:for="{{item.goodsSkuList}}" data-item="{{item2}}" wx:for-index="index2" wx:for-item="item2" wx:key="index2">
-                  <view class="goods-item-class" wx:if="{{item2.hasChild == 0}}">
-                    <view>
-                      <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item2.iconThumPath}}" />
-                    </view>
-                    <view class="goods-item-tag">
-                      <view style="display: flex;justify-content: space-between;">
-                        <view class="{{((item2.replaceableSku && item2.replaceableSku.length > 0) || item2.cpFlgGift) ?'goods-item-title-replace':''}}">
-                          <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel ? item2.skuModel : item2.skuCode}}"></dk-title>
-                        </view>
-                        <view wx:if="{{item2.replaceableSku && item2.replaceableSku.length > 0}}">
-                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" bind:tap="flag_bindtap" value="替换" color="red"></dk-van-tag>
-                        </view>
-
-                        <view style="padding-left: 3rpx;" wx:if="{{item2.promotionType != 2}}">
-                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" dataItemIndex="{{index}}" dataItemIndex2="{{index2}}" bind:tap="deleteItem" value="删除" color="red"></dk-van-tag>
-                        </view>
-                      </view>
-                      <view style="width: 100%;display: flex;">
-                        <dk-text fontWeight="normal" value="{{item2.skuName}}"></dk-text>
-                      </view>
 
-                      <view style="padding-top: 8rpx; display: flex;">
-                        <view wx:if="{{item2.cpFlgGift}}">
-                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" dataItemIndex="{{index}}" dataItemIndex2="{{index2}}" bind:tap="cpFlgGift_bindtap" value="赠品" color="#1B365D"></dk-van-tag>
-                        </view>
-                        <view wx:if="{{item2.flgAllowSpecsUndefine}}" style="padding-left: 8rpx;">
-                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" dataItemIndex="{{index}}" dataItemIndex2="{{index2}}" bind:tap="flgAllowSpecsUndefine_bindtap" value="坑距" color="#1B365D"></dk-van-tag>
-                        </view>
+            <!--子件-->
+            <view class="goods-class" wx:if="{{item.packageDetailsFlag}}">
+              <view wx:for="{{item.goodsSkuList}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
+                <view class="goods-item-class" wx:if="{{item2.hasChild == 0}}">
+                  <view>
+                    <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item2.iconThumPath }}" />
+                  </view>
+                  <view class="goods-item-tag">
+                    <view style="display: flex;">
+                      <view class="{{(item2.replaceableSku && item2.replaceableSku.length > 0)?'goods-item-title-replace':''}}">
+                        <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
                       </view>
 
-                      <!--子级明细价格-->
-                      <view style="display: flex;width: 100%;flex-direction: row;">
-                        <view style="width: 90%;">
-                          <dk-cell   contentFontSize="12" height="45rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{ item2.priceSale}}"></dk-cell>
-                        </view>
-                        <view style="width: 10%">
-                          <dk-text fontWeight="nomal" color="#95A8CB" value="x {{item2.itemQuantity }}"></dk-text>
-                        </view>
+                    </view>
+                    <view style="width: 100%;display: flex;">
+                      <dk-text fontWeight="normal" value="{{item2.skuName}}"></dk-text>
+                    </view>
+                    <!--子级明细价格-->
+                    <view style="display: flex;width: 100%;flex-direction: row;">
+                      <view style="width: 90%;">
+                        <dk-cell contentFontSize="12" height="45rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{ item2.priceSale}}"></dk-cell>
                       </view>
+                      <view style="width: 10%">
+                        <dk-text fontWeight="nomal" color="#95A8CB" value="x {{item2.tItemQuantity }}"></dk-text>
+                      </view>
+
                     </view>
                   </view>
                 </view>
               </view>
             </view>
+          </view>
+          <view class="hr"></view>
 
-            <view style="display: flex;width: 100%;margin-top:5px;align-items: center;" data-index="{{index}}" catchtap="openRemark">
-              <view style="width: 100%;text-align: left;font-size:24rpx;color: #95A8CB;">
-                <van-image width="19rpx" height="20rpx" src="/static/img/remerk-edit.png" />
-                备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : '请输入内容'}}</span>
-              </view>
+          <view style="display: flex;width: 100%;align-items: center;height: 60rpx;" data-index="{{index}}" catchtap="openRemark">
+            <view style="width: 100%;text-align: left;font-size: 14px;color: #95A8CB;">
+              备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
             </view>
-            <view class="divide-class"></view>
+
           </view>
-        </van-card>
-        <view slot="right">删除</view>
-      </van-swipe-cell>
-    </view>
+          <view class="divide-class"></view>
+        </view>
+      </van-card>
 
 
-    <!--合计金额-->
-    <view style="display:flex;padding-bottom:20rpx;">
-      <view style="width: 45%;">
-        <view style="padding-left: 30rpx;padding-top: 25rpx;">
-          <text class="dk-cell-title">{{form.categoryQuantity ? form.categoryQuantity : 0}}品类 共计{{form.sumQuantity ? form.sumQuantity : 0}}件</text>
-        </view>
-      </view>
 
-      <view style="width: 55%;">
-        <dk-cell  fontSize="16" fontWeight="bold" contentColor="#CAA977" titleColor="#1B365D;" title="合计金额" content="{{form.sumAmount}}"></dk-cell>
-      </view>
     </view>
-  </view>
-</view>
-<!-- 其他信息 -->
-<view style="margin: 10px 32rpx 10px 32rpx;margin-top: 41rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
-  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 0px 0px 15rpx 15rpx;">
-    <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 32rpx;">其他信息</view>
-    <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="remarks" maxlength="50" value="{{ form.remarks }}" input-align="right" label="备注" placeholder="请输入备注" autosize border="{{ false }}" bind:change="changeField">
-    </van-field>
 
-    <view style="display:flex;width:100%;margin: 1vw;padding-top:20rpx;">
-      <view style="width: 30%; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
-      <view style="width: 70%;text-align: left;">
-        <van-uploader max-count="5" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ fileList }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" />
+    <view catchtap="collapseFlagChange" data-index="{{index}}" wx:if="{{goodsList.length > 2}}" style="padding: 30rpx 32rpx 30rpx 32rpx;border-radius: 16rpx;color:#95A8CB;text-align: center;font-size: 26rpx;display: flex;justify-content: center;">
+      <view>{{!collapseFlag ? '展开查看更多' : '收起查看更多'}}</view>
+      <view style="padding-left: 10rpx;">
+        <van-icon name="{{!collapseFlag ? 'arrow-down':'arrow-up'}}" size="24rpx" />
       </view>
     </view>
 
-
-    <view style="height: 40rpx;"></view>
   </view>
 
 
-</view>
-
-<view style="height: 200rpx;"></view>
+  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius:0rpx 0rpx 15rpx 15rpx;">
 
-<!-- 编辑商品 -->
-<van-popup custom-class="dk-popup" show="{{ showEditProduct }}" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo">
-  <view style="position:relative; top:280rpx;z-index:  1;background-color: transparent; height: 44rpx;"></view>
-  <view class="special-topic">
-    <!-- 图片 -->
-    <view class="special-topic-content">
-      <van-image radius="15rpx" custom-class="goods-pop-image" fit="fill" src="{{ currentChoosedItem.iconThumPath }}"></van-image>
-    </view>
-    <view class="special-topic-title">
-      <!-- 标签 标题-->
-      <dk-title id="titleTagPop" titleTag="{{currentChoosedItem.titleTag}}" title="{{currentChoosedItem.title}}"></dk-title>
-      <view style="padding-top: 10rpx;">
-        <dk-text fontWeight="" value="{{currentChoosedItem.desc}}"> </dk-text>
-      </view>
-      <view style="display: flex;padding-top: 5rpx;">
-        <view wx:if="{{currentChoosedItem.promotionType != 0  }}" class="price-pop-class" style="display: flex;width: 100%;">
-          <view style="width: 90%;">
-            <dk-cell  height="46rpx" spaceWidth="1rpx" left="0" fontSize="12" contentColor="#CAA977" fontWeight="bold" title="批发价:" content="{{currentChoosedItem.pricePromotion}}"></dk-cell>
-          </view>
-        </view>
-        <view wx:else class="price-pop-class">
-          <dk-cell  height="46rpx" spaceWidth="0rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="批发价：" content="{{currentChoosedItem.priceStandard}}"></dk-cell>
-        </view>
 
-        <!-- 可换件 -->
-        <view style="text-align: right; width: 20%;">
-          <van-button style="border-radius: 5rpx;" data-item="{{currentChoosedItem}}" round wx:if="{{currentChoosedItem.replaceFlag}}" catchtap="flag_bindtap" size="mini" color="#E4002B" type="info">可换件</van-button>
+    <view style="display:flex;;margin-right: 24rpx;">
+      <view style="width: 50%;">
+        <view style="padding-left: 30rpx;padding-top: 25rpx;">
+          <text style="color: #95A8CB;font-size: 28rpx;">共计 {{item.tSumQuantity ? item.tSumQuantity :1}} 件</text>
         </view>
       </view>
-      <!--sku编码-->
-      <view class="selected-sku-text" wx:if="{{currentChoosedItem.skuName}}" style="padding-top: 6rpx !important;">
-        <dk-text catchtap="changeDisplayText" fontWeight="" fontSize="10px" value="已选：{{ currentChoosedItem.displayTextFlag?currentChoosedItem.skuCode:currentChoosedItem.skuName}}"> </dk-text>
-      </view>
-    </view>
-  </view>
 
-  <!--内容-->
-  <view class="pop-content-class">
-    <view style="display: flex;font-size: 28rpx;padding-left: 30rpx;">
-      <view style="color: #95A8CB;width: 40%;">代理商库存</view>
-      <view style="color: #95A8CB; width:30%;text-align: center;">库存量：{{selectStock.inventoryQuantity ? selectStock.inventoryQuantity : 0}}</view>
-      <view style="color: #95A8CB;width:30%;text-align: center;">可售量：{{selectStock.balanceQuantity ? selectStock.balanceQuantity : 0}}</view>
+      <view style="width: 50%;">
+        <dk-cell   fontSize="14" contentColor="#CAA977" titleColor="#1B365D;" contentRight="right" fontWeight="bold" title="合计金额" content="15,999.00"></dk-cell>
+      </view>
     </view>
 
-    <van-cell-group border="{{ false }}">
-      <view style="height:calc({{windowHeight+'px'}} - 976rpx);overflow-y: scroll;overflow-x: hidden;">
-        <!-- 非标参数选择 -->
-        <view wx:if="{{ show7}}">
-          <view wx:for="{{currentChoosedItem.nonStandardList}}" wx:key="index" date-item="{{item}}">
-            <view style="width: 30%;">
-              <dk-text wx:if="{{item.isScope == 0}}" fontSize="13px" value="{{item.fieldName}}"></dk-text>
-            </view>
-            <view class="tags" wx:if="{{item.isScope == 0}}">
-              <view class="tag-bom-item" wx:key="indext" wx:for="{{item.options}}" wx:for-index="indext" wx:for-item="itemt">
-                <van-button size="small" catchtap="nonStandardTap" data-pindex="{{index}}" custom-class="{{itemt.infotype=='info'?'button-selected-class':'button-class'}}" data-itemt="{{itemt}}" data-indext="{{indext}}">{{ itemt.name }}
-                </van-button>
-              </view>
-            </view>
-            <view wx:if="{{item.isScope == 1}}" style="display: flex; padding-bottom: 20rpx; padding-top: 10rpx;">
-              <view style="width: 50%;">
-                <dk-text fontSize="13px" value="{{item.fieldName}}"></dk-text>
-              </view>
-              <view style="width: 50%; text-align: right;font-size: 13px; ">
-                <input type="text" placeholder-class="placeholder-class" placeholder="{{'请输入'+item.fieldName}}" data-pindex="{{index}}" data-item="{{item}}" value="{{item.optionName}}" bindblur="bindBlurIsScopeOne" bindinput="bindInputIsScopeOne"></input>
-              </view>
-            </view>
-          </view>
-          <view wx:if="{{currentChoosedItem.flgNonStandardType == 1}}">
-            <view style="display: flex; padding-bottom: 20rpx; padding-top: 10rpx;">
-              <view style="width: 50%;">
-                <dk-text fontSize="13px" value="面积公式"></dk-text>
-              </view>
-              <view style="width: 50%; text-align: right;font-size: 13px; ">
-                <input type="text" placeholder-class="placeholder-class" data-pindex="{{index}}" disabled="{{true}}" data-item="{{item}}" value="{{currentChoosedItem.specialFormulaName}}" bindblur="bindBlurIsScopeOne" bindinput="bindInputIsScopeOne"></input>
-              </view>
-            </view>
-            <van-cell border="{{ false }}" title-width="410rpx" title-class="{{!currentChoosedItem.flgGift ? 'red-label' : ''}}" disabled="{{currentChoosedItem.flgGift}}">
-              <view slot="title">
-                面积
-              </view>
-              <view Cell Slot="value">
-                <dk-number-input sign="" formatThousandth="{{false}}" digits="{{6}}" center="right" data-key="nonStandardArea" inputValue="{{currentChoosedItem.nonStandardArea?currentChoosedItem.nonStandardArea:0}}" bind:triggerBindValue="bindBlurNonStantardArea"></dk-number-input>
-              </view>
-            </van-cell>
-
-          </view>
-        </view>
-
-        <van-cell wx:if="{{orderEdit_type == 2 && !orderEdit_type_apvResult}}" title="数量" title-class="red-label" value="{{currentChoosedItem.itemQuantity}}" border="{{ false }}">
-        </van-cell>
-        <!--数量-->
-        <van-cell wx:if="{{orderEdit_type != 2 || orderEdit_type_apvResult =='1'}}" title="数量" title-class="red-label" border="{{ false }}">
-          <van-stepper integer="{{true}}" value="{{currentChoosedItem.itemQuantity}}" data-index="{{index}}" min="0" max="999999999" bind:change="changeChooseItemQuantity" />
-        </van-cell>
-
-        <van-field wx:if="{{currentChoosedItem.flgNonStandardType == 1}}" label-class="nomal-label" input-class="dk-cell-value-pop-class" border="{{ false }}" label="非标备注" maxlength="100" bind:blur="changeStandardPrice1" bind:change="changeCurrentChoosedItemField" data-key="nonstandardRemarks" value="{{currentChoosedItem.nonstandardRemarks}}" input-align="right" placeholder="请输入非标备注" border="{{ false }}" readonly="{{true}}" />
-
-        <van-field input-width="200rpx" input-class="dk-cell-value-pop-class" label-class="nomal-label" input-align="left" data-key="warehouse" maxlength="100" type="text" value="{{ currentChoosedItem.entryWhId_Name ? currentChoosedItem.entryWhId_Name : currentChoosedItem.entryWhName}}" label="收货仓库" placeholder="请选择收货仓库" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" data-type='warehouse' catchtap="openSingle" readonly="{{true}}">
-        </van-field>
 
-        <view class="tags">
-          <view style="margin-left: 15px;margin-bottom: 10px;" wx:key="indext" wx:for="{{tags}}" wx:for-index="indext" wx:for-item="itemt">
-            <van-button size="mini" catchtap="clicktype" color="#989697" data-pindex="{{index}}" data-itemt="{{itemt}}" data-indext="{{indext}}" plain type="info">{{ itemt.usedLocation }}</van-button>
-          </view>
-        </view>
-        <!--备注-->
-        <van-field label-class="nomal-label" input-class="dk-cell-value-pop-class" label="备注" maxlength="1000" bind:change="changeCurrentChoosedItemField" data-key="remarks" value="{{currentChoosedItem.remarks}}" input-align="right" placeholder="请输入备注" border="{{ false }}" />
-        <!--赠品标识-->
-        <van-cell wx:if="{{currentChoosedItem.cpFlgGift}}" title-class="nomal-label" title="赠品标识" border="{{ false }}" value-class="value-class">
-          <van-checkbox shape="round" value="{{ currentChoosedItem.flgGift}}" data-index="{{index}}" data-key="flgGift" bind:change="changeAllReadyCheckBox" />
-        </van-cell>
-        <view style="height: 100rpx;"></view>
-      </view>
-      <view style="text-align: center;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" data-item="{{currentChoosedItem}}" size="small" bindtap="updateToChooseList">确定</van-button>
-      </view>
-    </van-cell-group>
   </view>
-</van-popup>
-
 
-<!-- 新建 -->
-<dk-save-bottom  wx:if="{{orderType === 'add'}}"  leftButtonFlag="true"  rightButtonFlag="{{true}}"  loading="{{loading}}" flagTypeName="purchase-orders-offer" totallength="{{numberFormat.toThousandCents(totallength)}}" item="{{item}}" bind:allClean="deal" bind:submit="submit"></dk-save-bottom>
+</view>
 
-<!-- 编辑 -->
-<dk-save-bottom  leftButtonFlag="{{true}}" rightButtonFlag="{{true}}" wx:if="{{orderType === 'edit'}}"  loading="{{loading}}" flagTypeName="purchase-orders-edit1" totallength="{{numberFormat.toThousandCents(totallength)}}" item="{{item}}" bind:allClean="deal" bind:submit="submit"></dk-save-bottom>
 
 
-<!--备注-->
-<van-popup show="{{ remarkFlag }}" style="z-index: 999;" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_remark">
-  <van-cell-group>
-    <van-cell border="{{ false }}">
-      <view style="display: flex;">
-        <view style="width:80%;font-size:16px;color:#34495e;text-align:left;">
-          备注修改
-        </view>
 
-        <view style="text-align: right; width:20%; ">
-        </view>
-      </view>
-    </van-cell>
-    <van-divider />
 
-    <van-field rows="5" autosize label="备注" value="{{goodsList[remarksIndex].remarks}}" type="textarea" maxlength="1000" placeholder="请输入备注" data-item="{{goodsList[remarksIndex].remarks}}" data-key="remarks" input-class="input-class" bind:change="changeRemarksField" border="{{ false }}" />
 
-    <view style="height: 450rpx;"></view>
 
-    <view style="text-align: center;">
-      <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" size="small" bindtap="updateToChooseList_remark">确定</van-button>
-    </view>
-    <view style="height: 40rpx;"></view>
-  </van-cell-group>
-</van-popup>
+<!-- 其他信息 -->
+<view style="margin: 10px 32rpx 10px 32rpx;margin-top: 41rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
+  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius:15rpx;">
+    <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 32rpx;">其他信息</view>
 
-<!--联系电话-->
-<van-popup show="{{ telephoneFlag }}" style="z-index: 999;" round="{{true}}" position="bottom" bind:close="closeCustomerPhonePop">
-  <van-cell-group>
-    <van-cell border="{{ false }}">
-      <view style="display: flex;">
-        <view style="width:80%;font-size:16px;;color:#34495e;text-align:left;">
-          联系电话修改
-        </view>
-        <view style="text-align: right; width:20%; ">
-        </view>
-      </view>
-    </van-cell>
-    <van-divider />
-    <dk-number-phone-input dataKey="customerPhone" value="{{form.customerForm.customerPhone}}" bind:changeField="changeCustomerPhonePop"></dk-number-phone-input>
-    <view style="color:blue;font-size: 14px;padding-left: 30rpx;">注意：仅修改当前客户的联系电话</view>
-    <view style="height: 550rpx;"></view>
-    <view style="text-align: center;">
-      <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" size="small" bindtap="updateCustomerPhone">确定</van-button>
-    </view>
-    <view style="height: 40rpx;"></view>
-  </van-cell-group>
-</van-popup>
+          <!--备注-->
+          <van-field input-width="200rpx" 
+         input-class="dk-cell-value-class" 
+         input-align="left" label-class="nomal-label"
+          data-key="remarks" maxlength="1000" type="textarea" 
+          value="{{ item.remarks }}" input-align="left" 
+          label="备注" placeholder="请输入备注" autosize
+           border="{{ false }}" bind:change="fieldChange" data-type='remarks'>
+        </van-field>
 
-<!-- 可换件-->
-<dk-replace-sku model:show="{{replaceShow}}" value="{{replaceObj}}" bind:replace="replaceItem" bind:closePop="replaceItemClose">
-</dk-replace-sku>
-
-<!-- 赠品标价 -->
-<van-popup custom-class="dk-popup" show="{{ cpFlgGiftFlag }}" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_cpFlgGift">
-  <view style="position:relative; top:280rpx;z-index:  1;background-color: transparent; height: 44rpx;"></view>
-  <view class="special-topic">
-    <!-- 图片 -->
-    <view class="special-topic-content">
-      <van-image radius="15rpx" custom-class="goods-pop-image" fit="fill" src="{{ currentSkuChoosedItem.iconThumPath }}"></van-image>
-    </view>
-    <view class="special-topic-title">
-      <!-- 标签 标题-->
-      <dk-title titleTag="{{currentSkuChoosedItem.titleTag}}" title="{{currentSkuChoosedItem.skuModel}}"></dk-title>
-      <view style="padding-top: 10rpx;">
-        <dk-text fontWeight="normal" value="{{currentSkuChoosedItem.skuName}}"></dk-text>
-      </view>
-      <view style="display: flex;padding-top: 5rpx;">
-        <view wx:if="{{currentSkuChoosedItem.promotionType != 0 || currentSkuChoosedItem.flgNonStandardType == 1}}" class="price-pop-class">
-          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="售价:" content="{{currentSkuChoosedItem.priceSale ?  currentSkuChoosedItem.priceSale: currentSkuChoosedItem.pricePromotion}}"></dk-cell>
-        </view>
-        <view wx:else class="price-pop-class">
-          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="标价：" content="{{currentSkuChoosedItem.priceSale ?  currentSkuChoosedItem.priceSale: currentSkuChoosedItem.priceStandard}}"></dk-cell>
+    <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;">
+            <view style="width: 30%; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
+            <view style="width: 70%;text-align: left;">
+                <van-uploader max-count="5" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ fileList }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" />
+            </view>
         </view>
 
-        <!-- 赠品 -->
-        <view style="text-align: right; width: 20%;">
-          <van-button style="border-radius: 5rpx;" data-item="{{currentSkuChoosedItem}}" round catchtap="" size="mini" color="#1B365D" type="info">赠品</van-button>
-        </view>
-      </view>
-    </view>
   </view>
 
-  <!--内容-->
-  <view class="pop-content-class">
-    <van-cell-group border="{{ false }}">
-
-      <!--销售价格-->
-      <van-cell border="{{ false }}" title-width="410rpx">
-        <view slot="title">
-          销售价格
-        </view>
-        <view Cell Slot="value">
-          <dk-number-input center="right" data-key="priceSale" inputValue="{{currentSkuChoosedItem.priceSale}}" bind:triggerBindValue="changeSalesPriceField"></dk-number-input>
-        </view>
-      </van-cell>
-      <van-cell border="{{ false }}" title-width="410rpx">
-        <view slot="title">
-          销售金额
-        </view>
-        <view Cell Slot="value">
-          <dk-number-input center="right" data-key="itemAmount" inputValue="{{currentSkuChoosedItem.itemAmount}}" bind:triggerBindValue="changeItemAmountField"></dk-number-input>
-        </view>
-      </van-cell>
-
-      <!--正常品显示-->
-      <van-cell wx:if="{{currentSkuChoosedItem.promotionType==0}}" border="{{ false }}" title-width="410rpx" disabled="{{currentSkuChoosedItem.flgGift}}">
-        <view slot="title" style="color:#95A8CB">
-          标价折扣
-        </view>
-        <dk-text color="#1B365D" fontSize="13px" fontWeight="nomal" value="{{(currentSkuChoosedItem.discountStandard  || currentSkuChoosedItem.discountStandard ==0)?(currentSkuChoosedItem.discountStandard+ '%'):'' }}"></dk-text>
-      </van-cell>
+</view>
 
-      <!--促销品显示-->
-      <van-cell wx:if="{{currentSkuChoosedItem.promotionType !=0 }}" border="{{ false }}" title-width="410rpx">
-        <view slot="title" style="color:#95A8CB">
-          标准售价折扣
-        </view>
-        <dk-text color="#1B365D" fontSize="13px" fontWeight="nomal" value="{{currentSkuChoosedItem.discountPromotion?(currentSkuChoosedItem.discountPromotion+ '%'):'' }}"></dk-text>
-      </van-cell>
+<view style="height: 200rpx;"></view>
 
-      <!--赠品标识-->
-      <van-cell title-class="nomal-label" title="赠品标识" border="{{ false }}" value-class="value-class">
-        <van-checkbox shape="round" value="{{ currentSkuChoosedItem.flgGift}}" data-index="{{index}}" data-key="flgGift" bind:change="changeSkuFlgGift" />
-      </van-cell>
-      <view style="height: 100rpx;"></view>
+<!--  save -->
+<dk-save-bottom disabledFlag="{{loadingButtonFlag}}" loading="{{loading}}" flagTypeName="purchase-inventory-offer" totallength="{{numberFormat.toThousandCents(item.tSumAmount)}}" item="{{item}}" allCleanName="关闭" allSubmitName="{{  item.entryStatus == 3 ? '保存' : '入库' }}" bind:allClean="deal" bind:submit="submit"></dk-save-bottom>
 
-      <view style="text-align: center;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" data-item="{{currentSkuChoosedItem}}" size="small" bindtap="updateCurrentSkuChoosedItem">确定</van-button>
-      </view>
-    </van-cell-group>
-  </view>
-</van-popup>
 
-<van-popup custom-class="dk-popup" show="{{ flgAllowSpecsUndefineFlag }}" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_flgAllowSpecsUndefine">
-  <view style="position:relative; top:280rpx;z-index:  1;background-color: transparent; height: 44rpx;"></view>
-  <view class="special-topic">
-    <!-- 图片 -->
-    <view class="special-topic-content">
-      <van-image radius="15rpx" custom-class="goods-pop-image" fit="fill" src="{{ currentSkuChoosedItem.iconThumPath }}"></van-image>
-    </view>
-    <view class="special-topic-title">
-      <!-- 标签 标题-->
-      <dk-title titleTag="{{currentSkuChoosedItem.titleTag}}" title="{{currentSkuChoosedItem.skuModel}}"></dk-title>
-      <view style="padding-top: 10rpx;">
-        <dk-text fontWeight="normal" value="{{currentSkuChoosedItem.skuName}}"></dk-text>
-      </view>
-      <view style="display: flex;padding-top: 5rpx;">
-        <view wx:if="{{currentSkuChoosedItem.promotionType == 0}}" class="price-pop-class">
-          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="标价：" content="{{currentSkuChoosedItem.priceStandard}}"></dk-cell>
-        </view>
-        <view wx:if="{{currentSkuChoosedItem.promotionType != 0}}" class="price-pop-class">
-          <dk-cell height="46rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="标准售价:" content="{{currentSkuChoosedItem.pricePromotion}}"></dk-cell>
-        </view>
 
-        <!-- 赠品 -->
-        <!-- <view style="text-align: right; width: 20%;">
-          <van-button style="border-radius: 5rpx;" data-item="{{currentSkuChoosedItem}}" round catchtap="" size="mini" color="#1B365D" type="info">坑距</van-button>
-        </view> -->
+<van-popup show="{{ sacnFlag }}" style="z-index: 999;box-shadow: 0px -8px 24px 0px #0010271A;" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_scan">
+  <view style="padding:20rpx;">
+    <view style="font-size: 32rpx;display: flex; justify-content:center;">
+      <van-image style="padding-top: 4rpx;" width="33rpx" height="33rpx" src="/static/img/scan-code-p.png" />
+      <view style="padding-left: 10rpx; color:#1B365D;display: flex;">
+      <view>查看条码</view>
+      <view>{{ '('+ barListLength +'个)'}}</view>
       </view>
-
     </view>
   </view>
 
-  <!--内容-->
-  <view class="pop-content-class">
-    <van-cell-group border="{{ false }}">
-      <!--坑距待定-->
-      <!-- <van-cell title-class="nomal-label" title="坑距待定" border="{{ false }}" value-class="value-class">
-        <van-checkbox shape="round" value="{{ currentSkuChoosedItem.flgSpecsUndefine}}" data-index="{{index}}" data-key="flgGift" bind:change="changeSkuFlgSpecsUndefine" />
-      </van-cell> -->
-      <view style="height: 100rpx;"></view>
-      <view style="text-align: center;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" data-item="{{currentSkuChoosedItem}}" size="small" bindtap="updateCurrentSkuChoosedItemFlgSpecsUndefine">确定</van-button>
-      </view>
-    </van-cell-group>
-  </view>
-</van-popup>
-
-<!-- 收货人列表 -->
-<van-popup show="{{ contactFlag }}" style="z-index: 999;" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_contact">
-  <view style="padding-top:30rpx;">
-    <scroll-view scroll-y="{{true}}" style="height: 50vh;">
-      <view wx:for="{{contactList}}" data-item="{{item}}" wx:for-index="index" wx:key="index" class="main-class">
-        <view class="main-foot" style="border-radius: 15rpx;">
-          <view style="padding:10rpx;">
-            <view data-index="{{index}}" data-item="{{item}}">
-              <view style="padding:20rpx;" class="table-row-right">
-                <view style="display: flex;">
-                  <view style=" width: 9%;">
-                    <view style="border-radius: 51%; width: 38rpx; height: 38rpx;background-color: #95A8CB;display: flex;align-items: center;justify-content:center;text-align: center;padding:2rpx;">
-                      <van-icon name="/static/img/address_mana.png" custom-style="width:30rpx;height:30rpx; " />
-                    </view>
-                  </view>
-                  <view style="font-weight: bold;display: flex; width: 67%;">
-                    <view style="width: auto;padding-right:30rpx; font-size: 30rpx;text-overflow: ellipsis;  white-space: nowrap;overflow: hidden;color:#1B365D">
-                      {{item.contactName}}
-                    </view>
-                    <view style="width: 50%;">
-                      <dk-text fontSize="30rpx" fontWeight="nomal" value="{{item.contactPhone}}"></dk-text>
-                    </view>
-                  </view>
-                  <view style="width: 24%;display: flex;justify-content: right;align-items: right;margin-left: 4rpx;">
-                    <view style="font-size: 24rpx;width: 70%;text-align: center;">
-                      <view style="border: solid 2rpx #606EB2;border-radius: 12rpx;" wx:if="{{item.flgDefault}}">
-
-                        <view style="padding-top: 2rpx;padding-bottom: 2rpx; padding-right: 12rpx;padding-left:12rpx">
-                          默认
-                        </view>
-                      </view>
-                    </view>
-                    <view style="width: 30%;text-align: center;padding-left:10rpx;" catchtap="edit" data-item="{{item}}">
-                      <van-checkbox value="{{ item.checked }}" data-index="{{index}}" bind:change="consigneeSelection"></van-checkbox>
-                    </view>
-                  </view>
-                </view>
-              </view>
-              <view style="padding:20rpx;font-weight: bold;" class="table-row-right">
-                <dk-text fontSize="28rpx" fontWeight="nomal" value="{{ item.addressFull }}"></dk-text>
-              </view>
-            </view>
+  <scroll-view scroll-y="{{true}}" style="height: 50vh;">
+    <view style="margin:20rpx;">
+      <van-collapse value="{{ activeNames }}" bind:change="onChange">
+      </van-collapse>
+      <view wx:for="{{barList}}" data-item="{{item}}" wx:for-index="index" wx:key="key">
+        <van-cell title="{{item.title}}" custom-class="dk-collapse-item" value="{{item.checked ? '收起' :'展开'}}" value-width="15%" title-width="85%" bind:click="onClickScan" data-index="{{index}}"/>
+        <view class="test" wx:if="{{item.checked }}">
+          <view  wx:for="{{item.detail}}" data-item="{{item_}}" wx:for-item="item_" wx:for-index="index_" wx:key="key_">
+          <view style="display: flex;padding:20rpx;font-size: 30rpx;color:#1B365D;">
+            <view>条码：</view>
+            <view>{{item_.barcode}}</view>
           </view>
         </view>
+        </view>
+        <view style="height: 20rpx;"></view>
       </view>
-      <view style="height: 100rpx;"></view>
-    </scroll-view>
-  </view>
-
+    </view>
+    <view style="height: 100rpx;"></view>
+  </scroll-view>
 
   <view style="padding:20rpx;">
-    <view style="display: flex;">
-      <view style="width: 40%;">
-        <van-button disabled="{{disabledFlag}}" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="contactAdd" type="default">新建
-        </van-button>
-
-      </view>
-      <view style="width: 60%;text-align: right;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:380rpx;" type="info" size="large" bindtap="contactUpdate">确定</van-button>
-      </view>
-    </view>
+    <van-button plain round size="large" custom-style="height:88rpx; width:100%;color:#1B365D;" bind:click="closeChoosedItemInfo_scan" type="default">取消
+    </van-button>
     <view style="height: 20rpx;"></view>
   </view>
 
-
 </van-popup>
 
-<!-- 收货日期 -->
-<van-popup show="{{ deliveryFlag }}" data-key="deliveryTime" position="bottom" bind:close="onConfirmChooseDateClose" bind:click-overlay="onConfirmChooseDateClose">
-  <view style="display:flex;justify-content: space-around;height:80rpx;">
-    <view style="width:45%;text-align: left;color:#b6b6b6;line-height:80rpx;" data-key="deliveryTime" catchtap="onConfirmChooseDateClose">取消</view>
-    <view style="width:45%;text-align: right;color:#1989fa;line-height:80rpx;" data-key="deliveryTime" catchtap="onConfirmChooseDate">确定</view>
-  </view>
-  <van-datetime-picker show-toolbar="{{false}}" data-key="deliveryTime" bindonlyinput="changeDate" data-index="0" type="date" loading="{true}" value="{{ deliveryTimeDefaultSearch }}" />
-</van-popup>
-
-<!-- 库区 -->
-<dk-single-dropdown-item model:show="{{warehouseFlag}}" contentID="{{currentChoosedItem.whId}}" orgId="{{orgMain.organizationId}}" id='warehouse' typeName='warehouse' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
-
-
-
-<dk-single-dropdown-item model:show="{{warehouseTotalFlag}}" contentID="{{entryWh.entryWhId}}" id='warehouseTotal' typeName='warehouseTotal' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+<!-- 仓库 -->
+<dk-single-dropdown-item show="{{whFlag}}" content="{{form.whName}}" contentID="{{form.whId}}" id='warehouseTotal' typeName='warehouseTotal'
+    bind:muticommit='mutiSearch' bind:muticlose='muticlose'>
+</dk-single-dropdown-item>

package-inventory/pages/warehousing-processing/add/add.wxss

@@ -1,468 +1,66 @@
-page {
-	background: #F5F5F5;
-  }
-  
-  .tab-h {
-	height: 75rpx;
-	width: 100%;
-	box-sizing: border-box;
-	overflow: hidden;
-	line-height: 75rpx;
-	background: #F7F7F7;
-	font-size: 30rpx;
-	white-space: nowrap;
-	top: 0;
-	left: 0;
-	z-index: 99;
-	background-color: white !important;
-  }
-  
-  .tab-item {
-	margin: 0 27rpx;
-	display: inline-block;
-	font-size: 25rpx;
-  }
-  
-  .tab-item.active {
-	color: #1989FA;
-	position: relative;
-  }
-  
-  .tab-item.active:after {
-	content: "";
-	display: block;
-	height: 8rpx;
-	width: 88rpx;
-	background: #1989FA;
-	position: absolute;
-	bottom: 0;
-	left: 5rpx;
-	border-radius: 16rpx;
-  }
-  
-  .page-group {
-	display: table;
-	width: 100%;
-	table-layout: fixed;
-	position: relative;
-	top: 0;
-	left: 0;
-	z-index: 999;
-  
-	/*这个设置在原生组件中用于置顶导航条*/
-  }
-  
-  .hiddenmore .more-item {
-	display: none;
-  }
-  
-  .showmore .more-item {
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-  }
-  
-  .flex-class {
-	display: flex;
-	justify-content: space-around;
-  }
-  
-  .hr {
-	width: 100%;
-	height: 3rpx;
-	margin-top: 15rpx;
-	/* margin-left: 37.5rpx; */
-	background-color: #dfdedd;
-  }
-  
-  .value-class {
-	flex: none !important;
-  }
-  
-  .right-field-css {
-	text-align: right !important;
-  }
-  
-  .add-btn {
-	margin-top: 10rpx;
-  }
-  
-  .list-msg {
-	padding: 0 20rpx;
-	background-color: #fff;
-	position: relative;
-  }
-  
-  .list-msg1 {
-	height: 60rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-  }
-  
-  .list-msg .list-msg2 {
-	height: 60rpx;
+.statistics{
+	margin-left:15rpx; 
+	margin-right:15rpx; 
+	width: 209rpx;
+	height: 98rpx;  
+	background: #ECD9B8;
+	box-shadow: 0px 10px 15px rgba(225, 229, 238, 0.6);
+	border-radius: 15rpx;
 	display: flex;
+	justify-content: center;
 	align-items: center;
-	justify-content: space-between;
-	border: 1px solid #ccc;
-	padding: 0 10rpx;
-  }
-  
-  .select_box {
-	background-color: #eee;
-	padding: 0 10rpx;
-	width: 93%;
-	position: absolute;
-	top: 130rpx;
-	z-index: 1;
-	overflow: hidden;
-	animation: myfirst 0.5s;
-  }
-  
-  @keyframes myfirst {
-	from {
-	  height: 0rpx;
-	}
-  
-	to {
-	  height: 210rpx;
-	}
-  }
-  
-  .select_one {
-	height: 60rpx;
-	line-height: 60rpx;
-	border-bottom: 1px solid #ccc;
   }
   
-  /**客户信息**/
-  .content-customer-info{
-	padding: 20rpx 32rpx 20rpx 32rpx;
+  .statistics-title{
 	color: #1B365D;
-	font-size: 16px;
-	font-weight: bold;
-  }
-  
-  /**客户信息**/
-  .content-goods-info{
-	padding: 10px 32rpx 10px 32rpx;
-	color: #1B365D;
-	font-size: 16px;
-	font-weight: bold;
-  }
-  
-  /**分割线*/
-  .divide-class{
-	margin-top:19rpx;
-	width: 617rpx;
-	border: 1rpx solid #E9F0FE;
-	flex: none;
-	order: 1;
-	flex-grow: 0;
-	z-index: 1;
-  }
-  
-  
-  .right-field-css {
-	color: black;
-  }
-  
-  /* .van-cell__title {
-	color: #646566;
-  } */
-  
-  
-  /**收缩样式*/
-  .expand-class{
-	border-radius: 15rpx;
+	font-size: 24rpx;
 	text-align: center;
-	padding-top:23rpx;
-	padding-bottom: 23rpx; 
-	color: #95A8CB;
-	background-color: #FFFFFF;
-	font-size: 12px;
-  }
-  
-  /**选择商品*/
-  .choose-goods{
-	text-align: center; 
-	display: flex; 
-	justify-content: center; 
-	align-items: center;width: 330rpx;
-	box-shadow: 0px 13px 10px rgba(68, 85, 166, 0.15);
-	border-radius: 15rpx; 
-	background-color: #00A7B5;
   }
-  
-  /**选择商品图标*/
-  .choose-goods-image{
-	width:31.96rpx;
-	height:33.93rpx; 
-	padding-right: 29rpx;
-  }
-  
-  /**选择商品文字*/
-  .choose-goods-text{
-	color: #FFFFFF;
-	font-size: 16px;
+  .statistics-value{
+	color:#1B365D;
+	font-size: 34rpx;
 	font-weight: bold;
-  }
-  
-  /**扫码*/
-  .scan-goods{
-	text-align: center; 
-	display: flex; 
-	justify-content: center; 
-	align-items: center;
-	width: 330rpx;
-	box-shadow: 0px 13px 10px rgba(68, 85, 166, 0.15);
-	border-radius: 15rpx; 
-	background-color: #606EB2;
-  }
-  
-  .tags {
-	display: flex;
-	flex-wrap: wrap;
-	align-content: stretch;
-	width: 100%;
-	flex-direction: row; 
-	justify-content: flex-start;
-	background: white; 
-	align-items: center;
-	margin-bottom: 5rpx;
-	margin-top: 10rpx;
-  }
-  
-  .designGraphics-class {
-	text-align: right !important;
-	padding-left: 185rpx;
-  }
-  
-  
-  .cell-value-staff-org {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
 	text-align: center;
-	color: #1B365D !important;
-	font-size: 13px !important;
-	font-weight: bold !important;
+	padding-top: 4rpx;
   }
   
-  .input {
-	text-align: left !important;
-	font-size: 26rpx !important;
-	color: #1B365D !important;
-  }
   
-  /**非必输项label*/
-  .dk-cell-title {
+  
+  .van-title-cell {
 	color: #95A8CB !important;
-	font-size: 14px !important;
+	font-size: 28rpx !important;
   }
-  
-  .dk-cell-value {
-	color: #CAA977 !important;
-	font-size: 26rpx;
+  /* 收货仓库 */
+  .dk-value{
+	text-align: left !important;
+	color:#1B365D !important;
   }
   
-  .van-card {
-	background-color: #FFFFFF !important;
+  .dk-title{
+	color:#E4002B !important;
+	width: 100rpx !important;
   }
-  
-  .van-card__content{
-	justify-content: space-around !important;
+  .van-card{
+	background-color: white !important;
   }
   
   
-  
-  /**产品明细的样式**/
-  .goods-class{
-	width: 100% !important;
-	background: #FBF6EF !important;
+  .dk-collapse-item{
 	border-radius: 15rpx !important;
-	padding: 10rpx;
-  }
-  
-  /**产品条目的样式**/
-  .goods-item-class{
-	text-align: left;
-	background: #FFFFFF;
-	border: 2rpx solid #606EB2;
-	border-radius: 15rpx;
-	margin: 10rpx 10rpx 20rpx 10rpx !important;
-	display: flex;
-  }
-  
-  .goods-item-image{
-	width: 116rpx;
-	height: 116rpx;
-	left: 16rpx;
-	top: calc((100% - 116rpx)/2);
-  }
-  
-  /**包含替换品时的样式*/
-  .goods-item-title-replace{
-	width: 85%;
-  }
-  
-  /**子件标题tag样式*/
-  .goods-item-tag{
-	margin: 10rpx 10rpx 10rpx 26rpx;
-	width: 100%;
-  }
-  
-  .price-pop-class{
-	width: 75%;
-  }
-  
-  .label-bule{
-	color: #95A8CB  ;
-	font-size: 14px ;
-  }
-  
-  .placeholder-class{
-	color: #95A8CB;
-  }
-  
-  .button-class{
-	height: 85rpx !important;
-	background: #F8F9FD !important;
-	color: #95A8CB !important;
-	border: 2rpx solid #95A8CB;
-	border-radius: 10rpx !important;
-	text-align: left !important;
-	margin-bottom: 10rpx;
-	z-index: 999 !important;
+	background-color: #DEE2ED !important;
+	font-size: 30rpx !important;
   }
-  
-  .button-selected-class{
-	height: 85rpx !important;
-	background: #606EB2 !important;
-	color: #fff !important;
-	border: 2rpx solid #606EB2;
-	border-radius: 10rpx !important;
-	text-align: left !important;
-	margin-bottom: 10rpx;
-	z-index: 999 !important;
-	/* overflow: hidden !important;
-	text-overflow: ellipsis !important;
-	white-space: nowrap !important; */
+  .test{
+	overflow:hidden
   }
-  .tag-text{
-	overflow: hidden !important;
-	text-overflow: ellipsis !important;
-	white-space: nowrap;
-	word-wrap: break-all;
-	width: 100%;
-	height: 44rpx;
-	margin-top: -10rpx;
-	margin-bottom: -10rpx;
-  }
-  
-  .tag-bom-item{
-	padding-right: 20rpx;
-	flex-direction: column;
+  .dk-value-class{
+	width: 80rpx !important;
   }
   
   
-  
-  
-  
-  
-  
-  
-  
-  .contents{
-	width:100%;
-	min-height: 100%;
-	
-  }
-  .touch-item {
-	height: 130rpx;
-	width: 100%;
-	background: #fff;
-	border-bottom: 1rpx solid #eee;
-	display: flex;
-	/* //均匀排布每个元素 */
-	justify-content: space-between;
-	width: 100%;
-	overflow: hidden;
-  }
-  .content {
-   width: 100%;
-   padding: 0 30rpx;
-   /* margin-right:0; */
-   -webkit-transition: all 0.4s;
-   transition: all 0.4s;
-   -webkit-transform: translateX(150rpx);
-   transform: translateX(150rpx);
-   margin-left: -150rpx;
-   box-sizing: border-box;
-  }
-  .del {
-	width: 150rpx;  
-	height: 100%;  
-	background-color: red; 
-	color: white; 
-	display: flex;  
-	justify-content: center;  
-	align-items: center;  
-	-webkit-transform: translateX(90px);
-	transform: translateX(90px);
-	-webkit-transition: all 0.4s;
-	transition: all 0.4s;
-  }
-  .content_name{
-	font-size: 28rpx;
-	color: #333;
-	line-height: 30rpx;
-	margin: 30rpx 0 28rpx;
-  }
-  .content_time{
-	color: rgb(153,153,153);
-	font-size: 20rpx;
-	line-height: 20rpx;
-  }
-  .touch-move-active .content,
-  .touch-move-active .del {
-   -webkit-transform: translateX(0);
-   transform: translateX(0);
-  }
-  .input-class {
-	text-align: left !important;
-	height: 100px !important;
-	color: #95A8CB !important;
-	font-size: 12px !important;
-  }
-  .van-collapse-item__content{
-	padding:10rpx !important;
-	padding-bottom: 20rpx !important;
-	border-radius: 0rpx 0rpx 15rpx 15rpx !important;
-  }
-  .dk-collapse{
-	padding:10rpx !important;
-	background-color: white !important;
-	border-radius:15rpx !important;
-	color:#1B365D !important;
-	font-size: 32rpx !important;
-  }
-  .dk-collapse-item{
-  
-	color:#1B365D !important;
-	font-size: 32rpx !important;
-	font-weight: bold;
-  }
-  .save-button-class-canl{
-	width: 196rpx;
-	background: #ffffff !important;
-	/* border-radius: 15rpx !important; */
-	color:#1B365D !important;
-	border: solid 2rpx #1B365D !important;
-	font-size: 16px !important;
-	font-weight: bold !important;
-  }
-  /* .dk-popup{
-	height: 60%;
-  } */
+  .goods-detail-title{
+	display:flex;
+	justify-content:center;
+	align-items: center;
+	padding-left:10rpx;
+  }

package-inventory/pages/warehousing-processing/choose-sku-product/choose-sku-product.js

@@ -292,64 +292,10 @@ mutiSearch(e) {
    * @author : 周兴
    */
   submit() {
-  if(this.data.choosedGoodsList.length<=0){
-    wx.showToast({
-      title: "请选则商品",
-      icon: 'none'
+    let choosedGoodsList = this.data.choosedGoodsList
+    wx.navigateTo({
+      url: '../../other-outbound/other-outbound?goodsList=' + encodeURIComponent(JSON.stringify(choosedGoodsList)),
     })
-    return
-  }
-    if (this.data.sourcePage == "warehousingProcessing") {
-      let goodsListTemp = []
-      // 处理数据
-      let list = chooseGoodsCommon.handleData(goodsListTemp, this);
-      //处理使用位置
-      if (list && list.length > 0) {
-        list.forEach((it, index) => {
-          //过滤数量为零的数据
-          if (it.itemQuantity == 0) {
-            list.splice(index, 1)
-          }
-          if (it.goodsSkuList && it.goodsSkuList.length > 0) {
-            it.goodsSkuList.forEach(obj => {
-              obj.usedLocation = it.usedLocation
-            })
-          }
-        })
-      } 
-    
-        wx.navigateTo({
-          url: '/package7/pages/other-warehousing/other-warehousing?goodsList=' + encodeURIComponent(JSON.stringify(list)) + '&chooseFlag=true' + '&page=purchase-price',
-        })
-
-    } else {
-      var pages = getCurrentPages();
-      var prevPage = pages[pages.length - 2]; //上一个页面
-      let goodsList = prevPage.data.goodsList 
-      // 处理数据
-      let list = chooseGoodsCommon.handleData(goodsList, this);
-      //处理使用位置
-      if (list && list.length > 0) {
-        list.forEach(it => {
-          if (it.goodsSkuList && it.goodsSkuList.length > 0) {
-            it.goodsSkuList.forEach(obj => {
-              obj.usedLocation = it.usedLocation
-            })
-          }
-        })
-      }
-
-      prevPage.setData({
-        goodsList: list,
-        chooseFlag: true,
-        orgGoodsListFlag: false
-      })
-
-      // 关闭本页
-      wx.navigateBack({
-        delta: 1
-      })
-    }
   },
   /**
    * @desc : 查询

package-inventory/pages/warehousing-processing/choose-sku-product/choose-sku-product.wxml

@@ -1,6 +1,6 @@
 <wxs module="m1">
   var displayPrice = function (item) {
-    var numberFormat = require("../../../utils/numberFormat.wxs");
+    var numberFormat = require("@/utils/numberFormat.wxs");
     // 如果有促销显示标准售价,如果正常品显示标价
     // if (item.promotionType == 0) {
     //优先显示促销价
@@ -18,8 +18,8 @@
   module.exports.displayPrice = displayPrice
 </wxs>
 
-<wxs src='../../../utils/numberFormat.wxs' module="numberFormat"></wxs>
-<wxs src='../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<wxs src='@/utils/numberFormat.wxs' module="numberFormat"></wxs>
+<wxs src='@/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-dialog id="van-dialog" />
 <van-tabs type="card" custom-class="tags-class" tab-active-class="{{active==0?'van-tab-active-left':'van-tab-active-right'}}" animated="{{true}}" swipeable="{{true}}" active="{{ active }}" dot bind:change="changeTag">
@@ -116,7 +116,7 @@
 <van-search wx:if="{{active == 0}}" bind:search="doSearch" custom-class="search-class" bind:change="onSearchText" model:value="{{ searchText }}" placeholder="商品名称/商品型号" use-right-icon-slot="{{true}}" placeholder-style="color:#95A8CB">
 </van-search>
 <view wx:if="{{active == 0}}" class="scan-class">
-  <image class="scan-image" fit="fill" src="../../../static/img/Group.png"></image>
+  <image class="scan-image" fit="fill" src="@/static/img/Group.png"></image>
 </view>
 
 <van-sidebar activeKey="{{sideKey}}" bindchange="changeSidebar" custom-class="{{active == 0 ? 'left-class' : 'right-class'}}">

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

@@ -128,7 +128,7 @@
         })
       } else if (item.entryKindName == "采购入库") {
         wx.navigateTo({
-          url: '/package7/pages/scan-show-purchase-entry/scan-show-purchase-entry?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)),
+          url: 'add/add?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)),
         })
       } else if (item.entryKindName == "销售回库") {
         wx.navigateTo({
@@ -153,7 +153,7 @@
         })
       } 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',
+          url: 'add/add?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=scan-show-purchase',
         })
       } else if (item.entryKindName == "销售回库") {
         wx.navigateTo({
@@ -174,7 +174,7 @@
         })
       } 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',
+          url: 'add/add?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=scan-show-purchase',
         })
       } else if (item.entryKindName == "销售回库") {
         wx.navigateTo({
@@ -437,8 +437,8 @@
         {
           "entryId": 486,
           "customerId": null,
-          "customerName": null,
-          "customerPhone": null,
+          "customerName": '王软',
+          "customerPhone": '13900138000',
           "contactName": null,
           "contactPhones": null,
           "salesChannel": null,
@@ -477,7 +477,7 @@
           "addressArea": null,
           "addressName": null,
           "addressGcj02": null,
-          "addressFull": null,
+          "addressFull": '沈阳市国际软件园F9-102',
           "sale2IvtType": null,
           "whName": null,
           "makingUser": 937,
@@ -498,7 +498,7 @@
           "sale2Name": null,
           "procureOrderNo": null,
           "invoiceDate": null,
-          "entryKindName": "其他入库",
+          "entryKindName": "退货回库",
           "supplierName": null,
           "statusName": null,
           "inOutStatus": null,
@@ -779,716 +779,7 @@
           "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, //合计

package-inventory/pages/warehousing-processing/warehousing-processing.wxml

@@ -154,7 +154,7 @@
 
 
       <!-- 客户电话 -->
-      <view wx:if="{{item.entryKindName =='销售回库'}}" 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.customerPhone}}"></dk-text>
@@ -166,20 +166,20 @@
       </view>
 
       <!-- 客户地址 -->
-      <view wx:if="{{item.entryKindName =='销售回库'}}" 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>
           </view>
           <view class="table-content-class">
             <!-- {{item.addressFull ? item.addressFull : ''}} -->
-            {{ wxmlUtil.addressFullIsUndefined(item.addressFull)}}
+            {{  item.addressFull}}
           </view>
         </view>
       </view>
 
       <!-- 门店信息 -->
-      <view wx:if="{{item.entryKindName =='销售回库'}}" 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.orgName}} | 业务员 {{item.staffName}}"></dk-text>
@@ -191,24 +191,24 @@
       </view>
 
       <!-- 收货信息 -->
-      <view wx:if="{{item.entryKindName =='采购入货'}}" 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.returnContactName}} | {{item.returnContactPhone}}"></dk-text>
           </view>
           <view class="table-content-class">
-            {{item.returnContactName}} | {{item.returnContactPhone}}
+            {{item.customerName}} | {{item.customerPhone}}
           </view>
         </view>
       </view>
       <!-- 收货地址 -->
-      <view wx:if="{{item.entryKindName =='采购入货'}}" 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="收货地址"></dk-text>
           </view>
           <view class="table-content-class">
-            {{item.returnAddressFull?item.returnAddressFull:''}}
+            {{item.addressFull?item.addressFull:''}}
           </view>
         </view>
       </view>

project.private.config.json

@@ -2,7 +2,7 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "iboss_wx_app",
     "setting": {
-        "compileHotReLoad": false
+        "compileHotReLoad": true
     },
     "libVersion": "2.23.4"
 }

utils/chooseGoodsCommon.js

@@ -141,13 +141,13 @@ function openAddItemInfoCommon(e, _this, page, type) {
             item.nonStandardList = []
             item.nonStandardArea = 1
             //加载默认spu非标参数数据
-            getFlgNonStandardList(item, _this)
+           // getFlgNonStandardList(item, _this)
             _this.setData({
                 show7: true
             })
         }
         // 根据spuId获取sku相关信息
-        getSkuBySpuIdProduct(e, _this);
+        //getSkuBySpuIdProduct(e, _this);
         _this.setData({
             show1: false,
             show2: false,