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

+ 11 - 12
src/views/promotionRulesManagement/dealerPromotions/productPreviewModal.vue

@@ -4,10 +4,13 @@
     class="productPreview-modal"
     :footer="null"
     :maskClosable="false"
-    :title="title"
     v-model="isShow"
     @cancel="isShow=false"
     width="80%">
+    <template slot="title">
+      <div v-if="resObj"><strong>{{ resObj.tit }}</strong>(已选<span style="color:#ed1c24;">{{ dataList.length }}</span>项)</div>
+      <span v-else>预览弹窗</span>
+    </template>
     <a-spin :spinning="spinning" tip="Loading...">
       <div style="height:540px;">
         <ve-table
@@ -20,8 +23,8 @@
         <div v-show="newDataList&&newDataList.length==0" class="empty-data" style="height:'300px'"><a-empty description="暂无数据" :image="simpleImage"/></div>
       </div>
       <div class="btn-cont">
-        <a-button type="primary" v-if="resObj&&resObj.promotionRuleSn" style="margin-right:20px;"  @click="handleExport" :loading="exportLoading">导出</a-button>
-        <a-button  id="productPreview-back" @click="isShow = false">关闭</a-button>
+        <a-button type="primary" v-if="resObj&&resObj.promotionRuleSn" style="margin-right:20px;" @click="handleExport" :loading="exportLoading">导出</a-button>
+        <a-button id="productPreview-back" @click="isShow = false">关闭</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -49,7 +52,6 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
-      title: '预览弹窗',
       titName: '',
       resObj: {},
       exportLoading: false,
@@ -59,15 +61,12 @@ export default {
         { title: '产品编码', field: 'productCode', key: 'b', width: '40%', align: 'center', operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '--' } },
         { title: '起订量', field: 'unitTypeInfo', key: 'c', width: '40%', align: 'center', operationColumn: false, renderBodyCell: ({ row, column }) => { return row[column.field] || '--' } }
       ],
-      newDataList:this.dataList
+      newDataList: this.dataList
     }
   },
   methods: {
     pageInit (obj) {
       this.resObj = obj
-      this.$nextTick(()=>{
-        this.title = obj.tit + '(已选' + this.dataList.length + '项)'
-      })
     },
     //  导出
     handleExport () {
@@ -94,10 +93,10 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-      }else{
-        if(this.dataList&&this.dataList.length>0){
-          this.newDataList = this.dataList.map((item,i)=>{
-            item.no = i*1+1
+      } else {
+        if (this.dataList && this.dataList.length > 0) {
+          this.newDataList = this.dataList.map((item, i) => {
+            item.no = i * 1 + 1
             return item
           })
         }

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

@@ -52,7 +52,7 @@
         <div style="max-height:126px;overflow-y:scroll;" v-if="!record.productThisList || record.productThisList.length==0">
           <a-row v-if="record.productBrandArr && record.productBrandArr.length>0">
             <a-col :span="18">
-              <a-tag v-for="item in record.productBrandArr" :key="item.brandSn" style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
+              <a-tag v-for="item in record.productBrandArr" :key="item.productBrandSn" style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
                 {{ item.brandName }}
               </a-tag>
             </a-col>
@@ -576,7 +576,7 @@ export default {
         if (isRepeatTypeFlag.flag && isRepeatTypeFlag.noTypeFlag && uniqueArr.length == 1) {
           this.dataSource.splice(pos, 1)
         } else {
-          const j = this.dataSource[pos].productBrandArr.findIndex(con => con.brandSn == row.brandSn)
+          const j = this.dataSource[pos].productBrandArr.findIndex(con => con.productBrandSn == row.productBrandSn)
           this.dataSource[pos].productBrandArr.splice(j, 1)
           this.dataSource[pos].productBrandList.splice(j, 1)
         }

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

@@ -48,7 +48,7 @@
         <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="17">
-              <div v-for="item in record.productBrandArr" :key="item.brandSn">
+              <div v-for="item in record.productBrandArr" :key="item.productBrandSn">
                 <a-tooltip v-if="item.brandName&&item.brandName.length > 7" :title="item.brandName">
                   <a-tag style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
                     {{ `${item.brandName.slice(0, 7)}...` }}
@@ -718,7 +718,7 @@ export default {
         if (isRepeatTypeFlag.flag && isRepeatTypeFlag.noTypeFlag && uniqueArr.length == 1) {
           this.dataSource.splice(pos, 1)
         } else {
-          const j = this.dataSource[pos].productBrandArr.findIndex(con => con.brandSn == row.brandSn)
+          const j = this.dataSource[pos].productBrandArr.findIndex(con => con.productBrandSn == row.productBrandSn)
           this.dataSource[pos].productBrandArr.splice(j, 1)
           this.dataSource[pos].productBrandList.splice(j, 1)
         }

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -149,7 +149,7 @@ export default {
         this.disabled = true
         this.queryParam.dealerSn = this.buyerSn
         this.queryParam.promoProductClz = this.promoProductClz
-        return queryPromoProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1', pricingState: 'PRICED' })).then(res => {
+        return queryPromoProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1' })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/queryPart.vue

@@ -137,7 +137,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.queryParam.dealerSn = this.buyerSn
-        return queryStockProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1', pricingState: 'PRICED' })).then(res => {
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1' })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data