浏览代码

修改bug

chenrui 10 月之前
父节点
当前提交
9544b33d0f

+ 4 - 4
src/views/promotionRulesManagement/promotionManagement/chooseProductsModal.vue

@@ -67,7 +67,7 @@
           size="small"
           :rowKey="(record) => record.productSn"
           rowKeyName="productSn"
-          :row-selection="{ columnWidth: 40}"
+          :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: !record.terminalPrice } })}"
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
@@ -161,9 +161,9 @@ export default {
         { title: '产品编码', dataIndex: 'code', align: 'center' },
         { title: '产品名称', dataIndex: 'name', align: 'center', width: '18%', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '省级价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '终端价', dataIndex: 'terminalPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        // { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        // { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '品牌', dataIndex: 'productBrandName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
         { title: '包装数', scopedSlots: { customRender: 'productQty' }, align: 'center' },

+ 0 - 2
src/views/promotionRulesManagement/promotionManagement/detailModal.vue

@@ -81,8 +81,6 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
-            :row-selection="{ columnWidth: 40 }"
-            @rowSelection="rowSelectionFun"
             :defaultLoadData="false"
             bordered>
           </s-table>

+ 3 - 2
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -503,7 +503,7 @@ export default {
           // 编辑按钮时,publishState 已发布,只能编辑是否发布;publishState已关闭,都可以编辑
           if (_this.pageType === 'edit') {
             _this.isDisabled = res.data.publishState === 'PUBLISH'
-            _this.form.publishFlag = res.data.publishFlag // 未返值
+            _this.form.publishFlag = res.data.publishFlag
           }
           _this.form.promoActiveSn = res.data.promoActiveSn
           _this.form.title = res.data.title
@@ -751,7 +751,8 @@ export default {
           promoRuleSn: this.sellForm.promoRuleSn,
           productCode: item.code,
           productSn: item.productSn,
-          ruleValue: this.sellForm.ruleValue
+          ruleValue: this.sellForm.ruleValue,
+          price: item.terminalPrice
         }
       })
       promoCreateBatch(productArr).then(res => {

+ 0 - 1
src/views/promotionRulesManagement/promotionManagement/productTable.vue

@@ -89,7 +89,6 @@ export default {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
-        console.log('11111111111111', this.promoActiveSn)
         params.promoActiveSn = this.promoActiveSn
         return promoRuleProductList(params).then(res => {
           let data