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

+ 13 - 30
ghsApp/src/admin/clear/customInfo.vue

@@ -7,36 +7,28 @@
 			<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">
 					<view>支付方式:</view>
 					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
 				</view>
-
 				<view class="order-info_box">
 					<view>操作人员:</view>
 					<view>{{ detailInfo.operator }}</view>
 				</view>
 				<view class="order-info_box">
 					<view>状态:</view>
-					<view>已结账</view>
+					<view>{{detailInfo.status==1?'待结账':detailInfo.status==2?'已结账':detailInfo.status==3?'已取消':'待结账'}}</view>
 				</view>
 			</view>
-
 			<view class="title">
 				客户
 			</view>
@@ -48,29 +40,28 @@
 					<i @click="callUp(detailInfo.customMobile)" class="iconfont icondianhua1" ></i>
 				</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 v-for="(s, idx) in detailInfo.orderList" :key="idx" class="commodity-item" >
 							<view class="item-info" @click="pageTo({url: '/pagesOrder/detail',query: {id: s.id,},})" >
 								<view class="info-line">
-									<text class="item-name">单号 {{ s.orderSn }}</text>
+									<text class="item-name">单号 {{ s.orderSn }} 时间 {{s.addTime ? 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>
@@ -104,15 +95,7 @@
 				<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>

+ 3 - 5
ghsApp/src/admin/clear/customOrderItem.vue

@@ -3,17 +3,15 @@
 		<view class="item-header">
 			<view class="title">
 				<image class="icon" :src="info.customAvatar" alt="" />
-				<text class="name">
-					{{ info.customName }}
-				</text>
+				<text class="name"> {{ info.customName }} </text>
 			</view>
-			<view class="status">已结账</view>
+			<view class="status">{{info.status==1?'待结账':info.status==2?'已结账':info.status==3?'已取消':'待结账'}}</view>
 		</view>
 		<view class="item-main" >
 			<view class="item-info">
 				<view class="info-row">
 					<text class="info-label"> 日期:</text>
-					<text class="info-value">{{ info.addTime }} </text>
+					<text class="info-value">{{ info.addTime.substr(5,11) }} </text>
 				</view>
 				<view class="info-row">
 					<text class="info-label"> 单号:</text>

+ 4 - 6
ghsApp/src/admin/clear/orderItem.vue

@@ -2,7 +2,7 @@
 	<view class="order-item-view" @click="clickItemEvent">
 		<view class="item-header">
 			<view class="title">
-				<image class="icon" :src="info.ghsAvatar" alt="" />
+				<image class="icon" :src="info.ghsAvatar" ></image>
 				<text class="name">
 					{{ info.ghsName }}
 				</text>
@@ -13,7 +13,7 @@
 			<view class="item-info">
 				<view class="info-row">
 					<text class="info-label"> 日期:</text>
-					<text class="info-value">{{ info.addTime }} </text>
+					<text class="info-value">{{ info.addTime.substr(5,11) }} </text>
 				</view>
 				<view class="info-row">
 					<text class="info-label"> 单号:</text>
@@ -24,11 +24,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 +122,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

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

@@ -101,7 +101,7 @@ export default {
         { 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/yggl.png`, url: "/admin/staff/list",pf:1 },
-        { name: "结账单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:0 },
+        { 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,10 +16,10 @@
               <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="pageTo({ url: '/admin/ghs/debtChange',query: {ghsId: ghsInfo.id}})">欠款变动明细 </view>
+              <view class="btn_entrance" @click="settleAccounts(ghsInfo)"> 待结订单 </view>
+              <view class="btn_entrance" @click="pageTo({ url: '/admin/ghs/debtChange',query: {ghsId: ghsInfo.id}})">欠款变动明细-¥{{parseFloat(ghsInfo.debtAmount)}}</view>
             </view>
           </view>
         </block>