shish 3 лет назад
Родитель
Сommit
ca13c6e177

+ 1 - 11
ghsApp/src/admin/item/components/ItemStock.vue

@@ -30,27 +30,17 @@
 </view>
 </template>
 <script>
-import { STOCK_TYPE } from "@/utils/declare";
 export default {
-	name: "Commodity",
+	name: "ItemStock",
 	components: {
 	},
 	props: {
-		isPrice: {
-			type: Boolean,
-			default: true
-		},
-		isEdit: {
-			type: Boolean,
-			default: true
-		},
 		info: {
 			required: true
 		}
 	},
 	data() {
 		return {
-			STOCK_TYPE
 		};
 	},
 	methods: {

+ 3 - 7
ghsApp/src/admin/item/list.vue

@@ -27,7 +27,8 @@
 							<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
 								<template v-for="(productItem, productIndex) in classItem.child">
 									<view style="height:250upx" :id="`class_${classIndex}`" :key="productIndex">
-										<ItemStock v-if="classItem.isActive" :isPrice="false" :info="productItem" @goToProduct="goToProduct" @moreToDo="moreToDo" @doPrintLabel="doPrintLabel" ></ItemStock>
+										<ItemStock v-if="classItem.isActive" :info="productItem" @goToProduct="goToProduct" @moreToDo="moreToDo" @doPrintLabel="doPrintLabel" >
+										</ItemStock>
 									</view>
 								</template>
 							</view>
@@ -81,7 +82,7 @@ import ItemStock from "./components/ItemStock";
 import productMins from "@/mixins/product";
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite/index";
-import { generatePriceTable,generateBarcodeTable,print,statusUpdate } from '@/api/product';
+import { print,statusUpdate } from '@/api/product';
 import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
 import ModalModule from "@/components/plugin/modal"
 export default {
@@ -153,11 +154,6 @@ export default {
 		},
 		setFocus() {
 			this.printFocus = true
-
-			//let that=this;
-			//that.$refs.input.focus()
-			//that.$refs.input.$el.focus()
-			//that.$refs.input.$el.children[0].focus();
 		},
 		dialogInputConfirm(val) {
 			console.log(val)

+ 9 - 2
ghsApp/src/mixins/product.js

@@ -241,12 +241,19 @@ export default {
 						}
 					}
 				}
-
-				if(i<2){
+				
+				if(i==0){
 					classList.push({...list[i],isActive:true});
+				}else if(i == 1){
+					if(list[0].child && list[0].child.length >= 5){
+						classList.push({...list[i],isActive:false});	
+					}else{
+						classList.push({...list[i],isActive:true});
+					}
 				}else{
 					classList.push({...list[i],isActive:false});
 				}
+
 			}
 			this.globalClassItemList = classList
 		},