修改bug

i18n/zh-CN.js

@@ -485,10 +485,16 @@ const goodsSku = {
   wholesalePrice: '批发价',
   referencePrice: '参考价',
   SaleSPriceLimit: '销售限价',
+  otherPriceLimit: '其他价',
   abbreviation: '品牌简称',
   flagV: '有效值',
   SellableQuantityAsc: '可售量升序',
   SellableQuantityDesc: '可售量降序',
+  purchasePricetip:'采购订单、采购入库价格参考使用',
+  retailPricetip:'销售订单、销售出库零售渠道价格参考使用',
+  wholesalePricetip:'销售订单、销售出库分销渠道价格参考使用',
+  SaleSPriceLimittip:'销售订单、销售出库“自建渠道”价格参考使用',
+  otherPriceLimittip:'销售订单、销售出库商品最低价格',
 }
 const fund = {
   openingBalance: "期初余额",

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

@@ -265,6 +265,7 @@ Page({
    * @author : 周兴
    */
   setSearchParams(params) {
+    params.flgValid = true
     // 字典类别
     if (this.data.dictCode) {
       params.dictCode = this.data.dictCode
@@ -280,7 +281,7 @@ Page({
       params.supType = "";
       let active = this.data.active
       params.supType = Constants.kindCode.supplierPur;
-      params.flgValid = true
+     
       if (active == 1) { //采购供应商
         params.supType = Constants.kindCode.supplierPur;
       } else if (active == 2) { //服务供应商

package-basic-data/pages/product-file/add/add.js

@@ -113,22 +113,31 @@ Page({
 
       ],
       price: [{ //采购价
+        tip:mixins.$t("purchasePricetip"),
         code: 'pricePurchase',
         type: 'number',
         title: mixins.$t("purchasePrice"),
       }, { //零售价
+        tip:mixins.$t("retailPricetip"),
         code: 'priceStandard',
         type: 'number',
         title: mixins.$t("retailPrice"),
       }, { //批发价
+        tip:mixins.$t("wholesalePricetip"),
         code: 'priceWholesale',
         type: 'number',
         title: mixins.$t("wholesalePrice"),
       }, { //销售限价
+        tip:mixins.$t("SaleSPriceLimittip"),
         code: 'priceLimited',
         type: 'number',
         title: mixins.$t("SaleSPriceLimit"),
-      }, ],
+      }, { //其他价
+        tip: mixins.$t("otherPriceLimittip"),
+        code: 'priceOther',
+        type: 'number',
+        title: mixins.$t("otherPriceLimit"),
+      },],
 
       other: [{
         code: 'remarks',

package-basic-data/pages/product-file/product-brand/product-brand.wxml

@@ -11,8 +11,7 @@
 
 <!-- 内容列表 -->
 <view style="width: 100%;">
-  <view wx:for="{{tableData}}" wx:key="index" class="main-class">
-    <van-swipe-cell right-width="{{ 65 }}">
+  <view wx:for="{{tableData}}" wx:key="index" class="main-class"> 
       <view bind:tap="toChecked" data-index="{{index}}" data-item="{{item}}" class="{{item.checked ? 'main-foot-1' : 'main-foot'}}" style="border-radius:15rpx;" style="{{item.checked ?'background-color: #E1E5EE;':''}}">
         <view class="table-content">
           <view class="table-content-row">
@@ -51,10 +50,7 @@
             </view>
           </view>  
         </view>
-      </view>
-      <view data-item="{{item}}" bind:tap="changeSwipe" slot="right">{{item.flgValid ? $t['disable'] : $t['enable'] }}</view>
-    </van-swipe-cell>
-
+      </view> 
   </view>
   <!-- 保留高度 -->
   <view style="height: 220rpx;"></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="skuCode" subCol="skuCode"descCol="skuModel" priceCol="pricePur"pupPriceCol="pricePurchase"  quantityCol="itemQty" sumAmountCol="itemAmt" 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}}"
+<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel"   descCol="skuName" priceCol="pricePur"pupPriceCol="pricePurchase"  quantityCol="itemQty" sumAmountCol="itemAmt" 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>