shish пре 4 година
родитељ
комит
8a2a5221d0

+ 1 - 1
ghsApp/src/admin/clear/customInfo.vue

@@ -49,7 +49,7 @@
 						<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 }} 时间 {{s.addTime ? s.addTime.substr(5,11):''}}</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.orderPrice?parseFloat(s.orderPrice):0 }}</text>

+ 5 - 9
ghsApp/src/admin/clear/info.vue

@@ -7,7 +7,7 @@
 			<view class="bills-info_box content-box">
 				<view class="order-info_box">
 					<view>订单日期:</view>
-					<view>{{ detailInfo.addTime }}</view>
+					<view>{{ detailInfo.addTime ?detailInfo.addTime.substr(5,11) : '' }}</view>
 				</view>
 				<view class="order-info_box">
 					<view>订单编码:</view>
@@ -36,22 +36,18 @@
 			<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: '/pagesPurchase/info',query: {orderSn: s.orderSn,},})" >
 								<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>
 								</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">{{ `${s.bigNum}/${s.smallNum}` }}</text>
+									<text class="item-count" style="font-weight:normal;color:#3385FF;font-size:33upx;">查看明细</text>
 								</view>
 							</view>
 						</view>

+ 1 - 1
ghsApp/src/pages.json

@@ -298,7 +298,7 @@
 		{
 			"root": "pagesGys",
 			"pages": [
-				{ "path": "list", "style": { "navigationBarTitleText": "欠款订单", "enablePullDownRefresh": true } },
+				{ "path": "list", "style": { "navigationBarTitleText": "待结订单", "enablePullDownRefresh": true } },
 				{ "path": "details", "style": { "navigationBarTitleText": "结账单", "enablePullDownRefresh": true } }
 			]
 		},

+ 1 - 1
ghsApp/src/pagesPurchase/supplier.vue

@@ -17,7 +17,7 @@
             </view>
             <view class="store_btn">
               <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list',query: {ghsId: item.id}})"> 结账记录 </view>
-              <view class="btn_entrance" @click.stop="gotoDetailsEvent(item)" > 欠款订单 </view>
+              <view class="btn_entrance" @click.stop="gotoDetailsEvent(item)" > 待结订单 </view>
               <view class="btn_entrance" @click.stop="pageTo({url:'/pagesPurchase/order',query:{ghsId:item.id}})">采购记录</view>
               <view class="cg-button">采购</view>
             </view>

+ 1 - 1
hdApp/src/admin/clear/info.vue

@@ -42,7 +42,7 @@
 						<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 }} 时间 {{s.addTime.substr(5,11)}}</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.orderPrice?parseFloat(s.orderPrice):0 }}</text>