朱园亮 / erp-mobile · Commits

Commit 984ae581e36389ff41e2c87b5f57fbf3eac2ab4a

Authored by 史婷婷
1 parent 38c284cf

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

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