Explorar el Código

供货商修改选择门店 和选择时间的问题

wangning hace 5 años
padre
commit
4631afcd90

+ 1 - 1
ghsApp/src/components/app-date-picker.vue

@@ -3,7 +3,7 @@
 		<picker :mode="mode" :value="date" :start="startDate2" :end="endDate2" @change="bindDateChange">
 		<picker :mode="mode" :value="date" :start="startDate2" :end="endDate2" @change="bindDateChange">
 			<slot>
 			<slot>
 				<view class="uni-input">
 				<view class="uni-input">
-					<span v-if="placeholder && !date">{{placeholder}}</span>
+					<span v-if="placeholder && !date" style="color: #ccc;">{{placeholder}}</span>
 					<span v-else>{{date}}</span>
 					<span v-else>{{date}}</span>
 					<span></span>
 					<span></span>
 				</view>
 				</view>

+ 8 - 0
ghsApp/src/components/module/dorpdownSelect.vue

@@ -6,8 +6,12 @@
             <!--{{selectItemId?menuObjActive:''}}-->
             <!--{{selectItemId?menuObjActive:''}}-->
 														<text v-if="typeTime">{{selectItemId?menuObjActive:menuObj.title}}</text>
 														<text v-if="typeTime">{{selectItemId?menuObjActive:menuObj.title}}</text>
 														<text v-else>{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}</text>
 														<text v-else>{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}</text>
+                            <text v-if="placeholder" style="color: #ccc;">{{placeholder}}</text>
 <!--            {{getMyShopInfo?getMyShopInfo.shopName:menuObj.title}}-->
 <!--            {{getMyShopInfo?getMyShopInfo.shopName:menuObj.title}}-->
             <i v-if="isShowMore" class="iconfont iconsanjiao_xia"></i>
             <i v-if="isShowMore" class="iconfont iconsanjiao_xia"></i>
+        </view>
+        <view v-else @click="switchCut" :class="['select-title',dropdownShow?'select_corlor':'']">
+          <text v-if="placeholder" style="color: #ccc;">{{placeholder}}</text>
         </view>
         </view>
          <view
          <view
             class="select-mark-view" v-show="dropdownShow" @click="switchCut"></view>
             class="select-mark-view" v-show="dropdownShow" @click="switchCut"></view>
@@ -92,6 +96,10 @@
             isShowMore:{
             isShowMore:{
                 type: Boolean,
                 type: Boolean,
                 default: true
                 default: true
+            },
+            placeholder: {
+              type: String,
+              default: ''
             }
             }
         },
         },
         data(){
         data(){

+ 18 - 14
ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -5,7 +5,7 @@
 				<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
 								<DorpdownSelect
 									:menuObj.sync="menuObj"
 									:menuObj.sync="menuObj"
@@ -13,7 +13,9 @@
 									:isShowMore="false"
 									:isShowMore="false"
 									:selectItemId.sync="form.inShopId"
 									:selectItemId.sync="form.inShopId"
 									@selectSussess="selectSussess"
 									@selectSussess="selectSussess"
-                  :typeTime="true"
+                  :typeTime="typeTimeShow"
+                  :placeholder="shopPlaceholder"
+                  :isShowTit="isShowTit"
 								></DorpdownSelect>
 								></DorpdownSelect>
 							</view>
 							</view>
 						</TuiListCell>
 						</TuiListCell>
@@ -131,14 +133,17 @@ export default {
 					width: 120,
 					width: 120,
 					align: "center"
 					align: "center"
 				}
 				}
-			]
+			],
+      shopPlaceholder: '请选择门店',
+      typeTimeShow: true,
+      isShowTit: true
 		};
 		};
 	},
 	},
 	onShow() {
 	onShow() {
 		console.log('拿到选择商品列表', this.selectList);
 		console.log('拿到选择商品列表', this.selectList);
 	},
 	},
 	onLoad(){
 	onLoad(){
-		this.form.inShopId = this.getLoginInfo.shopId;
+		// this.form.inShopId = this.getLoginInfo.shopId;
 	},
 	},
 	methods: {
 	methods: {
 		...mapActions(["resetSelectInfoByType"]),
 		...mapActions(["resetSelectInfoByType"]),
@@ -162,16 +167,20 @@ export default {
 		},
 		},
 
 
 		selectSussess(val) {
 		selectSussess(val) {
+      if(this.getLoginInfo.shopId == val.selectItem.id) {
+        this.$msg('不能出库给当前门店,请重新选择门店')
+        this.isShowTit = false
+        this.shopPlaceholder = '请选择门店'
+        this.form.inShopId = ''
+        return
+      }
+      this.isShowTit = true
+      this.shopPlaceholder = ''
 			this.form.inShopId = val.selectItem.id;
 			this.form.inShopId = val.selectItem.id;
 		},
 		},
 		createStockOutOrder() {
 		createStockOutOrder() {
 			try {
 			try {
 				let rules = [
 				let rules = [
-					{
-						name: "date",
-						rule: ["required"],
-						msg: ["请选择日期"]
-					},
 					{
 					{
 						name: "inShopId",
 						name: "inShopId",
 						rule: ["required"],
 						rule: ["required"],
@@ -218,11 +227,6 @@ export default {
 		confirmStockOutOrder() {
 		confirmStockOutOrder() {
 			try {
 			try {
 				let rules = [
 				let rules = [
-					{
-						name: "date",
-						rule: ["required"],
-						msg: ["请选择日期"]
-					},
 					{
 					{
 						name: "inShopId",
 						name: "inShopId",
 						rule: ["required"],
 						rule: ["required"],