修改

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

@@ -449,7 +449,7 @@ Page({
             title: '来源名称'
           },
           ],
-          placeholder: ['cusFromName']
+          placeholder: ['sourceName']
         })
         break;
       //销售渠道

package-base-select/pages/select-goods/select-goods.wxml

@@ -51,7 +51,7 @@
           <view style="margin-left: 26rpx;width: 100%; ">
             <!-- 标题 -->
             <view>
-              <dk-title  titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
+              <dk-title  titleTag="{{item.shortName}}" title="{{item.skuModel}}"></dk-title>
             </view>
             <!-- 描述 -->
             <view style="display: flex;padding-top: 10rpx;">
@@ -200,7 +200,7 @@
               <view data-item="{{item}}" data-index="{{index}}" bind:tap="openChoosedItemInfo">
                 <!-- 标题 -->
                 <view style="display: flex;">
-                  <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
+                  <dk-title titleTag="{{item.shortName}}" title="{{item.skuModel}}"></dk-title>
                 </view>
                 <!-- 描述 -->
                 <view style="display: flex; ">
@@ -262,15 +262,15 @@
 
 
 
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuName" titleTagCol="shortName" titleCol="skuModel" iconCol="imagesUrl" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
 
 
-<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="shortName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
-<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" popupTopObj="{{popupTopObj}}">
+<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="shortName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" popupTopObj="{{popupTopObj}}">
 </dk-popup>
 
 <dk-save-button  cssType="sale" model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="submit"></dk-save-button>

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

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

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

@@ -41,7 +41,7 @@
 </view>
 
 
-<dk-form-bill id="dk-form-bill" routeObjName="{{routeObjName}}" bind:onStepper="onChangeStepper" cardList="{{cardList}}" titleTagCol="brandName" titleCol="skuModel" showPopFlag="{{true}}" descCol="skuName" priceCol="priceReturn" quantityCol="returnQty"   iconCol="imagesUrl"  quantityMin="returnQtyMin" quantityMax="returnQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol="sumReturnAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popType="sale" priceTitle=""  stepperFlag="{{true}}">
+<dk-form-bill id="dk-form-bill" routeObjName="{{routeObjName}}" bind:onStepper="onChangeStepper" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel" showPopFlag="{{true}}" descCol="skuName" priceCol="priceReturn" quantityCol="returnQty"   iconCol="imagesUrl"  quantityMin="returnQtyMin" quantityMax="returnQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol="sumReturnAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popType="sale" priceTitle=""  stepperFlag="{{true}}">
 </dk-form-bill>
 
 <!-- 空高度  -->

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 
 
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="skuCode" priceCol="priceSale" quantityCol="itemQty" sumAmountCol="sumAmount" sumQuantityCol="sumQuantity" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" pupPriceCol="priceStd"
+<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="skuCode" priceCol="priceSale" quantityCol="itemQty" sumAmountCol="sumAmount" sumQuantityCol="sumQuantity" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" pupPriceCol="priceStd"
 bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"
 bind:customersChoose="customersChoose" bind:changeCheckBox="changeCheckBox" bind:changePhoneblur="changePhoneblur"  popType="sale" priceTitle="标价：" staff="staff" org="org">
 </dk-form-bill>

package-sales/pages/order-billing/detail/detail.wxml

@@ -93,7 +93,7 @@
 
 
 
-<dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName" titleCol="skuModel" descCol="skuName" priceCol="priceSale" quantityCol="itemQty" sumAmountCol="sumAmount"  iconCol="imagesUrl"  discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{true}}" showPopFlag="{{true}}" bind:editItems="editItems" saleStaffAndOrgFlag="{{false}}" bind:customersChoose="customersChoose" popType="sale" priceTitle="售价：">
+<dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel" descCol="skuName" priceCol="priceSale" quantityCol="itemQty" sumAmountCol="sumAmount"  iconCol="imagesUrl"  discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{true}}" showPopFlag="{{true}}" bind:editItems="editItems" saleStaffAndOrgFlag="{{false}}" bind:customersChoose="customersChoose" popType="sale" priceTitle="售价：">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>
 <view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode =='other'}}">

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 
 
-<dk-form-bill type="saleOutReturn" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName" titleCol="skuModel"  subCol="skuName" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="priceStd" contentObj="{{contentObj}}"  iconCol="imagesUrl"  model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
+<dk-form-bill type="saleOutReturn" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel"  subCol="skuName" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="priceStd" contentObj="{{contentObj}}"  iconCol="imagesUrl"  model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
 bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"
 bind:customersChoose="customersChoose"   popType="sale" priceTitle="标价：" staff="staff" org="org"
 

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 
 
-<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName" titleCol="skuModel"  subCol="skuCode" 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"   table="{{table}}" pupPriceCol="priceStd"
+<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel"  subCol="skuCode" 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"   table="{{table}}" pupPriceCol="priceStd"
 bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList"
 bind:customersChoose="customersChoose"   popType="sale" priceTitle="销售价：" staff="staff" org="org"
 popupTopObj="{{popupTopObj}}"