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

# Conflicts:
#	package-base-select/pages/select-data/select-data.js

app.json

@@ -12,7 +12,6 @@
         "components/dkbase/dk-customer-detail/dk-customer-detail",
         "components/dkbase/dk-step/dk-step",
         "components/dkbase/dk-goos-list-step/dk-goos-list-step"
-        
     ],
     "subPackages": [
         {
@@ -34,7 +33,7 @@
                 "pages/basic-data/basic-data",
                 "pages/basic-data/basic-data-sort/basic-data-sort",
                 "pages/product-file/product-file",
-                "pages/product-file/add/add", 
+                "pages/product-file/add/add",
                 "pages/product-file/product-types/product-types",
                 "pages/product-file/product-series/product-series",
                 "pages/product-file/metering-unit/metering-unit",
@@ -317,7 +316,7 @@
         "dk-search": "components/dkbase/dk-search/dk-search",
         "dk-side-pull-menu": "components/dkbase/dk-side-pull-menu/dk-side-pull-menu",
         "dk-step": "components/dkbase/dk-step/dk-step",
-        "dk-goos-list-step": "components/dkbase/dk-goos-list-step/dk-goos-list-step", 
+        "dk-goos-list-step": "components/dkbase/dk-goos-list-step/dk-goos-list-step",
         "dk-table": "components/dkbase/dk-table/dk-table",
         "dk-tabs": "components/dkbase/dk-tabs/dk-tabs",
         "dk-tag": "components/dkbase/dk-tag/dk-tag",
@@ -348,7 +347,8 @@
         "dk-drag": "components/dkbase/dk-drag/index",
         "dk-guide": "components/dkbase/dk-guide/dk-guide",
         "dk-list-report": "components/dkbase/dk-list-report/dk-list-report",
-        "dk-goos-list": "components/dkbase/dk-goos-list/dk-goos-list"
+        "dk-goos-list": "components/dkbase/dk-goos-list/dk-goos-list",
+        "dk-stepper": "components/dkbase/dk-stepper/dk-stepper"
     },
     "tabBar": {
         "color": "#95A8CB",

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -45,6 +45,10 @@ Component({
     dataTime: {
       type: Number,
     },
+    // 最小日期
+    minDate: {
+      type: Number,
+    },
     // 开单组件类型(sale,pur)
     type: {
       type: String,
@@ -126,7 +130,7 @@ Component({
       type: Boolean,
       value: true
     },
-    isDetailFlag:{
+    isDetailFlag: {
       type: Boolean,
       value: false
     },
@@ -479,8 +483,8 @@ Component({
         return;
       }
       let ds = e.currentTarget.dataset;
-      console.log('openChoosedItemInfo',e);
-      if ( ds.item.flgSubUnit) {
+      console.log('openChoosedItemInfo', e);
+      if (ds.item.flgSubUnit) {
         ds.item.calculationFormula = ds.item.packBox + ds.item.unitName + '= 1' + ds.item.subUnitName
         ds.item.packageBox = ds.item['box'] + ds.item.subUnitName + ds.item['piece'] + ds.item.unitName
       }
@@ -490,41 +494,41 @@ Component({
       if (this.data.type == Constants.billType.purInto) { //采购入库 
         ds.item.sumPrice = ds.item['itemQty'] * ds.item.priceInto
       }
-      if ( this.data.type == Constants.billType.out ) {
+      if (this.data.type == Constants.billType.out) {
         ds.item.sumPrice = ds.item['itemQty'] * ds.item.priceOut
       }
- 
+
       if (this.data.type == Constants.billType.saleOut ||
-        this.data.type == Constants.billType.inventory) { 
-        ds.item.sumPrice = ds.item['outingQty'] * ds.item.priceOut 
+        this.data.type == Constants.billType.inventory) {
+        ds.item.sumPrice = ds.item['outingQty'] * ds.item.priceOut
       }
       if (this.data.type == Constants.billType.saleOutReturn) { //销售退货的时候 打开商品的pup 就要计算箱片 
-        ds.item.sumPrice = ds.item['outingQty'] * ds.item.priceOut 
+        ds.item.sumPrice = ds.item['outingQty'] * ds.item.priceOut
       }
       this.setInitPopData()
       //没有skuid 是外协商品 
       let popupTopObj_sku = null
       let popContent_sku = null
-      let popContent_ =  util.copyObj(this.data.popContent) 
-      if(ds.item.skuId){  //正常品走
+      let popContent_ = util.copyObj(this.data.popContent)
+      if (ds.item.skuId) { //正常品走
         popupTopObj_sku = this.data.popupTopObj
         popContent_sku = popContent_
-      }else{  //外协品走
+      } else { //外协品走
         //  全-免费版-销售出库-新建、编辑、详情-外协品-抽屉不展示库存量、仓库字段
         popupTopObj_sku = []
-        let index = popContent_.findIndex(element => element.code == 'whId');  
-        if (index !== -1) {  
-            // 找到了满足条件的元素，index 是它的索引  
-            popContent_sku = popContent_
-            popContent_sku.splice(index,1)
-        } else {  
+        let index = popContent_.findIndex(element => element.code == 'whId');
+        if (index !== -1) {
+          // 找到了满足条件的元素，index 是它的索引  
+          popContent_sku = popContent_
+          popContent_sku.splice(index, 1)
+        } else {
           popContent_sku = popContent_
-        } 
+        }
       }
-      console.log("popContent_sku",popContent_sku);
+      console.log("popContent_sku", popContent_sku);
       this.setData({
-        popContent_sku:popContent_sku,
-        popupTopObj_sku:popupTopObj_sku,
+        popContent_sku: popContent_sku,
+        popupTopObj_sku: popupTopObj_sku,
         dataIndex: ds.index,
         dataItem: JSON.stringify(ds.item),
         showPop: true,
@@ -619,7 +623,7 @@ Component({
         this.data.type == Constants.billType.purInto ||
         this.data.type == Constants.billType.inventory
       ) {
-        let itemQty = Number(dataItem['box'])  * Number(dataItem['packBox']) + Number(dataItem['piece']) 
+        let itemQty = Number(dataItem['box']) * Number(dataItem['packBox']) + Number(dataItem['piece'])
         //如果设有做大值 判断  箱片的反算数量 大于 数量最大值
         if (dataItem["itemQty_max"] && itemQty > dataItem["itemQty_max"]) {
           //那就吧 把最大值的数量换算 箱片赋值箱片
@@ -633,7 +637,7 @@ Component({
           return
         }
         //数量等于 包乘以包装数 加上片数 
-        dataItem['itemQty'] =Number(dataItem['box'])  * Number(dataItem['packBox']) + Number(dataItem['piece'])
+        dataItem['itemQty'] = Number(dataItem['box']) * Number(dataItem['packBox']) + Number(dataItem['piece'])
         dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
         if (this.data.type == Constants.billType.pur) { // 采购订单
           dataItem.sumPrice = dataItem['itemQty'] * dataItem.pricePur
@@ -950,8 +954,8 @@ Component({
                   if (!t[item.code]) {
                     t[item.code + '_errMsg'] = title + '不为空'
                     flag = false;
-                  } 
-                
+                  }
+
                 })
               }
             })
@@ -962,14 +966,14 @@ Component({
               if (item.required && !form[item.code]) {
                 item.errMsg = title + '不为空'
                 flag = false;
-              } 
-               
+              }
+
               if (item.type == 'phone' && item.required && form[item.code]) {
                 // 联系电话格式错误
                 var myreg = Constants.Mobile_Phone_Number_Regular_Expression
                 if (!myreg.test(form[item.code])) {
                   item.errMsg = title + '格式错误'
-                  flag = false; 
+                  flag = false;
                 }
               }
             })
@@ -1162,19 +1166,19 @@ Component({
         item: e.detail.item
       })
     },
-       /**
-   * @desc   : 修改str 文本变化
-   * @author : 王英杰
-   * @date   : 2024/2/2 11:46
-   */
-  changeDetailField(e){
-    console.log("changeDetailField",e);
-    let dataItem = JSON.parse(this.data.dataItem)
-    dataItem[e.detail.key]= e.detail.name
-    this.setData({
-      dataItem: JSON.stringify(dataItem)
-    })
-  },
+    /**
+     * @desc   : 修改str 文本变化
+     * @author : 王英杰
+     * @date   : 2024/2/2 11:46
+     */
+    changeDetailField(e) {
+      console.log("changeDetailField", e);
+      let dataItem = JSON.parse(this.data.dataItem)
+      dataItem[e.detail.key] = e.detail.name
+      this.setData({
+        dataItem: JSON.stringify(dataItem)
+      })
+    },
     /**
      * @desc   : 修改输入框的值
      * @author : 周兴
@@ -1219,7 +1223,7 @@ Component({
      * @author : 周兴
      * @date   : 2024/2/2 11:46
      */
-    clearField(e) { 
+    clearField(e) {
       // 只读
       if (this.data.readonly) {
         return;
@@ -1243,10 +1247,10 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     clearAddress(e) {
-         // 明细 只读只读240320
-         if (this.data.readonly) {
-          return;
-        }
+      // 明细 只读只读240320
+      if (this.data.readonly) {
+        return;
+      }
       let form = this.data.form
       delete form['address']
       delete form['addressName'];
@@ -1346,15 +1350,15 @@ Component({
      * @author : 周兴
      * @date   : 2024/2/2 11:46
      */
-    clearChoose(e) { 
+    clearChoose(e) {
       let ds = e.currentTarget.dataset
       let key = ds.key
       let name = ds.name
       let item = ds.item
-        // 明细 只读只读240320
-        if (this.data.readonly) {
-          return;
-        }
+      // 明细 只读只读240320
+      if (this.data.readonly) {
+        return;
+      }
       // 明细 只读只读240320
       if (item.readonlyItem) {
         return;
@@ -1610,7 +1614,7 @@ Component({
      * @author : 周兴
      * @date : 2024/1/19
      */
-    setGoods(e) { 
+    setGoods(e) {
       if (e.data) {
         let form = this.data.form
         let goodsList = form[this.data.itemName] || []
@@ -1621,7 +1625,7 @@ Component({
         this.setData({
           form: form,
           value: JSON.stringify(form)
-        }) 
+        })
         // 设置商品总单的金额信息 
         if (this.data.type == Constants.billType.sale) {
           this.setGoodsAmount(e.data);
@@ -1642,7 +1646,7 @@ Component({
 
         // 设置是否进行收缩
         let card = this.data.cardList.filter(it => it.name == 'items');
-        this.handleContentObj(card[0]) 
+        this.handleContentObj(card[0])
         // 外露setGoods方法
         this.triggerEvent("setGoods", {
           data: goodsList
@@ -1886,7 +1890,7 @@ Component({
       this.setData({
         cardList: cardList,
         form: form
-      }) 
+      })
     },
     /**
      * @desc : 设置商品明细金额相关信息 销售出库
@@ -1906,7 +1910,7 @@ Component({
           item.outingQty = item.outingQty ? item.outingQty : item.itemQty * -1
           item.outingAmt = item.priceOut * item.outingQty
           item.priceOut = item.priceOut
-          sumQuantity += Number(item.outingQty)  //数量
+          sumQuantity += Number(item.outingQty) //数量
           sumAmount += item.priceOut * item.outingQty //没有售价默认取标价
         })
 
@@ -1917,16 +1921,16 @@ Component({
         form.sumQuantity = sumQuantity
         form.outingAmt = sumAmount
         form.outingQty = sumQuantity
-      }else{
+      } else {
         let sumAmount = Number(0)
         let sumQuantity = Number(0)
-         //合计金额
-         cardList[index].sumAmount = sumAmount
-         cardList[index].sumQuantity = sumQuantity
-         form.sumAmount = sumAmount
-         form.sumQuantity = sumQuantity
-         form.outingAmt = sumAmount
-         form.outingQty = sumQuantity
+        //合计金额
+        cardList[index].sumAmount = sumAmount
+        cardList[index].sumQuantity = sumQuantity
+        form.sumAmount = sumAmount
+        form.sumQuantity = sumQuantity
+        form.outingAmt = sumAmount
+        form.outingQty = sumQuantity
       }
       this.setData({
         cardList: cardList,
@@ -1953,7 +1957,7 @@ Component({
       }
       this.setData({
         form: form
-      }) 
+      })
       this.setGoodsOutAmount()
     },
     /**
@@ -1965,8 +1969,8 @@ Component({
       let key = e.detail.key
       let value = e.detail.value
       let dataItem = JSON.parse(this.data.dataItem)
-      dataItem[key] = value 
-      if (isNaN(Number(value))) {  //value是字符串类型的数字 故不能用 (typeof myVar === 'number'来判断
+      dataItem[key] = value
+      if (isNaN(Number(value))) { //value是字符串类型的数字 故不能用 (typeof myVar === 'number'来判断
         dataItem['box'] = 0
         dataItem['piece'] = 0
         dataItem.packageBox = undefined
@@ -1975,7 +1979,7 @@ Component({
           dataItem: JSON.stringify(dataItem)
         })
         return
-      }  
+      }
       if (this.data.type == Constants.billType.sale ||
         this.data.type == Constants.billType.pur ||
         this.data.type == Constants.billType.purInto) {
@@ -1983,7 +1987,7 @@ Component({
         if (key == 'itemQty') {
           dataItem['itemQty'] = value
           dataItem['box'] = parseInt(value / dataItem.packBox)
-          dataItem['piece'] = parseFloat( Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces)); 
+          dataItem['piece'] = parseFloat(Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces));
           dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
           if (this.data.type == Constants.billType.pur) { //采购订单 ，单价*数量，实时变化
             dataItem.sumPrice = dataItem['itemQty'] * dataItem.pricePur
@@ -1997,10 +2001,10 @@ Component({
       } else if (this.data.type == Constants.billType.saleOut ||
         this.data.type == Constants.billType.inventory) {
         //箱片的取值逻辑： 箱 =(数量/包装）取整，片= （数量%包装）取余数
-        if (key == 'outingQty') { 
+        if (key == 'outingQty') {
           dataItem['outingQty'] = value
           dataItem['box'] = parseInt(value / dataItem.packBox)
-          dataItem['piece'] = parseFloat( Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces)); 
+          dataItem['piece'] = parseFloat(Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces));
           dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
           if (this.data.type == Constants.billType.saleOut) { //销售退货
             dataItem.sumPrice = dataItem['outingQty'] * dataItem.priceOut
@@ -2009,14 +2013,14 @@ Component({
 
       } else if (this.data.type == Constants.billType.saleOutReturn) {
         if (key == 'outingQty') {
-          console.log('outingQty',-Math.abs(value));
+          console.log('outingQty', -Math.abs(value));
           dataItem['outingQty'] = -Math.abs(value)
           // 使用 Math.abs() 函数获取 outingQty 的绝对值  
           let outingQty = Math.abs(dataItem.outingQty);
           dataItem['box'] = parseInt(outingQty / dataItem.packBox)
-          dataItem['piece'] = parseFloat( Number(outingQty % dataItem.packBox).toFixed(dataItem.decimalPlaces)); 
-          dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName 
-          dataItem.sumPrice = dataItem['outingQty'] * dataItem.priceOut 
+          dataItem['piece'] = parseFloat(Number(outingQty % dataItem.packBox).toFixed(dataItem.decimalPlaces));
+          dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
+          dataItem.sumPrice = dataItem['outingQty'] * dataItem.priceOut
         }
       }
       this.setData({

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -109,7 +109,7 @@
                     <view style="width: 60%;">
                       <dk-cell contentFontSize="16" height="25rpx" fontWeight="700" left="0rpx" contentColor="#FF7B1A" title="" content="{{ item[priceCol]}}"></dk-cell>
                     </view>
-                    <view style="width: 40%;text-align: right;"> 
+                    <view style="width: 40%;text-align: right;">
                       <van-stepper wx:if="{{stepperFlag}}" integer="{{true}}" value="{{ item[quantityCol]}}" max="{{item[quantityMax]}}" min="{{item[quantityMin]}}" data-index="{{index}}" bind:change="onChangeStepper" />
                       <dk-text wx:else fontWeight="nomal" fontWeight="700" value="{{'x ' + item[quantityCol]}}"></dk-text>
                     </view>
@@ -129,7 +129,7 @@
               </van-card>
               <!-- 明细右上角 -->
               <view wx:if="{{titpsFlag&&!isDetailFlag&&!!!item.noshowtitps}}" class="titps" style="{{item[titpsItemColorFlagKey] ? 'background-color: #E4002B8F;' : 'background: #77C5D59C;'}}">
-                <view  class="titps-font" style="{{ item[titpsItemColorFlagKey] ?'color:#E4002B' : 'color: #00A7B5;'}}">{{ item[titpsLabel] ? item[titpsLabel] : '有货' }}</view>
+                <view class="titps-font" style="{{ item[titpsItemColorFlagKey] ?'color:#E4002B' : 'color: #00A7B5;'}}">{{ item[titpsLabel] ? item[titpsLabel] : '有货' }}</view>
               </view>
               <view style="display: flex;" wx:if="{{item[quantityRedColFlagKey]}}">
                 <view style="width: 60%;">
@@ -170,7 +170,7 @@
             <!--标价折扣-->
             <dk-cell amount="{{false}}" contentColor="#FF7B1A" contentFontWeight="700" titleColor="#95A8CB;" title="标价折扣" content="{{(card[discountStandardCol] && card[discountStandardCol] != 'NaN' && card[discountStandardCol] != 'Infinity')?card[discountStandardCol] + ' %':''  +'-'}}"></dk-cell>
           </view>
-          <view wx:if="{{sumAmountColFlag}}" class="amount-item-class" >
+          <view wx:if="{{sumAmountColFlag}}" class="amount-item-class">
             <!--条数-->
             <dk-cell titleColor="#95A8CB;" title="{{$t['together'] + (card[sumQuantityCol]?card[sumQuantityCol]:0) + $t['piece']}}" amount="{{false}}"></dk-cell>
             <!--合计金额-->
@@ -182,7 +182,7 @@
               <dk-number-input style="width: calc(100% - 130rpx);" fontSize="16" center="left" data-key="{{sumAmountCol}}" inputColor="#FF7B1A"  fontWeight="700" inputValue="{{card[sumAmountCol]?card[sumAmountCol]:0}}" data-index="{{cardIndex}}"bind:triggerBindValue="changeAmount">
               </dk-number-input>
             </view> -->
-          </view>   
+          </view>
           <!--使用收款-->
           <!-- <view class="amount-item-class" wx:if="{{type === 'sale' || type === 'saleOut' }}">
             <view style="display: flex;">
@@ -204,7 +204,7 @@
             </van-field>
 
             <!--文本框-->
-            <van-field wx:if="{{item.type=='str' && (item.show || item.show == undefined) && !item.hide }}" required="{{item.required?true:false }}" data-key="{{item.code}}" auto-focus="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize clearable border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}"  input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
+            <van-field wx:if="{{item.type=='str' && (item.show || item.show == undefined) && !item.hide }}" required="{{item.required?true:false }}" data-key="{{item.code}}" auto-focus="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize clearable border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
               <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
             </van-field>
             <!--选单-->
@@ -285,10 +285,10 @@
 <dk-muti-dropdown-item show="{{mutishow}}" typeName='{{dropType}}' bind:commit='chooseData' bind:muticlose='muticlose'></dk-muti-dropdown-item>
 
 <!--日期-->
-<van-popup show="{{ showDate }}"   custom-style="border-radius:30rpx 30rpx 0 0;" position="bottom" bind:close="cancelDatePop">
-  <van-datetime-picker type="date" bind:confirm="chooseDate" bind:cancel="cancelDatePop" loading="{true}" value="{{dataTime}}" />
+<van-popup show="{{ showDate }}" custom-style="border-radius:30rpx 30rpx 0 0;" position="bottom" bind:close="cancelDatePop">
+  <van-datetime-picker type="date" bind:confirm="chooseDate" bind:cancel="cancelDatePop" loading="{true}" value="{{dataTime}}" min-date="{{ minDate }}" />
 </van-popup>
 
-<dk-popup id="dkPopup" stepperDecimal ="decimalPlaces"   type="{{popType}}" routeObjName="{{routeObjName}}"   titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" readonly="{{readonly}}"  bind:changeField= "changeDetailField" bind:blurNumberField="blurNumberField" bind:commit="editItems"    bind:openPackageBox="openPackageBox"></dk-popup>
+<dk-popup id="dkPopup" stepperDecimal="decimalPlaces" type="{{popType}}" routeObjName="{{routeObjName}}" titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" readonly="{{readonly}}" bind:changeField="changeDetailField" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox"></dk-popup>
 <!-- 箱片 -->
-<dk-popup type="basic" title="修改包装数量" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}" contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox"stepperDecimal ="decimalPlaces"></dk-popup>
+<dk-popup type="basic" title="修改包装数量" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}" contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox" stepperDecimal="decimalPlaces"></dk-popup>

components/dkbase/dk-form/dk-form.wxml

@@ -28,7 +28,7 @@
       <!--开关-->
       <van-field wx:if="{{item.type=='switch'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="right" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
-        <view slot="inputbefor" style="text-align: left;padding-top: 5rpx;">
+        <view slot="inputbefor" style="width:100%;text-align: left;padding-top: 5rpx;" bindtap="onChange">
           <van-switch size="20px" checked="{{ form[item.code]}}" bind:change="onChange" active-color="#3E69F6" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}"disabled="{{item.disabled}}" />
         </view>
       </van-field> 

components/dkbase/dk-popup/dk-popup.js

@@ -415,6 +415,7 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     changeStep(e) {
+      console.log('eee',e);
       if (this.data.readonly) {
         return;
       }

components/dkbase/dk-popup/dk-popup.wxml

@@ -69,7 +69,8 @@
       <!--数量step-->  
       <van-cell wx:if="{{item.type=='step'}}" border="{{ false }}" title-class="cell_title"  title="{{item.title?item.title:'数量'}}" required="{{item.required?true:false }}">
         <van-stepper wx:if="{{item.code == 'box'}}"input-width="50px" value="{{form[item.code]}}" integer="{{true}}"  data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:-9999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
-        <van-stepper wx:else value="{{form[item.code]}}" input-width="50px" integer="{{ form[stepperDecimal]==0}}"decimal-length="{{ form[stepperDecimal] }}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:-99999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
+        <dk-stepper wx:elif="{{item.code == 'itemQty'}}" value="{{form[item.code]}}" input-width="50px" integer="{{ form[stepperDecimal]==0}}"decimal-length="{{ form[stepperDecimal] }}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:-99999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
+        <van-stepper wx:else value="{{form[item.code]}}" input-width="50px" integer="{{ form[stepperDecimal]==0}}"decimal-length="{{ form[stepperDecimal] }}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:-99999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}"/>
       </van-cell>
       <!--数字类-->
       <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" max="{{(item.max || item.max == '')?item.max:10000000}}" min="{{(item.min || item.min == '')?item.min:-10000000}}"  data-index="{{index}}" center="{{'right'}}" readonly="{{!!readonly || !!item.readonly}}" 

components/dkbase/dk-stepper/dk-stepper.js

@@ -0,0 +1,192 @@
+// components/dkbase/dk-stepper/dk-stepper.js
+Component({
+
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+      // 设置数字部分显示宽度
+      inputWidth:{
+        type: String,
+        value: "32px"
+      },
+      value: {
+        type: String
+      },
+      min: {
+        type: String,
+        value:"1"
+      },
+      max: {
+        type: String
+      },
+      step: {
+        type: String,
+        value:"1"
+      },
+      integer: {
+        type: Boolean,
+        value: false
+      },
+      disabled: {
+        type: Boolean,
+        value: false
+      },
+      disableInput: {
+        type: Boolean,
+        value: false
+      },
+      asyncChange: {
+        type: Boolean,
+        value: false
+      },
+      buttonSize: {
+        type: Number,
+        value: "17px"
+      },
+      showPlus: {
+        type: Boolean,
+        value: true
+      },
+      showMinus: {
+        type: Boolean,
+        value: true
+      },
+      decimalLength: {
+        type: Number
+      },
+      theme:{
+        type: String
+      },
+      disablePlus:{
+        type: Boolean
+      },
+      disableMinus:{
+        type: Boolean
+      },
+      longPress:{
+        type: Boolean,
+        value: true
+      },
+      alwaysEmbed:{
+        type: Boolean,
+        value: false
+      },
+      // 用于控制是否显示负数
+      shieldShow:{
+        type: Boolean,
+        value: true
+      }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+      // 光标点击控制遮罩显隐 true遮罩隐藏 false显示
+      checkFocus: false,
+      // 组件内容显示
+      inputValue: '-' + '1',
+      shieldWidth: '',
+      shieldRight: ''
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+      /**
+       * 步进器数值改变
+       * @author 刘尧
+       */
+      changeStep(e){
+        this.setData({
+          inputValue: '-' + e.detail,
+          value: e.detail
+        })
+        // 触发自定义事件  
+        this.triggerEvent('change', String(e.detail));
+      },
+      /**
+       * 显示数字遮罩层
+       * @author 刘尧
+       * @param {*} e 
+       */
+      shieldShow(e){
+        if(this.data.checkFocus){
+          this.setData({
+            checkFocus: false
+          })
+        } 
+      },
+      /**
+       * 步进器点击加号事件
+       * @author 刘尧
+       * @param {*} e 
+       */
+      bindPlus(e){
+        this.shieldShow()
+      },
+       /**
+       * 步进器点击减号事件
+       * @author 刘尧
+       * @param {*} e 
+       */
+      bindMinus(e){
+        this.shieldShow()
+      },
+
+      // 遮罩层input组件和van-stepper组件均绑定以下焦点事件，以便控制遮罩显隐
+
+      /**遮罩组件点击事件
+       * @author : 刘尧
+       * @date : 2024/6/3 09:02
+       * @param {*} e 
+       */
+      inputOnFocus(e){
+        if(!this.data.checkFocus && !this.data.disableInput){
+          this.setData({
+            checkFocus:true
+          })
+        }
+      },
+      /** 
+       * 步进器失去焦点
+       * @author : 刘尧
+       * @date : 2024/6/3 08:44
+       *  */
+      onBlur(e){
+        this.setData({
+          checkFocus:false
+        })
+      },
+      /** 
+       * 步进器获取焦点
+       * @author : 刘尧
+       * @date : 2024/6/3 08:43
+       *  */
+      onFocus(e){
+        this.setData({
+          checkFocus:true
+        })
+      }
+    },
+    observers: {
+      'value, min': function(value, min) {
+        /**
+         * 数据监听当组件被赋予value值或最小值时执行
+         * @author 刘尧
+         */
+        this.setData({
+          inputValue: '-' + value || min
+        })
+      },
+      'inputWidth, buttonSize': function(inputWidth, buttonSize){
+        let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
+        this.setData({
+          shieldWidth: (750 / deviceWidth) * Number(inputWidth.replace('px', '')) + 'rpx',
+          shieldRight: (750 / deviceWidth) * Number(buttonSize.replace('px', '')) + 'rpx'
+        })
+      }
+    }
+})

components/dkbase/dk-stepper/dk-stepper.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

components/dkbase/dk-stepper/dk-stepper.wxml

@@ -0,0 +1,12 @@
+<view>
+  <view class="com-content">
+    <!-- 将文字显示上方获取焦点相关事件处理遮罩文字显隐 -->
+    <view class="number-view" style="width: {{inputWidth}};margin-right:{{buttonSize}};">
+      <view class="number-content" style="width: {{inputWidth ? inputWidth: ''}};" bindtap="inputOnFocus" wx:if="{{ !checkFocus && shieldShow }}">{{ inputValue }}</view>
+    </view>
+    <!-- 原始步进器组件 -->
+    <van-stepper bind:blur="onBlur"
+    value="{{value}}"
+    input-width="{{inputWidth}}" async-change="{{asyncChange}}" button-size="{{buttonSize}}" show-plus="{{showPlus}}" min="{{min}}" max="{{max}}" bind:focus="onFocus" step="{{step}}" disabled="{{disabled}}" disableInput="{{disableInput}}" integer="{{integer}}" show-minus="{{showMinus}}" decimal-length="{{decimalLength}}" theme="{{theme}}" disable-plus="{{disablePlus}}" disable-minus="{{disableMinus}}" long-press="{{longPress}}" always-embed="{{alwaysEmbed}}" bind:plus="bindPlus" bind:minus="bindMinus" bind:change="changeStep"></van-stepper>
+  </view>
+</view>

components/dkbase/dk-stepper/dk-stepper.wxss

@@ -0,0 +1,22 @@
+.com-content{
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  background-color: #ffffff;
+  padding: 5rpx;
+}
+
+.number-view{
+  position: fixed;
+  display: flex;
+  z-index: 100;
+  justify-content: center;
+  align-items: center;
+  padding: 5rpx;
+}
+
+.number-content{
+  text-align: center;
+  z-index: 100;
+  background-color: #ffffff;
+}

package-base-select/pages/select-choose-coordination/select-choose-coordination.js

@@ -8,12 +8,17 @@ Page({
    * 页面的初始数据
    */
   data: {
-    cardList: [{ name: 'items' }],
-    buttonSaveList: [{ code: 'add', title: mixins.$t('confirm'), width: '120rpx' }],
+    cardList: [{
+      name: 'items'
+    }],
+    buttonSaveList: [{
+      code: 'add',
+      title: mixins.$t('confirm'),
+      width: '120rpx'
+    }],
     routeObjName: 'goodsBrand',
     contentObj: {
-      items: [
-        {
+      items: [{
           code: 'supId',
           name: 'supName',
           title: mixins.$t("supplier"), //'供应商',
@@ -21,12 +26,42 @@ Page({
           required: true,
           urlKey: 'chooseOutSupplier'
         },
-        { code: 'skuModel', type: 'str', title: mixins.$t("skuModel"), required: true },
-        { code: 'skuName', type: 'str', title: mixins.$t("skuName"), },
-        { code: 'itemQty', required: true, type: 'number', sign: "", digits: 0, title: mixins.$t('count') },
-        { code: 'itemPrice', required: true, type: 'number', title: mixins.$t("salePrice") },
-        { code: 'itemAmt', readonly: true, type: 'number', title: mixins.$t("amount") },
-        { code: 'remarks', type: 'str', title: mixins.$t("remarks") }
+        {
+          code: 'skuModel',
+          type: 'str',
+          title: mixins.$t("skuModel"),
+          required: true
+        },
+        {
+          code: 'skuName',
+          type: 'str',
+          title: mixins.$t("skuName"),
+        },
+        {
+          code: 'itemQty',
+          required: true,
+          type: 'number',
+          sign: "",
+          digits: 0,
+          title: mixins.$t('count')
+        },
+        {
+          code: 'itemPrice',
+          required: true,
+          type: 'number',
+          title: mixins.$t("salePrice")
+        },
+        {
+          code: 'itemAmt',
+          readonly: true,
+          type: 'number',
+          title: mixins.$t("amount")
+        },
+        {
+          code: 'remarks',
+          type: 'str',
+          title: mixins.$t("remarks")
+        }
       ],
     }
 
@@ -48,7 +83,7 @@ Page({
       formData.itemList[index]['itemAmt'] = Number(formData.itemList[index]['itemPrice'] * formData.itemList[index]['itemQty'])
     }
     this.setData({
-      formData:JSON.stringify(formData)
+      formData: JSON.stringify(formData)
     })
   },
 
@@ -57,24 +92,26 @@ Page({
    * @date : 2024/5/11 15:49
    * @author : 于继渤
    */
-  saveButton(e){
+  saveButton(e) {
     let formData = JSON.parse(this.data.formData)
     console.log(formData.itemList)
-    if(this.data.item == Constants.billType.sale){
+    if (this.data.item == Constants.billType.sale) {
 
     }
-    if(this.data.item == Constants.billType.saleOut){
-      formData.itemList.forEach(res=>{
+    formData.itemList.forEach(res => {
+      if (this.data.item == Constants.billType.saleOut) {
         res['priceOut'] = res.itemPrice
         res['outingQty'] = res.itemQty
         res['outingAmt'] = res.itemAmt
-      })
-    }
+      }
+      res['brandName'] =  res['supName']+"(外协)"
+    })
+
 
 
     const eventChannel = this.getOpenerEventChannel();
     eventChannel.emit('bindData', {
-      choosedGoodsList:formData.itemList
+      choosedGoodsList: formData.itemList
     })
     wx.navigateBack({
       delta: 1

package-base-select/pages/select-choose-coordination/select-choose-coordination.wxml

@@ -7,7 +7,7 @@
 
 <dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol=""  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}"  bind:chooseData="chooseData" bind:changeItemNumberField ="changeItemNumberField" readonly="{{false}}" bind:changeNumber="changeNumber" bind:delItem= "delItem"  >
 </dk-form-more-items>     
-
+<view style="height: 200rpx;"></view>
 
 <!--  保存 -->
 <dk-save-button  btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="saveButton" ></dk-save-button>

package-base-select/pages/select-data/select-data.js

@@ -61,7 +61,7 @@ Page({
       title: '确定'
     }],
     // 新加的数据
-    addItem:null,
+    addItem: null,
   },
   /**
    * @desc : 调到新建
@@ -298,7 +298,7 @@ Page({
       case Constants.chooseType.series:
         data = {
           id: item.seriesId,
-          name: item.serieName
+          name: item.seriesName
         }
         break;
       // 计量单位 刘尧 2024.05.29
@@ -449,7 +449,7 @@ Page({
     let routeObjNamePop = this.data.routeObjNamePop
     if (!routeObjNamePop) return;
     this.setData({
-      addItem:null
+      addItem: null
     })
     let service = app.globalData[routeObjNamePop + 'Service']
     let defaultFlag = this.data.defaultFlag;
@@ -465,12 +465,12 @@ Page({
           if (res.data.data) {
             setTimeout(() => {
               // 多选就选中
-              if(this.data.chooseFlag){
+              if (this.data.chooseFlag) {
                 this.setData({
-                  addItem:res.data.data
+                  addItem: res.data.data
                 })
                 this.searchData();
-              }else{
+              } else {
                 // 执行点击事件
                 this._toDetail(res.data.data)
               }
@@ -593,7 +593,7 @@ Page({
           addUrl: '/package-basic-data/pages/role/add/add',
           routeObjName: 'common',
           method: 'getRole',
-          valueKey:'roleId',
+          valueKey: 'roleId',
           title: 'roleName',
           chooseFlag: route.chooseFlag,
           contentList: [{
@@ -610,7 +610,7 @@ Page({
           addUrl: app.globalData.company.gradeCode == Constants.gradeCode.STD ? null : '/package-basic-data/pages/org/org',
           routeObjName: 'common',
           method: 'getOrg',
-          valueKey:'orgId',
+          valueKey: 'orgId',
           title: 'orgName',
           contentList: [{
             name: 'orgCode',
@@ -626,7 +626,7 @@ Page({
           addUrl: '/package-basic-data/pages/staff/add/add',
           routeObjName: 'common',
           method: 'getStaff',
-          valueKey:'staffId',
+          valueKey: 'staffId',
           title: 'staffName',
           contentList: [{
             name: 'staffCode',
@@ -647,7 +647,7 @@ Page({
         this.setData({
           routeObjName: 'common',
           method: 'getInitData',
-          valueKey:'dataId',
+          valueKey: 'dataId',
           title: 'dataValue',
           contentList: [{
             name: 'dataCode',
@@ -669,7 +669,7 @@ Page({
           routeObjName: 'common',
           pageFlag: false,
           method: 'getMac',
-          valueKey:'macId',
+          valueKey: 'macId',
           title: 'macName',
           contentList: [{
             name: 'macCode',
@@ -691,7 +691,7 @@ Page({
         this.setData({
           routeObjName: 'common',
           method: 'getInitData',
-          valueKey:'channelId',
+          valueKey: 'channelId',
           title: 'channelName',
           simpleFlag: true,
           placeholder: ['channelName']
@@ -752,7 +752,7 @@ Page({
           routeObjName: 'common',
           routeObjNamePop: 'warehouse',
           method: 'getWarehouseListBy',
-          valueKey:'whId',
+          valueKey: 'whId',
           title: 'whName',
           contentList: [{
             name: 'supervisor',
@@ -877,9 +877,15 @@ Page({
           valueKey: 'seriesId',
           pageFlag: false,
           popTitle: mixins.$t('add') + title,
-          title: 'serieName',
+          title: 'seriesName',
           simpleFlag: true,
-          placeholder: ['seriesName']
+          placeholder: ['seriesName'],
+        })
+        this.setData({
+          popContent: [
+            { code: 'seriesName', type: 'str', title: mixins.$t('seriesName'), required: true },
+            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+          ],
         })
         break;
       // 计量单位 刘尧 2024.05.29
@@ -1036,10 +1042,10 @@ Page({
     let valueKey = this.data.valueKey
     let choosedData = this.data.choosedData
     tableData.forEach(item => {
-      if(addItem && valueKey){
-        if(item[valueKey] == addItem[valueKey]){
+      if (addItem && valueKey) {
+        if (item[valueKey] == addItem[valueKey]) {
           item.checked = true;
-          choosedData.push({...item});
+          choosedData.push({ ...item });
         }
       }
       // 判断数据中是否存在计量单位的小数位数字段
@@ -1049,7 +1055,7 @@ Page({
     })
     this.setData({
       tableData: tableData,
-      choosedData:choosedData
+      choosedData: choosedData
     })
   }
 })

package-base-select/pages/select-source-sale-order/select-source-sale-order.wxml

@@ -40,7 +40,7 @@
             </view>
             <view style="width: 100%;padding:20rpx;padding-left: 10rpx;">
               <view>
-                <dk-title titleTag="{{'HEGII'}}" title="{{item_.skuCode}}"></dk-title>
+                <dk-title titleTag="{{item_.brandName}}"  title="{{item_.skuCode}}"></dk-title>
               </view>
               <view>
                 <view style="width: 100%;margin-top: 10rpx;" class="font">{{item_.skuName}}</view>

package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order.wxml

@@ -39,7 +39,9 @@
               <van-image radius="5px" width="80" height="80" src="{{item_.skuImages? item_.skuImages.path : ''}}" />
             </view>
             <view style="width: 100%;padding:20rpx;padding-left: 10rpx;">
-           
+              <view>
+                <dk-title titleTag="{{item_.brandName}}" title="{{item_.skuCode}}"></dk-title>
+              </view>
               <view>
                 <view style="width: 100%;margin-top: 10rpx;" class="font">{{item_.skuModel?item_.skuModel:''}}</view>
               </view>

package-inventory/pages/outbound-processing/detail/detail.js

@@ -160,13 +160,24 @@ Page({
 
     cardList_.forEach(card => {
       if (card.name === 'items') {
-        if (data.outStatus == Constants.outStatus.outBounding) {
-          card.info = "（" + mixins.$t("outboundProcessing") + "）"
-          card.color = "#E4002B"
-        } else {
-          card.info = "（" + mixins.$t("checkouted") + "）"
-          card.color = "#1B365D"
+        if(data.outType == Constants.outType.purReturn){
+          if (data.outStatus == Constants.outStatus.outBounding) {
+            card.info = "（" + mixins.$t("warehousingProcessing") + "）"
+            card.color = "#E4002B"
+          } else {
+            card.info = "（" + mixins.$t("checkined") + "）"
+            card.color = "#1B365D"
+          }
+        }else{
+          if (data.outStatus == Constants.outStatus.outBounding) {
+            card.info = "（" + mixins.$t("outboundProcessing") + "）"
+            card.color = "#E4002B"
+          } else {
+            card.info = "（" + mixins.$t("checkouted") + "）"
+            card.color = "#1B365D"
+          }
         }
+      
         card.itemAmt = sumitemAmt
         //  出库状态-已出库
         if (data.outStatus == Constants.outStatus.outBounded) {

package-inventory/pages/outbound-processing/detail/detail.wxml

@@ -2,7 +2,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading> 
 
-<dk-form-bill id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{item.outStatus == $t['outBoundedOutStatus']}}" cardList="{{cardList}}"  titleCol="skuCode"  subCol="skuCode" descCol="skuName" priceCol="priceOut" quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" iconCol="imagesUrl" discountStandardCol="saleDiscount"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" table="{{table}}" bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag"  popType="sale" popupTopObj = "{{popupTopObj}}" titpsFlag="{{titpsFlag}}">
+<dk-form-bill id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{item.outStatus == $t['outBoundedOutStatus']}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" iconCol="imagesUrl" discountStandardCol="saleDiscount"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" table="{{table}}" bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag"  popType="sale" popupTopObj = "{{popupTopObj}}" titpsFlag="{{titpsFlag}}">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

package-sales/pages/order-return/add/add.js

@@ -824,7 +824,7 @@ Page({
       //按钮
       buttonSaveList = [{
         code: 'save',
-        title: mixins.$t("outProcessing")
+        title: mixins.$t("inProcessing")
       }]
       contentSaveList = [
         {

package-sales/pages/order-return/add/add.wxml

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 <van-dialog id="van-dialog" />
 <!-- priceStd -->
-<dk-form-bill type="saleOutReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="" titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods" readonly="{{formMode == 'detail' && formType =='detail'}}" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel">
+<dk-form-bill type="saleOutReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="" titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods" readonly="{{formMode == 'detail' && formType =='detail'}}" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel"titleTagCol="brandName">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

package-sales/pages/sales-outbound/add/add.wxml

@@ -4,7 +4,7 @@
 
 
  
-<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{formMode == 'detail'}}" table="{{table}}" pupPriceCol="sumPrice" bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale"   staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" isDetailFlag="{{isDetailFlag}}">
+<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{formMode == 'detail'}}" table="{{table}}" pupPriceCol="sumPrice" bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale"   staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" isDetailFlag="{{isDetailFlag}}"dataTime="{{dataTime}}"minDate="{{dataTime}}"titleTagCol="brandName">
  
 </dk-form-bill>
 <van-dialog id="van-dialog" />