Browse Source

Merge branch 'develop_yh50' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh68

lilei 1 month ago
parent
commit
77a60cebcb

+ 1 - 0
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -132,6 +132,7 @@
           <span v-else>{{ record.purchaseBillNo }}</span>
           <span v-else>{{ record.purchaseBillNo }}</span>
           <a-badge v-if="record.promotionFlag && record.promotionFlag==1" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
           <a-badge v-if="record.promotionFlag && record.promotionFlag==1" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
           <a-badge count="改" v-if="record.billStatus=='HQ_CHANGE'||record.billStatus=='SUPERIOR_CHANGE'" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
           <a-badge count="改" v-if="record.billStatus=='HQ_CHANGE'||record.billStatus=='SUPERIOR_CHANGE'" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+          <a-badge count="转促" v-if="record.borrowedShowFlag=='1'" :number-style="{ zoom:'80%',marginLeft:'5px',backgroundColor: '#BfBf00' }"></a-badge>
         </template>
         </template>
         <!-- 审核icon -->
         <!-- 审核icon -->
         <template slot="audit" slot-scope="text, record">
         <template slot="audit" slot-scope="text, record">

+ 4 - 1
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -125,6 +125,7 @@
             <span v-else>{{ record.purchaseBillNo }}</span>
             <span v-else>{{ record.purchaseBillNo }}</span>
             <a-badge v-if="record.promotionFlag && record.promotionFlag==1" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
             <a-badge v-if="record.promotionFlag && record.promotionFlag==1" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
             <a-badge count="改" v-if="record.billStatus=='HQ_CHANGE'||record.billStatus=='SUPERIOR_CHANGE'" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
             <a-badge count="改" v-if="record.billStatus=='HQ_CHANGE'||record.billStatus=='SUPERIOR_CHANGE'" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+            <a-badge count="转促" v-if="record.borrowedShowFlag=='1'" :number-style="{ zoom:'80%',marginLeft:'5px',backgroundColor: '#BfBf00' }"></a-badge>
           </template>
           </template>
           <!-- 审核icon -->
           <!-- 审核icon -->
           <template slot="audit" slot-scope="text, record">
           <template slot="audit" slot-scope="text, record">
@@ -426,5 +427,7 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less">
 <style lang="less">
-
+.box{
+  background:rgba(194, 255, 172, 0.5)
+}
 </style>
 </style>