盘点问题

ghsApp/src/admin/home/workbench.vue

@@ -30,7 +30,8 @@
 		<div class="user-wrap">
 			<div class="user-top">
 				<div class="app-size-28">今日概况</div>
-				<text v-if="!$util.isEmpty(errorPirceList)" @click="showErrorPriceFn" style="float:right;color:yellow;font-weight:bold;">价格异常，点击查看</text>
+				<text v-if="!$util.isEmpty(errorPirceList)" @click="showErrorPriceFn" 
+				style="float:right;color:yellow;font-weight:bold;font-size:30upx;">价格异常，点击查看</text>
 			</div>
 			<div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
 				<div>收入</div>
@@ -145,7 +146,7 @@
 
 	<uni-popup ref="errorPriceRef" background-color="#fff" type="center" :animation="false">
 		<view style="padding-top:20upx;font-size:30upx;padding-bottom:20upx;">
-			<view v-for="(errItem, errIndex) in errorPirceList" :key="errIndex">
+			<view style="margin-bottom:10upx;" v-for="(errItem, errIndex) in errorPirceList" :key="errIndex">
 				<text v-if="errItem.name">{{errItem.name}}</text>
 				<text v-if="errItem.a" style="margin-left:18upx;">A级：¥{{errItem.a?parseFloat(errItem.a):0}}</text>
 				<text v-if="errItem.b" style="margin-left:18upx;">B级：¥{{errItem.b?parseFloat(errItem.b):0}}</text>

ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -30,9 +30,10 @@
 </view>
 </template>
 <script>
-import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import { getCheckOrderListApi } from "@/api/inventory";
+import AppWrapperEmpty from "@/components/app-wrapper-empty"
+import { getCheckOrderListApi } from "@/api/inventory"
 import { generateItemTable } from '@/api/product'
+import {mapGetters} from "vuex"
 import { list } from "@/mixins";
 export default {
 	name: "panDianList",
@@ -42,6 +43,9 @@ export default {
 		return {
 		};
 	},
+	computed: {		
+		...mapGetters(["getLoginInfo"])
+	},
 	onShow() {
 	},
 	onPullDownRefresh() {
@@ -103,10 +107,10 @@ export default {
 				});
 		},
 		stockInAddEvent(){
-			this.$util.pageTo({ url: '/pagesStorehouse/inventory/select?pdType=stockInPd'})
+			this.$util.pageTo({ url: '/pagesStorehouse/inventory/select?pdType=stockInPd&shopId='+this.getLoginInfo.shopId})
 		},
 		addEvent() {
-			uni.navigateTo({url: '/pagesStorehouse/inventory/select'})
+			uni.navigateTo({url: '/pagesStorehouse/inventory/select?shopId='+this.getLoginInfo.shopId})
 		},
 		gotoDetailsEvent(item) {
 			uni.navigateTo({

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -132,7 +132,7 @@ export default {
 			selectJobType: "inventory",
 			checkStock: false,
 			isAddInputFocus: false,
-			isSmallCount:false,//是否是小单位（支）
+			isSmallCount:false,
 			tabIndex: 0,
 			customData: {
 				bigCount: 0,
@@ -152,7 +152,12 @@ export default {
 	},
 	onLoad() {
 		let pdType = this.option.pdType ? this.option.pdType: ''
-		this.initData({ type:'',pdType:pdType,status:0,version:1});
+		this.initData({ type:'',pdType:pdType,status:0,version:1})
+
+		if(this.option.shopId){
+			this.selectJobId = this.option.shopId
+		}
+
 	},
 	methods: {
 		changeClass(index){
@@ -171,7 +176,7 @@ export default {
 				return false
 			}
 			let pdType = this.option.pdType ? this.option.pdType: ''
-			this.$util.pageTo({url: "/pagesStorehouse/inventory/update?pdType="+pdType,type:2})
+			this.$util.pageTo({url: "/pagesStorehouse/inventory/update?pdType="+pdType+"&shopId="+this.option.shopId,type:2})
 		},
 		submitEvent(val) {
 			if (val.index === 0) {

ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -108,6 +108,11 @@ export default {
 		if (!this.getMerchantInfo) {
 			this.initMerchantInfo();
 		}
+
+		if(this.option.shopId){
+			this.selectJobId = this.option.shopId
+		}
+
 	},
 	computed: {
 		...mapGetters(["getMerchantInfo"])