lilei пре 8 месеци
родитељ
комит
86d1d7b30c
2 измењених фајлова са 26 додато и 6 уклоњено
  1. 13 3
      pages/sales/edit.vue
  2. 13 3
      pages/sales/salesDetail.vue

+ 13 - 3
pages/sales/edit.vue

@@ -55,9 +55,9 @@
 						<view class="font_13 flex_1 flex justify_between">
 							<view class="pimgs">
 								<u-image :src="item.productMainImage?item.productMainImage:`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
-								<view v-if="item.oosFlag == 1" class="sign" :style="{backgroundColor: $config('errorColor')}">急</view>
-								<view v-if="item.price < item.cost" class="sign" :style="{backgroundColor: $config('errorColor')}">亏</view>
-								<view v-if="item.price == 0" class="sign" :style="{backgroundColor: $config('errorColor')}">赠</view>
+								<view v-if="(isOwerEdit && item.oosFlag == 1) || (isOwerEdit && item.oosFlag == 1)" class="sign" :style="{backgroundColor: $config('errorColor')}">急</view>
+								<view v-if="item.price < item.cost" class="sign" :style="{backgroundColor: $config('warringColor')}">亏</view>
+								<view v-if="!isOwerEdit&&!isAudit&&(!item.currentStockQty || item.currentStockQty < item.qty)" class="sign" :style="{backgroundColor: $config('errorColor')}">缺</view>
 							</view>
 							<view class="sales-item-main flex_1">
 								<view class="sales-item-name">{{item.productName || '--'}}</view>
@@ -165,6 +165,16 @@
 		onUnload() {
 			uni.$off('refreshEditBL')
 		},
+		computed: {
+			 // 是否自建单据
+			 isOwerEdit () {
+			   return this.detailData && this.detailData.sourceType == 'SALES'
+			 },
+			 // 是否审核通过
+			 isAudit () {
+			   return this.detailData ? (this.detailData.billStatus == 'WAIT_OUT_WAREHOUSE' || this.detailData.billStatus == 'FINISH') : false
+			 },
+		},
 		methods: {
 			init(){
 				this.getList(1)

+ 13 - 3
pages/sales/salesDetail.vue

@@ -46,9 +46,9 @@
 						<view class="font_13 flex_1 flex justify_between">
 							<view class="pimgs">
 								<u-image :src="item.productMainImage?item.productMainImage:`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
-								<view v-if="item.oosFlag == 1" class="sign" :style="{backgroundColor: $config('errorColor')}">急</view>
-								<view v-if="item.price < item.cost" class="sign" :style="{backgroundColor: $config('errorColor')}">亏</view>
-								<view v-if="item.price == 0" class="sign" :style="{backgroundColor: $config('errorColor')}">赠</view>
+								<view v-if="(isOwerEdit && item.oosFlag == 1) || (isOwerEdit && item.oosFlag == 1)" class="sign" :style="{backgroundColor: $config('errorColor')}">急</view>
+								<view v-if="item.price < item.cost" class="sign" :style="{backgroundColor: $config('warringColor')}">亏</view>
+								<view v-if="!isOwerEdit&&!isAudit&&(!item.currentStockQty || item.currentStockQty < item.qty)" class="sign" :style="{backgroundColor: $config('errorColor')}">缺</view>
 							</view>
 							<view class="sales-item-main flex_1">
 								<view class="sales-item-name">{{item.productName || '--'}}</view>
@@ -156,6 +156,16 @@
 		onUnload() {
 			uni.$off('refreshEditBL')
 		},
+		computed: {
+			 // 是否自建单据
+			 isOwerEdit () {
+			   return this.detailData && this.detailData.sourceType == 'SALES'
+			 },
+			 // 是否审核通过
+			 isAudit () {
+			   return this.detailData ? (this.detailData.billStatus == 'WAIT_OUT_WAREHOUSE' || this.detailData.billStatus == 'FINISH') : false
+			 },
+		},
 		watch: {
 			toggle (newValue, oldValue) {
 				this.changeScrollH()