shish 3 anos atrás
pai
commit
84b4e0e528

+ 3 - 6
hdApp/src/admin/billing/index.vue

@@ -6,7 +6,7 @@
 		</view>
 		</view>
 		<view class="scroll-middle_bx">
 		<view class="scroll-middle_bx">
 
 
-			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+			<scroll-view scroll-y scroll-with-animation class="tab-view">
 				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
 				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
 					<text>{{ item.className || "" }}</text>
 					<text>{{ item.className || "" }}</text>
 				</div>
 				</div>
@@ -28,9 +28,6 @@
 									:offVerifyRepertory = 'true'
 									:offVerifyRepertory = 'true'
 									:info="productItem" :bigCount=" getSelectItemById(productItem.id, classItem.classId).bigCount "
 									:info="productItem" :bigCount=" getSelectItemById(productItem.id, classItem.classId).bigCount "
 									:smallCount=" getSelectItemById(productItem.id, classItem.classId).smallCount "
 									:smallCount=" getSelectItemById(productItem.id, classItem.classId).smallCount "
-									@add="addEvent"
-									@addOneEvent="addCustomNumEvent"
-									@del="delEvent"
 									:checkStock="true"
 									:checkStock="true"
 									:selectJobType="selectJobType"
 									:selectJobType="selectJobType"
 									@showAddModelFn="showAddModelFn"
 									@showAddModelFn="showAddModelFn"
@@ -199,7 +196,7 @@ export default {
 		overflow: hidden;
 		overflow: hidden;
 	}
 	}
 	.tab-view {
 	.tab-view {
-		height: 100%;
+		height: calc(100vh - 140upx);
 		width: 170upx;
 		width: 170upx;
 		flex-shrink: 0;
 		flex-shrink: 0;
 		background-color: #f0f2f6;
 		background-color: #f0f2f6;
@@ -248,7 +245,7 @@ export default {
 		}
 		}
 	}
 	}
 	.right-box {
 	.right-box {
-		height: 100%;
+		height: calc(100vh - 140upx);
 		flex: 1;
 		flex: 1;
 		box-sizing: border-box;
 		box-sizing: border-box;
 	}
 	}

+ 0 - 1
hdApp/src/admin/breakage/index.vue

@@ -213,7 +213,6 @@ export default {
 		height: calc(100vh - 140upx);
 		height: calc(100vh - 140upx);
 		flex: 1;
 		flex: 1;
 		box-sizing: border-box;
 		box-sizing: border-box;
-
 	}
 	}
 	.item_list_bx {
 	.item_list_bx {
 		padding: 40upx 16upx;
 		padding: 40upx 16upx;