朱园亮 / erp-mobile · Commits

Commit 3a58d5f2112fe9abf06e01f06771790df50f9082

Authored by 史婷婷
1 parent a985e847

feat: 经销库存合同-新增&编辑&锁规-底部dom移入uni-list里-解决日期组件被 foot（提交合计等）遮盖问题

Inline Side-by-side
Showing 3 changed files with 84 additions and 82 deletions
... ... @@ -176,41 +176,42 @@
176 176 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
177 177 </template>
178 178 </uni-list-item>
  179 + <view class="footer">
  180 + <div class="total">
  181 + <div class="total-text">
  182 + 合计
  183 + </div>
  184 + <div class="total-item">
  185 + <div class="total-item-text">
  186 + 数量
  187 + </div>
  188 + <div class="total-item-price">
  189 + {{ (totalQuantity || 0).toFixed(2) }}kg
  190 + </div>
  191 + </div>
  192 + <div class="total-item">
  193 + <div class="total-item-text">
  194 + 不含税金额
  195 + </div>
  196 + <div class="total-item-price text-red">
  197 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  198 + </div>
  199 + </div>
  200 + <div class="total-item">
  201 + <div class="total-item-text">
  202 + 总金额
  203 + </div>
  204 + <div class="total-item-price text-red">
  205 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  206 + </div>
  207 + </div>
  208 + </div>
  209 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  210 + </view>
179 211 </uni-list>
180 212
181 213 </scroll-view>
182   - <view class="footer">
183   - <div class="total">
184   - <div class="total-text">
185   - 合计
186   - </div>
187   - <div class="total-item">
188   - <div class="total-item-text">
189   - 数量
190   - </div>
191   - <div class="total-item-price">
192   - {{ (totalQuantity || 0).toFixed(2) }}kg
193   - </div>
194   - </div>
195   - <div class="total-item">
196   - <div class="total-item-text">
197   - 不含税金额
198   - </div>
199   - <div class="total-item-price text-red">
200   - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
201   - </div>
202   - </div>
203   - <div class="total-item">
204   - <div class="total-item-text">
205   - 总金额
206   - </div>
207   - <div class="total-item-price text-red">
208   - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
209   - </div>
210   - </div>
211   - </div>
212   - <button class="btn submit" type="primary" @click="onSubmit">提交</button>
213   - </view>
  214 +
214 215 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
215 216 v-model="sheet.value" @confirm="onSheetConfirm" />
216 217 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
... ...
... ... @@ -114,43 +114,43 @@
114 114 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
115 115 </template>
116 116 </uni-list-item>
  117 + <view class="footer">
  118 + <div class="total">
  119 + <div class="total-text">
  120 + 合计
  121 + </div>
  122 + <div class="total-item">
  123 + <div class="total-item-text">
  124 + 数量
  125 + </div>
  126 + <div class="total-item-price">
  127 + {{ (totalQuantity || 0).toFixed(2) }}t
  128 + </div>
  129 + </div>
  130 + <div class="total-item">
  131 + <div class="total-item-text">
  132 + 不含税金额
  133 + </div>
  134 + <div class="total-item-price text-red">
  135 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  136 + </div>
  137 + </div>
  138 + <div class="total-item">
  139 + <div class="total-item-text">
  140 + 总金额
  141 + </div>
  142 + <div class="total-item-price text-red">
  143 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  144 + </div>
  145 + </div>
  146 + </div>
  147 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  148 + </view>
117 149 </uni-list>
118 150 </view>
119 151 </view>
120 152 </scroll-view>
121 153
122   - <view class="footer">
123   - <div class="total">
124   - <div class="total-text">
125   - 合计
126   - </div>
127   - <div class="total-item">
128   - <div class="total-item-text">
129   - 数量
130   - </div>
131   - <div class="total-item-price">
132   - {{ (totalQuantity || 0).toFixed(2) }}t
133   - </div>
134   - </div>
135   - <div class="total-item">
136   - <div class="total-item-text">
137   - 不含税金额
138   - </div>
139   - <div class="total-item-price text-red">
140   - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
141   - </div>
142   - </div>
143   - <div class="total-item">
144   - <div class="total-item-text">
145   - 总金额
146   - </div>
147   - <div class="total-item-price text-red">
148   - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
149   - </div>
150   - </div>
151   - </div>
152   - <button class="btn submit" type="primary" @click="onSubmit">提交</button>
153   - </view>
154 154 </view>
155 155 </template>
156 156
... ...
... ... @@ -180,26 +180,27 @@
180 180 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
181 181 </template>
182 182 </uni-list-item>
  183 + <view class="footer">
  184 + <div class="total">
  185 + <div class="total-text">合计</div>
  186 + <div class="total-item">
  187 + <div class="total-item-text">数量</div>
  188 + <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
  189 + </div>
  190 + <div class="total-item">
  191 + <div class="total-item-text">不含税金额</div>
  192 + <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
  193 + </div>
  194 + <div class="total-item">
  195 + <div class="total-item-text">总金额</div>
  196 + <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
  197 + </div>
  198 + </div>
  199 + <button class="btn submit" type="primary" @click="onSubmit">保存</button>
  200 + </view>
183 201 </uni-list>
184 202 </scroll-view>
185   - <view class="footer">
186   - <div class="total">
187   - <div class="total-text">合计</div>
188   - <div class="total-item">
189   - <div class="total-item-text">数量</div>
190   - <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
191   - </div>
192   - <div class="total-item">
193   - <div class="total-item-text">不含税金额</div>
194   - <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
195   - </div>
196   - <div class="total-item">
197   - <div class="total-item-text">总金额</div>
198   - <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
199   - </div>
200   - </div>
201   - <button class="btn submit" type="primary" @click="onSubmit">保存</button>
202   - </view>
  203 +
203 204 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
204 205 v-model="sheet.value" @confirm="onSheetConfirm" />
205 206 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
... ...