chenrui 3 bulan lalu
induk
melakukan
882fca8854

+ 1 - 1
src/views/numsGoodsShelves/customerAccount/transactionFlowModal.vue

@@ -91,7 +91,7 @@ export default {
       type: Boolean,
       default: false
     },
-    modalType: { // 1是充值交易流水  2是补贴交易流水
+    modalType: { // 1是充值交易流水  2是抵扣交易流水
       type: String,
       default: '1'
     },

+ 1 - 1
src/views/numsGoodsShelves/customerAccount/zeroClearingModal.vue

@@ -13,7 +13,7 @@
         <a-checkbox-group v-model="accountType" id="zero-clearing-checkbox">
           <a-checkbox value="RECHARGE" id="zero-clearing-checkbox1">清空{{ (conInfo.rechargeBalance||conInfo.rechargeBalance==0)?toThousands(conInfo.rechargeBalance):'--' }}元【充值余额】</a-checkbox>
           <br />
-          <a-checkbox value="GIVE" id="zero-clearing-checkbox2">清空{{ (conInfo.giveBalance||conInfo.giveBalance==0)?toThousands(conInfo.giveBalance):'--' }}元【补贴余额】</a-checkbox>
+          <a-checkbox value="GIVE" id="zero-clearing-checkbox2">清空{{ (conInfo.giveBalance||conInfo.giveBalance==0)?toThousands(conInfo.giveBalance):'--' }}元【抵扣余额】</a-checkbox>
         </a-checkbox-group>
         <div style="margin-top:10px;">注意:请慎重操作,一旦清空,不可变更</div>
       </div>

+ 11 - 4
src/views/promotionManagement/subsidizedProducts/list.vue

@@ -40,10 +40,16 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator-nobor">
-      <a-button id="subsidizedProducts-add"  v-if="$hasPermissions('B_subsidizedProducts_add')" type="primary" class="button-error" @click="openAddModal=true">新增</a-button>
-      <a-button id="subsidizedProducts-edit"  v-if="$hasPermissions('B_subsidizedProducts_edit')" type="primary" class="button-info" @click="handleEdit()">批量编辑</a-button>
-      <a-button id="subsidizedProducts-del"  v-if="$hasPermissions('B_subsidizedProducts_del')" type="primary" class="button-error" ghost @click="handleDel()">批量删除</a-button>
-      <a-button id="subsidizedProducts-import"  v-if="$hasPermissions('B_subsidizedProducts_import')" style="margin-left:5px;" @click="openGuideModal=true">导入</a-button>
+      <a-button id="subsidizedProducts-add" v-if="$hasPermissions('B_subsidizedProducts_add')" type="primary" class="button-error" @click="openAddModal=true">新增</a-button>
+      <a-button id="subsidizedProducts-edit" v-if="$hasPermissions('B_subsidizedProducts_edit')" type="primary" class="button-info" @click="handleEdit()">批量编辑</a-button>
+      <a-button
+        id="subsidizedProducts-del"
+        v-if="$hasPermissions('B_subsidizedProducts_del')"
+        type="primary"
+        class="button-error"
+        ghost
+        @click="handleDel()">批量删除</a-button>
+      <a-button id="subsidizedProducts-import" v-if="$hasPermissions('B_subsidizedProducts_import')" style="margin-left:5px;" @click="openGuideModal=true">导入</a-button>
       <span style="margin-left: 10px;" v-if="selectTotal">已选{{ selectTotal }}项</span>
     </div>
     <a-spin :spinning="spinning" tip="Loading...">
@@ -165,6 +171,7 @@ export default {
         { title: '产品品牌', dataIndex: 'productEntity.productBrandName', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
         { title: '产品分类', align: 'center', width: '15%', scopedSlots: { customRender: 'productType' } },
         { title: '商城类目', scopedSlots: { customRender: 'categoryName' }, width: '13%', align: 'center' },
+        { title: '促销产品', dataIndex: 'promoProductSn', align: 'center', width: '10%', customRender: function (text) { return (!text ? '否' : '是') } },
         { title: '原售价', dataIndex: 'shopProductPrice', width: '11%', align: 'right', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } },
         { title: '抵扣金额', dataIndex: 'subsidyAmount', align: 'right', width: '11%', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } },
         { title: '抵扣后售价', dataIndex: 'subsidyedPrice', align: 'right', width: '11%', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } },