From b039381df09a1956dfc5a29fcb4145420c19ceb0 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期五, 13 三月 2026 09:10:01 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/xiaoshouchuku/SellOutBill.vue | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/pages/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index 657a1c0..d9129c8 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -27,13 +27,8 @@
<view class="form-item">
<view class="title">{{ $t("SellOutBill_PDA.StockPlace") == "SellOutBill_PDA.StockPlace" ? "浠撲綅" : $t("SellOutBill_PDA.StockPlace") }}:</view>
<!-- 鍥涚淮灏斿惎鐢ㄤ粨浣嶆壂鐮� 鍏朵粬瀹㈡埛鎸夐渶鍚敤鎺у埗 -->
-<<<<<<< HEAD
<view class="right" >
<uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
-=======
- <view class="right">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
->>>>>>> ab4be81fa6146ef1238f96ba3bc92bc64f74a553
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
--
Gitblit v1.9.1