朱园亮 / erp-mobile · Commits

Commit 0d8f6df4a8dda447da841ae3d74857aa86c1874f

Authored by 史婷婷
1 parent e640f572

feat: 加工标准合同-新增&编辑-底部dom移入uni-list里-解决日期组件被 foot（提交合计等）遮盖问题

Inline Side-by-side
Showing 2 changed files with 52 additions and 50 deletions
... ... @@ -182,41 +182,42 @@
182 182 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
183 183 </template>
184 184 </uni-list-item>
  185 + <view class="footer">
  186 + <div class="total">
  187 + <div class="total-text">
  188 + 合计
  189 + </div>
  190 + <div class="total-item">
  191 + <div class="total-item-text">
  192 + 数量
  193 + </div>
  194 + <div class="total-item-price">
  195 + {{ (totalQuantity || 0).toFixed(2) }}kg
  196 + </div>
  197 + </div>
  198 + <div class="total-item">
  199 + <div class="total-item-text">
  200 + 不含税金额
  201 + </div>
  202 + <div class="total-item-price text-red">
  203 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  204 + </div>
  205 + </div>
  206 + <div class="total-item">
  207 + <div class="total-item-text">
  208 + 总金额
  209 + </div>
  210 + <div class="total-item-price text-red">
  211 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  212 + </div>
  213 + </div>
  214 + </div>
  215 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  216 + </view>
185 217 </uni-list>
186 218
187 219 </scroll-view>
188   - <view class="footer">
189   - <div class="total">
190   - <div class="total-text">
191   - 合计
192   - </div>
193   - <div class="total-item">
194   - <div class="total-item-text">
195   - 数量
196   - </div>
197   - <div class="total-item-price">
198   - {{ (totalQuantity || 0).toFixed(2) }}kg
199   - </div>
200   - </div>
201   - <div class="total-item">
202   - <div class="total-item-text">
203   - 不含税金额
204   - </div>
205   - <div class="total-item-price text-red">
206   - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
207   - </div>
208   - </div>
209   - <div class="total-item">
210   - <div class="total-item-text">
211   - 总金额
212   - </div>
213   - <div class="total-item-price text-red">
214   - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
215   - </div>
216   - </div>
217   - </div>
218   - <button class="btn submit" type="primary" @click="onSubmit">提交</button>
219   - </view>
  220 +
220 221 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
221 222 v-model="sheet.value" @confirm="onSheetConfirm" />
222 223 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
... ...
... ... @@ -162,26 +162,27 @@
162 162 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
163 163 </template>
164 164 </uni-list-item>
  165 + <view class="footer">
  166 + <div class="total">
  167 + <div class="total-text">合计</div>
  168 + <div class="total-item">
  169 + <div class="total-item-text">数量</div>
  170 + <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
  171 + </div>
  172 + <div class="total-item">
  173 + <div class="total-item-text">不含税金额</div>
  174 + <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
  175 + </div>
  176 + <div class="total-item">
  177 + <div class="total-item-text">总金额</div>
  178 + <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
  179 + </div>
  180 + </div>
  181 + <button class="btn submit" type="primary" @click="onSubmit">保存</button>
  182 + </view>
165 183 </uni-list>
166 184 </scroll-view>
167   - <view class="footer">
168   - <div class="total">
169   - <div class="total-text">合计</div>
170   - <div class="total-item">
171   - <div class="total-item-text">数量</div>
172   - <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
173   - </div>
174   - <div class="total-item">
175   - <div class="total-item-text">不含税金额</div>
176   - <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
177   - </div>
178   - <div class="total-item">
179   - <div class="total-item-text">总金额</div>
180   - <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
181   - </div>
182   - </div>
183   - <button class="btn submit" type="primary" @click="onSubmit">保存</button>
184   - </view>
  185 +
185 186 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
186 187 v-model="sheet.value" @confirm="onSheetConfirm" />
187 188 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
... ...