lilei 1 day ago
parent
commit
d86aeac879

+ 3 - 3
src/views/salesManagement/backorder/detailModal.vue

@@ -41,14 +41,14 @@
           bordered>
           bordered>
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <span style="padding-right: 15px;">{{ text }}</span>
             <span style="padding-right: 15px;">{{ text }}</span>
-            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
             <!-- <a-badge count="正" v-if="record.promotionFlag=='REGULAR'" :number-style="{ backgroundColor: '#108ee9', zoom:'80%' }"></a-badge> -->
             <!-- <a-badge count="正" v-if="record.promotionFlag=='REGULAR'" :number-style="{ backgroundColor: '#108ee9', zoom:'80%' }"></a-badge> -->
-            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
           </template>
           </template>
           <!-- 销售价 -->
           <!-- 销售价 -->
           <template slot="price" slot-scope="text, record">
           <template slot="price" slot-scope="text, record">
             {{ toThousands(text) }}
             {{ toThousands(text) }}
-            <span v-if="record.promotionFlag=='GIFT'||record.promotionFlag=='DISCOUNT'" title="原价">({{ toThousands(record.origPrice) }})</span>
+            <span v-if="record.promotionFlag.indexOf('GIFT')>=0||record.promotionFlag.indexOf('DISCOUNT')>=0" title="原价">({{ toThousands(record.origPrice) }})</span>
           </template>
           </template>
         </s-table>
         </s-table>
       </a-card>
       </a-card>

+ 3 - 3
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -104,13 +104,13 @@
           <!-- 产品编码 -->
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <span>{{ text }}</span>
             <span>{{ text }}</span>
-            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+            <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
           </template>
           </template>
           <!-- 销售价 -->
           <!-- 销售价 -->
           <template slot="price" slot-scope="text, record">
           <template slot="price" slot-scope="text, record">
             {{ toThousands(text) }}
             {{ toThousands(text) }}
-            <span v-if="record.promotionFlag=='GIFT'||record.promotionFlag=='DISCOUNT'" title="原价">({{ toThousands(record.origPrice) }})</span>
+            <span v-if="record.promotionFlag.indexOf('GIFT')>=0||record.promotionFlag.indexOf('DISCOUNT')>=0" title="原价">({{ toThousands(record.origPrice) }})</span>
           </template>
           </template>
         </s-table>
         </s-table>
       </a-card>
       </a-card>

+ 3 - 3
src/views/salesManagement/pushOrderManagement/detailForOut.vue

@@ -94,13 +94,13 @@
           <!-- 产品编码 -->
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <span>{{ text }}</span>
             <span>{{ text }}</span>
-            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+            <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
           </template>
           </template>
           <!-- 销售价 -->
           <!-- 销售价 -->
           <template slot="price" slot-scope="text, record">
           <template slot="price" slot-scope="text, record">
             {{ toThousands(text) }}
             {{ toThousands(text) }}
-            <span v-if="record.promotionFlag=='GIFT'||record.promotionFlag=='DISCOUNT'" title="原价">({{ toThousands(record.origPrice) }})</span>
+            <span v-if="record.promotionFlag.indexOf('GIFT')>=0||record.promotionFlag.indexOf('DISCOUNT')>=0" title="原价">({{ toThousands(record.origPrice) }})</span>
           </template>
           </template>
         </s-table>
         </s-table>
       </a-card>
       </a-card>

+ 2 - 2
src/views/salesManagement/salesOrderWarehouse/detail.vue

@@ -67,8 +67,8 @@
           <!-- 产品编码 -->
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <span>{{ text }}</span>
             <span>{{ text }}</span>
-            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+            <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
           </template>
           </template>
         </s-table>
         </s-table>
       </a-card>
       </a-card>

+ 3 - 3
src/views/salesManagement/salesQueryNew/detailAll.vue

@@ -129,10 +129,10 @@
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <div>
             <div>
               <span>{{ text }}</span>
               <span>{{ text }}</span>
-              <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-              <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+              <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+              <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
               <!-- 可审核时才可显示“缺”货产品 -->
               <!-- 可审核时才可显示“缺”货产品 -->
-              <a-badge count="缺" v-if="(Number(record.stockQty) < Number(record.unpushedQty)) && (detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesAudit'))">
+              <a-badge count="缺" v-if="(Number(record.stockQty) < Number(record.unpushedQty)) && (detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&record.borrowFlag != '1'&&$hasPermissions('B_salesAudit'))">
               </a-badge>
               </a-badge>
             </div>
             </div>
           </template>
           </template>

+ 3 - 3
src/views/salesManagement/salesQueryNew/stockOutDetailModal.vue

@@ -32,13 +32,13 @@
         <!-- 单号 -->
         <!-- 单号 -->
         <template slot="productCode" slot-scope="text, record">
         <template slot="productCode" slot-scope="text, record">
           <span style="padding-right: 15px;">{{ text }}</span>
           <span style="padding-right: 15px;">{{ text }}</span>
-          <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-          <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+          <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+          <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
         </template>
         </template>
         <!-- 销售价 -->
         <!-- 销售价 -->
         <template slot="price" slot-scope="text, record">
         <template slot="price" slot-scope="text, record">
           {{ toThousands(text) }}
           {{ toThousands(text) }}
-          <span v-if="record.promotionFlag=='GIFT'||record.promotionFlag=='DISCOUNT'" title="原价">({{ toThousands(record.origPrice) }})</span>
+          <span v-if="record.promotionFlag.indexOf('GIFT')>=0||record.promotionFlag.indexOf('DISCOUNT')>=0" title="原价">({{ toThousands(record.origPrice) }})</span>
         </template>
         </template>
       </s-table>
       </s-table>
       <!-- 操作按钮 -->
       <!-- 操作按钮 -->

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

@@ -26,7 +26,7 @@
           <!-- 产品编码 -->
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <span>{{ record.productCode||'--' }}</span>
             <span>{{ record.productCode||'--' }}</span>
-            <a-badge count="促" v-if="record.promotionFlag==='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
           </template>
           </template>
           <!-- 初始价 价格级别 省  市  特约-->
           <!-- 初始价 价格级别 省  市  特约-->
           <template slot="priceLevelOrig" slot-scope="text, record">
           <template slot="priceLevelOrig" slot-scope="text, record">

+ 2 - 2
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -143,8 +143,8 @@
           bordered>
           bordered>
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <span style="padding-right: 10px;">{{ text }}</span>
             <span style="padding-right: 10px;">{{ text }}</span>
-            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'0.8' }"></a-badge>
-            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'0.8' }"></a-badge>
+            <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'0.8' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'0.8' }"></a-badge>
           </template>
           </template>
         </v-table>
         </v-table>
       </a-spin>
       </a-spin>

+ 2 - 2
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -104,8 +104,8 @@
           bordered>
           bordered>
           <template slot="productCode" slot-scope="text, record">
           <template slot="productCode" slot-scope="text, record">
             <span style="padding-right: 15px;">{{ text }}</span>
             <span style="padding-right: 15px;">{{ text }}</span>
-            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+            <a-badge count="促" v-if="record.promotionFlag.indexOf('GIFT')>=0" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag.indexOf('DISCOUNT')>=0" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
           </template>
           </template>
         </v-table>
         </v-table>
       </a-spin>
       </a-spin>