2 订单所有pop中的品牌名称放在头部去，下方不显示

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

@@ -60,12 +60,7 @@ Page({
         readonly: true,
         dropType: ''
       },
-      {
-        code: 'brandName',
-        title: mixins.$t('brandName'),
-        type: 'str',
-        readonly: true,
-      },
+      
       {
         code: 'nonStdCode',
         title: '色号',
@@ -230,13 +225,7 @@ Page({
             title: mixins.$t("warehouseId"),
             type: 'choose',
             urlKey: 'chooseWh'
-          },
-          {
-            code: 'brandName',
-            title: mixins.$t('brandName'),
-            type: 'str',
-            readonly: true,
-          },
+          }, 
           {
             code: 'nonStdCode',
             title: mixins.$t("goodsBatch"),
@@ -297,13 +286,7 @@ Page({
             readonly: true,
             title: mixins.$t("warehouseId"),
             type: 'str'
-          },
-          {
-            code: 'brandName',
-            title: mixins.$t('brandName'),
-            type: 'str',
-            readonly: true,
-          },
+          }, 
           {
             code: 'nonStdCode',
             readonly: true,
@@ -363,13 +346,7 @@ Page({
             title: mixins.$t("warehouseId"),
             type: 'choose',
             urlKey: 'chooseWh'
-          },
-          {
-            code: 'brandName',
-            title: mixins.$t('brandName'),
-            type: 'str',
-            readonly: true,
-          },
+          }, 
           {
             code: 'nonStdCode',
             title: mixins.$t("goodsBatch"),
@@ -431,13 +408,7 @@ Page({
             title: mixins.$t("warehouseId"),
             type: 'choose',
             urlKey: 'openingInventory',
-          },
-          {
-            code: 'brandName',
-            title: mixins.$t('brandName'),
-            type: 'str',
-            readonly: true,
-          },
+          }, 
           {
             code: 'nonStdCode',
             title: mixins.$t("goodsBatch"),
@@ -476,13 +447,7 @@ Page({
             title: mixins.$t("warehouseId"),
             type: 'choose',
             urlKey: 'selectInventorySku',
-          },
-          {
-            code: 'brandName',
-            title: mixins.$t('brandName'),
-            type: 'str',
-            readonly: true,
-          },
+          }, 
           {
             code: 'nonStdCode',
             title: mixins.$t("goodsBatch"),

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

@@ -66,7 +66,7 @@
           <view style="margin-left: 26rpx;width: 100%; ">
             <!-- 标题 -->
             <view>
-              <dk-title titleTag="{{}}" title="{{item.skuModel}}"></dk-title>
+              <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
             </view>
             <!-- 描述 -->
             <view style="display: flex;padding-top: 10rpx;">
@@ -217,7 +217,7 @@
             <view data-item="{{item}}" data-index="{{index}}" bind:tap="openChoosedItemInfo">
               <!-- 标题 -->
               <view style="display: flex;">
-                <dk-title titleTag="{{ }}" title="{{item.skuModel}}"></dk-title>
+                <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
               </view>
               <!-- 描述 -->
               <view style="display: flex; ">
@@ -399,19 +399,19 @@
 
 
 <!--  采购入库 采购订单 其它入库  -->
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory'  }}" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems">
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory'  }}" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems">
 </dk-popup>
 
 <!-- 库存 -->
-<dk-popup id="dkPopup" wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName" stepperDecimal="decimalPlaces" subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField="changeField" bind:changeCheckBox="popupChangeCheckBox">
+<dk-popup id="dkPopup" wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName" stepperDecimal="decimalPlaces" subCol="calculationFormula" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField="changeField" bind:changeCheckBox="popupChangeCheckBox">
 </dk-popup>
 
 
 <!-- 销售开单 -->
-<dk-popup id="dkPopup" wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems" bind:blurNumberField="blurNumberField" bind:changeField="changeField" bind:changeCheckBox="popupChangeCheckBox">
+<dk-popup id="dkPopup" wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems" bind:blurNumberField="blurNumberField" bind:changeField="changeField" bind:changeCheckBox="popupChangeCheckBox">
 </dk-popup>
 <!-- 销售出库 -->
-<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox" bind:blurNumberField="blurNumberField" bind:changeField="changeField">
+<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox" bind:blurNumberField="blurNumberField" bind:changeField="changeField">
 </dk-popup>
 
 <!-- 箱片 -->

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

@@ -39,13 +39,7 @@ Page({
                 title: mixins.$t('goodSpec'), //'规格',
                 type: 'str',
                 readonly: true,
-            },
-            {
-                code: 'brandName',
-                title: mixins.$t('brandName'),
-                type: 'str',
-                readonly: true,
-            },
+            }, 
             {
                 code: 'nonStdCode',
                 title: mixins.$t('goodsBatch'), //'色号',

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

@@ -6,7 +6,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel"   descCol="skuName" subCol="calculationFormula" priceCol="pricePur"  pupPriceCol="sumPrice"  quantityCol="itemQty" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}" iconCol="imagesUrl" bind:delItem="setGoods" bind:setGoods="setGoods"  minDate="{{minDate}}">
+<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleTagCol="brandName"   titleCol="skuModel"   descCol="skuName" subCol="calculationFormula" priceCol="pricePur"  pupPriceCol="sumPrice"  quantityCol="itemQty" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}" iconCol="imagesUrl" bind:delItem="setGoods" bind:setGoods="setGoods"  minDate="{{minDate}}">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -79,13 +79,7 @@ Page({
         title: mixins.$t('goodSpec'), //'规格',
         type: 'str',
         readonly: true,
-      },
-      {
-        code: 'brandName',
-        title: mixins.$t('brandName'),
-        type: 'str',
-        readonly: true,
-      },
+      }, 
       {
         code: 'nonStdCode',
         title: mixins.$t('goodsBatch'), //'色号',

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

@@ -94,7 +94,7 @@
 </view>
 
 <!-- 商品信息 和 其他信息 -->
-<dk-form-bill id="{{formName}}"  type="pur" routeObjName="{{routeObjName}}" readonly="{{true}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"subCol="calculationFormula" priceCol="pricePur"pupPriceCol="sumPrice" quantityCol="itemQty" iconCol="imagesUrl"sumAmountCol="itemAmt"sumQuantityCol="itemQty"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：">
+<dk-form-bill id="{{formName}}"  titleTagCol="brandName"  type="pur" routeObjName="{{routeObjName}}" readonly="{{true}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"subCol="calculationFormula" priceCol="pricePur"pupPriceCol="sumPrice" quantityCol="itemQty" iconCol="imagesUrl"sumAmountCol="itemAmt"sumQuantityCol="itemQty"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -65,13 +65,7 @@ Page({
       title: mixins.$t("goodSpec"), //'规格',
       type: 'str',
       readonly: true,
-    },
-    {
-      code: 'brandName',
-      title: mixins.$t('brandName'),
-      type: 'str',
-      readonly: true,
-    },
+    }, 
     {
       code: 'nonStdCode',
       title: mixins.$t("goodsBatch"), //'色号',

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

@@ -4,7 +4,7 @@
 <loading wx:if="{{loading}}" ></loading>
 
  
-<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula"  descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{(!intoStatusflag)?'intoQty':'intoingQty'}}" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle=""   bind:clear = "clear" readonly = "{{readonly}}"   controlFlags ="{{controlFlags}}"
+<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" titleTagCol="brandName"  subCol="calculationFormula"  descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{(!intoStatusflag)?'intoQty':'intoingQty'}}" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle=""   bind:clear = "clear" readonly = "{{readonly}}"   controlFlags ="{{controlFlags}}"
 bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods" table="{{table}}">
 </dk-form-bill>
 

package-purchase/pages/purchase-receipt/detail/detail.js

@@ -97,13 +97,7 @@ Page({
         title: mixins.$t("goodSpec"), //'规格',
         type: 'str',
         readonly: true
-      },
-      {
-        code: 'brandName',
-        title: mixins.$t('brandName'), 
-        type: 'str',
-        readonly:true,
-    },
+      }, 
       {
         code: 'nonStdCode',
         title: mixins.$t("goodsBatch"), //'色号',

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

@@ -42,7 +42,7 @@
   </view>
 </view>
 
-<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" quantityCol="{{intoStatusflag?'intoingQty':'intoQty'}}" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']+'：'}}" bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods">
+<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" titleTagCol="brandName"  iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" quantityCol="{{intoStatusflag?'intoingQty':'intoQty'}}" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']+'：'}}" bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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}}"  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}}"  titleCol="skuModel" titleTagCol="brandName"  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}}"  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="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>
 
 <!-- 空高度  -->

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

@@ -189,13 +189,7 @@ Page({
         title: mixins.$t("warehouseId"),
         type: 'choose',
         urlKey: 'openingInventory',
-      },
-      {
-        code: 'brandName',
-        title: mixins.$t('brandName'),
-        type: 'str',
-        readonly: true,
-      },
+      }, 
       {
         code: 'nonStdCode',
         title: mixins.$t("goodsBatch"),

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

@@ -154,13 +154,7 @@ Page({
       title: mixins.$t("warehouseId"),
       type: 'choose',
       urlKey: 'openingInventory',
-    },
-    {
-      code: 'brandName',
-      title: mixins.$t('brandName'),
-      type: 'str',
-      readonly: true,
-    },
+    }, 
     {
       code: 'nonStdCode',
       title: mixins.$t("goodsBatch"),
@@ -1511,13 +1505,7 @@ Page({
             title: mixins.$t("warehouseId"),
             type: 'choose',
             urlKey: 'openingInventory',
-          },
-          {
-            code: 'brandName',
-            title: mixins.$t('brandName'),
-            type: 'str',
-            readonly: true,
-          },
+          }, 
           {
             code: 'nonStdCode',
             title: mixins.$t("goodsBatch"),

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="" satffAndOrgReadonly="{{satffAndOrgReadonly}}" 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 type="saleOutReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  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="" satffAndOrgReadonly="{{satffAndOrgReadonly}}" 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/order-sum-report/order-sum-report.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText":"销售汇总表"
 }

pages/shopping/shopping.js

@@ -55,13 +55,7 @@ Page({
       urlKey: 'openingInventory',
       readonly: true,
 
-    },
-    {
-      code: 'brandName',
-      title: mixins.$t('brandName'),
-      type: 'str',
-      readonly: true,
-    },
+    }, 
     {
       code: 'nonStdCode',
       title: '色号',

pages/shopping/shopping.wxml

@@ -189,7 +189,7 @@
 
 
 
-<dk-popup id="dkPopup"  type="sale"   subCol="calculationFormula" descCol="skuName" titleCol="skuModel"  priceCol="{{ 'sumPrice'}}" iconCol="imagesUrl"  value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeCheckBox="popupChangeCheckBox" stepperDecimal ="decimalPlaces" >
+<dk-popup id="dkPopup"  type="sale"  titleTagCol="brandName"    subCol="calculationFormula" descCol="skuName" titleCol="skuModel"  priceCol="{{ 'sumPrice'}}" iconCol="imagesUrl"  value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeCheckBox="popupChangeCheckBox" stepperDecimal ="decimalPlaces" >
 </dk-popup>
 
 <!-- 箱片 -->