改价格

ghsApp/src/admin/stat/stock.vue

@@ -13,7 +13,13 @@
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th><view style="width:270upx;text-align:left;">花材</view></t-th><t-th>库存</t-th><t-th>批发价</t-th><t-th>零售价</t-th></t-tr>
+						<t-tr header>
+							<t-th><view style="width:240upx;text-align:left;">花材</view></t-th>
+							<t-th>库存</t-th>
+							<t-th>会员价</t-th>
+							<t-th>批发价</t-th>
+							<t-th>零售价</t-th>
+						</t-tr>
 						<block v-if="!$util.isEmpty(classItemData)">
 							<block v-for="(classItem,classIndex) in classItemData" :key="classIndex">
 								<block v-if="classItem.child && !$util.isEmpty(classItem.child)">
@@ -30,7 +36,7 @@
 										<block v-for="(productItem, productIndex) in classItem.child" :key="productIndex">
 											<t-tr>
 												<t-td>
-													<view style="width:270upx;text-align:left;color:#333333;font-size:30upx;
+													<view style="width:240upx;text-align:left;color:#333333;font-size:30upx;
 													overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" 
 													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
 														{{productItem.name}}
@@ -44,6 +50,12 @@
 												</t-td>
 												<t-td>
 													<view style="font-size:30upx;" 
+													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
+														¥{{productItem.hjPrice?parseFloat(productItem.hjPrice):0}}
+													</view>
+												</t-td>
+												<t-td>
+													<view style="color:#333333;font-weight:bold;font-size:30upx;" 
 													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
 														¥{{productItem.price?parseFloat(productItem.price):0}}
 													</view>
@@ -122,6 +134,9 @@ export default {
 		this.showStock()
 	},
 	methods: {
+		init(){
+
+		},
 		allOutSelectShop(flag){
 			//是否直接入库
 			this.confirmIn = flag

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -8,7 +8,10 @@
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn" />
 			</view>
-			<view style="float:right;">
+			<view style="padding:0 0upx 0 20upx;" >
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
+			</view>
+			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" @click="removeFromSave()">清除花材</button>
 			</view>
 		</view>
@@ -143,20 +146,23 @@ export default {
 			showClassRemind:false
 		};
 	},
-	computed: {
-
+	onShow(){
+		this.pdInit()
 	},
 	computed:{
 		...mapGetters(["getMyShopInfo","getLoginInfo"]),
 	},
 	onLoad() {
-		let pdType = this.option.pdType ? this.option.pdType: ''
-		this.initData({ type:'',pdType:pdType,status:0,version:1,requestType:'check'})
-		if(this.option.shopId){
-			this.selectJobId = this.option.shopId
-		}
+		this.pdInit()
 	},
 	methods: {
+		pdInit(){
+			let pdType = this.option.pdType ? this.option.pdType: ''
+			this.initData({ type:'',pdType:pdType,status:0,version:1,requestType:'check'})
+			if(this.option.shopId){
+				this.selectJobId = this.option.shopId
+			}
+		},
 		changeClass(index){
 			this.$refs.selectFlowerNumRef.close()
 			this.swichClass(index)