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

api/pages/ivt/saleOutBoundReturn.js

@@ -25,7 +25,7 @@ module.exports = {
       add:{key:'add',url:'/package-sales/pages/order-return/add/add'},
       edit:{key:'edit',url:'/package-sales/pages/order-return/add/add',idKey:'outId',formType:'detail'},
       selectSourceSaleOrder:{
-        key:'selectSourceSaleOrder',url:'/package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order'
+        key:'selectSourceSaleOrder',url:'/package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order' , primaryKey: 'cusId'
       }, 
       selectCustomers: { key: 'selectCustomers', url: '/package-base-select/pages/select-customers/select-customers' },
       openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },

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

@@ -35,6 +35,7 @@ setSearchParams(params) {
   //销售状态
   params.outStatus = Constants.outStatus.outBounded
   params.outType = Constants.outType.sale
+  params.cusId = this.data.item.id
   return params
 },
   

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

@@ -18,6 +18,8 @@ Page({
     showPopFlag: true,
     stepperFlag: true,
     cardList: [
+      { name: 'main', title: ''},
+      { name: 'relation', title: ''},
       { name: 'items', title: mixins.$t("goodsDetail"), chooseGoodsFlag: false, sumReturnAmt: 0, displayNum: 2 },
       { name: 'other', title: mixins.$t("otherInfo") }
     ],

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

@@ -39,7 +39,7 @@
   </view>
 </view>
 
-<dk-form-bill id="dk-form-bill" routeObjName="{{routeObjName}}" type="purReturn" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" showPopFlag="{{showPopFlag}}" descCol="skuModel" priceCol="priceReturn" quantityCol="itemQty" quantityMin="itemQtyMin" quantityMax="itemQtyMax" sumAmountCol="sumReturnAmt" bind:chooseData="chooseData" saleStaffAndOrgFlag="{{formMode == 'edit' ? false: true}}" contentObj="{{contentObj}}" model:value="{{formData}}" popType="sale" bind:setGoods="setGoods" bind:delItem="delItem" staff="staff" org="org" bind:onStepper="onChangeStepper" quantityMin="itemQtyMin" quantityMax="itemQtyMax" stepperFlag="{{stepperFlag}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}">
+<dk-form-bill id="{{formName}}" routeObjName="{{routeObjName}}" type="purReturn" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" showPopFlag="{{showPopFlag}}" descCol="skuModel" priceCol="priceReturn" quantityCol="itemQty" quantityMin="itemQtyMin" quantityMax="itemQtyMax" sumAmountCol="sumReturnAmt" bind:chooseData="chooseData" saleStaffAndOrgFlag="{{formMode == 'edit' ? false: true}}" contentObj="{{contentObj}}" model:value="{{formData}}" popType="sale" bind:setGoods="setGoods" bind:delItem="delItem" staff="staff" org="org" bind:onStepper="onChangeStepper" quantityMin="itemQtyMin" quantityMax="itemQtyMax" stepperFlag="{{stepperFlag}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}">
 </dk-form-bill>
 
 

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

@@ -34,6 +34,8 @@ Page({
         code: 'fromNo',
         name: 'fromNo',
         type: 'choose',
+        titpsKey:'cusId',
+        titpsMessage:'请选择客户',
         controlChooseFlag: true,
         title: mixins.$t("sourceOrder"),//'关联源单'
         urlKey: 'selectSourceSaleOrder'