采购等相关

ghsApp/src/pagesOrder/detail.vue

@@ -40,9 +40,8 @@
 					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
 				<view class="order-info_box">
-					<view>出货时间：</view>
-					<view v-if="detailInfo.outTime == '0000-00-00 00:00:00'">--</view>
-					<view v-else>{{ detailInfo.outTime }}</view>
+					<view>送货时间：</view>
+					<view>{{ detailInfo.sendTimeWant }}</view>
 				</view>
 				<view class="order-info_box">
 					<view>客户下单：</view>
@@ -71,6 +70,9 @@
 				<view v-if="detailInfo.refund == 2" class="order-info_box">
 					<view>退款金额：</view>
 					<view style="color:red;font-weight:bold;font-size:30rpx;">{{detailInfo.tkPrice}}</view>
+					<view class="price" v-if="detailInfo.refund==2">
+						<button @click="pageTo({url: '/pagesOrder/refundMsg',query: {orderSn: detailInfo.orderSn}})" class="admin-button-com">退款明细</button>
+					</view>
 				</view>
 				<view v-if="detailInfo.refund == 2" class="order-info_box">
 					<view>退款方式：</view>
@@ -104,7 +106,6 @@
 			<view class="flex-space title">
 				商品信息
 				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="detailInfo.status == 4">
-					<navigator v-if="detailInfo.refund==2" :url="`/pagesOrder/refundMsg?orderSn=${detailInfo.orderSn}`">退款明细</navigator>
 					<navigator v-if="detailInfo.refund==1" :url="`/pagesOrder/refund?id=${option.id}`" style="margin-left: 20rpx;">发起退款</navigator>
 				</view>
 			</view>
@@ -136,7 +137,10 @@
 					<view class="summary-bar">
 						<view class="operate-view" ></view>
 						<view class="describe-view">
-							共{{ detailInfo.productStat.kind}}种，共{{ detailInfo.productStat.bigNum }}扎{{detailInfo.productStat.smallNun}}支，合计 ¥<text class="price">{{ userPrice.toFixed(2) }}</text>
+							共{{ detailInfo.productStat.kind}}种，共
+							<text v-if="detailInfo.productStat.bigNum > 0">{{ detailInfo.productStat.bigNum }}扎</text>
+							<text v-if="detailInfo.productStat.smallNun > 0">{{detailInfo.productStat.smallNun}}支</text>
+							，合计 ¥<text class="price">{{ userPrice.toFixed(2) }}</text>
 						</view>
 					</view>
 				</view>
@@ -145,15 +149,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"
-						/>
+						<div>{{ detailInfo.remark }}</div>
 					</tui-list-cell>
 				</div>
 			</view>
@@ -635,7 +631,7 @@ export default {
 						justify-content: space-between;
 						align-items: flex-end;
 						.item-name {
-							color: #666;
+							color: black;
 							font-size: 30px;
 							font-weight: 700;
 						}

ghsApp/src/pagesPurchase/add.vue

@@ -73,19 +73,20 @@
 			color="#333"
 			:size="32"
 			padding="30rpx 30rpx"
+			:button="showButton"
 		>
 			<template slot="customContent">
 				<view class="select-view">
 					<view class="select-cmd_bx">
 						<view class="num_bx">
 							<view class="kc">数量</view>
-							<input v-model="customData.bigCount" :focus="isFocus" type="number" placeholder="扎" />
+							<input v-model="customData.bigCount" :focus="isFocus" type="number" placeholder="填写扎数" />
 						</view>
 					</view>
 					<view class="select-cmd_bx">
 						<view class="num_bx">
 							<view class="kc">单价</view>
-							<input v-model="customData.itemPrice" @focus="customData.itemPrice = null" type="number" placeholder="元" />
+							<input v-model="customData.itemPrice" @focus="customData.itemPrice = null" type="number" placeholder="填写单价" />
 						</view>
 					</view>
 				</view>
@@ -135,6 +136,7 @@ export default {
 				weight:null,
 			},
 			autoLoad: false, //不自动请求数据  自定义请求
+			showButton:[{text: '删除花材',plain: true}, {text: '确定',plain: false}]
 		};
 	},
 	computed:{
@@ -395,6 +397,7 @@ export default {
 			align-items: center;
 			.kc {
 				width: 80upx;
+				font-size:32rpx;
 			}
 			& > input {
 				flex: 1;
@@ -403,7 +406,7 @@ export default {
 				border-radius: 4px;
 				text-align: center;
 				margin-right: 24px;
-				font-size: 40rpx;
+				font-size: 32rpx;
 			}
 		}
 	}

hdApp/src/admin/billing/affirmGhs.vue

@@ -179,24 +179,20 @@
 						<view class="commodity-list">
 							<view class="commodity-item" v-for="(item, index) in list" :key="index">
 								<image class="item-icon" :src="item.cover" alt="商品图" />
-
 								<view class="item-info">
 									<view class="info-line">
 										<text class="item-name">{{ item.itemName }}</text>
 										<text class="item-price">
 											<text class="unit">¥</text>
-
 											<text class="price">
-												{{ getSelectItemPrice(item) }}
+												{{ item.bigPrice }}
 											</text>
 										</text>
 									</view>
 									<view class="info-line">
-										<text class="item-type">{{ item.rank }}级</text>
+										<text class="item-type"></text>
 										<text class="item-count">
-											<text v-if="item.bigCount > 0 || item.smallCount > 0">{{`${item.bigCount}`}}</text>
-											<text v-if="item.smallCount > 0">/</text>
-											<text v-if="item.smallCount > 0">{{ `${item.smallCount}` }}</text>
+											<text>{{`${item.bigCount}`}}扎</text>
 										</text>
 									</view>
 								</view>
@@ -230,7 +226,7 @@
 						<view class="tui-title ">配送时间</view>
 						
 						<picker mode="date" :value="sendTimeWant" @change="bindDateChange" style="width:400rpx;">
-                        <view class="uni-input">{{sendTimeWant || '默认今天'}}</view>
+                        <view class="uni-input">{{sendTimeWant || '今天'}}</view>
                     	</picker>
 
 					</tui-list-cell>

hdApp/src/mixins/product.js

@@ -339,7 +339,6 @@ export default {
 					if(this.filterProductInfo[this.classIndex+1].child.length<5){
 						this.filterProductInfo[this.classIndex+2].isActive = true;
 					}
-					// this.scrollPushList();
 					break;
 				}else if(node2 && top_page === node2){
 					this.classIndex = i + 1;
@@ -348,7 +347,6 @@ export default {
 					if(this.filterProductInfo[this.classIndex+1].child.length<5){
 						this.filterProductInfo[this.classIndex+2].isActive = true;
 					}
-					// this.scrollPushList();
 					break;
 				}
 			}
@@ -357,11 +355,8 @@ export default {
 				this.classIndex = this.filterProductInfo.length-1
 				this.filterProductInfo[this.classIndex].isActive = true;
 				this.filterProductInfo[this.classIndex-1].isActive = true;
-			// this.scrollPushList();
 		},
-		/**
-			* 获取当前选中商品总价
-			*/
+		//获取当前选中商品总价
 		getSelectItemPrice(item) {
 			let price = 0;
 			const { bigCount, smallCount, bigPrice, smallPrice } = item;

hdApp/src/pagesPurchase/purDetails.vue

@@ -48,10 +48,15 @@
         </view>
 
         <view class="order-info_box">
-          <view>采购员：</view>
+          <view>采购人员：</view>
           <view>{{ detailInfo.adminName }}</view>
         </view>
 
+        <view class="order-info_box">
+          <view>配送时间：</view>
+          <view>{{ detailInfo.sendTimeWant }}</view>
+        </view>
+
         <view class="order-info_box">
           <view>订单状态：</view>
           <view>{{
@@ -146,20 +151,9 @@
       </view>
       <view v-if="detailInfo.remark !=''" class="content-box price-detail">
         <div class="module-com input-line-wrap">
-          <tui-list-cell
-            class="line-cell"
-            :hover="false"
-          >
+          <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"
-            />
+            <div>{{detailInfo.remark}}</div>
           </tui-list-cell>
         </div>
       </view>
@@ -413,7 +407,7 @@ export default {
             justify-content: space-between;
             align-items: flex-end;
             .item-name {
-              color: #666;
+              color: black;
               font-size: 30px;
               font-weight: 700;
             }