shish 1 an în urmă
părinte
comite
08d01a0cbd

+ 4 - 1
ghsApp/src/admin/part/index.vue

@@ -52,7 +52,10 @@
 		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
-					<view class="kc"><text class="unit_price">库存 {{ customData.stock||0 }}</text></view>
+					<view class="kc">
+						<text class="unit_price">库存 {{ customData.stock?parseFloat(customData.stock):0 }}</text>
+						<text style="margin-left:14upx;">{{customData.ratio}}{{customData.smallUnit}}/{{customData.bigUnit}}</text>
+					</view>
 					<view class="num_bx">
 
 						<!-- #ifdef APP-PLUS -->

+ 3 - 2
ghsApp/src/pagesOrder/refundSuccess.vue

@@ -3,14 +3,15 @@
     <button class="admin-button-com big blue" style="width:80%;" @click="goBack">返回</button>
     <view v-if="!$util.isEmpty(itemList)" style="margin-top:20upx;">
       <block v-for="(item, index) in itemList" :key="index">
-        <view style="text-align:center;margin-bottom:10upx;" v-if="item.xhUnitType == 0">
+        <view style="text-align:center;margin-bottom:10upx;">
           <text style="font-size:32upx;">
             {{item.name}} 已退{{item.xhNum}}{{item.xhUnitName}}
             <text v-if="Number(item.xhWasteNum)>0" style="margin-left:12upx;color:green;">
             已报损{{item.xhWasteNum}}{{item.xhUnitName}}
             </text>
           </text>
-          <button class="admin-button-com middle" style="margin:10upx auto 0 auto;" @click="beginWastage(item)">报损</button>
+          <button class="admin-button-com middle" style="margin:10upx auto 0 auto;" @click="beginWastage(item)" v-if="item.xhUnitType == 0">报损</button>
+          <button class="admin-button-com middle" style="margin:10upx auto 0 auto;" @click="pageTo({url:'/admin/item/detail?id='+item.productId})" v-else>去损报</button>
         </view>
       </block>
     </view>