Преглед изворни кода

Merge branch 'develop_yh39' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh39

chenrui пре 1 година
родитељ
комит
2a1c102349
2 измењених фајлова са 5 додато и 5 уклоњено
  1. 1 1
      public/version.json
  2. 4 4
      src/views/salesManagement/productPricing/list.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1713411149067
+  "version": 1714095865513
 }

+ 4 - 4
src/views/salesManagement/productPricing/list.vue

@@ -56,11 +56,11 @@
     </div>
     <!-- 价格 -->
     <div style="padding: 10px 0;text-align: right;">
-      <a-checkbox v-model="isCostPrice" v-if="$hasPermissions('M_ShowAllCost')"><span style="display: inline-block;">成本价</span></a-checkbox>
+      <a-checkbox v-model="isCostPrice" v-if="$hasPermissions('M_ShowAllCost')"><span style="display: inline-block;">参考成本价</span></a-checkbox>
       <!-- 特约加盟商不可见市级价 -->
-      <a-checkbox v-model="isCityPrice" v-if="dealerData && dealerData.dealerType1 != 'special'"><span style="display: inline-block;">市级价</span></a-checkbox>
+      <a-checkbox v-model="isCityPrice" v-if="dealerData && dealerData.dealerLevel != 'SPECIAL'"><span style="display: inline-block;">市级价</span></a-checkbox>
       <!-- 是否展示特约价 -->
-      <a-checkbox v-model="isSpecialPrice" v-if="dealerData && dealerData.dealerType1 == 'special'"><span style="display: inline-block;">特约价</span></a-checkbox>
+      <a-checkbox v-model="isSpecialPrice" v-if="dealerData && dealerData.dealerLevel == 'SPECIAL'"><span style="display: inline-block;">特约价</span></a-checkbox>
       <a-checkbox v-model="isTerminalPrice"><span style="display: inline-block;">终端价/自定义终端价</span></a-checkbox>
     </div>
     <!-- 列表 -->
@@ -170,7 +170,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isCostPrice) {
-        arr.splice(6, 0, { title: '成本价', dataIndex: 'offerCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '参考成本价', dataIndex: 'offerCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.isCityPrice) {
         const ind = this.isCostPrice ? 7 : 6