chenrui 1 سال پیش
والد
کامیت
354e2d2463

+ 4 - 7
src/views/promotionRulesManagement/dealerPromotions/chooseImportModal.vue

@@ -107,7 +107,7 @@ export default {
       let columnsArr = [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '70%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '产品名称', dataIndex: 'product.name', width: '50%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (_this.goodsFlag == '0') {
         const arr = [
@@ -124,16 +124,13 @@ export default {
       let unColumnsArr = [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '60%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '50%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '错误说明', scopedSlots: { customRender: 'errorMsg' }, width: '20%', align: 'center' }
       ]
       if (_this.goodsFlag == '0') {
-        const arr = [
-          { title: '省价特价', dataIndex: 'provinceDiscountPriceText', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        unColumnsArr.splice(3,0,{ title: '省价特价', dataIndex: 'provinceDiscountPriceText', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
           { title: '市价特价', dataIndex: 'cityDiscountPriceText', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '特约特价', dataIndex: 'specialDiscountPriceText', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
-        ]
-        unColumnsArr = unColumnsArr.concat(arr)
+          { title: '特约特价', dataIndex: 'specialDiscountPriceText', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return unColumnsArr
     }

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -441,10 +441,10 @@ export default {
             newObj.title = item.productTypeName1
             newObj.id = item.productTypeSn1
           } else if (Object.keys(obj).length == 2) {
-            newObj.title = item.productTypeName1 + '/' + item.productTypeName2
+            newObj.title = item.productTypeName2
             newObj.id = item.productTypeSn2
           } else {
-            newObj.title = item.productTypeName1 + '/' + item.productTypeName2 + '/' + item.productTypeName3
+            newObj.title = item.productTypeName2 + '/' + item.productTypeName3
             newObj.id = item.productTypeSn3
           }
           newData.productTypeList[0] = obj

+ 4 - 2
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -13,7 +13,7 @@
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record,index">
-        <div style="max-height:126px;width:100%;overflow-y:scroll;">
+        <div style="max-height:126px;width:100%;overflow-y:scroll;" v-if="record.dataSourceOrigin=='0'">
           <a-row v-if="record.productTypeArr && record.productTypeArr.length>0">
             <a-col :span="16">
               <div v-for="con in record.productTypeArr" :key="con.id">
@@ -41,10 +41,11 @@
             </a-col>
           </a-row>
         </div>
+        <span v-else v-for="con in record.productTypeArr" :key="con.id">{{ con.title }}</span>
       </template>
       <!-- 品牌 -->
       <template slot="productBrand" slot-scope="text, record,index">
-        <div style="max-height:126px;overflow-y:scroll;">
+        <div style="max-height:126px;overflow-y:scroll;" v-if="record.dataSourceOrigin=='0'">
           <a-row v-if="record.productBrandArr && record.productBrandArr.length>0">
             <a-col :span="16">
               <div v-for="item in record.productBrandArr" :key="item.brandSn">
@@ -73,6 +74,7 @@
             </a-col>
           </a-row>
         </div>
+        <span v-else v-for="item in record.productBrandArr" :key="item.brandSn">{{ item.brandName }}</span>
       </template>
       <!-- 产品 -->
       <template slot="product" slot-scope="text, record">