shish 5 лет назад
Родитель
Сommit
018c785bbd

+ 6 - 1
ghsApp/src/admin/billing/affirm.vue

@@ -58,6 +58,11 @@
 						<view class="tui-placeholder" style="width: 100%" v-else @click="showCustomer = true">请选择客户</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+						<view class="tui-title ">取货</view>
+						<button @tap="form.sendType=2" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
+						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 						<view class="tui-title ">运费</view>
 						<input type="number" placeholder="留空表示免运费" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder">
 					</tui-list-cell>
@@ -128,7 +133,7 @@ export default {
 				receiveAddress: "",
 				receiveLong: "",
 				receiveLat: "",
-				sendType: "3",
+				sendType: 2,
 				sendSide: "2",
 				sendDate: "",
 				sendTime: "",

+ 8 - 1
ghsApp/src/pages.json

@@ -572,7 +572,7 @@
 				{
 					"path": "details",
 					"style": {
-						"navigationBarTitleText": "采购单详情"
+						"navigationBarTitleText": "确认订单"
 					}
 				},
 				{
@@ -581,6 +581,13 @@
 						"navigationBarTitleText": "采购订单",
 						"enablePullDownRefresh": true
 					}
+				},
+				{
+					"path": "info",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
 				}
 			]
 		},

+ 415 - 0
ghsApp/src/pagesPurchase/info.vue

@@ -0,0 +1,415 @@
+<template>
+	<view class="app-content">
+		<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
+			<view class="title">
+				供应商
+			</view>
+			<view class="address-des_bx content-box">
+				<view>
+					<view> {{ detailInfo.supplierName }} {{ detailInfo.supplierMobile }} </view>
+					<view class="">
+						{{ detailInfo.supplierAddress}}
+					</view>
+				</view>
+				<view>
+					<i
+						@click="callUp(detailInfo.supplierMobile)"
+						class="iconfont icondianhua1"
+					></i>
+				</view>
+			</view>
+			<view class="title">
+				单据信息
+			</view>
+			<view class="bills-info_box content-box">
+				<view class="order-info_box">
+					<view>订单日期:</view>
+					<view>{{ detailInfo.addTime }}</view>
+				</view>
+				<view class="order-info_box">
+					<view>订单编码:</view>
+					<view>{{ detailInfo.orderSn }}</view>
+					<view class="price">
+						<button
+							@click="copy(detailInfo.orderSn)"
+							class="admin-button-com default"
+						>
+							复制
+						</button>
+					</view>
+				</view>
+				<view class="order-info_box">
+					<view>入库人员:</view>
+					<view>{{ detailInfo.adminName }}</view>
+				</view>
+				<view class="order-info_box">
+					<view>入库日期:</view>
+					<view>{{ detailInfo.entryTime }}</view>
+				</view>
+				<view class="order-info_box">
+					<view>欠款:</view>
+					<view>{{ detailInfo.debt==1?'是':'-' }}</view>
+				</view>
+				<view class="order-info_box">
+					<view>状态:</view>
+					<view>{{ 
+						detailInfo.status==1?'待付款'
+						:detailInfo.status==2?'待配送'
+						:detailInfo.status==3?'配送中'
+						:detailInfo.status==4?'已签收'
+						:detailInfo.status==5?'已入库'
+						:detailInfo.status==6?'已取消'
+						:'已退款'
+						 }}</view>
+				</view>
+			</view>
+
+			<view class="title">
+				商品信息
+			</view>
+			<view class="module-com content-box">
+				<view class="commodity-view">
+					<view class="commodity-list">
+						<view
+							v-for="(s, idx) in detailInfo.itemInfo"
+							:key="idx"
+							class="commodity-item"
+						>
+							<image class="item-icon" :src="s.itemCover" alt="商品图片" />
+
+							<view class="item-info">
+								<view class="info-line">
+									<text class="item-name">{{ s.itemName }}</text>
+									<text class="item-price">
+										<text class="unit">¥</text>
+
+										<text class="price">{{ s.itemPrice }}</text>
+									</text>
+								</view>
+								<view class="info-line">
+									<text class="item-type">{{ s.property }}</text>
+									<text class="item-count">{{ `${s.bigNum}/${s.smallNum}` }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="summary-bar">
+						<view class="operate-view" ></view>
+						<view class="describe-view">
+							共{{ detailInfo.kind || 0 }}种, 共{{ detailInfo.bigNum }}扎{{
+								detailInfo.smallNum}}支,合计 ¥<text class="price">{{ detailInfo.price }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="content-box price-detail">
+				<div class="module-com input-line-wrap">
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">打包费</div>
+						<div class="detail-price_box">¥{{ detailInfo.packingCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">短途运费</div>
+						<div class="detail-price_box">¥{{ detailInfo.shortCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">包机(长途)费</div>
+						<div class="detail-price_box">¥{{ detailInfo.longCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">提货费</div>
+						<div class="detail-price_box">¥{{ detailInfo.pickCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">本地运费</div>
+						<div class="detail-price_box">¥{{ detailInfo.localCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">总金额</div>
+						<div class="detail-price_box red">¥{{ detailInfo.actPrice || 0.00 }}</div>
+					</tui-list-cell>
+				</div>
+			</view>
+			<view class="content-box price-detail">
+				<div class="module-com input-line-wrap">
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">备注</div>
+						<input
+							:disabled="true"
+							v-model="detailInfo.remark"
+							placeholder-class="phcolor"
+							class="tui-input"
+							name="name"
+							maxlength="50"
+							type="text"
+						/>
+					</tui-list-cell>
+				</div>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+import { getPurchaseDetailApi } from "@/api/purchase/index";
+import productMins from "@/mixins/product";
+import TuiListCell from "@/components/plugin/list-cell";
+
+export default {
+	name: "info",
+	components: {
+		TuiListCell
+	},
+	mixins: [productMins],
+	data() {
+		return {
+			pageType: "order_change",
+			autoLoad: false,
+			stepActive: 0,
+			form: {
+				name: ""
+			},
+			detailInfo: {},
+			loading: false
+		};
+	},
+	onShow() {
+
+	},
+	methods: {
+		copy(val) {
+			const self = this;
+			uni.setClipboardData({
+				data: val,
+				success: function() {
+					self.$msg("复制成功");
+				}
+			});
+		},
+		callUp(mobile) {
+			uni.makePhoneCall({
+				phoneNumber: mobile
+			});
+		},
+		async init() {
+			const { orderSn } = this.option;
+			if (!orderSn) {
+				return;
+			}
+			const { data } = await getPurchaseDetailApi(orderSn);
+			this.detailInfo = data;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.info-content_box {
+	padding: 0 20px 100px;
+	& > .title {
+		color: #666666;
+		font-size: 28px;
+		font-weight: 600;
+		padding: 30px 3px;
+	}
+	& .address-des_bx {
+		display: flex;
+		padding: 20px 10px 30px 20px;
+		& > view:nth-child(1) {
+			flex: 1;
+			margin-top: 10px;
+			& > view:nth-child(1) {
+				color: #333333;
+				font-size: 32px;
+				font-weight: bold;
+			}
+			& > view:nth-child(2) {
+				color: #666666;
+				font-size: 28px;
+				font-weight: 400;
+				margin-top: 20px;
+			}
+		}
+		& > view:nth-child(2) {
+			display: flex;
+			& .icondianhua1 {
+				font-size: 44px;
+				color: #3385ff;
+				margin-left: 10px;
+			}
+		}
+	}
+	.bills-info_box {
+		padding: 30px 20px 30px;
+		// border-bottom: 1px solid #EEEEEE;
+		& > .order-info_box {
+			display: flex;
+			align-items: center;
+			font-size: 26px;
+			font-weight: 400;
+			margin-bottom: 5px;
+			& > view:nth-child(1) {
+				color: #999999;
+				width: 135px;
+				text-align: right;
+			}
+			& > view:nth-child(2) {
+				color: #333333;
+			}
+			& > .price {
+				flex: 1;
+				font-size: 30px;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				& .iconxiangyou {
+					color: #999999;
+					font-size: 25px;
+					margin-left: 12px;
+				}
+			}
+		}
+	}
+	.content-box {
+		background-color: #ffffff;
+		border-radius: 10px;
+	}
+	.commodity-view {
+		display: flex;
+		flex-direction: column;
+		.commodity-list {
+			padding: 20px;
+			.commodity-item {
+				display: flex;
+				margin-bottom: 20px;
+				.item-icon {
+					flex-shrink: 0;
+					width: 140px;
+					height: 140px;
+				}
+				.item-info {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					flex: 1;
+					margin-left: 20px;
+					.info-line {
+						margin-bottom: 20px;
+						display: flex;
+						justify-content: space-between;
+						align-items: flex-end;
+						.item-name {
+							color: #666;
+							font-size: 28px;
+						}
+						.item-price {
+							color: #333;
+							font-size: 22px;
+							.price {
+								font-size: 32px;
+								font-weight: bold;
+							}
+						}
+						.item-type {
+							color: #999;
+							font-size: 24px;
+						}
+						.item-count {
+							color: #666;
+							font-size: 24px;
+						}
+					}
+				}
+			}
+		}
+		.summary-bar {
+			padding: 0 20px;
+			height: 90px;
+			display: flex;
+
+			align-items: center;
+			justify-content: space-between;
+			border-top: 1px solid #eeeeee;
+			.operate-view {
+				display: flex;
+
+				align-items: center;
+				color: #3385ff;
+				font-size: 26px;
+				.iconfont {
+					margin-right: 20px;
+					font-size: 40px;
+				}
+			}
+			.describe-view {
+				display: flex;
+
+				align-items: center;
+				color: #333;
+				font-size: 24px;
+				.price {
+					font-weight: bold;
+					font-size: 36px;
+				}
+			}
+		}
+	}
+	.shipping-address {
+		display: flex;
+		align-items: center;
+		margin-top: 20px;
+		& > view:nth-child(1) {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			display: inline-block;
+			padding: 30upx 0 30upx 20upx;
+			flex: 1;
+			& > text {
+				color: #333333;
+				font-weight: 600;
+			}
+		}
+		& > view:nth-child(2) {
+			font-size: 60px;
+			color: #d6e7ff;
+			margin-right: 10px;
+		}
+	}
+	.price-detail {
+		margin-top: 20px;
+		margin-bottom: 20px;
+	}
+	.detail-price_box {
+		color: #333333;
+		font-size: 22px;
+		text-align: right;
+		flex: 1;
+		font-weight: 600;
+		&.red {
+			color: #ff2842;
+		}
+	}
+}
+.app-footer {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	& .admin-button-com {
+		padding: 0;
+		margin-right: 15px;
+		width: 140px;
+		height: 70px;
+		line-height: 70px;
+		text-align: center;
+		color: #3385ff;
+		border: 1px solid #3385ff;
+		&.active{
+			color: #666666;
+			border: 1px solid #ccc;
+		}
+	}
+}
+</style>

+ 5 - 8
ghsApp/src/pagesPurchase/order.vue

@@ -11,7 +11,7 @@
 				@change="changeTabEvent"
 				itemWidth="20%"
 				@add="addEvent"
-				:isAdd="true"
+				:isAdd="false"
 				addText="新增"
 			></Tabs>
 		</view>
@@ -30,9 +30,9 @@
 			</block>
 		</scroll-view>
 
-			<view class="app-footer">
-				<div class="admin-button-com middle blue" @click="addEvent">新增</div>
-			</view>
+		<view class="app-footer open_btn">
+			<view @click="addEvent" class="admin-button-com middle blue">新增采购</view>
+		</view>
 
 	</view>
 </template>
@@ -165,11 +165,8 @@ export default {
 			});
 		},
 		gotoDetails(item) {
-			// if (item.status == PURCHASE_ORDER_STATUS.CONFIRM) {
-
-			// }
 			uni.navigateTo({
-				url: `/pagesPurchase/details?orderSn=${item.orderSn}`,
+				url: `/pagesPurchase/info?orderSn=${item.orderSn}`,
 				success: result => {},
 				fail: () => {},
 				complete: () => {}

+ 5 - 5
ghsApp/src/pagesStatistics/business.vue

@@ -39,7 +39,7 @@
 					<view class="title-bar">
 						<image
 							class="title-icon"
-							src="../../../static/images/common/business-stock.png"
+							src=""
 						>
 						</image>
 						<text class="title">
@@ -71,7 +71,7 @@
 					<view class="title-bar">
 						<image
 							class="title-icon"
-							src="../../../static/images/common/business-sale.png"
+							src=""
 						>
 						</image>
 						<text class="title">
@@ -83,7 +83,7 @@
 					<view :class="['show-tag',baseInfo.todayCompareYesterday>0?'up':'down']">
 						<view class="tag">
 							同期
-							<image class="arrow" src="../../../static/images/common/arrow.png" />
+							<image class="arrow" src="" />
 						</view>
 						<text>{{baseInfo.todayCompareYesterday}}</text>
 					</view>
@@ -98,7 +98,7 @@
 						<view :class="['show-tag',baseInfo.latestSevenSameTerm>0?'up':'down']">
 							<view class="tag">
 								同期
-								<image class="arrow" src="../../../static/images/common/arrow.png" />
+								<image class="arrow" src="" />
 							</view>
 							<text>{{baseInfo.latestSevenSameTerm}}</text>
 						</view>
@@ -113,7 +113,7 @@
 						<view :class="['show-tag',baseInfo.latestThirtySameTerm>0?'up':'down']">
 							<view class="tag ">
 								同期
-								<image class="arrow" src="../../../static/images/common/arrow.png" />
+								<image class="arrow" src="" />
 							</view>
 							<text>{{baseInfo.latestThirtySameTerm}}</text>
 						</view>

+ 7 - 5
ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -8,7 +8,7 @@
 				@change="changeTabEvent"
 				@add="addEvent"
 				:addText="'新增'"
-				:isAdd="true"
+				:isAdd="false"
 			></Tabs>
 		</view>
 		<scroll-view scroll-y class="allot-list">
@@ -49,12 +49,14 @@
 				</view>
 			</block>
 			<block v-else>
-				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+				<AppWrapperEmpty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</scroll-view>
-		<!-- <div class="app-footer open_btn">
-			<div @click="addEvent" class="admin-button-com middle blue">新增</div>
-		</div> -->
+		
+		<view class="app-footer open_btn">
+			<view @click="addEvent" class="admin-button-com middle blue">新增出库</view>
+		</view>
+
 	</view>
 </template>
 <script>

+ 3 - 4
ghsApp/src/pagesStorehouse/allot/allotPut.vue

@@ -50,10 +50,9 @@
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</scroll-view>
-		<div class="app-footer open_btn">
-			<!-- <div class="admin-button-com middle blue" @click="pageTo('/admin/shop/add')">添加门店</div> -->
-			<div @click="addEvent" class="admin-button-com middle blue">新增</div>
-		</div>
+		<view class="app-footer open_btn">
+			<view @click="addEvent" class="admin-button-com middle blue">新增入库</view>
+		</view>
 	</view>
 </template>
 <script>

+ 2 - 3
ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -43,12 +43,11 @@
 				</view>
 			</block>
 			<block v-else>
-				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+				<AppWrapperEmpty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</scroll-view>
 		<div class="app-footer open_btn">
-			<!-- <div class="admin-button-com middle blue" @click="pageTo('/admin/shop/add')">添加门店</div> -->
-			<div @click="addEvent" class="admin-button-com middle blue">新增</div>
+			<div @click="addEvent" class="admin-button-com middle blue">新增盘点</div>
 		</div>
 	</view>
 </template>