Kaynağa Gözat

对账单bug修改

liujun 2 yıl önce
ebeveyn
işleme
c86af13fc9

+ 10 - 12
pages/sales/bill.vue

@@ -93,11 +93,11 @@
 						<view class="label">折让金额:</view>
 						<u-input v-model="discountVal" :border="true" :height="50" />
 					</view>
-					<view class="tip" v-if="discountVal > chooseTotalPayPrice">折让金额不能大于待收金额,请重新输入</view>
+					<view class="tip" v-if="discountVal*1 > chooseTotalPayPrice*1">折让金额不能大于待收金额,请重新输入</view>
 					<view class="costText">折让后金额</view>
 					<view class="costText">¥{{ settlement }}</view>
 				</view>
-				<u-button type="primary" :custom-style="customStyle" shape="circle" @click="handleDisCount">确定</u-button>
+				<u-button type="primary" :custom-style="customStyle"  shape="circle" @click="handleDisCount">确定</u-button>
 			</view>
 		</u-popup>
 		<!-- 对账周期弹窗 -->
@@ -105,7 +105,7 @@
 			<view class="slot-content"><rich-text :nodes="tipContent"></rich-text></view>
 		</u-modal>
 		<!-- 分享询问弹窗 -->
-		<u-modal v-model="shareShow" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false"></u-modal>
+		<u-modal v-model="shareShow" :show-cancel-button="true" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false"></u-modal>
 	</view>
 </template>
 
@@ -113,7 +113,7 @@
 import billList from './billListComponent.vue';
 import { queryUnsettleSaleList, insert } from '@/api/verify.js';
 import getDate from '@/libs/getDate.js';
-import { toThousands } from '@/libs/tools'
+import { toThousands,formatDecimal} from '@/libs/tools'
 export default {
 	components: { billList },
 	data() {
@@ -227,11 +227,6 @@ export default {
 		});
 		this.changeTime();
 	},
-	onNavigationBarButtonTap() {
-		uni.navigateTo({
-			url: '/pages/sales/billHistory'
-		});
-	},
 	onBackPress() {
 		if (this.showSearch) {
 			this.showSearch = false;
@@ -255,7 +250,7 @@ export default {
 				this.bill[i].unsettleAmount = this.bill[i].unsettleAmount ? this.bill[i].unsettleAmount : 0;
 				totalPrice += this.bill[i].unsettleAmount;
 			}
-			return toThousands(totalPrice,2);
+			return formatDecimal(totalPrice,2);
 		},
 		chooseTotalPayPrice() {
 			let price = 0;
@@ -263,13 +258,13 @@ export default {
 				item.unsettleAmount = item.unsettleAmount ? item.unsettleAmount : 0;
 				price += item.unsettleAmount;
 			});
-			return toThousands(price,2);
+			return formatDecimal(price,2);
 		},
 		settlement() {
 			let totalPrice=this.chooseTotalPayPrice?this.chooseTotalPayPrice:0;
 			let discountPrice=this.discountVal?this.discountVal:0
 			let priceNum=totalPrice - discountPrice;
-			return toThousands(priceNum,2)
+			return formatDecimal(priceNum,2)
 		}
 	},
 	methods: {
@@ -416,6 +411,9 @@ export default {
 		allCheckeChange(e) {
 			this.$refs.bill.allSelect(e.value);
 			const list = this.$refs.bill.getAllData();
+			list.map(item => {
+				this.allCheckedCallback(true,item)
+			})
 		},
 		// 选中事件
 		allCheckedCallback(isAllChecked, row) {

+ 8 - 3
pages/sales/chooseCustomerBill.vue

@@ -43,7 +43,7 @@
 					@custom="getSearchCon"
 					@clear="clearSearch"
 					:show-action="false"
-					placeholder="请输入客户名称拼音首字母查询"
+					placeholder="请输入客户名称"
 				></u-search>
 			</view>
 		</view>
@@ -112,7 +112,11 @@ export default {
 		  this.listHeight = Math.floor(data.height)
 		}).exec();
 	},
-	
+	onNavigationBarButtonTap() {
+		uni.navigateTo({
+			url: '/pages/sales/billHistory'
+		});
+	},
 	onLoad() {
 		this.theme = getApp().globalData.theme;
 		this.getSetInfo();
@@ -186,7 +190,8 @@ export default {
 			this.refreshList();
 		},
 		clearSearch(){
-			_this.params.customer.queryWord = undefined
+			this.keyword = ''
+			this.params.customer.queryWord = undefined
 			this.refreshList();
 		},
 		refreshList(e){

+ 1 - 1
pages/sales/customerList.vue

@@ -8,7 +8,7 @@
 						<text>欠款:</text>
 						<text>¥{{ item.settleAmount || 0 }}</text>
 					</view>
-					<view class="customer-box">收款方式:{{ item.customer.settleStyleSnDictValue }}</view>
+					<view class="customer-box">收款方式:{{ item.customer.settleStyleSnDictValue || '--' }}</view>
 				</view>
 			</view>
 			<view v-if="listData && listData.length == 0"><u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="100"></u-empty></view>

+ 1 - 1
pages/sales/index.vue

@@ -35,7 +35,7 @@
 					<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/chooseCustomerBill')">
+				<view class="nav-item" @click="toPage('/pages/sales/chooseCustomerBill')" v-if="$hasPermissions('M_queryProduct_mobile')">
 					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/billImg.png`" width="64" height="64"></u-image>
 					<text class="nav-txt">应收对账单</text>
 				</view>

+ 93 - 82
pages/sales/orderInfoModal.vue

@@ -3,93 +3,95 @@
 		<view class="order-info-con">
 			<scroll-view scroll-y>
 			<view class="order-info-main">
+				<view class="order-info-list">
+					<text class="info-item-tit">销售单号:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.salesBillNo) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">客户名称:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.buyerName) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">客户地址:</text>
+					<text
+						class="info-item-txt"
+						v-if="
+							infoData &&
+								(infoData.shippingAddressProvinceName || infoData.shippingAddressCityName || infoData.shippingAddressCountyName || infoData.shippingAddress)
+						"
+					>
+						{{ infoData.shippingAddressProvinceName || '' }}{{ infoData.shippingAddressCityName || '' }}{{ infoData.shippingAddressCountyName || ''
+						}}{{ infoData.shippingAddress || '' }}
+					</text>
+					<text class="info-item-txt" v-else>--</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">{{ infoFlag ? '单据来源' : '来源' }}:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.sourceTypeDictValue) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">业务状态:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.billStatusDictValue) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">财务状态:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.financialStatusDictValue) || '--' }}</text>
+				</view>
+				<view v-if="infoFlag">
 					<view class="order-info-list">
-						<text class="info-item-tit">销售单号:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.salesBillNo) || '--' }}</text>
+						<text class="info-item-tit">创建时间:</text>
+						<text class="info-item-txt">{{ (infoData && infoData.createDate) || '--' }}</text>
 					</view>
 					<view class="order-info-list">
-						<text class="info-item-tit">客户名称:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.buyerName) || '--' }}</text>
+						<text class="info-item-tit">审核时间:</text>
+						<text class="info-item-txt">{{ (infoData && infoData.auditDate) || '--' }}</text>
 					</view>
 					<view class="order-info-list">
-						<text class="info-item-tit">客户地址:</text>
-						<text
-							class="info-item-txt"
-							v-if="
-								infoData &&
-									(infoData.shippingAddressProvinceName || infoData.shippingAddressCityName || infoData.shippingAddressCountyName || infoData.shippingAddress)
-							"
-						>
-							{{ infoData.shippingAddressProvinceName || '' }}{{ infoData.shippingAddressCityName || '' }}{{ infoData.shippingAddressCountyName || ''
-							}}{{ infoData.shippingAddress || '' }}
-						</text>
-						<text class="info-item-txt" v-else>--</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">联系电话:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.consigneeTel) || '--' }}</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">收款方式:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.settleStyleSnDictValue) || '--' }}</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">{{ infoFlag ? '开单人' : '制单人' }}:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.operatorName) || '--' }}</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">业务员:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.salesManName) || '--' }}</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">{{ infoFlag ? '单据来源' : '来源' }}:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.sourceTypeDictValue) || '--' }}</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">业务状态:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.billStatusDictValue) || '--' }}</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">财务状态:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.financialStatusDictValue) || '--' }}</text>
-					</view>
-					<view class="order-info-list">
-						<text class="info-item-tit">备注:</text>
-						<text class="info-item-txt">{{ (infoData && infoData.remarks) || '--' }}</text>
-					</view>
-					<view v-if="infoFlag">
-						<view class="order-info-list">
-							<text class="info-item-tit">创建时间:</text>
-							<text class="info-item-txt">{{ (infoData && infoData.sourceTypeDictValue) || '--' }}</text>
-						</view>
-						<view class="order-info-list">
-							<text class="info-item-tit">审核时间:</text>
-							<text class="info-item-txt">{{ (infoData && infoData.auditDate) || '--' }}</text>
-						</view>
-						<view class="order-info-list">
-							<text class="info-item-tit">联系人:</text>
-							<text class="info-item-txt">{{ (infoData && infoData.consigneeName) || '--' }}</text>
-						</view>
-						<view class="order-info-list">
-							<text class="info-item-tit">联系手机:</text>
-							<text class="info-item-txt">{{ (infoData && infoData.consigneeMobile) || '--' }}</text>
-						</view>
-						<view class="order-info-list">
-							<text class="info-item-tit">价格类型:</text>
-							<text class="info-item-txt">{{ (infoData && infoData.priceTypeDictValue) || '--' }}</text>
-						</view>
-						<view class="order-info-list">
-							<text class="info-item-tit">配送方式:</text>
-							<text class="info-item-txt">{{ (infoData && infoData.dispatchType) || '--' }}</text>
-						</view>
-						<view class="order-info-list">
-							<text class="info-item-tit">铺货出库:</text>
-							<text class="info-item-txt">{{ (infoData && infoData.sourceTypeDictValue)?infoData.sourceTypeDictValue==0?'否':'是':'--' }}</text>
-						</view>
+						<text class="info-item-tit">联系人:</text>
+						<text class="info-item-txt">{{ (infoData && infoData.consigneeName) || '--' }}</text>
 					</view>
+				</view>
+					
+				<view class="order-info-list">
+					<text class="info-item-tit">联系电话:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.consigneeTel) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">联系手机:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.consigneeMobile) || '--' }}</text>
+				</view>
+				<view class="order-info-list" v-if="infoFlag">
+					<text class="info-item-tit">价格类型:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.priceTypeDictValue) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">收款方式:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.settleStyleSnDictValue) || '--' }}</text>
+				</view>
+				<view class="order-info-list" v-if="infoFlag">
+					<text class="info-item-tit">配送方式:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.dispatchTypeDictValue) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">业务员:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.salesManName) || '--' }}</text>
+				</view>
+				<view class="order-info-list" v-if="infoFlag">
+					<text class="info-item-tit">铺货出库:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.distributionFlag)?infoData.distributionFlag==0?'否':'是':'--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">备注:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.remarks) || '--' }}</text>
+				</view>
+				<view class="order-info-list">
+					<text class="info-item-tit">{{ infoFlag ? '开单人' : '制单人' }}:</text>
+					<text class="info-item-txt">{{ (infoData && infoData.operatorName) || '--' }}</text>
+				</view>
 			</view>
+			
 			</scroll-view>
-			<view class="order-info-footer"><view class="button-cancel" @click="isShow = false">关闭</view></view>
+			<view class="order-info-footer"><view :class="infoFlag?'button-cancel':''" @click="isShow = false">关闭</view></view>
 		</view>
 	</u-mask>
 </template>
@@ -147,7 +149,7 @@ export default {
 			padding: 20upx 20upx;
 			height:800rpx;
 			.order-info-list {
-				padding: 10upx 0;
+				padding: 20upx 0;
 				border-bottom: 1upx solid #e4e7ed;
 				.info-item-tit {
 					color: #666;
@@ -157,8 +159,17 @@ export default {
 		}
 		.order-info-footer {
 			text-align: center;
-			padding-bottom: 20upx;
-		}
+			padding: 20upx 0;
+			text-align: center;
+			.button-cancel{
+				width:160rpx;
+				height: 68rpx;
+				line-height: 68rpx;
+				margin:auto;
+				border-radius: 38rpx;
+				border:1rpx solid #e4e7ed;
+			}
+		}	
 	}
 }
 </style>

+ 2 - 2
pages/sales/salesDetail.vue

@@ -76,11 +76,11 @@
 			</view>
 			<!-- 收款记录列表 -->
 			<view class="flex flex_column" v-show="current == 1">
-			<view ref="salesTotal" class="sales-total-box border-b font_13 flex justify_between">
+			<!-- <view ref="salesTotal" class="sales-total-box border-b font_13 flex justify_between">
 				<view class="sales-total-con flex_1" :style="{height: toggle ? 'auto' : '44upx'}">
 					应收:<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.discountAmount || detailData.discountAmount==0) ? toThousands(detailData.discountAmount, 2) : '--'}}</text>;
 				</view>
-			</view>
+			</view> -->
 			<view class="sales-list-box">
 				<scroll-view class="sales-list-con" :style="{height:scrollH+'upx'}" scroll-y>
 					<view class="sales-list-item flex align_center justify_between" v-for="(con,i) in payRecode" :key="">