Merge branch 'master' of http://159.75.207.46:3000/denghong/plant_manage_mobile into master

pages/purchase/specs.vue

@@ -186,6 +186,7 @@
 			<view class="title_mast">采购数量</view>
 			<view class="input">
 				<input placeholder="请输入采购数量" type="digit" v-model="formData.num"/>
+				<text>{{dressingUnit}}</text>
 			</view>
 		</view>
 
@@ -216,6 +217,7 @@ export default{
 			purchaseId:'',
 			specList:[[]],
 			specStr:"",
+			dressingUnit:"",
 			show:false,
 			formData:{
 				goodsName:"",
@@ -258,12 +260,16 @@ export default{
 			this.formData.supplier=val.supplier
 
 			var res=await request("/api/goods/queryGoodsSpecification",{
-				params:{goodsName:this.formData.goodsName}
+				params:{
+					goodsName:this.formData.goodsName,
+					supplier:this.formData.supplier,
+				}
 			})
 			if(res.statu){
 				this.specList=[res.data.map(v=>({label:v.goodsSpecification,value:v.goodsSpecification,id:v.id}))]
 				this.formData.goodsSpecification=''
 				this.specStr=''
+				this.dressingUnit=''
 			}else{
 				uni.showModal({
 					title:"提示",
@@ -276,9 +282,10 @@ export default{
 			var res=await request("/api/goods/stockShow?goodsSpecificationId",{
 				params:{goodsSpecificationId:id}
 			})
-			if(res.statu&&res.data){
+			if(res.data.packing&&res.data.heft){
 				this.specStr=`${res.data.packing}(${res.data.heft})`
-			}
+			}else{this.specStr=''}
+			this.dressingUnit=`${res.data.dressingUnit}`
 		},
 		toAdd(){
 			uni.navigateTo({