朱园亮 / erp-mobile · Commits

Commit 38c284cfaefa456f105fac86a30c339cc4fbcda9

Authored by 史婷婷
1 parent c420b182

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

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