Procházet zdrojové kódy

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

chenrui před 1 rokem
rodič
revize
f286621370

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -187,9 +187,9 @@
       <!-- 折扣 -->
       <template slot="discountPrice" slot-scope="text, record">
         <div v-if="record.promotionFlag=='DISCOUNT'&&detailData">
-          <span v-if="detailData.buyerLevel=='PROVINCE'">{{ record.provinceDiscount }}%</span>
-          <span v-if="detailData.buyerLevel=='CITY'">{{ record.cityDiscount }}%</span>
-          <span v-if="detailData.buyerLevel=='SPECIAL'">{{ record.specialDiscount }}%</span>
+          <span v-if="detailData.buyerLevel=='PROVINCE'">{{ record.provinceDiscount*100 }}%</span>
+          <span v-if="detailData.buyerLevel=='CITY'">{{ record.cityDiscount*100 }}%</span>
+          <span v-if="detailData.buyerLevel=='SPECIAL'">{{ record.specialDiscount*100 }}%</span>
         </div>
         <div v-else>--</div>
       </template>

+ 1 - 1
src/views/salesManagement/salesQueryNew/newPromoModal.vue

@@ -17,7 +17,7 @@
           <div style="text-align:left;color:#00aaff;">
             <a-checkbox-group v-model="newPromoSnList">
               <a-row v-for="item in newActiveList" :key="item.promotionSn">
-                <a-col :span="24"><a-checkbox :value="item.promotionSn">{{ item.title }}</a-checkbox></a-col>
+                <a-col :span="24"><a-checkbox :value="item.promotionSn">{{ item.description }}</a-checkbox></a-col>
               </a-row>
             </a-checkbox-group>
           </div>