shish 4 лет назад
Родитель
Сommit
2534b06051

+ 21 - 48
hdApp/src/admin/clear/info.vue

@@ -7,18 +7,13 @@
 			<view class="bills-info_box content-box">
 				<view class="order-info_box">
 					<view>订单日期:</view>
-					<view>{{ detailInfo.addTime }}</view>
+					<view>{{ detailInfo.addTime.substr(5,11) }}</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>
+						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default" > 复制 </button>
 					</view>
 				</view>
 				<view class="order-info_box">
@@ -30,32 +25,32 @@
 					<view>{{ detailInfo.operator }}</view>
 				</view>
 				<view class="order-info_box">
-					<view>状态:</view>
-					<view>已结账</view>
+					<view>订单状态:</view>
+					<view style="color:red;font-weight:bold;">{{detailInfo.status == 1 ?'待结账':detailInfo.status==2?'已结账':detailInfo.status==3?'已取消':'待结账'}}</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.orderList"
-							:key="idx"
-							class="commodity-item"
-						>
-							<view class="item-info" @click="pageTo({url: '/pagesPurchase/purDetails',query: {id: s.id,},})" >
+						<view v-for="(s, idx) in detailInfo.orderList" :key="idx" class="commodity-item" >
+							<view class="item-info" @click="pageTo({url: '/pagesPurchase/purDetails',query: {id: s.id,}})" >
 								<view class="info-line">
-									<text class="item-name">单号:{{ s.orderSn }}</text>
+									<text class="item-name">单号 {{ s.orderSn }} 时间 {{s.addTime.substr(5,11)}}</text>
 									<text class="item-price">
 										<text class="unit">¥</text>
-										<text class="price">{{ s.realPrice }}</text>
+										<text class="price">{{ s.orderPrice?parseFloat(s.orderPrice):0 }}</text>
 									</text>
 								</view>
 								<view class="info-line">
-									<text class="item-type">{{ s.property }}</text>
-									<text class="item-count">{{ `${s.bigNum}/${s.smallNum}` }}</text>
+									<text class="item-type">
+										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
+										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
+										<text style="margin-left:10upx;color:black;" v-if="Number(s.tkPrice)>0">退款¥{{parseFloat(s.tkPrice)}} 实付¥{{parseFloat(s.actPrice)}}</text>
+									</text>
+									<text class="item-count" style="color: #3385ff;">查看明细</text>
 								</view>
 							</view>
 						</view>
@@ -72,50 +67,30 @@
 				<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" style="font-size: 28upx;">¥{{ detailInfo.prePrice }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.prePrice ? parseFloat(detailInfo.prePrice) : 0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.discountAmount > 0">
 						<div class="tui-title">扣除</div>
-						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.discountAmount }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.discountAmount ? parseFloat(detailInfo.discountAmount) : 0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
-						<div class="tui-title">实</div>
-						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.realPrice }}</div>
+						<div class="tui-title">实际金额</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.realPrice ? parseFloat(detailInfo.realPrice) : 0 }}</div>
 					</tui-list-cell>
-
 				</div>
 			</view>
 			<view class="content-box price-detail" v-if="detailInfo.remark && detailInfo.remark.length > 0">
 				<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"
-						/>
+						<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 class="title"> 供应商 </view>
-			<view class="address-des_bx content-box">
-				<view>
-					<view> {{ detailInfo.ghsName }} {{ detailInfo.ghsMobile }} </view>
-				</view>
-				<view>
-					<i @click="callUp(detailInfo.ghsMobile)" class="iconfont icondianhua1" ></i>
-				</view>
-			</view>
-
 		</view>
 	</view>
 </template>
-
 <script>
 import { getDetail } from "@/api/clear/index";
 import productMins from "@/mixins/product";
@@ -167,7 +142,6 @@ export default {
 	}
 };
 </script>
-
 <style lang="scss" scoped>
 .info-content_box {
 	padding: 0 20upx 100upx;
@@ -206,7 +180,6 @@ export default {
 	}
 	.bills-info_box {
 		padding: 30upx 20upx 30upx;
-		// border-bottom: 1px solid #EEEEEE;
 		& > .order-info_box {
 			display: flex;
 			align-items: center;
@@ -376,4 +349,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

+ 5 - 9
hdApp/src/admin/clear/orderItem.vue

@@ -2,12 +2,10 @@
 	<view class="order-item-view" @click="clickItemEvent">
 		<view class="item-header">
 			<view class="title">
-				<image class="icon" :src="info.ghsAvatar" alt="" />
-				<text class="name">
-					{{ info.ghsName }}
-				</text>
+				<image class="icon" :src="info.ghsAvatar"></image>
+				<text class="name"> {{ info.ghsName }} </text>
 			</view>
-			<view class="status">已结账</view>
+			<view class="status">{{info.status == 1 ?'待结账':info.status==2?'已结账':infot.status==3?'已取消':'待结账'}}</view>
 		</view>
 		<view class="item-main" >
 			<view class="item-info">
@@ -24,11 +22,9 @@
 					<text class="info-value">{{ info.operator }} </text>
 				</view>
 			</view>
-			<view class="item-price"
-				>¥{{ info.realPrice }} <text class="iconfont iconxiangyou"></text>
+			<view class="item-price">¥{{ info.realPrice ? parseFloat(info.realPrice):0 }} <text class="iconfont iconxiangyou"></text>
 			</view>
 		</view>
-		
 	</view>
 </template>
 <script>
@@ -124,4 +120,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

+ 3 - 1
hdApp/src/admin/home/workbench.vue

@@ -99,7 +99,9 @@ export default {
         { name: "花束盆栽", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1 },
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:0},
-        { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1 }
+        { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1 },
+        { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:1 },
+        { name: "结账单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:0 },
       ],
       totalData: [
         { name: "客户数", value: 0 },

+ 3 - 3
hdApp/src/pagesPurchase/order.vue

@@ -16,9 +16,9 @@
               <text class="explain" @click="getBookItemExplain(ghsInfo)">预订说明</text>
             </view>
             <view class="store_btn">
-              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list',query: {ghsId: ghsInfo.id}})">结账记录</view>
+              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list',query: {ghsId: ghsInfo.id}})">结账</view>
               <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 采购记录 </view>
-              <view class="btn_entrance" @click="settleAccounts(ghsInfo)"> 欠款 ¥{{parseFloat(ghsInfo.debtAmount)}} </view>
+              <view class="btn_entrance" @click="settleAccounts(ghsInfo)"> 欠款-¥{{parseFloat(ghsInfo.debtAmount)}} </view>
               <view class="btn_entrance" @click="pageTo({ url: '/admin/ghs/debtChange',query: {ghsId: ghsInfo.id}})">欠款变动明细 </view>
             </view>
           </view>
@@ -146,7 +146,7 @@ export default {
           padding: 20upx 35upx;
           position: absolute;
           top:40upx;
-          right:30upx;
+          right:45upx;
           background: #3385FF;
       }
       .book-button{