shish 4 лет назад
Родитель
Сommit
e3fa562d33

+ 0 - 4
ghsApp/src/components/module/app-commodity.vue

@@ -42,10 +42,6 @@ export default {
 			default: 0
 		},
 		autoPrice: {},
-		offPrice: {
-			type: Boolean,
-			default: false
-		},
 		isActive: {
 			type: Boolean,
 			default: false

+ 8 - 24
ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="billing_box_bg">
 		<view class="input-wrap">
-			<app-search-module v-model="py" placeholder="入关键词,支持拼音首字母搜索" @input="searchFn" />
+			<app-search-module v-model="py" placeholder="输字母搜索" @input="searchFn" />
 		</view>
-
 		<view class="scroll-middle_bx">
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
 				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)" >
@@ -11,7 +10,6 @@
 				</div>
 				<view style="height: 120upx"></view>
 			</scroll-view>
-
 				<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
 																	@scroll="scroll_detail"
 																	lower-threshold="100"
@@ -25,10 +23,8 @@
 						<template v-for="(productItem, productIndex) in classItem.child">
 							<view style="height: 160upx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
 							<Commondity v-if="classItem.isActive"
-								:offPrice="true"
 								:key="productIndex"
 								:info="productItem"
-								:storeItem="getSelectItemById(productItem.id, classItem.classId)"
 								@showAddModel="showAddModel"
 								@add="addEvent"
 								@groupDataBeforeShowModel="groupInfoBeforeShowModel"
@@ -46,7 +42,7 @@
 			</block>
 		</view>
 
-		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="isModel" @cancel="modalCancel" @click="pdConfirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存{{ customData.stock }} </view>
@@ -68,7 +64,6 @@
 
 <script>
 import AppSearchModule from "@/components/module/app-search";
-import AppTabs from "@/components/plugin/tabs";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import Commondity from "@/components/module/app-commodity";
 import FooterCart from "@/components/module/app-footer-cart";
@@ -78,9 +73,8 @@ import allMoreSelectInput from "@/components/module/allMoreSelectInput";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
 import { mapGetters } from "vuex";
 export default {
-	name: "allotEx", // 开单
+	name: "allotEx",
 	components: {
-		AppTabs,
 		AppSearchModule,
 		AppWrapperEmpty,
 		Commondity,
@@ -96,24 +90,14 @@ export default {
 			isFocus: false,
 			isSmallCount:false,//是否是小单位(支)
 			tabIndex: 0,
-			tabs: [
-				{
-					name: "花材"
-				},
-				{
-					name: "成品"
-				}
-				// {
-				//     name: '课程'
-				// },
-			],
 			isModel: false,
 			customData: {
 				bigCount: 0,
-				smallCount: 0
+				smallCount: 0,
+				userPrice:0
 			},
 			showSubmitModel: false,
-			autoLoad: false, //不自动请求数据  自定义请求
+			autoLoad: false, //不自动请求数据
 		};
 	},
 	computed: {
@@ -146,7 +130,7 @@ export default {
 			this.customData = {};
 		},
 		// 取消 确认
-		affirm(val) {
+		pdConfirm(val) {
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{
@@ -340,4 +324,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>