jufubao-admin-library 1.1.60 → 1.1.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -24,11 +24,11 @@
24
24
  {{$xdHelper.divisionFloatNumber(inScope.row.volume, 100)}}m³
25
25
  </template>
26
26
  <template slot="jfb_price_ratio" slot-scope="inScope">
27
- <div>货源:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
27
+ <div v-if="inScope.row.purchase_div_jfb_discount_ratio">货源:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
28
28
  <div v-if="inScope.row.dist_div_jfb_discount_ratio">平台:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_jfb_discount_ratio, 1000)}}</span>折</div>
29
29
  </template>
30
30
  <template slot="market_price_ratio" slot-scope="inScope">
31
- <div>货源:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_market_discount_ratio, 1000)}}</span>折</div>
31
+ <div v-if="inScope.row.purchase_div_market_discount_ratio">货源:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_market_discount_ratio, 1000)}}</span>折</div>
32
32
  <div v-if="inScope.row.dist_div_market_discount_ratio">平台:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_market_discount_ratio, 1000)}}</span>折</div>
33
33
  </template>
34
34
  </xd-table>
@@ -75,6 +75,8 @@
75
75
  datePricesRow:null,
76
76
  sku_name:'',
77
77
  isShowPurchasePrice: false,
78
+ isShowJfbPriceRatio: false,
79
+ isShowMarketPriceRatio: false
78
80
  }
79
81
  },
80
82
  computed:{
@@ -137,9 +139,9 @@
137
139
  {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
138
140
  this.isShowPurchasePrice && {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},
139
141
  {"type": "price", "prop": "jfb_price", "align": "center", "min-width": 80, "label": "建议零售价"},
140
- {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
142
+ this.isShowJfbPriceRatio && {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
141
143
  {"type": "price", "prop": "market_price", "align": "center", "min-width": 80, "label": "市场价"},
142
- {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
144
+ this.isShowMarketPriceRatio && {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
143
145
  {"type": "normal", "prop": "init_num", "align": "left", "min-width": 80, "label": "库存"},
144
146
  {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
145
147
  {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
@@ -165,6 +167,8 @@
165
167
  created(){
166
168
  if(this.productSkuList && this.productSkuList.length && this.productSkuList.length > 0) {
167
169
  this.isShowPurchasePrice = this.productSkuList[0].specs.purchase_price > 0;
170
+ this.isShowJfbPriceRatio = (this.productSkuList[0].specs.purchase_div_jfb_discount_ratio || this.productSkuList[0].specs.dist_div_jfb_discount_ratio)?true:false;
171
+ this.isShowMarketPriceRatio = (this.productSkuList[0].specs.purchase_div_market_discount_ratio || this.productSkuList[0].specs.dist_div_market_discount_ratio)?true:false;
168
172
  }
169
173
  },
170
174
  methods: {
@@ -292,6 +292,13 @@ export default {
292
292
  minWidth: 100,
293
293
  label: "资金方向",
294
294
  },
295
+ {
296
+ type: "normal",
297
+ prop: "trade_type_name",
298
+ align: "center",
299
+ minWidth: 100,
300
+ label: "交易类型",
301
+ },
295
302
  {
296
303
  type: "normal",
297
304
  prop: "invoice_name",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.60",
3
+ "version": "1.1.62",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {