修改采购

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

@@ -479,7 +479,7 @@ Component({
         ds.item.packageBox = ds.item['outingBox'] + ds.item.subUnitName + ds.item['outingPiece'] + ds.item.unitName
       }else if(this.data.type == Constants.billType.saleOutReturn){ //销售退货的时候 打开商品的pup 就要计算箱片
         // 使用 Math.abs() 函数获取 outingQty 的绝对值
-       let   outingQty = Math.abs(ds.item.outingQty);
+       let  outingQty = Math.abs(ds.item.outingQty);
         ds.item['box'] = parseInt(outingQty / ds.item.packBox)
         ds.item['piece'] = Number(outingQty % ds.item.packBox)
         ds.item.packageBox = ds.item['box'] + ds.item.subUnitName + ds.item['piece'] + ds.item.unitName

components/dkbase/dk-title/dk-title.js

@@ -33,6 +33,13 @@ Component({
       type:Number,
       value:10
     },
+     /**
+     *  ）
+     */
+    indent:{
+      type:Number,
+      value:1
+    },
     /**
      * title字体大小（默认13px）
      */

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

@@ -65,7 +65,7 @@
             <!-- 标题 -->
             <view>
 
-              <dk-title titleTag="{{item.shortName}}" title="{{item.skuModel}}"></dk-title>
+              <dk-title titleTag="{{}}" title="{{item.skuModel}}"></dk-title>
             </view>
             <!-- 描述 -->
             <view style="display: flex;padding-top: 10rpx;">
@@ -218,7 +218,7 @@
             <view data-item="{{item}}" data-index="{{index}}" bind:tap="openChoosedItemInfo">
               <!-- 标题 -->
               <view style="display: flex;">
-                <dk-title titleTag="{{item.shortName}}" title="{{item.skuModel}}"></dk-title>
+                <dk-title titleTag="{{ }}" title="{{item.skuModel}}"></dk-title>
               </view>
               <!-- 描述 -->
               <view style="display: flex; ">
@@ -400,20 +400,20 @@
 
 
 <!--  采购入库 采购订单 其它入库  -->
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory'  }}" type="sale" descCol="skuName" titleTagCol="shortName" titleCol="skuModel" iconCol="imagesUrl"  subCol="calculationFormula" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价：" priceCol="pricePurchase" contentObj="{{popContent}}"bind:changeStep="changeStep"  bind:openPackageBox="openPackageBox" bind:commit="editItems">
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory'  }}" type="sale" descCol="skuName" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl"  subCol="calculationFormula" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价：" priceCol="pricePurchase" contentObj="{{popContent}}"bind:changeStep="changeStep"  bind:openPackageBox="openPackageBox" bind:commit="editItems">
 
 </dk-popup>
 
 <!-- 库存 -->
-<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName" subCol="calculationFormula" titleTagCol="shortName" titleCol="skuModel" iconCol="imagesUrl" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="标价：" priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox">
+<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName" subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="标价：" priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox">
 </dk-popup>
 
 
 <!-- 销售开单 -->
-<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="shortName" subCol="calculationFormula" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 <!-- 销售出库 -->
-<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="shortName" subCol="calculationFormula" descCol="skuName" titleCol="skuModel" priceTitle="{{gradeCode == 'STD' ? '' : '标价：'}}" iconCol="imagesUrl" priceCol="{{gradeCode == 'STD' ? '' : 'priceStandard'}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep"  bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox">
+<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" titleCol="skuModel" priceTitle="{{gradeCode == 'STD' ? '' : '标价：'}}" iconCol="imagesUrl" priceCol="{{gradeCode == 'STD' ? '' : 'priceStandard'}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep"  bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox">
 </dk-popup>
 
 <!-- 箱片 -->

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

@@ -72,7 +72,7 @@
                   <view slot="title" style="display: flex;">
                     <!-- 标题 -->
                     <view style="display: flex;">
-                      <dk-title titleTag="{{item_.shortName}}" title="{{item_.skuModel}}"></dk-title>
+                      <dk-title  title="{{item_.skuModel}}"></dk-title>
                     </view>
                   </view>
                   <!-- 描述 -->

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}}" titleTagCol="shortName" titleCol="skuModel"   descCol="skuName" subCol="calculationFormula" priceCol="pricePur"pupPriceCol="pricePurchase"  quantityCol="itemQty" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}" iconCol="imagesUrl"
+<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel"   descCol="skuName" subCol="calculationFormula" priceCol="pricePur"pupPriceCol="pricePurchase"  quantityCol="itemQty" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}" iconCol="imagesUrl"
 bind:delItem="setGoods" bind:setGoods="setGoods"  >
 </dk-form-bill>
 

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}}" titleTagCol="shortName" titleCol="skuModel" descCol="skuName"subCol="calculationFormula" priceCol="pricePur"pupPriceCol="pricePurchase" 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}}"  type="pur" routeObjName="{{routeObjName}}" readonly="{{true}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"subCol="calculationFormula" priceCol="pricePur"pupPriceCol="pricePurchase" 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.wxml

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

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

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

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

@@ -43,7 +43,7 @@
   </view>
  
 <dk-form-bill type="purInto" id="{{formName}}"  routeObjName="{{routeObjName}}" 
-cardList="{{cardList}}"  titleTagCol="shortName" titleCol="skuModel"  iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="pricePurchase" quantityCol="{{intoStatusflag?'intoingQty':'intoQty'}}"  sumAmountCol ="itemAmt"sumQuantityCol="itemQty"
+cardList="{{cardList}}"    titleCol="skuModel"  iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="pricePurchase" 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>

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 
 
-<dk-form-bill type="saleOutReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel"  subCol="calculationFormula" 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="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="" titleCol="skuModel"  subCol="calculationFormula" 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" readonly="{{formMode == 'detail' && formType =='detail'}}"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"
 bind:customersChoose="customersChoose"   popType="sale" priceTitle="标价：" staff="staff" org="org"