Browse Source

还货判断

Sunny Feng 3 years ago
parent
commit
9cb138e74c

+ 1 - 1
app/Http/Controllers/Api/GoodsBackController.php

xqd
@@ -73,7 +73,7 @@ class GoodsBackController extends Controller
                     $source_back_sum = GoodsBack::where('seller_user_id', $seller_user->id)
                     ->whereHas('sourceUser', function($query) {
                         $query->where('role', 3); // 所有售后
-                    });
+                    })
                     ->where('goods_id', $goods->id)
                     ->where('out_at', $out_at)
                     ->sum('number');

+ 4 - 3
wechat/pages/componentsA/inbound/add.vue

xqd
@@ -28,15 +28,16 @@
 				<u-form-item label="价格" prop="price" label-width="150">
 					<u-input placeholder="请输入价格" v-model="model.price" type="number"></u-input>
 				</u-form-item>
-				<u-form-item label="备注" prop="remark">
-					<u-input placeholder="请填写备注" v-model="model.remark" height="80" :auto-height="true"
-						type="textarea" />
+				<u-form-item label="备注" prop="remark" label-width="150">
+					<u-input placeholder="请填写备注" v-model="model.remark" height="80" 
+						type="text" />
 				</u-form-item>
 			</view>
 		</u-form>
 		<u-gap height="20"></u-gap>
 		<u-button :style="[inputStyle]" @click="submit" class="submit-btn">确认</u-button>
 		<u-gap height="70"></u-gap>
+		
 		<u-modal v-model="codeShow" title="手动添加" :show-cancel-button="true">
 			<view class="slot-content">
 				<u-input placeholder="请输入商品条形码" v-model="model.bar_code" type="text" :border="true"></u-input>

+ 3 - 3
wechat/pages/componentsB/deliver/add.vue

xqd
@@ -54,9 +54,9 @@
 				<u-form-item label="合计金额" prop="pri" label-width="150">
 					¥{{ priceInt(totalPrice(orderList)) }}.{{ priceDecimal(totalPrice(orderList)) }}
 				</u-form-item>
-				<u-form-item label="备注" prop="remark">
-					<u-input placeholder="请填写备注" v-model="model.remark" height="80" :auto-height="true"
-						type="textarea" />
+				<u-form-item label="备注" prop="remark" label-width="150">
+					<u-input placeholder="请填写备注" v-model="model.remark" height="80" 
+						type="text" />
 				</u-form-item>
 			</view>
 			<!-- end 汇总区域 -->

+ 3 - 3
wechat/pages/componentsB/return/add.vue

xqd
@@ -58,9 +58,9 @@
 				<u-form-item label="合计金额" prop="pri" label-width="150">
 					¥{{ priceInt(totalPrice(orderList)) }}.{{ priceDecimal(totalPrice(orderList)) }}
 				</u-form-item>
-				<u-form-item label="备注" prop="remark">
-					<u-input placeholder="请填写备注" v-model="model.remark" height="80" :auto-height="true"
-						type="textarea" />
+				<u-form-item label="备注" prop="remark" label-width="150">
+					<u-input placeholder="请填写备注" v-model="model.remark" height="80" 
+						type="text" />
 				</u-form-item>
 			</view>
 			<!-- end 汇总区域 -->

+ 3 - 3
wechat/pages/componentsC/inspect/add.vue

xqd
@@ -54,9 +54,9 @@
 				<u-form-item label="合计金额" prop="pri" label-width="150">
 					¥{{ priceInt(totalPrice(orderList)) }}.{{ priceDecimal(totalPrice(orderList)) }}
 				</u-form-item>
-				<u-form-item label="备注" prop="remark">
-					<u-input placeholder="请填写备注" v-model="model.remark" height="80" :auto-height="true"
-						type="textarea" />
+				<u-form-item label="备注" prop="remark" label-width="150">
+					<u-input placeholder="请填写备注" v-model="model.remark" height="80" 
+						type="text" />
 				</u-form-item>
 			</view>
 			<!-- end 汇总区域 -->

+ 3 - 3
wechat/pages/componentsC/outbound/add.vue

xqd
@@ -44,9 +44,9 @@
 				<u-form-item label="合计金额" prop="pri" label-width="150">
 					¥{{ priceInt(totalPrice(orderList)) }}.{{ priceDecimal(totalPrice(orderList)) }}
 				</u-form-item>
-				<u-form-item label="备注" prop="remark">
-					<u-input placeholder="请填写备注" v-model="model.remark" height="80" :auto-height="true"
-						type="textarea" />
+				<u-form-item label="备注" prop="remark" label-width="150">
+					<u-input placeholder="请填写备注" v-model="model.remark" height="80"
+						type="text" />
 				</u-form-item>
 			</view>
 			<!-- end 汇总区域 -->