shish 3 years ago
parent
commit
3a3fd25080

+ 7 - 7
ghsApp/src/pagesStorehouse/inventory/details.vue

@@ -3,19 +3,19 @@
 	<view class="main-view overscroll">
 	<view class="main-view overscroll">
 		<view class="space-view ex-info">
 		<view class="space-view ex-info">
 			<view class="info-cell">
 			<view class="info-cell">
-				<view class="cell-label"> 操作</view>
+				<view class="cell-label"> 操作</view>
 				<view class="cell-value"> {{ dataInfo.adminName || "" }}</view>
 				<view class="cell-value"> {{ dataInfo.adminName || "" }}</view>
 			</view>
 			</view>
 			<view class="info-cell">
 			<view class="info-cell">
-				<view class="cell-label"> 日期</view>
+				<view class="cell-label"> 日期</view>
 				<view class="cell-value"> {{ dataInfo.updateTime ? dataInfo.updateTime.substr(5,11) : '' }}</view>
 				<view class="cell-value"> {{ dataInfo.updateTime ? dataInfo.updateTime.substr(5,11) : '' }}</view>
 			</view>
 			</view>
 			<view class="info-cell">
 			<view class="info-cell">
-				<view class="cell-label"> 状态</view>
+				<view class="cell-label"> 状态</view>
 				<view class="cell-value"> {{ getItemStatusName(dataInfo.status) || "" }}</view >
 				<view class="cell-value"> {{ getItemStatusName(dataInfo.status) || "" }}</view >
 			</view>
 			</view>
 			<view class="info-cell">
 			<view class="info-cell">
-				<view class="cell-label"> 备注</view>
+				<view class="cell-label"> 备注</view>
 				<view class="cell-value">
 				<view class="cell-value">
 					{{ dataInfo.remark || "" }}
 					{{ dataInfo.remark || "" }}
 				</view>
 				</view>
@@ -32,9 +32,9 @@
 				<t-tr v-for="(item, index) in dataInfo.itemInfo || []" :key="index">
 				<t-tr v-for="(item, index) in dataInfo.itemInfo || []" :key="index">
 
 
 				<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
 				<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
-					<view v-if="column.custom == 'icon'" class="list-icon" style="width:245upx;">
-						<image class="icon-image" :src="item.itemCover" @click.stop="goToStockDetail(item.id)" />
-						<view class="icon-info" @click.stop="goToStockDetail(item.id)">
+					<view v-if="column.custom == 'icon'" class="list-icon" style="width:245upx;"  @click.stop="goToStockDetail(item.id)">
+						<image class="icon-image" :src="item.itemCover" />
+						<view class="icon-info">
 							<view class="info-name"> {{ item.itemName }} </view>
 							<view class="info-name"> {{ item.itemName }} </view>
 							<view class="info-type"></view>
 							<view class="info-type"></view>
 						</view>
 						</view>

+ 1 - 1
ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -22,7 +22,7 @@
 			</block>
 			</block>
 		</view>
 		</view>
 		<div class="app-footer open_btn">
 		<div class="app-footer open_btn">
-			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:10upx;">全部花材</div>
+			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:10upx;">花材下载</div>
 			<div @click="getAllStock()" class="admin-button-com big default" style="margin-right:10upx;">全部库存</div>
 			<div @click="getAllStock()" class="admin-button-com big default" style="margin-right:10upx;">全部库存</div>
 			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:10upx;">入库盘点</div>
 			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:10upx;">入库盘点</div>
 			<div @click="addEvent" class="admin-button-com big blue">新增盘点</div>
 			<div @click="addEvent" class="admin-button-com big blue">新增盘点</div>

+ 3 - 2
ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -13,7 +13,7 @@
 							<view class="table-td" v-for="(column, columnIndex) in columns" :key="columnIndex">
 							<view class="table-td" v-for="(column, columnIndex) in columns" :key="columnIndex">
 								<view v-if="column.custom == 'icon'" class="list-icon" style="width:330upx;">
 								<view v-if="column.custom == 'icon'" class="list-icon" style="width:330upx;">
 									<image class="icon-image" :src="item.cover" />
 									<image class="icon-image" :src="item.cover" />
-									<view class="icon-info"> <view class="info-name"> {{ item.itemName }} </view> </view>
+									<view class="icon-info"> <view class="info-name"> {{ item.name||'' }} </view> </view>
 								</view>
 								</view>
 								<view v-else-if="column.custom == 'stock'" style="width:150upx;color: #333333;">
 								<view v-else-if="column.custom == 'stock'" style="width:150upx;color: #333333;">
 									<text :class="[Number(item.bigNum) != Number(item.bigCount) ? 'red-color' : '']">
 									<text :class="[Number(item.bigNum) != Number(item.bigCount) ? 'red-color' : '']">
@@ -93,7 +93,8 @@ export default {
 						});
 						});
 					}
 					}
 				}
 				}
-			]
+			],
+			autoLoad:false
 		};
 		};
 	},
 	},
 	onLoad(option) {
 	onLoad(option) {