shish 2 years ago
parent
commit
94dbd9a121

+ 6 - 1
ghsApp/src/admin/book/custom.vue

@@ -23,7 +23,12 @@
 						<template v-if="!$util.isEmpty(bookCustomData)">
 							<view v-for="(item, index) in bookCustomData" :key="index" @click="goAction(item)">
 								<t-tr>
-									<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.name}}</view></t-td>
+									<t-td>
+										<view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']" style="position: relative;">
+										<image :src="`${constant.imgUrl}/ghs/book/remark2.png`" style="width:38upx;height:38upx;display:inline-block;" mode="widthFix" v-if="item.hasRemark == 1"></image>
+										{{item.name}}
+										</view>
+									</t-td>
 									<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
 									<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
 									<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>

+ 2 - 2
ghsApp/src/admin/book/itemCustom.vue

@@ -19,7 +19,7 @@
                         </t-tr>
                         <template v-if="!$util.isEmpty(bookData)">
                             <view v-for="(item, index) in bookData" :key="index" @click="goAction(item)" style="position: relative;">
-								<text style="position: absolute;top:68upx;left:190upx;font-weight:bold;color:red;font-size:24upx;">小菊一箱凑数</text>
+								<text style="position: absolute;top:68upx;left:190upx;font-weight:bold;color:red;font-size:24upx;" v-if="item.hasRemark == 1">{{ item.remark?item.remark:'' }}</text>
                                 <t-tr>
                                     <t-td>
 									<view class="name" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']" style="width:170upx;position: relative;">
@@ -27,7 +27,7 @@
 										<image :src="`${constant.imgUrl}/ghs/book/box1.png`" style="width:35upx;height:35upx;display: inline-block;position: absolute;top:49upx;" 
 										mode="widthFix" v-if="item.box == 1"></image>
 										<image :src="`${constant.imgUrl}/ghs/book/remark2.png`" style="width:39upx;height:39upx;display: inline-block;position: absolute;top:45upx;left:50upx;" 
-										mode="widthFix" v-if="item.box == 1"></image>
+										mode="widthFix" v-if="item.hasRemark == 1"></image>
 									</view>
 									</t-td>
                                     <t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>

+ 7 - 1
ghsApp/src/admin/order/statBook.vue

@@ -28,7 +28,13 @@
 					<template v-if="!$util.isEmpty(profile)">
 						<view v-for="(item, index) in profile" :key="index" @click="goAction(item)">
 							<t-tr>
-								<t-td><view class="name" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.name}}</view></t-td>
+								<t-td>
+									<view class="name" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']" style="width:160upx;position: relative;">
+									{{item.name}}
+									<image :src="`${constant.imgUrl}/ghs/book/remark2.png`" style="width:39upx;height:39upx;display: inline-block;position: absolute;top:45upx;left:50upx;" 
+									mode="widthFix" v-if="item.hasRemark == 1"></image>
+									</view>
+								</t-td>
 								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
 								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
 								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">