shish 1 год назад
Родитель
Сommit
405bb78a46

+ 0 - 6
ghsApp/src/admin/billing/result.vue

@@ -16,12 +16,6 @@
   <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价格)</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 
-  <!-- #ifdef MP-WEIXIN -->
-  <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
-  <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
-  <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
-  <!-- #endif -->
-
   <view style="margin-top:50upx;">
     <block v-for="(item, index) in detailInfo.product" :key="index">
       <view style="text-align:center;margin-bottom:10upx;">

+ 37 - 32
ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -18,38 +18,43 @@
 						</t-tr>
 						</view>
 						<view style="margin-top:20upx;">
-						<t-tr v-for="(item, index) in list.data" :key="index">
-							<t-td align="center" color="info">
-								<view style="width:130upx;color:#333333;font-size:28upx;" @click="goDetail(item)">
-									<view>{{ item.addTime.substr(5,11) }}</view>
-									<view>{{item.ptStyle==1?'零售':'批发'}}</view>
-								</view>
-							</t-td>
-							<t-td>
-								<view @click="goDetail(item)" 
-								style="width:120upx;color:#333333;font-size:25upx;word-break:break-all;">
-									{{item.relateName}}
-								</view>
-							</t-td>
-							<t-td>
-								<view @click="goDetail(item)" 
-								style="width:190upx;color:#333333;font-size:28upx;word-break:break-all;">
-									{{item.typeName}}
-								</view>
-							</t-td>
-							<t-td>
-								<view style="color:#333333;font-size:30upx;" @click="goDetail(item)">
-									<text v-if="item.io == 1">+</text>
-									<text v-if="item.io == 0">-</text>
-									{{parseFloat(item.itemNum)}}
-								</view>
-							</t-td>
-							<t-td>
-								<view @click="goDetail(item)" style="color:#333333;font-size:30upx;">
-									{{parseFloat(item.newStock)}}
-								</view>
-							</t-td>
-						</t-tr>
+							<view v-for="(item, index) in list.data" :key="index">
+								<t-tr>
+									<t-td align="center" color="info">
+										<view style="width:130upx;color:#333333;font-size:28upx;" @click="goDetail(item)">
+											<view>{{ item.addTime.substr(5,11) }}</view>
+											<view>{{item.ptStyle==1?'零售':'批发'}}</view>
+										</view>
+									</t-td>
+									<t-td>
+										<view @click="goDetail(item)" 
+										style="width:120upx;color:#333333;font-size:25upx;word-break:break-all;">
+											{{item.relateName}}
+										</view>
+									</t-td>
+									<t-td>
+										<view @click="goDetail(item)" 
+										style="width:190upx;color:#333333;font-size:28upx;word-break:break-all;">
+											{{item.typeName}}
+										</view>
+									</t-td>
+									<t-td>
+										<view style="color:#333333;font-size:30upx;" @click="goDetail(item)">
+											<text v-if="item.io == 1">+</text>
+											<text v-if="item.io == 0">-</text>
+											{{parseFloat(item.itemNum)}}
+										</view>
+									</t-td>
+									<t-td>
+										<view @click="goDetail(item)" style="color:#333333;font-size:30upx;">
+											{{parseFloat(item.newStock)}}
+										</view>
+									</t-td>
+								</t-tr>
+								<t-tr v-if="!$util.isEmpty(item.remark)">
+									<td><view style="color:green;margin-left:50upx;">备注:{{ item.remark }}</view></td>
+								</t-tr>
+							</view>
 						</view>
 					</t-table>
 				</block>