朱园亮 / erp-mobile · Commits

Commit 6ec77fc3a51e288a3b8a4012d5fd4129166d5be9

Authored by 史婷婷
1 parent 1dd07faa

feat: 补货单-新增&编辑&填写补货时间-底部dom移入uni-list里-解决日期组件被 foot（提交合计等）遮盖问题

Inline Side-by-side
Showing 3 changed files with 62 additions and 63 deletions
@@ -46,29 +46,28 @@ @@ -46,29 +46,28 @@
46 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" 46 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
47 :orderDate="form.orderDate" /> 47 :orderDate="form.orderDate" />
48 </view> 48 </view>
49 - 49 + <view class="footer">
  50 + <view class="view-total">
  51 + <view class="head">合计</view>
  52 + <view class="row">
  53 + <view class="row2">
  54 + <text class="label">需发</text><text class="value">{{ form.totalQuantity }}</text>
  55 + </view>
  56 + <view class="row2">
  57 + <text class="label">实发</text><text class="value">{{ form.totalShippedQuantity }}</text>
  58 + </view>
  59 + </view>
  60 + <view class="row">
  61 + <view class="row2">
  62 + <text class="label">需求补货</text><text class="value">{{ form.totalSupplementaryQuantity }}</text>
  63 + </view>
  64 + </view>
  65 + </view>
  66 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  67 + </view>
50 </uni-list> 68 </uni-list>
51 </scroll-view> 69 </scroll-view>
52 70
53 - <view class="footer">  
54 - <view class="view-total">  
55 - <view class="head">合计</view>  
56 - <view class="row">  
57 - <view class="row2">  
58 - <text class="label">需发</text><text class="value">{{ form.totalQuantity }}</text>  
59 - </view>  
60 - <view class="row2">  
61 - <text class="label">实发</text><text class="value">{{ form.totalShippedQuantity }}</text>  
62 - </view>  
63 - </view>  
64 - <view class="row">  
65 - <view class="row2">  
66 - <text class="label">需求补货</text><text class="value">{{ form.totalSupplementaryQuantity }}</text>  
67 - </view>  
68 - </view>  
69 - </view>  
70 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
71 - </view>  
72 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 71 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
73 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey" 72 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
74 :selectedKeys.sync="relate.selectedKeys" :source-extra="{ queryType: 'REPLENISHMENT' }" 73 :selectedKeys.sync="relate.selectedKeys" :source-extra="{ queryType: 'REPLENISHMENT' }"
@@ -297,7 +296,7 @@ export default { @@ -297,7 +296,7 @@ export default {
297 296
298 .scroll { 297 .scroll {
299 flex: 1; 298 flex: 1;
300 - padding: 6rpx 0 356rpx; 299 + padding: 6rpx 0 400rpx;
301 } 300 }
302 301
303 302
@@ -48,28 +48,30 @@ @@ -48,28 +48,30 @@
48 :orderDate="form.orderDate" /> 48 :orderDate="form.orderDate" />
49 </view> 49 </view>
50 50
  51 + <view class="footer">
  52 + <view class="view-total">
  53 + <view class="head">合计</view>
  54 + <view class="row">
  55 + <view class="row2">
  56 + <text class="label">需发</text><text class="value">{{ form.totalQuantity }}</text>
  57 + </view>
  58 + <view class="row2">
  59 + <text class="label">实发</text><text class="value">{{ form.totalShippedQuantity }}</text>
  60 + </view>
  61 + </view>
  62 + <view class="row">
  63 + <view class="row2">
  64 + <text class="label">需求补货</text><text class="value">{{ form.totalSupplementaryQuantity }}</text>
  65 + </view>
  66 + </view>
  67 + </view>
  68 + <button class="btn submit" type="primary" @click="onSubmit">保存</button>
  69 + </view>
  70 +
51 </uni-list> 71 </uni-list>
52 </scroll-view> 72 </scroll-view>
53 73
54 - <view class="footer">  
55 - <view class="view-total">  
56 - <view class="head">合计</view>  
57 - <view class="row">  
58 - <view class="row2">  
59 - <text class="label">需发</text><text class="value">{{ form.totalQuantity }}</text>  
60 - </view>  
61 - <view class="row2">  
62 - <text class="label">实发</text><text class="value">{{ form.totalShippedQuantity }}</text>  
63 - </view>  
64 - </view>  
65 - <view class="row">  
66 - <view class="row2">  
67 - <text class="label">需求补货</text><text class="value">{{ form.totalSupplementaryQuantity }}</text>  
68 - </view>  
69 - </view>  
70 - </view>  
71 - <button class="btn submit" type="primary" @click="onSubmit">保存</button>  
72 - </view> 74 +
73 </view> 75 </view>
74 </template> 76 </template>
75 77
@@ -223,7 +225,7 @@ export default { @@ -223,7 +225,7 @@ export default {
223 225
224 .scroll { 226 .scroll {
225 flex: 1; 227 flex: 1;
226 - padding: 6rpx 0 356rpx; 228 + padding: 6rpx 0 400rpx;
227 } 229 }
228 230
229 231
@@ -47,29 +47,27 @@ @@ -47,29 +47,27 @@
47 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" 47 <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
48 :orderDate="form.orderDate" /> 48 :orderDate="form.orderDate" />
49 </view> 49 </view>
50 -  
51 - </uni-list>  
52 - </scroll-view>  
53 -  
54 - <view class="footer">  
55 - <view class="view-total">  
56 - <view class="head">合计</view>  
57 - <view class="row">  
58 - <view class="row2">  
59 - <text class="label">需发</text><text class="value">{{ form.totalQuantity }}</text>  
60 - </view>  
61 - <view class="row2">  
62 - <text class="label">实发</text><text class="value">{{ form.totalShippedQuantity }}</text> 50 + <view class="footer">
  51 + <view class="view-total">
  52 + <view class="head">合计</view>
  53 + <view class="row">
  54 + <view class="row2">
  55 + <text class="label">需发</text><text class="value">{{ form.totalQuantity }}</text>
  56 + </view>
  57 + <view class="row2">
  58 + <text class="label">实发</text><text class="value">{{ form.totalShippedQuantity }}</text>
  59 + </view>
  60 + </view>
  61 + <view class="row">
  62 + <view class="row2">
  63 + <text class="label">需求补货</text><text class="value">{{ form.totalSupplementaryQuantity }}</text>
  64 + </view>
  65 + </view>
63 </view> 66 </view>
  67 + <button class="btn submit" type="primary" @click="onSubmit">保存</button>
64 </view> 68 </view>
65 - <view class="row">  
66 - <view class="row2">  
67 - <text class="label">需求补货</text><text class="value">{{ form.totalSupplementaryQuantity }}</text>  
68 - </view>  
69 - </view>  
70 - </view>  
71 - <button class="btn submit" type="primary" @click="onSubmit">保存</button>  
72 - </view> 69 + </uni-list>
  70 + </scroll-view>
73 </view> 71 </view>
74 </template> 72 </template>
75 73
@@ -250,7 +248,7 @@ export default { @@ -250,7 +248,7 @@ export default {
250 248
251 .scroll { 249 .scroll {
252 flex: 1; 250 flex: 1;
253 - padding: 6rpx 0 356rpx; 251 + padding: 6rpx 0 400rpx;
254 } 252 }
255 253
256 254