朱园亮 / erp-mobile · Commits

Commit e640f5729ce145e1ed4115e9719a7ef4def75c10

Authored by 史婷婷
1 parent 3a58d5f2

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

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