Przeglądaj źródła

线上支付订单

lilei 4 miesięcy temu
rodzic
commit
fbdb06ed3d

+ 1 - 0
config/index.js

@@ -18,6 +18,7 @@ const getConfig = (theme) => {
 			warringColor: '#f3bb12', // 警告
 			errorColor: '#E70012', // 错误
 			successColor: '#13C442', // 成功
+			orangeColor: '#FF5500',
 			infoColor: '#909399',
 			topBarBackground: 'linear-gradient(45deg, #fff, #fff)', // 顶部栏渐变色
 			topBarTitleColors: '#222222', // 顶部栏文字颜色

+ 71 - 52
pages/sales/edit.vue

@@ -35,7 +35,7 @@
 					<view>
 						总款数:<text class="sales-total-num" :style="{color: $config('warringColor')}">{{detailData && (detailData.totalCategory || detailData.totalCategory==0) ? toThousands(detailData.totalCategory) : '--'}}</text>;总数量:<text class="sales-total-num" :style="{color: $config('warringColor')}">{{detailData && (detailData.totalQty || detailData.totalQty==0) ? toThousands(detailData.totalQty) : '--'}}</text>;总售价:<text class="sales-total-num" :style="{color: $config('warringColor')}">¥{{detailData && (detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount, 2) : '--'}}</text>;
 					</view>
-					<view>
+					<view v-if="detailData&&detailData.payOnlineFlag!=1">
 						折扣金额:<text class="sales-total-num" :style="{color: $config('warringColor')}">¥{{detailData && (detailData.discountAmount || detailData.discountAmount==0) ? toThousands(detailData.discountAmount, 2) : '--'}}</text>;折扣:<text class="sales-total-num" :style="{color: $config('warringColor')}">{{detailData && (detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--'}}</text>;折后总售价:<text class="sales-total-num" :style="{color: $config('warringColor')}">¥{{detailData && (detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount, 2) : '--'}}</text>;
 					</view>
 					<view>
@@ -55,14 +55,19 @@
 						<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>
 							<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="{border:setColor.borderColor,backgroundColor:setColor.bgColor,color:setColor.fontColor}">缺</view>
+									<view class="sign" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='GIFT_PRODUCT'" :style="{border:setColor.borderColor1,backgroundColor:setColor.bgColor1,color:setColor.fontColor1}">赠</view>
+									<view class="sign" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='TICKET_PRODUCT'" :style="{border:setColor.borderColor2,backgroundColor:setColor.bgColor2,color:setColor.fontColor2}">券</view>
+									<view class="sign" v-if="detailData&&detailData.payOnlineFlag==1&&item.promoProductType=='SPECIAL_PRODUCT'"  :style="{border:setColor.borderColor3,backgroundColor:setColor.bgColor3,color:setColor.fontColor3}">特</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.warehouseName">{{item.warehouseName}} > {{item.warehouseLocationName}}</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">
 									<view class="sales-item-priceInfo">
 										<view :style="{color: $config('errorColor'), display: 'inline-block'}">¥<text style="font-size: 30upx;">{{toThousands(item.price||0, 2)}}</text></view>
@@ -148,6 +153,20 @@
 				productInfo: null,  // 编辑产品需要的参数
 				editInfo: null,  // 添加/编辑 提交的值
 				commonType: 1,  // 公共弹框类型  1删除产品,2删除销售单,3编辑产品时库存不足
+				setColor:{
+					borderColor:'1upx solid #E70012',
+					fontColor:'#E70012',
+					bgColor:'rgba(236,0,18,.2)',
+					borderColor1:'1upx solid #13C442',
+					fontColor1:'#13C442',
+					bgColor1:'rgba(19,196,66,.2)',
+					borderColor2:'1upx solid #FF5500',
+					fontColor2:'#FF5500',
+					bgColor2:'rgba(255,85,0,.2)',
+					borderColor3:'1upx solid #f3bb12',
+					fontColor3:'#f3bb12',
+					bgColor3:'rgba(243,187,18,.2)'
+				}
 			}
 		},
 		onLoad(opt) {
@@ -157,6 +176,11 @@
 					type: opt.pageType || 'edit',
 					data: opt.data ? JSON.parse(opt.data) : null
 				}
+				if(opt.data&&JSON.parse(opt.data).payOnlineFlag==1){
+					uni.setNavigationBarTitle({
+						title: '线上支付订单' // 页面标题为“新的页面标题”
+					});
+				}
 			}
 			this.init()
 			// 监听整改完成后刷新事件
@@ -184,44 +208,37 @@
 			getList(pageNo){
 				const _this = this
 				if (pageNo) {
-					this.pageNo = pageNo
+					_this.pageNo = pageNo
 				}
 				let params = {
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-					salesBillSn: this.pageData.data && this.pageData.data.salesBillSn
+					pageNo: _this.pageNo,
+					pageSize:_this.pageSize,
+					salesBillSn: _this.pageData.data && _this.pageData.data.salesBillSn
 				}
-				this.status = "loading"
+				_this.status = "loading"
 				salesDetailList(params).then(res => {
 					if (res.status == 200) {
 						if(res.data && res.data.list){
 							res.data.list.map(item => {
-								const productCode = (item.productEntity && item.productEntity.code) || (item.dealerProductEntity && item.dealerProductEntity.code)
-								const productName = (item.productEntity && item.productEntity.name) || (item.dealerProductEntity && item.dealerProductEntity.name)
-								const productOrigCode = (item.productEntity && item.productEntity.origCode) || (item.dealerProductEntity && item.dealerProductEntity.origCode) || '--'
-								const productOrigUnit = (item.productEntity && item.productEntity.unit) || (item.dealerProductEntity && item.dealerProductEntity.unit)
-								item.productCode = productCode || '--'
-								item.productName = productName || '--'
-								item.productOrigCode = productOrigCode || '--'
-								item.productUnit = productOrigUnit || '--'
-								item.warehouseName = item.warehouseEntity && item.warehouseEntity.name || '--'
-								item.warehouseLocationName = item.warehouseLocationEntity && item.warehouseLocationEntity.name || '--'
+								item.productName = item.productEntity && item.productEntity.name || item.dealerProductEntity && item.dealerProductEntity.name
+								item.productCode = item.productEntity && item.productEntity.code || item.dealerProductEntity && item.dealerProductEntity.code
+								item.productUnit = item.productEntity && item.productEntity.unit || item.dealerProductEntity && item.dealerProductEntity.unit
 							})
-							if(this.pageNo>1){
-								this.listData = this.listData.concat(res.data && res.data.list || [])
+							if(_this.pageNo>1){
+								_this.listData = _this.listData.concat(res.data && res.data.list || [])
 							}else{
-								this.listData = res.data.list || []
+								_this.listData = res.data.list || []
 							}
 						}else{
-							this.listData = []
+							_this.listData = []
 						}
-						this.totalNum = res.data && res.data.count || 0
+						_this.totalNum = res.data && res.data.count || 0
 					} else {
-						this.listData = []
-						this.totalNum = 0
-						this.noDataText = res.message
+						_this.listData = []
+						_this.totalNum = 0
+						_this.noDataText = res.message
 					}
-					this.status = "loadmore"
+					_this.status = "loadmore"
 				})
 			},
 			// scroll-view到底部加载更多
@@ -262,8 +279,8 @@
 					productMainImage: data.productMainImage,
 					productCode: data.productCode,
 					productOrigCode: data.productOrigCode,
-					warehouseName: data.warehouseName,
-					warehouseLocationName: data.warehouseLocationName,
+					warehouseName: data.warehouseEntity && data.warehouseEntity.name,
+					warehouseLocationName: data.warehouseLocationEntity && data.warehouseLocationEntity.name,
 					price: data.price,
 					qty: data.qty
 				}
@@ -480,28 +497,30 @@
 						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;
-							}
 						}
 						.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: 15%;
+									width: 40upx;
+									height:34upx;
+									line-height: 34upx;
+									text-align: center;
+									margin-right:5px;
+									font-size: 22upx;
+								}
+								.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;
@@ -531,4 +550,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 35 - 25
pages/sales/index.vue

@@ -22,30 +22,37 @@
 				</view>
 			</view>
 			<!-- 产品报价及新增销售单 -->
-			<view class="nav-cont flex align_center">
-				<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>
-				</view>
-				<!-- <view class="nav-item" @click="toPage('/pages/sales/chooseCustomer?backPage=addSales')">
-					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/sale_icon.png`" width="70" height="70"></u-image>
-					<text class="nav-txt">新增销售单</text>
-				</view> -->
-				<view class="nav-item" @click="toPage('/pages/webviews/openview?title=产品查询&url=https://jgqp.51cjml.com/h5/#!/')" v-if="$hasPermissions('M_queryProduct_mobile')">
-					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/pfind.png`" width="64" height="64"></u-image>
-					<text class="nav-txt">产品查询</text>
-				</view>	
-				<view class="nav-item" @click="toPage('/pages/sales/productUniversal')" v-if="$hasPermissions('M_productUniversalList_mobile')">
-					<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/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>
-				</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>
+					</view>
+					<!-- <view class="nav-item" @click="toPage('/pages/sales/chooseCustomer?backPage=addSales')">
+						<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/sale_icon.png`" width="70" height="70"></u-image>
+						<text class="nav-txt">新增销售单</text>
+					</view> -->
+					<view class="nav-item" @click="toPage('/pages/webviews/openview?title=产品查询&url=https://jgqp.51cjml.com/h5/#!/')" v-if="$hasPermissions('M_queryProduct_mobile')">
+						<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/pfind.png`" width="64" height="64"></u-image>
+						<text class="nav-txt">产品查询</text>
+					</view>	
+					<view class="nav-item" @click="toPage('/pages/sales/productUniversal')" v-if="$hasPermissions('M_productUniversalList_mobile')">
+						<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/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>
+					</view>
+				</scroll-view>
 			</view>
 			<!-- 销售单 -->
-			<view class="sales-list">
+			<view class="sales-list" v-if="$hasPermissions('M_salesList_mobile')">
 				<view class="title">
 					<text class="title-name" @click="$refs.salesList.refash()">
 						销售单 
@@ -56,7 +63,7 @@
 			</view>
 		</view>
 		<!-- 销售单列表 -->
-		<listComponent ref="salesList" :height="listHeight" />
+		<listComponent ref="salesList" v-if="$hasPermissions('M_salesList_mobile')" :height="listHeight" />
 	</view>
 </template>
 
@@ -268,8 +275,11 @@
 			}
 		}
 		.nav-cont{
+			width:100%;
+			white-space: nowrap;
 			.nav-item{
-				flex:1;
+				width:27%;
+				display: inline-block;
 				margin-right: 2%;
 				border-radius: 25upx;
 				background-color: #ffffff;
@@ -305,4 +315,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 71 - 33
pages/sales/list.vue

@@ -1,27 +1,37 @@
 <template>
 	<view class="sales-list-wrap">
 		<u-dropdown class="search-top-box" id="tjCons">
-			<u-dropdown-item v-model="searchForm.billStatus" @change="handleChange('bill')" title="业务状态" :options="billStatusOpt"></u-dropdown-item>
-			<u-dropdown-item v-model="searchForm.financialStatus" @change="handleChange('financial')" title="财务状态" :options="financialStatusOpt"></u-dropdown-item>
+			<u-dropdown-item v-model="searchForm.billStatus" @change="handleChange('bill')" title="业务状态"
+				:options="billStatusOpt"></u-dropdown-item>
+			<u-dropdown-item v-model="searchForm.financialStatus" @change="handleChange('financial')" title="财务状态"
+				:options="(pageType&&pageType=='onlinePagOrder')?onlinePagStatusOpt:financialStatusOpt"></u-dropdown-item>
 		</u-dropdown>
 		<!-- 销售单列表 -->
 		<view class="list-box">
 			<listComponent ref="salesList" :height="listHeight" :params="searchForm" />
 		</view>
 		<!-- 查询右侧弹框 -->
-		<salesSearch ref="searchBox" :openModal="openModal" :defaultParams="searchForm" @refresh="refresh" @close="openModal=false" />
+		<salesSearch ref="searchBox" :openModal="openModal" :defaultParams="searchForm" @refresh="refresh"
+			@close="openModal=false" />
 	</view>
 </template>
 
 <script>
 	import ListComponent from './listComponent.vue'
 	import SalesSearch from './salesSearch.vue'
-	import { getLookUpItem } from '@/api/data'
-	import { salesList } from '@/api/sales'
-	export default{
-		components: { ListComponent, SalesSearch },
-		data(){
-			return{
+	import {
+		getLookUpItem
+	} from '@/api/data'
+	import {
+		salesList
+	} from '@/api/sales'
+	export default {
+		components: {
+			ListComponent,
+			SalesSearch
+		},
+		data() {
+			return {
 				listData: [],
 				pageNo: 1,
 				pageSize: 6,
@@ -29,19 +39,22 @@
 				noDataText: '暂无数据',
 				billStatusOpt: [],
 				financialStatusOpt: [],
+				onlinePagStatusOpt:[],
 				searchForm: {
 					billStatus: null,
-					financialStatus: null
+					financialStatus: null,
+					payOnlineFlag:null//1线上支付订单  0 支付订单
 				},
 				listHeight: 200,
-				openModal: false
+				openModal: false,
+				pageType:null
 			}
 		},
-		onNavigationBarButtonTap(e){  // 标题栏 按钮操作
+		onNavigationBarButtonTap(e) { // 标题栏 按钮操作
 			this.openModal = true
 		},
 		onBackPress() {
-			if(this.openModal){
+			if (this.openModal) {
 				this.$refs.searchBox.closeBox()
 				this.openModal = false
 				return true
@@ -50,61 +63,84 @@
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			query.select('#tjCons').boundingClientRect(data => {
-			  this.listHeight = Math.floor(data.height + 5)
+				this.listHeight = Math.floor(data.height + 5)
 			}).exec();
 		},
-		onLoad() {
+		onLoad(options) {
 			const _this = this
 			this.getLookUpItem('SALES_BILL_STATUS')
 			this.getLookUpItem('FINANCIAL_RECEIVE_STATUS')
-			this.$nextTick(function(){
+			this.getLookUpItem('FINANCIAL_ONLINE_RECEIVE_STATUS')
+			this.$nextTick(function() {
 				// 监听整改完成后刷新事件
-				uni.$on('refreshSalesBL', function(data){
+				uni.$on('refreshSalesBL', function(data) {
 					_this.$refs.salesList.getList(1)
 				})
 			})
+			this.searchForm.payOnlineFlag=options?(options.pageType&&options.pageType=='onlinePagOrder')?1:0:0
+			if (options&&options.pageType&&options.pageType=='onlinePagOrder') {
+				this.pageType = options.pageType
+				uni.setNavigationBarTitle({
+					title: '线上支付订单' // 页面标题为“新的页面标题”
+				});
+			}
 		},
 		onUnload() {
 			uni.$off('refreshSalesBL')
 		},
 		methods: {
 			// 获取查询参数 刷新列表
-			refresh(params){
+			refresh(params) {
 				const _this = this
-				const data = params ? Object.assign(this.searchForm,params) :  {
+				const data = params ? Object.assign(this.searchForm, params) : {
 					billStatus: null,
 					financialStatus: null
 				}
 				data.beginDate = data.beginDate ? (data.beginDate + ' 00:00:00') : ''
 				data.endDate = data.endDate ? (data.endDate + ' 23:59:59') : ''
 				this.searchForm = data
-				this.$nextTick(function(){
+				this.$nextTick(function() {
 					_this.$refs.salesList.refash()
 				})
 			},
 			// 状态  change
-			handleChange(type){
+			handleChange(type) {
 				this.$refs.salesList.refash()
 			},
 			// 配送方式
-			getLookUpItem (type) {
-				getLookUpItem({ lookupCode: type, pageNo: 1, pageSize: 1000 }).then(res => {
+			getLookUpItem(type) {
+				getLookUpItem({
+					lookupCode: type,
+					pageNo: 1,
+					pageSize: 1000
+				}).then(res => {
 					if (res.status == 200 && res.data && res.data.list) {
 						res.data.list.map(item => {
 							item.label = item.dispName
 							item.value = item.code
 						})
-						res.data.list.splice(0, 0, { label: '全部', value: null })
-						if(type == 'SALES_BILL_STATUS'){
-							this.billStatusOpt = res.data.list
-						}else if(type == 'FINANCIAL_RECEIVE_STATUS'){
+						res.data.list.splice(0, 0, {
+							label: '全部',
+							value: null
+						})
+						if (type == 'SALES_BILL_STATUS') {
+							if(this.pageType =='onlinePagOrder'){
+								this.billStatusOpt = res.data.list.filter(item=>item.code!='WAIT_SUBMIT'&&item.code!='SUPERIOR_CHANGE')
+							}else{
+								this.billStatusOpt = res.data.list
+							}
+						} else if (type == 'FINANCIAL_RECEIVE_STATUS') {
 							this.financialStatusOpt = res.data.list
+						}else if(type=='FINANCIAL_ONLINE_RECEIVE_STATUS'){
+							this.onlinePagStatusOpt = res.data.list
 						}
 					} else {
-						if(type == 'SALES_BILL_STATUS'){
+						if (type == 'SALES_BILL_STATUS') {
 							this.billStatusOpt = []
-						}else if(type == 'FINANCIAL_RECEIVE_STATUS'){
+						} else if (type == 'FINANCIAL_RECEIVE_STATUS') {
 							this.financialStatusOpt = []
+						}else if(type=='FINANCIAL_ONLINE_RECEIVE_STATUS'){
+							this.onlinePagStatusOpt = []
 						}
 					}
 				})
@@ -114,13 +150,15 @@
 </script>
 
 <style lang="scss">
-	.sales-list-wrap{
+	.sales-list-wrap {
 		width: 100%;
-		.search-top-box{
+
+		.search-top-box {
 			background-color: #fff;
 		}
-		.list-box{
+
+		.list-box {
 			padding: 0 25upx;
 		}
 	}
-</style>
+</style>

+ 9 - 1
pages/sales/orderInfoModal.vue

@@ -72,6 +72,14 @@
 					<text class="info-item-tit">配送方式:</text>
 					<text class="info-item-txt">{{ (infoData && infoData.dispatchTypeDictValue) || '--' }}</text>
 				</view>
+				<view class="order-info-list" v-if="infoData&&infoData.sourceType!='SALES'">
+					<text class="info-item-tit">采购单号:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.purchaseBillNo) || '--' }}</text>
+				</view>
+				<view class="order-info-list" v-if="infoData&&infoData.sourceType!='XPRH_PURCHASE'&&infoData.sourceType!='SALES'&&infoData.billStatus=='FINISH'">
+					<text class="info-item-tit">收货状态:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.receiptStatusDictValue) || '--' }}</text>
+				</view>
 				<view class="order-info-list">
 					<text class="info-item-tit">业务员:</text>
 					<text class="info-item-txt">{{ (infoData && infoData.salesManName) || '--' }}</text>
@@ -172,4 +180,4 @@ export default {
 		}	
 	}
 }
-</style>
+</style>

+ 3 - 3
pages/sales/salesSearch.vue

@@ -14,10 +14,10 @@
 				<u-form-item label="采购单号" prop="purchaseBillNo" class="form-item">
 					<u-input v-model="form.purchaseBillNo" :maxlength="30" placeholder="请输入采购单号" />
 				</u-form-item>
-				<u-form-item label="收款方式" prop="settleStyleSn" class="form-item">
+				<u-form-item label="收款方式" prop="settleStyleSn" class="form-item" v-if="defaultParams&&defaultParams.payOnlineFlag==0">
 					<u-input clearable v-model="settleStyleName" @click="settleStyleModal=true" @clear="clearSettleStyle" type="select" placeholder="请选择收款方式"/>
 				</u-form-item>
-				<u-form-item label="单据来源" prop="settleStyleSn" class="form-item">
+				<u-form-item label="单据来源" prop="settleStyleSn" class="form-item" v-if="defaultParams&&defaultParams.payOnlineFlag==0">
 					<u-input clearable v-model="sourceTypeName" @click="sourceTypeModal=true" placeholder="请选择单据来源" type="select" @clear="clearSourceType" />
 				</u-form-item>
 				<!-- <u-form-item label="是否铺货" prop="settleStyleSn" class="form-item">
@@ -235,4 +235,4 @@
 			}
 		}
 	}
-</style>
+</style>

BIN
static/default/navIcon/mobilePay.png