shish 4 years ago
parent
commit
3afb0b30c8
2 changed files with 11 additions and 24 deletions
  1. 2 0
      ghsApp/src/admin/home/me.vue
  2. 9 24
      ghsApp/src/pagesStorehouse/allot/addExDetails.vue

+ 2 - 0
ghsApp/src/admin/home/me.vue

@@ -148,9 +148,11 @@ export default {
       this.init()
       this.init()
   },
   },
   onLoad(){
   onLoad(){
+    // #ifdef APP-PLUS
     if(plus.runtime.version){
     if(plus.runtime.version){
       this.version = plus.runtime.version
       this.version = plus.runtime.version
     }
     }
+    // #endif
   },
   },
   methods: {
   methods: {
     showAllShop () {
     showAllShop () {

+ 9 - 24
ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -6,18 +6,9 @@
 				<form>
 				<form>
 					<view class="module-com input-line-wrap">
 					<view class="module-com input-line-wrap">
 						<TuiListCell class="line-cell" :hover="false" :arrow="true">
 						<TuiListCell class="line-cell" :hover="false" :arrow="true">
-							<view class="tui-title ">收货</view>
+							<view class="tui-title ">收货门店</view>
 							<view class="tui-input">
 							<view class="tui-input">
-								<DorpdownSelect
-									:menuObj.sync="menuObj"
-									top="0"
-									:isShowMore="false"
-									:selectItemId.sync="form.inShopId"
-									@selectSussess="selectSussess"
-									:typeTime="typeTimeShow"
-									:placeholder="shopPlaceholder"
-									:isShowTit="isShowTit"
-								></DorpdownSelect>
+								<ShopSelect class="bar" top="0" :isShowMore="false" @selectShopFn="selectShopFn" />
 							</view>
 							</view>
 						</TuiListCell>
 						</TuiListCell>
 						<TuiListCell class="line-cell" :hover="false" :arrow="true">
 						<TuiListCell class="line-cell" :hover="false" :arrow="true">
@@ -88,13 +79,13 @@
 import TuiListCell from "@/components/plugin/list-cell";
 import TuiListCell from "@/components/plugin/list-cell";
 import productMins from "@/mixins/product";
 import productMins from "@/mixins/product";
 import AppDatePicker from "@/components/app-date-picker";
 import AppDatePicker from "@/components/app-date-picker";
-import DorpdownSelect from "@/components/module/shopSelect";
+import ShopSelect from "@/components/module/shopSelect";
 import { selectShop } from "@/mixins";
 import { selectShop } from "@/mixins";
 import { createStockOutOrderApi } from "@/api/storehouse/stock";
 import { createStockOutOrderApi } from "@/api/storehouse/stock";
 import {mapActions, mapGetters} from "vuex";
 import {mapActions, mapGetters} from "vuex";
 const formUtil = require("@/utils/formValidation.js");
 const formUtil = require("@/utils/formValidation.js");
 export default {
 export default {
-	components: { TuiListCell, AppDatePicker, DorpdownSelect },
+	components: { TuiListCell, AppDatePicker, ShopSelect },
 	mixins: [productMins, selectShop],
 	mixins: [productMins, selectShop],
 	computed: {
 	computed: {
 		...mapGetters(["getLoginInfo"])
 		...mapGetters(["getLoginInfo"])
@@ -113,9 +104,7 @@ export default {
 				{ name: "库存", dataIndex: "stock", width: 120, align: "center" }, 
 				{ name: "库存", dataIndex: "stock", width: 120, align: "center" }, 
 				{ name: "出库数量", custom: "excount", width: 120, align: "center" }
 				{ name: "出库数量", custom: "excount", width: 120, align: "center" }
 			],
 			],
-			shopPlaceholder: '请选择门店',
-			typeTimeShow: true,
-			isShowTit: true
+			typeTimeShow: true
 		};
 		};
 	},
 	},
 	onShow() {
 	onShow() {
@@ -127,17 +116,13 @@ export default {
 		gotoSelectPage() {
 		gotoSelectPage() {
 			uni.navigateTo({ url: `/pagesStorehouse/allot/exSelect`, success: result => {}, fail: () => {}, complete: () => {} })
 			uni.navigateTo({ url: `/pagesStorehouse/allot/exSelect`, success: result => {}, fail: () => {}, complete: () => {} })
 		},
 		},
-		selectSussess(val) {
-			if(this.getLoginInfo.shopId == val.selectItem.id) {
-				this.$msg('本店不可选')
-				this.isShowTit = false
-				this.shopPlaceholder = '请选择门店'
+		selectShopFn(val) {
+			if(this.getLoginInfo.shopId == val.id) {
+				this.$msg('不能出到库到本店')
 				this.form.inShopId = ''
 				this.form.inShopId = ''
 				return
 				return
 			}
 			}
-			this.isShowTit = true
-			this.shopPlaceholder = ''
-			this.form.inShopId = val.selectItem.id;
+			this.form.inShopId = val.id;
 		},
 		},
 		stockOutFn() {
 		stockOutFn() {
 			let rules = [ { name: "inShopId", rule: ["required"], msg: ["请选择门店"] } ];
 			let rules = [ { name: "inShopId", rule: ["required"], msg: ["请选择门店"] } ];