shish 4 лет назад
Родитель
Сommit
37e53ff525

+ 3 - 4
ghsApp/src/admin/breakage/info.vue

@@ -19,12 +19,12 @@
 					<view>{{ detailInfo.shopAdminName }}</view>
 					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="title"> 商品信息 </view>
+			<view class="title"> 花材信息 </view>
 			<view class="module-com content-box">
 			<view class="module-com content-box">
 				<view class="commodity-view">
 				<view class="commodity-view">
 					<view class="commodity-list">
 					<view class="commodity-list">
 						<view v-for="(s, idx) in detailInfo.itemInfo" :key="idx" class="commodity-item" >
 						<view v-for="(s, idx) in detailInfo.itemInfo" :key="idx" class="commodity-item" >
-							<image class="item-icon" :src="s.itemCover" />
+							<image class="item-icon" :src="s.cover" />
 							<view class="item-info">
 							<view class="item-info">
 								<view class="info-line">
 								<view class="info-line">
 									<text class="item-name">{{ s.itemName }}</text>
 									<text class="item-name">{{ s.itemName }}</text>
@@ -36,8 +36,7 @@
 								<view class="info-line">
 								<view class="info-line">
 									<text class="item-type"></text>
 									<text class="item-type"></text>
 									<text class="item-count">
 									<text class="item-count">
-										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
-										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
+										<text>{{s.itemNum?parseFloat(s.itemNum):0}}扎</text>
 									</text>
 									</text>
 								</view>
 								</view>
 							</view>
 							</view>

+ 4 - 7
ghsApp/src/admin/breakage/list.vue

@@ -9,8 +9,7 @@
 					<text>操作:{{item.shopAdminName}}</text>
 					<text>操作:{{item.shopAdminName}}</text>
 				</view>
 				</view>
 				<view class="flex val">
 				<view class="flex val">
-          <text v-if="Number(item.bigNum)>0">{{item.bigNum}}扎</text>
-          <text v-if="Number(item.smallNum)>0">{{item.smallNum}}支</text>
+          <text>{{item.num?parseFloat(item.num):0}}扎</text>
           <view class="iconfont iconxiangyou"></view>
           <view class="iconfont iconxiangyou"></view>
         </view>
         </view>
 			</navigator>
 			</navigator>
@@ -18,11 +17,9 @@
 			<block v-else>
 			<block v-else>
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 			</block>
-
-		<view class="app-footer open_btn">
-			<view @click="selectProduct" class="admin-button-com big blue">新增报损</view>
-		</view>
-
+      <view class="app-footer open_btn">
+        <view @click="selectProduct" class="admin-button-com big blue">新增报损</view>
+      </view>
   </div>
   </div>
 </template>
 </template>
 
 

+ 4 - 10
hdApp/src/admin/breakage/info.vue

@@ -21,18 +21,13 @@
 			</view>
 			</view>
 
 
 			<view class="title">
 			<view class="title">
-				商品信息
+				花材信息
 			</view>
 			</view>
 			<view class="module-com content-box">
 			<view class="module-com content-box">
 				<view class="commodity-view">
 				<view class="commodity-view">
 					<view class="commodity-list">
 					<view class="commodity-list">
-						<view
-							v-for="(s, idx) in detailInfo.itemInfo"
-							:key="idx"
-							class="commodity-item"
-						>
-							<image class="item-icon" :src="s.itemCover" alt="商品图片" />
-
+						<view v-for="(s, idx) in detailInfo.itemInfo" :key="idx" class="commodity-item" >
+							<image class="item-icon" :src="s.cover" />
 							<view class="item-info">
 							<view class="item-info">
 								<view class="info-line">
 								<view class="info-line">
 									<text class="item-name">{{ s.itemName }}</text>
 									<text class="item-name">{{ s.itemName }}</text>
@@ -44,8 +39,7 @@
 								<view class="info-line">
 								<view class="info-line">
 									<text class="item-type"></text>
 									<text class="item-type"></text>
 									<text class="item-count">
 									<text class="item-count">
-										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
-										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
+										<text>{{s.itemNum?parseFloat(s.itemNum):0}}扎</text>
 									</text>
 									</text>
 								</view>
 								</view>
 							</view>
 							</view>

+ 4 - 7
hdApp/src/admin/breakage/list.vue

@@ -9,8 +9,7 @@
 					<text>操作:{{item.shopAdminName}}</text>
 					<text>操作:{{item.shopAdminName}}</text>
 				</view>
 				</view>
 				<view class="flex val">
 				<view class="flex val">
-          <text v-if="Number(item.bigNum)>0">{{item.bigNum}}扎</text>
-          <text v-if="Number(item.smallNum)>0">{{item.smallNum}}支</text>
+          <text>{{item.num?parseFloat(item.num):0}}扎</text>
           <view class="iconfont iconxiangyou"></view>
           <view class="iconfont iconxiangyou"></view>
         </view>
         </view>
 			</navigator>
 			</navigator>
@@ -18,11 +17,9 @@
 			<block v-else>
 			<block v-else>
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 			</block>
-
-		<view class="app-footer open_btn">
-			<view @click="selectProduct" class="admin-button-com middle blue">新增报损</view>
-		</view>
-
+      <view class="app-footer open_btn">
+        <view @click="selectProduct" class="admin-button-com middle blue">新增报损</view>
+      </view>
   </div>
   </div>
 </template>
 </template>