采购

api/pages/pur/purchase.js

@@ -16,15 +16,11 @@ module.exports = {
   },
 
   routeUrl: {
-    purchase: {
-      selectSourcePurchaseOrder:{
-        key:'selectSourcePurchaseOrder',url:'/package-base-select/pages/select-source-purchase-order/select-source-purchase-order'
-      },
-      openingInventory: { key: 'openingInventory', url: '/package-basic-data/pages/product-file/warehouse-archives/warehouse-archives'  },
-      addWarehousing:{
-        key:'addWarehousing',url:'/package-purchase/pages/purchase-receipt/add/add'
-      },
- 
+    purchase: { 
+      add: { key: 'add', url: '/package-purchase/pages/purchase-order/add/add' }, 
+      chooseSupplier: { key: 'chooseSupplier', url: '/package-base-select/pages/select-suppliers/select-suppliers'  },
+      chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-warehouse/select-warehouse'  },
+      chooseSaleOrder: { key: 'chooseSaleOrder', url: '/package-purchase/pages/purchase-based-sales/purchase-based-sales'  },
     }
-  }
+  } 
 };

api/pages/sale/order.js

@@ -17,6 +17,7 @@ module.exports = {
     routeUrl: {
         order: {
           add: {key: 'add', url: '/package-sales/pages/order-billing/add/add'},
+          openPurchase: {key: 'openPurchase', url: '/package-purchase/pages/purchase-order/add/add'},
         }
     }
 };

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

@@ -31,19 +31,12 @@ Page({
       value: -1
     },
     // 弹出按钮
-    buttonList: [{
-      name: 'merge',
-      plain:true,
-      title: '取消'
-    }, {
-      name: 'merge',
-      title: '保存'
-    }],
+    buttonList: null,
     contentList: [{
       code: 'flag',
       title: '全选',
       type: 'checkbox'
-    }, { 
+    }, {
       code: 'count',
       type: 'count',
       bill: 2,
@@ -77,7 +70,7 @@ Page({
     })
   },
   selectTotallength(list) {
-     
+
     let chooseList = []
     // let countindex = this.data.contentList.filter(it => it.code == 'count');
     // contentList[countindex].bill
@@ -178,4 +171,92 @@ Page({
       selectlength: e.detail ? goodsListLength.length : 0, //单数
     })
   },
+  /**
+   * @desc : 按钮点击事件回调
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  open(e) {
+   let that = this
+    let code = e.detail.name
+    if (code == "cancel") { //取消点击事件
+      wx.navigateBack({
+        delta: 1
+      })
+    }
+    if (code == "save") { //确定点击事件  如果是从采购订单过来的 就应该返回去  如果不是 要打开采购订单新建页
+      let  list = this.data.tableData
+      let chooseList = []
+      list.forEach(res => {
+        if (res.orderItemResponseList && res.orderItemResponseList.length > 0) {
+          let tempList = res.orderItemResponseList.filter(itt => {
+            return itt.checked
+          })
+          chooseList = chooseList.concat(tempList)
+        }
+      })
+      if (!(chooseList && chooseList.length > 0)) {
+        wx.showToast({
+          title:"请至少选择一件商品" ,
+          icon: 'none'
+        })
+      }
+      if (that.data.isSourceOrderFlag) {
+        const eventChannel = that.getOpenerEventChannel();
+        eventChannel.emit('bindData', {
+          data: {
+            choooseItemList: chooseList
+          }
+        })
+        wx.navigateBack({
+          delta: 1
+        })
+      }else{ //打开采购订单新建 并把品 传过去 
+          
+        wx.navigateTo({
+          url: that.data.route.openPurchase.url,   
+          success: function (res) { 
+            res.eventChannel.emit('params', {choooseItemList: chooseList ,isSourceOrderFlag:that.data.isSourceOrderFlag})
+          }
+        })
+      }
+    }
+
+  },
+  /**
+   * @desc : 页面初始化加载方法
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  loadInit() {
+    // 获取页面栈
+    const pages = getCurrentPages();
+    const prevPage = pages[pages.length - 2]; // 上一个页面
+    // 判断上一个页面是哪个页面   true 就是 从采购订单进入的  false则是 从其他页面进来的
+    this.setData({
+      isSourceOrderFlag: (prevPage.route == 'package-purchase/pages/purchase-order/add/add')
+    })
+    if (this.data.isSourceOrderFlag) {
+      this.setData({
+        // 弹出按钮
+        buttonList: [{
+          code: "cancel",
+          plain: true,
+          title: '取消'
+        }, {
+          code: "save",
+          title: '确定'
+        }],
+      })
+    } else {
+      this.setData({
+        // 弹出按钮
+        buttonList: [{
+          code: "save",
+          title: '确定'
+        }],
+      })
+    }
+  },
+
 })

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

@@ -181,7 +181,7 @@
   </view>
 </view> -->
 <!-- 新建按钮 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="open"></dk-save-button>
 
 
 

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

@@ -1,181 +1,259 @@
+// package-basic-data/pages/test/add/add.js
 const mixins = require('@/mixins/index.js')
+const app = getApp()
 Page({
-  mixins: [mixins],
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    activeNames: ['1'],
-    orderType: 'add'
-  },
-  getData(){
+    mixins: [mixins],
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        orderIdArray: '', //来源单id 
+        // 弹出按钮
+        buttonList: [{
+            name: 'merge',
+            title: '保存'
+        }],
+        contentList: [  {
+            code: 'need',
+            title: '合集金额',
+            type: 'str'
+        }, {
+            code: 'amount',
+            content: 0,
+            type: 'number'
+        }],
+        btnFormData: null,
+        popContent: [{
+                code: 'itemQty',
+                type: 'step',
+                title: '数量',
+                required: true
+            },
+            {
+                code: 'whId',
+                name: 'whName',
+                title: '仓库',
+                type: 'drop',
+                dropType: 'warehouse'
+            },
+            {
+                code: 'skuSpec',
+                title: '规格',
+                type: 'str',
+                readonly: true,
+            },
+            {
+                code: 'nonStdCode',
+                title: '商品批次',
+                type: 'str',
+            },
+        ],
 
-  },
-  /**
-   * @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',
-    })
-  },
-  /**
-    * @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
-    })
+        cardList: [{
+                name: 'wh'
+            }, {
+                name: 'relation'
+            },
+            {
+                name: 'items',
+                title: '商品明细', 
+                color: '#E4002B',
+                displayNum: 2
+            }, {
+                name: 'other',
+                title: '其他信息'
+            }
+        ],
+        contentObj: {
 
-    //非标淋浴房
-    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
-      })
+            wh: [{
+                code: 'whId',
+                name: 'whName',
+                title: '预计入库仓库',
+                type: 'choose',
+                required: true,
+                urlKey: 'chooseWh'
+            }, {
+                code: 'pickupdate',
+                name: 'pickupDate',
+                type: 'date',
+                required: true,
+                title: '预计入库日期',
+            }, {
+                code: 'supId',
+                name: 'supName',
+                title: '供应商',
+                type: 'choose',
+                required: true,
+                urlKey: 'chooseSupplier'
+            }, ],
+            relation: [{
+                code: 'sourceNo',
+                name: 'fromNo',
+                type: 'choose',
+                controlChooseFlag: true,
+                title: '关联源单',
+                urlKey: 'chooseSaleOrder'
+            }],
+            items: [{
+                code: 'collectType',
+                name: 'collectName',
+                type: 'drop',
+                required: true,
+                dropType: 'collect'
+            }, {
+                code: 'collectAmount',
+                type: 'number',
+                title: '收款金额',
+                required: true
+            }],
 
-      //  this.getSkuBySpuId(copyItem.spuId)
-      this.setData({
-        show6: true
-      })
-    } else {
-      this.setData({
-        show6: false,
-        show7: false
-      })
-    }
-    //    this.getSelectStock(item)
-  },
-  /**
-* @desc : 编辑商品关闭编辑备注事件
-* @author : 于继渤
-* @date : 2022/5/26 12:16
-*/
-  closeChoosedItemInfo() {
-    this.setData({
-      showEditProduct: false
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    if (options.orderType == 'edit') {
-      this.setData({
-        orderType: 'edit'
-      })
-      wx.setNavigationBarTitle({
-        title: '编辑暂存采购订单',
-      })
-    }
-    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,
+            other: [{
+                code: 'remarks',
+                type: 'textarea',
+                title: '备注',
+                readonly: false
+            }, {
+                code: 'file',
+                type: 'uploader',
+                title: '附件'
+            }]
         },
-        {
-          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,
-        }]
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
+        // 路由
+        routeObjName: 'purchase',
+    },
+    /**
+     * @desc   : 绑定数据
+     * @author : 王英杰
+     * @date   : 2024年3月12日
+     */
+    chooseData(e) {
+        console.log("t", e, this.data.formData);
+        let formData = JSON.parse(this.data.formData)
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
+        let code = e.detail.code
+        let data = e.detail.data.data
+        let orderIdArray_ = this.data.orderIdArray //来源单id
+        if (code == "supId") { //供应商
+            formData.supId = data.id
+            formData.supName = data.name
+        }
+        if (code == "staffId") { //员工
+            formData.staffId = data.id
+            formData.staffName = data.name
+        }
+        if (code == "orgId") { //员工
+            formData.orgId = data.id
+            formData.orgName = data.name
+        }
+        if (code == "whId") { //仓库
+            formData.whId = data.id
+            formData.whName = data.name
+        }
+        if (code == "sourceNo") { //来源单 
+            formData.goodsList = this.convertGoods(data.choooseItemList)
+            // 提取purNo字段为数组，并去重
+            const orderNoArray = [...new Set(data.choooseItemList.map(item => item.orderNo))];
+            const orderIdArray = [...new Set(data.choooseItemList.map(item => item.orderId))]; 
+            // 将数组元素转换为逗号分隔的字符串
+            formData.fromNo = orderNoArray.join(','); //来源单号
+            orderIdArray_ = orderIdArray.join(',');
 
-  },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
+        }
 
-  },
+        this.setData({
+            orderIdArray: orderIdArray_,
+            formData: JSON.stringify(formData)
+        })
+    },
+    convertGoods(choooseItemList) {
+        let cardList_ = this.data.cardList
+        cardList_.forEach(card => { //循环出商品总共价格
+            if (card.name === 'items') {
+                card.priceSale = choooseItemList.sum("priceSale") //售价合计
+                card.itemQty = choooseItemList.sum("itemQty") //商品数量合计
+                card.priceStd = choooseItemList.sum("priceStd") //标价合计
+                card.itemAmt = choooseItemList.sum("itemAmt") //售价金额合计
+                card.purDiscount = choooseItemList.sum("purDiscount") //折扣
+            }
+        })
+        let contentList_ = this.data.contentList
+        contentList_.forEach(card => { //循环出商品总共价格
+            if (card.code === 'amount') {
+                card.content =  choooseItemList.sum("itemAmt") 
+            }
+        })
+        this.setData({
+            cardList: cardList_,
+            contentList:contentList_
+        })
+        choooseItemList.forEach(element => {
+            element.pricePur = element.priceSale
+            element.nonStdCode = '' // 色号  批次号   
+        });
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
+        return choooseItemList
+    },
 
-  },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
+    /**
+     * @desc : 保存的參數設置
+     * @date : 2024/2/1 15:49
+     * @author : 王英杰
+     */
+    setParams(params) { 
+        let cardList_ = this.data.cardList 
+        let formData = JSON.parse(this.data.formData)
+        cardList_.forEach(card => { //循环出商品总共价格
+            if (card.name === 'items') {
+                params.sumAmount = card.itemAmt //合计金额 
+                params.sumStandard = card.priceStd // 标价合计
+                params.sumQuantity = card.itemQty //商品总数量
+                params.purDiscount = card.purDiscount //折扣
+            }
+        })
+   
+        params.orgId = formData.orgId //组织部门
+        params.staffId = formData.staffId // 员工
+        params.supId = formData.supId // 供应商
+        params.whId = formData.whId // 仓库
+        params.remarks = formData.remarks // 备注
+        params.makeStaff = formData.staffId // 制单人
+        params.itemList = formData.goodsList //商品明细
+        console.log("save", this.data.params);
+        return params
+    },
 
-  },
+    /**
+     * @desc : 保存数据服务
+     * @date : 2024/2/1 15:49
+     * @author : 王英杰
+     */
+    saveData() {
+        return this.excute(this.data.service, this.data.service.insert , this.data.params)
+    },
+    /**
+     * @desc : 页面初始化加载方法
+     * @date : 2024/2/1 15:49
+     * @author : 王英杰
+     */
+    loadInit() {
+        let that = this
+        let formdata = JSON.parse(this.data.formData)
+        const eventChannel = this.getOpenerEventChannel()
+        eventChannel.on('params', function (data) {
+            const isSourceOrderFlag = data.isSourceOrderFlag
+            if (!isSourceOrderFlag) {
+                const choooseItemList = data.choooseItemList
+                console.log(choooseItemList)
+                formdata.goodsList = that.convertGoods(choooseItemList)
+                that.setData({
+                    formData: JSON.stringify(formdata)
+                })
+            }
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
 
-  }
+        })
+    }
 })

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

@@ -1,603 +1,15 @@
-<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>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
+<loading wx:if="{{loading}}" ></loading>
 
-      <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>
+<!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form> -->
 
-      </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>
+<dk-form-bill type="pur" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="批发价：">
+</dk-form-bill>
 
-      <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;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 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>
-      <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>
-    <van-cell wx:if="{{goodsList.length==0}}" border="{{ false }}" style="border-radius: 15rpx;">
-      <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>
-          <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" 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 wx:if="{{item.nonGlassListShow}}" style="padding-top: 15rpx; padding-bottom: 15rpx; width: 100%;">
-              <dk-text fontWeight="nomal" value="{{item.nonGlassListShow}}"></dk-text>
-            </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 style="width: 40%;text-align: right;">
-                <van-stepper integer="{{true}}" value="{{item.itemQuantity}}" data-index="{{index}}" min="0" max="999999999" bind:change="changeItemQuantity" />
-              </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>
-
-                      <!--子级明细价格-->
-                      <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>
-                  </view>
-                </view>
-              </view>
-            </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>
-            <view class="divide-class"></view>
-          </view>
-        </van-card>
-        <view slot="right">删除</view>
-      </van-swipe-cell>
-    </view>
-
-
-    <!--合计金额-->
-    <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>
-    </view>
-
-
-    <view style="height: 40rpx;"></view>
-  </view>
-
-
-</view>
-
-<view style="height: 200rpx;"></view>
-
-<!-- 编辑商品 -->
-<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>
-      </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>
-
-    <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>
-
-<!-- 编辑 -->
-<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>
-
-<!--联系电话-->
-<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>
-
-<!-- 可换件-->
-<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>
-
-        <!-- 赠品 -->
-        <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>
-
-      <!--促销品显示-->
-      <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>
-
-      <!--赠品标识-->
-      <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>
-
-      <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> -->
-      </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>
-          </view>
-        </view>
-      </view>
-      <view style="height: 100rpx;"></view>
-    </scroll-view>
-  </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>
-    <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-save-button   btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>

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

@@ -1,468 +1,22 @@
-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;
+/* package-basic-data/pages/test/add/add.wxss */
+/**底部的样式*/
+.bottom-class{
+  position: fixed;
+  bottom: 20rpx;
   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;
-  display: flex;
-  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;
-  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;
-  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;
-  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 {
+  justify-content: center;
+  border-top: 2rpx solid #efefef;
+  z-index: 2;
   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;
-}
-
-.input {
-  text-align: left !important;
-  font-size: 26rpx !important;
-  color: #1B365D !important;
 }
 
-/**非必输项label*/
-.dk-cell-title {
-  color: #95A8CB !important;
-  font-size: 14px !important;
-}
-
-.dk-cell-value {
-  color: #CAA977 !important;
-  font-size: 26rpx;
-}
-
-.van-card {
-  background-color: #FFFFFF !important;
-}
-
-.van-card__content{
-  justify-content: space-around !important;
-}
-
-
-
-/**产品明细的样式**/
-.goods-class{
-  width: 100% !important;
-  background: #FBF6EF !important;
+/**底部保存按钮的样式*/
+.save-button-class{
+  width: 640rpx;
+  background: #1B365D !important;
   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;
-}
-
-.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; */
-}
-.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;
-}
-
-
-
-
-
-
-
-
-
-.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;
+  color:#fff !important;
   font-size: 16px !important;
-  font-weight: bold !important;
-}
-/* .dk-popup{
-  height: 60%;
-} */
+  font-weight: 500 !important;
+}

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

@@ -17,26 +17,24 @@ Page({
    */
   data: {
 
-        // 弹出按钮
-        buttonList: [{
-          name: 'merge',
-          title: '保存'
-      }],
-      contentList: [{
-          code: 'flag',
-          title: '自动入库办理',
-          type: 'checkbox'
-      }, {
-          code: 'need',
-          title: '合集金额',
-          type: 'str'
-      }, {
-          code: 'amount',
-          content: 0,
-          type: 'number'
-      }],
-      btnFormData: null,
-    active:0,//默认查询入库中
+    // 弹出按钮
+    buttonList: [{
+      name: 'merge',
+      title: '新建'
+    }],
+    contentList: [  {
+      title: '合集金额:',
+      code: 'amount',
+      content: 0,
+      type: 'number'
+    },  {
+      type: 'count',
+      code: 'count',
+      bill: 1,
+      quantity: 2
+    }],
+    btnFormData: null,
+    active: 0, //默认查询入库中
     // 查询条件
     searchContent: [{
         code: 'createtime',
@@ -67,12 +65,11 @@ Page({
       code: 'nextFollowTime',
       dataType: 'date'
     }],
-    tagList: [ 
-       {
+    tagList: [{
       title: "全部单据"
     }, {
       title: "暂存"
-    },{
+    }, {
       title: "成交"
     }],
     contentObj: {
@@ -95,6 +92,44 @@ Page({
         name: 'pickupDate',
         title: '预计入库日期' //预计入库日期
       }],
+      '待入库': [{ //[mixins.$t("procurementSupplier")]
+        name: 'purNo',
+        title: '订单编号' //订单编号
+      }, {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: ''
+        }],
+        title: '采购信息' //采购信息
+      }, {
+        name: 'whName',
+        title: '预计入库仓库' //预计入库仓库
+      }, {
+        name: 'pickupDate',
+        title: '预计入库日期' //预计入库日期
+      }],
+      '入库中': [{ //[mixins.$t("procurementSupplier")]
+        name: 'purNo',
+        title: '订单编号' //订单编号
+      }, {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: ''
+        }],
+        title: '采购信息' //采购信息
+      }, {
+        name: 'whName',
+        title: '入库仓库' //预计入库仓库
+      }, {
+        name: 'pickupDate',
+        title: '入库日期' //预计入库日期
+      }],
       '已入库': [{ //[mixins.$t("procurementSupplier")]
         name: 'purNo',
         title: '订单编号' //订单编号
@@ -109,20 +144,20 @@ Page({
         title: '采购信息' //采购信息
       }, {
         name: 'whName',
-        title: '入库仓库' //入库仓库
+        title: '入库仓库' //预计入库仓库
       }, {
-        name: 'intoDate',
-        title: '入库日期' //收货日期
+        name: 'pickupDate',
+        title: '入库日期' //预计入库日期
       }],
     },
     // 列表区（脚部金额）
     footerAmount: {
       name: 'sumAmount',
-      title: '合计金额'
+      title: '共计金额'
     },
     // 列表区（脚部信息）
-    footerInfo: [ {
-      prefix:'共计',
+    footerInfo: [{
+      prefix: '共计',
       name: 'sumQuantity',
       title: '件'
     }],
@@ -130,7 +165,7 @@ Page({
     // 路由
     routeObjName: 'purchase',
   },
-/**
+  /**
    * @desc : 详细页面 （编辑）
    * @date : 2024/2/1 15:49
    * @author : 王英杰
@@ -151,13 +186,13 @@ Page({
         res.eventChannel.emit('params', {
           id: Id,
           formMode: Constants.formMode.edit,
-          formType: activity+1
+          formType: activity + 1
         })
       }
     })
   },
 
-    /**
+  /**
    * @desc : 新建
    * @date : 2024/2/1 15:49
    * @author : 王英杰
@@ -189,16 +224,16 @@ Page({
    * @author : 王英杰
    */
   setSearchParams(params) {
-  if(this.data.active == 1){ //入库中的查询参数
-    params.intoStatus = '订单状态-暂存'
-    // params.purType = '单据类型-采购订单'
-   
-  }
-  if(this.data.active == 2){ //已入库的查询参数 
-    params.purStatus = '订单状态-成交'
- 
-  }
-  params.purType = '单据类型-采购订单'
+    if (this.data.active == 1) { //入库中的查询参数
+      params.intoStatus = '订单状态-暂存'
+      // params.purType = '单据类型-采购订单'
+
+    }
+    if (this.data.active == 2) { //已入库的查询参数 
+      params.purStatus = '订单状态-成交'
+
+    }
+    params.purType = '单据类型-采购订单'
     return params;
   },
   /** 
@@ -207,7 +242,7 @@ Page({
    * @author : 王英杰
    */
   getData(params) {
- 
+
     return this.excute(this.data.service, this.data.service.selectByCond, params);
   },
 
@@ -226,9 +261,9 @@ Page({
     let sumAmount = 0 //总的 合计金额
     let sumNumber = 0 // 单数
     let sumQty = 0 //总的 合集数量
-      sumAmount = tableData.sum('sumAmount') 
-      sumNumber = tableData.length
-      sumQty = tableData.sum('sumQuantity') 
+    sumAmount = tableData.sum('sumAmount')
+    sumNumber = tableData.length
+    sumQty = tableData.sum('sumQuantity')
     this.setData({
       tableData: temp,
       sumAmount,
@@ -236,5 +271,5 @@ Page({
       sumQty
     })
   },
-  
+
 })

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

@@ -15,9 +15,9 @@
 <!-- 列表区 -->
 <dk-list   bind:toPoint="toPoint"   bind:toDetail="toDetail"
    list="{{tableData}}" flgPoint = "{{true}}" title="supplierName" 
-    status="intoStatusName"  contentCol="intoStatusName"
+    status="displayedStatus"  contentCol="displayedStatus"
      contentObj="{{contentObj}}" footerAmount="{{footerAmount}}" 
-     footerInfo="{{footerInfo}}"   ></dk-list>
+     footerInfo="{{footerInfo}}" ></dk-list>
 
 <!-- 显示没用更多 -->
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
@@ -28,4 +28,4 @@
  
  
 <!-- 新建按钮 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="open"></dk-save-button>