chenrui 5 mesiacov pred
rodič
commit
80bfb021d4

+ 36 - 36
pages/sales/edit.vue

@@ -55,15 +55,17 @@
 						<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="(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 class="sign1" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='GIFT_PRODUCT'" :style="{backgroundColor: $config('successColor')}">赠</view>
-								<view class="sign1" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='TICKET_PRODUCT'" :style="{backgroundColor: $config('orangeColor')}">券</view>
-								<view class="sign1" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='SPECIAL_PRODUCT'"  :style="{backgroundColor: $config('warringColor')}">特</view>
 							</view>
 							<view class="sales-item-main flex_1">
-								<view class="sales-item-name">{{item.productName || '--'}}</view>
+								<view class="sales-item-name">
+									<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 class="sign1" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='GIFT_PRODUCT'" :style="{backgroundColor: $config('successColor')}">赠</view>
+									<view class="sign1" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='TICKET_PRODUCT'" :style="{backgroundColor: $config('orangeColor')}">券</view>
+									<view class="sign1" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='SPECIAL_PRODUCT'"  :style="{backgroundColor: $config('warringColor')}">特</view>
+									<view class="nameInfo">{{item.productName || '--'}}</view>
+								</view>
 								<view class="sales-item-txt">{{item.productCode || '--'}}</view>
 								<view class="sales-item-txt color_6" style="font-size: 24upx;" v-if="item.warehouseEntity&&item.warehouseEntity.name || item.warehouseLocationEntity&&item.warehouseLocationEntity.name">{{item.warehouseEntity&&item.warehouseEntity.name}} > {{item.warehouseLocationEntity&&item.warehouseLocationEntity.name}}</view>
 								<view class="sales-item-txt flex align_center justify_between">
@@ -476,38 +478,36 @@
 						padding: 20upx 0;
 						.pimgs{
 							margin-right: 20upx;
-							position: relative;
-							.sign{
-								position: absolute;
-								right: -2upx;
-								top: -2upx;
-								color: #fff;
-								border-radius: 50%;
-								width: 40upx;
-								height: 40upx;
-								text-align: center;
-							}
-							.sign1{
-								position: absolute;
-								right: 45upx;
-								top: -2upx;
-								color: #fff;
-								border-radius: 50%;
-								width: 40upx;
-								height: 40upx;
-								text-align: center;
-							}
 						}
 						.sales-item-main{
 							.sales-item-name{
-								font-size: 28upx;
-								color: rgb(48, 49, 51);
-								font-weight: bold;
-								overflow: hidden;
-								text-overflow: ellipsis;
-								display: -webkit-box;
-								-webkit-box-orient: vertical;
-								-webkit-line-clamp: 1;
+								display:flex;
+								.sign{
+									border-radius: 50%;
+									width: 40upx;
+									height: 40upx;
+									text-align: center;
+									color:#ffffff;
+								}
+								.sign1{
+									border-radius: 50%;
+									width: 40upx;
+									height: 40upx;
+									text-align: center;
+									color:#ffffff;
+									margin:0 5px;
+								}
+								.nameInfo{
+									max-width: 80%;
+									font-size: 28upx;
+									color: rgb(48, 49, 51);
+									font-weight: bold;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									display: -webkit-box;
+									-webkit-box-orient: vertical;
+									-webkit-line-clamp: 1;
+								}
 							}
 							.sales-item-txt{
 								margin: 8upx 0;

+ 5 - 4
pages/sales/index.vue

@@ -22,8 +22,13 @@
 				</view>
 			</view>
 			<!-- 产品报价及新增销售单 -->
+			<!-- v-if="$hasPermissions('M_onlinePagOrder_mobile')" -->
 			<view class="nav-cont">
 				<scroll-view scroll-x="true">
+					<view class="nav-item" @click="toPage('/pages/sales/list?pageType=onlinePagOrder')" >
+						<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/mobilePay.png`" width="64" height="64"></u-image>
+						<text class="nav-txt">线上支付订单</text>
+					</view>
 					<view class="nav-item" @click="toPage('/pages/sales/productPricing')" v-if="$hasPermissions('M_productPrice_mobile')">
 						<u-image class="nav-pic" style="margin-top: 5upx;" :src="`../../static/${theme}/navIcon/price_icon.png`" width="60" height="60"></u-image>
 						<text class="nav-txt" style="margin-top: 5upx;">产品报价</text>
@@ -40,10 +45,6 @@
 						<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/parts.png`" width="64" height="64"></u-image>
 						<text class="nav-txt">通用产品</text>
 					</view>	
-					<view class="nav-item" @click="toPage('/pages/sales/list?pageType=onlinePagOrder')" v-if="$hasPermissions('M_productUniversalList_mobile')">
-						<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/mobilePay.png`" width="64" height="64"></u-image>
-						<text class="nav-txt">线上支付订单</text>
-					</view>	
 					<view class="nav-item" @click="toPage('/pages/sales/chooseCustomerBill')" v-if="$hasPermissions('M_ARStatement_mobile')">
 						<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/billImg.png`" width="64" height="64"></u-image>
 						<text class="nav-txt">应收对账单</text>

+ 1 - 2
pages/sales/list.vue

@@ -78,13 +78,12 @@
 				})
 			})
 			this.searchForm.payOnlineFlag=options?(options.pageType&&options.pageType=='onlinePagOrder')?1:0:0
-			if (options) {
+			if (options&&options.pageType&&options.pageType=='onlinePagOrder') {
 				this.pageType = options.pageType
 				uni.setNavigationBarTitle({
 					title: '线上支付订单' // 页面标题为“新的页面标题”
 				});
 			}
-			console.log('111111:',this.searchForm.payOnlineFlag)
 		},
 		onUnload() {
 			uni.$off('refreshSalesBL')

+ 2 - 1
pages/sales/listComponent.vue

@@ -122,7 +122,8 @@
 				}
 				let params = {
 					pageNo: this.pageNo,
-					pageSize: this.pageSize
+					pageSize: this.pageSize,
+					payOnlineFlag:0
 				}
 				this.status = "loading"
 				console.log(Object.assign(params, this.params))