表格下载

ghsApp/src/mixins/product.js

@@ -192,15 +192,15 @@ export default {
 							currentArray[currentIndex].bigPrice = this.globalItemList[currentId].bigPrice
 							currentArray[currentIndex].smallPrice = this.globalItemList[currentId].smallPrice
 							//已经记住的花材，价格修改之后，被记住的价格也要同步修改（除了采购模块）
-							if(this.selectJobType != 'purchase'){
-								if(!this.$util.isEmpty(currentArray[currentIndex].userPrice)){
-									if(currentArray[currentIndex].bigCount && Number(currentArray[currentIndex].bigCount)>0){
-										currentArray[currentIndex].userPrice = this.globalItemList[currentId].bigPrice
-									}else{
-										currentArray[currentIndex].userPrice = this.globalItemList[currentId].smallPrice
-									}
-								}
-							}
+							// if(this.selectJobType != 'purchase'){
+							// 	if(!this.$util.isEmpty(currentArray[currentIndex].userPrice)){
+							// 		if(currentArray[currentIndex].bigCount && Number(currentArray[currentIndex].bigCount)>0){
+							// 			currentArray[currentIndex].userPrice = this.globalItemList[currentId].bigPrice
+							// 		}else{
+							// 			currentArray[currentIndex].userPrice = this.globalItemList[currentId].smallPrice
+							// 		}
+							// 	}
+							// }
 						}
 					})
 					this.setSelectInfo({ selectJobType: this.selectJobType, info: currentInfo,selectJobId:this.selectJobId })
@@ -313,6 +313,12 @@ export default {
 				if(this.py.indexOf('白色') == 0 && this.py.length <= 2){
 					return
 				}
+				if(this.py.indexOf('cs') == 0 && this.py.length <= 2){
+					return
+				}
+				if(this.py.indexOf('橙色') == 0 && this.py.length <= 2){
+					return
+				}
 				if(this.py.indexOf('yj') == 0 && this.py.length <= 2){
 					return
 				}

ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -28,7 +28,7 @@
 
 		<view class="app-footer open_btn">
 			<view @click="getItem()" class="admin-button-com big default" style="margin-right:80upx;">
-			出库花材下载
+			有库存花材下载
 			</view>
 			<view @click="addEvent" class="admin-button-com big blue">新增出库</view>
 		</view>

ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -22,8 +22,8 @@
 			</block>
 		</view>
 		<div class="app-footer open_btn">
-			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:38upx;">全部花材下载</div>
-			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:38upx;">入库花材盘点</div>
+			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:32upx;">全部花材下载</div>
+			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:32upx;">入库花材盘点</div>
 			<div @click="addEvent" class="admin-button-com big blue">新增盘点</div>
 		</div>
 	</view>