朱园亮 / erp-mobile · Commits

Commit b9eeadd708fe6ad910b9529adf6b8b734b1da9af

Authored by 史婷婷
1 parent 984ae581

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

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