朱园亮 / erp-mobile · Commits

Commit 6ec539fb6e4ca6b0611290a5c6557a466aeab175

Authored by 史婷婷
2 parents 06515dda 42b3ef16

Merge remote-tracking branch 'origin/cjerp-1.0_20251220' into publish_cjerp

Inline Side-by-side
Showing 54 changed files with 730 additions and 697 deletions
@@ -101,6 +101,8 @@ export default { @@ -101,6 +101,8 @@ export default {
101 <style scoped> 101 <style scoped>
102 .file-upload { 102 .file-upload {
103 display: flex; 103 display: flex;
  104 + position: relative;
  105 + top: 6rpx;
104 } 106 }
105 .btn { 107 .btn {
106 color: #3D48A3; font-size: 28rpx; margin-right: 20rpx; cursor: pointer; 108 color: #3D48A3; font-size: 28rpx; margin-right: 20rpx; cursor: pointer;
@@ -129,20 +129,19 @@ @@ -129,20 +129,19 @@
129 <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 129 <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
130 </template> 130 </template>
131 </uni-list-item> 131 </uni-list-item>
132 - 132 + <view class="footer">
  133 + <view class="view-total">
  134 + <view class="head">合计</view>
  135 + <view class="row">
  136 + <text class="label">总数量</text><text class="value">{{ form.afterTotalQuantity }}</text>
  137 + </view>
  138 + </view>
  139 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  140 + </view>
133 141
134 </uni-list> 142 </uni-list>
135 </scroll-view> 143 </scroll-view>
136 144
137 - <view class="footer">  
138 - <view class="view-total">  
139 - <view class="head">合计</view>  
140 - <view class="row">  
141 - <text class="label">总数量</text><text class="value">{{ form.afterTotalQuantity }}</text>  
142 - </view>  
143 - </view>  
144 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
145 - </view>  
146 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 145 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
147 @confirm="onSheetConfirm" /> 146 @confirm="onSheetConfirm" />
148 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 147 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -128,20 +128,19 @@ @@ -128,20 +128,19 @@
128 <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 128 <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
129 </template> 129 </template>
130 </uni-list-item> 130 </uni-list-item>
131 - 131 + <view class="footer">
  132 + <view class="view-total">
  133 + <view class="head">合计</view>
  134 + <view class="row">
  135 + <text class="label">总数量</text><text class="value">{{ form.afterTotalQuantity }}</text>
  136 + </view>
  137 + </view>
  138 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  139 + </view>
132 140
133 </uni-list> 141 </uni-list>
134 </scroll-view> 142 </scroll-view>
135 143
136 - <view class="footer">  
137 - <view class="view-total">  
138 - <view class="head">合计</view>  
139 - <view class="row">  
140 - <text class="label">总数量</text><text class="value">{{ form.afterTotalQuantity }}</text>  
141 - </view>  
142 - </view>  
143 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
144 - </view>  
145 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 144 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
146 @confirm="onSheetConfirm" /> 145 @confirm="onSheetConfirm" />
147 </view> 146 </view>
@@ -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"
@@ -517,7 +518,7 @@ export default { @@ -517,7 +518,7 @@ export default {
517 openRelate(fieldKey) { 518 openRelate(fieldKey) {
518 let config = {} 519 let config = {}
519 if (fieldKey === 'buyer') { 520 if (fieldKey === 'buyer') {
520 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 521 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
521 } else if (fieldKey === 'stockUpCompanyId') { 522 } else if (fieldKey === 'stockUpCompanyId') {
522 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 523 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
523 } 524 }
@@ -588,7 +589,7 @@ export default { @@ -588,7 +589,7 @@ export default {
588 uni.showToast({ title: '新增成功', icon: 'none' }) 589 uni.showToast({ title: '新增成功', icon: 'none' })
589 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400) 590 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
590 } catch (e) { 591 } catch (e) {
591 - uni.showToast({ title: '提交失败', icon: 'none' }) 592 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
592 } 593 }
593 }, 594 },
594 validateRequired() { 595 validateRequired() {
@@ -234,7 +234,8 @@ export default { @@ -234,7 +234,8 @@ export default {
234 ] 234 ]
235 } 235 }
236 }, 236 },
237 - onLoad(options) { 237 + onShow() {
  238 + const options = this.$route.query || {}
238 const id = options && options.id ? options.id : '' 239 const id = options && options.id ? options.id : ''
239 this.id = id 240 this.id = id
240 this.loadDetail() 241 this.loadDetail()
@@ -472,7 +473,7 @@ export default { @@ -472,7 +473,7 @@ export default {
472 } 473 }
473 474
474 .label { 475 .label {
475 - width: 280rpx; 476 + width: 310rpx;
476 color: rgba(0, 0, 0, 0.6); 477 color: rgba(0, 0, 0, 0.6);
477 font-size: 28rpx; 478 font-size: 28rpx;
478 } 479 }
@@ -541,7 +542,7 @@ export default { @@ -541,7 +542,7 @@ export default {
541 } 542 }
542 543
543 .label1 { 544 .label1 {
544 - width: 280rpx; 545 + width: 310rpx;
545 color: rgba(0, 0, 0, 0.6); 546 color: rgba(0, 0, 0, 0.6);
546 font-size: 32rpx; 547 font-size: 32rpx;
547 } 548 }
@@ -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"
@@ -457,7 +458,7 @@ export default { @@ -457,7 +458,7 @@ export default {
457 openRelate(fieldKey) { 458 openRelate(fieldKey) {
458 let config = {} 459 let config = {}
459 if (fieldKey === 'buyer') { 460 if (fieldKey === 'buyer') {
460 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 461 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
461 } else if (fieldKey === 'stockUpCompanyId') { 462 } else if (fieldKey === 'stockUpCompanyId') {
462 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 463 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
463 } 464 }
@@ -562,7 +563,7 @@ export default { @@ -562,7 +563,7 @@ export default {
562 uni.showToast({ title: '保存成功', icon: 'none' }) 563 uni.showToast({ title: '保存成功', icon: 'none' })
563 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400) 564 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
564 } catch (e) { 565 } catch (e) {
565 - uni.showToast({ title: '提交失败', icon: 'none' }) 566 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
566 } 567 }
567 } 568 }
568 } 569 }
@@ -163,20 +163,20 @@ @@ -163,20 +163,20 @@
163 <view v-if="item.thickness" class="value-spec_box"> 163 <view v-if="item.thickness" class="value-spec_box">
164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
165 </view> 165 </view>
166 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 166 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
167 </view> 167 </view>
168 </view> 168 </view>
169 <view v-if="item.width" class="value-spec_val p12">*</view> 169 <view v-if="item.width" class="value-spec_val p12">*</view>
170 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 170 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
171 <view v-if="item.width" class="value-spec_box"> 171 <view v-if="item.width" class="value-spec_box">
172 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 172 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
173 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 173 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
174 </view> 174 </view>
175 <view v-if="item.length" class="value-spec_val p12">*</view> 175 <view v-if="item.length" class="value-spec_val p12">*</view>
176 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 176 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
177 <view v-if="item.length" class="value-spec_box"> 177 <view v-if="item.length" class="value-spec_box">
178 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 178 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
179 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 179 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
180 </view> 180 </view>
181 </view> 181 </view>
182 </view> 182 </view>
@@ -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"
@@ -521,7 +522,7 @@ export default { @@ -521,7 +522,7 @@ export default {
521 openRelate(fieldKey) { 522 openRelate(fieldKey) {
522 let config = {} 523 let config = {}
523 if (fieldKey === 'buyer') { 524 if (fieldKey === 'buyer') {
524 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 525 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
525 } else if (fieldKey === 'stockUpCompanyId') { 526 } else if (fieldKey === 'stockUpCompanyId') {
526 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 527 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
527 } 528 }
@@ -592,7 +593,7 @@ export default { @@ -592,7 +593,7 @@ export default {
592 uni.showToast({ title: '新增成功', icon: 'none' }) 593 uni.showToast({ title: '新增成功', icon: 'none' })
593 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400) 594 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
594 } catch (e) { 595 } catch (e) {
595 - uni.showToast({ title: '提交失败', icon: 'none' }) 596 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
596 } 597 }
597 }, 598 },
598 validateRequired() { 599 validateRequired() {
@@ -4,13 +4,19 @@ @@ -4,13 +4,19 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"> 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8 - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> 14 + <text class="label">正式合同规范性审核状态</text>
9 <text class="value"> 15 <text class="value">
10 - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>  
11 - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span> 16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
12 </text> 17 </text>
13 - </view> 18 + </view>
  19 +
14 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" /> 20 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
15 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 21 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
16 }}</text></view> 22 }}</text></view>
@@ -298,7 +304,8 @@ export default { @@ -298,7 +304,8 @@ export default {
298 ] 304 ]
299 } 305 }
300 }, 306 },
301 - onLoad(options) { 307 + onShow() {
  308 + const options = this.$route.query || {}
302 const id = options && options.id ? options.id : '' 309 const id = options && options.id ? options.id : ''
303 this.id = id 310 this.id = id
304 this.loadDetail() 311 this.loadDetail()
@@ -558,7 +565,7 @@ export default { @@ -558,7 +565,7 @@ export default {
558 } 565 }
559 566
560 .label { 567 .label {
561 - width: 280rpx; 568 + width: 310rpx;
562 color: rgba(0, 0, 0, 0.6); 569 color: rgba(0, 0, 0, 0.6);
563 font-size: 28rpx; 570 font-size: 28rpx;
564 } 571 }
@@ -627,7 +634,7 @@ export default { @@ -627,7 +634,7 @@ export default {
627 } 634 }
628 635
629 .label1 { 636 .label1 {
630 - width: 280rpx; 637 + width: 310rpx;
631 color: rgba(0, 0, 0, 0.6); 638 color: rgba(0, 0, 0, 0.6);
632 font-size: 32rpx; 639 font-size: 32rpx;
633 } 640 }
@@ -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
@@ -363,8 +364,8 @@ export default { @@ -363,8 +364,8 @@ export default {
363 setTimeout(() => { 364 setTimeout(() => {
364 uni.navigateTo({ url: '/pages/contract_foreign_stock/index' }) 365 uni.navigateTo({ url: '/pages/contract_foreign_stock/index' })
365 }, 500) 366 }, 500)
366 - }).catch(() => {  
367 - uni.showToast({ title: '提交失败', icon: 'none' }) 367 + }).catch((err) => {
  368 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 }) 369 })
369 } 370 }
370 } 371 }
@@ -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"
@@ -462,7 +463,7 @@ export default { @@ -462,7 +463,7 @@ export default {
462 openRelate(fieldKey) { 463 openRelate(fieldKey) {
463 let config = {} 464 let config = {}
464 if (fieldKey === 'buyer') { 465 if (fieldKey === 'buyer') {
465 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 466 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
466 } else if (fieldKey === 'stockUpCompanyId') { 467 } else if (fieldKey === 'stockUpCompanyId') {
467 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 468 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
468 } 469 }
@@ -565,7 +566,7 @@ export default { @@ -565,7 +566,7 @@ export default {
565 uni.showToast({ title: '保存成功', icon: 'none' }) 566 uni.showToast({ title: '保存成功', icon: 'none' })
566 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400) 567 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
567 } catch (e) { 568 } catch (e) {
568 - uni.showToast({ title: '提交失败', icon: 'none' }) 569 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
569 } 570 }
570 } 571 }
571 } 572 }
@@ -165,20 +165,20 @@ @@ -165,20 +165,20 @@
165 <view v-if="item.thickness" class="value-spec_box"> 165 <view v-if="item.thickness" class="value-spec_box">
166 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 166 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
167 </view> 167 </view>
168 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 168 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
169 </view> 169 </view>
170 </view> 170 </view>
171 <view v-if="item.width" class="value-spec_val p12">*</view> 171 <view v-if="item.width" class="value-spec_val p12">*</view>
172 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 172 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
173 <view v-if="item.width" class="value-spec_box"> 173 <view v-if="item.width" class="value-spec_box">
174 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 174 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
175 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 175 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
176 </view> 176 </view>
177 <view v-if="item.length" class="value-spec_val p12">*</view> 177 <view v-if="item.length" class="value-spec_val p12">*</view>
178 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 178 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
179 <view v-if="item.length" class="value-spec_box"> 179 <view v-if="item.length" class="value-spec_box">
180 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 180 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
181 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 181 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
182 </view> 182 </view>
183 </view> 183 </view>
184 </view> 184 </view>
@@ -182,41 +182,42 @@ @@ -182,41 +182,42 @@
182 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 182 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
183 </template> 183 </template>
184 </uni-list-item> 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 </uni-list> 217 </uni-list>
186 218
187 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 221 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
221 v-model="sheet.value" @confirm="onSheetConfirm" /> 222 v-model="sheet.value" @confirm="onSheetConfirm" />
222 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 223 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -518,7 +519,7 @@ export default { @@ -518,7 +519,7 @@ export default {
518 openRelate(fieldKey) { 519 openRelate(fieldKey) {
519 let config = {} 520 let config = {}
520 if (fieldKey === 'buyer') { 521 if (fieldKey === 'buyer') {
521 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 522 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
522 } else if (fieldKey === 'stockUpCompanyId') { 523 } else if (fieldKey === 'stockUpCompanyId') {
523 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 524 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
524 } 525 }
@@ -590,7 +591,7 @@ export default { @@ -590,7 +591,7 @@ export default {
590 uni.showToast({ title: '新增成功', icon: 'none' }) 591 uni.showToast({ title: '新增成功', icon: 'none' })
591 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400) 592 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
592 } catch (e) { 593 } catch (e) {
593 - uni.showToast({ title: '提交失败', icon: 'none' }) 594 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
594 } 595 }
595 }, 596 },
596 validateRequired() { 597 validateRequired() {
@@ -4,15 +4,19 @@ @@ -4,15 +4,19 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"> 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8 - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> 14 + <text class="label">正式合同规范性审核状态</text>
9 <text class="value"> 15 <text class="value">
10 -  
11 - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>  
12 - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>  
13 - 16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
14 </text> 17 </text>
15 - </view> 18 + </view>
  19 +
16 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" /> 20 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
17 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 21 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
18 }}</text></view> 22 }}</text></view>
@@ -307,7 +311,8 @@ export default { @@ -307,7 +311,8 @@ export default {
307 ] 311 ]
308 } 312 }
309 }, 313 },
310 - onLoad(options) { 314 + onShow() {
  315 + const options = this.$route.query || {}
311 const id = options && options.id ? options.id : '' 316 const id = options && options.id ? options.id : ''
312 this.id = id 317 this.id = id
313 this.loadDetail() 318 this.loadDetail()
@@ -572,7 +577,7 @@ export default { @@ -572,7 +577,7 @@ export default {
572 } 577 }
573 578
574 .label { 579 .label {
575 - width: 280rpx; 580 + width: 310rpx;
576 color: rgba(0, 0, 0, 0.6); 581 color: rgba(0, 0, 0, 0.6);
577 font-size: 28rpx; 582 font-size: 28rpx;
578 } 583 }
@@ -641,7 +646,7 @@ export default { @@ -641,7 +646,7 @@ export default {
641 } 646 }
642 647
643 .label1 { 648 .label1 {
644 - width: 280rpx; 649 + width: 310rpx;
645 color: rgba(0, 0, 0, 0.6); 650 color: rgba(0, 0, 0, 0.6);
646 font-size: 32rpx; 651 font-size: 32rpx;
647 } 652 }
@@ -113,43 +113,43 @@ @@ -113,43 +113,43 @@
113 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled /> 113 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
114 </template> 114 </template>
115 </uni-list-item> 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 </uni-list> 148 </uni-list>
117 </view> 149 </view>
118 </view> 150 </view>
119 </scroll-view> 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 </view> 153 </view>
154 </template> 154 </template>
155 155
@@ -363,8 +363,8 @@ export default { @@ -363,8 +363,8 @@ export default {
363 setTimeout(() => { 363 setTimeout(() => {
364 uni.navigateTo({ url: '/pages/contract_foreign_unplan/index' }) 364 uni.navigateTo({ url: '/pages/contract_foreign_unplan/index' })
365 }, 500) 365 }, 500)
366 - }).catch(() => {  
367 - uni.showToast({ title: '提交失败', icon: 'none' }) 366 + }).catch((err) => {
  367 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 }) 368 })
369 } 369 }
370 } 370 }
@@ -64,13 +64,14 @@ @@ -64,13 +64,14 @@
64 <uni-easyinput v-model="form.delayReason" placeholder="请输入原因" :inputBorder="false" /> 64 <uni-easyinput v-model="form.delayReason" placeholder="请输入原因" :inputBorder="false" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
  67 + <view class="footer">
  68 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  69 + </view>
67 </uni-list> 70 </uni-list>
68 </view> 71 </view>
69 </view> 72 </view>
70 </scroll-view> 73 </scroll-view>
71 - <view class="footer">  
72 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
73 - </view> 74 +
74 </view> 75 </view>
75 </template> 76 </template>
76 77
@@ -184,26 +184,27 @@ @@ -184,26 +184,27 @@
184 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 184 <uni-easyinput 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">合计</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 </uni-list> 205 </uni-list>
188 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 208 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
208 v-model="sheet.value" @confirm="onSheetConfirm" /> 209 v-model="sheet.value" @confirm="onSheetConfirm" />
209 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 210 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -461,7 +462,7 @@ export default { @@ -461,7 +462,7 @@ export default {
461 openRelate(fieldKey) { 462 openRelate(fieldKey) {
462 let config = {} 463 let config = {}
463 if (fieldKey === 'buyer') { 464 if (fieldKey === 'buyer') {
464 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 465 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
465 } else if (fieldKey === 'stockUpCompanyId') { 466 } else if (fieldKey === 'stockUpCompanyId') {
466 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 467 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
467 } 468 }
@@ -564,7 +565,7 @@ export default { @@ -564,7 +565,7 @@ export default {
564 uni.showToast({ title: '保存成功', icon: 'none' }) 565 uni.showToast({ title: '保存成功', icon: 'none' })
565 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400) 566 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
566 } catch (e) { 567 } catch (e) {
567 - uni.showToast({ title: '提交失败', icon: 'none' }) 568 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
568 } 569 }
569 } 570 }
570 } 571 }
@@ -163,20 +163,20 @@ @@ -163,20 +163,20 @@
163 <view v-if="item.thickness" class="value-spec_box"> 163 <view v-if="item.thickness" class="value-spec_box">
164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
165 </view> 165 </view>
166 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 166 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
167 </view> 167 </view>
168 </view> 168 </view>
169 <view v-if="item.width" class="value-spec_val p12">*</view> 169 <view v-if="item.width" class="value-spec_val p12">*</view>
170 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 170 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
171 <view v-if="item.width" class="value-spec_box"> 171 <view v-if="item.width" class="value-spec_box">
172 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 172 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
173 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 173 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
174 </view> 174 </view>
175 <view v-if="item.length" class="value-spec_val p12">*</view> 175 <view v-if="item.length" class="value-spec_val p12">*</view>
176 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 176 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
177 <view v-if="item.length" class="value-spec_box"> 177 <view v-if="item.length" class="value-spec_box">
178 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 178 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
179 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 179 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
180 </view> 180 </view>
181 </view> 181 </view>
182 </view> 182 </view>
@@ -41,13 +41,12 @@ @@ -41,13 +41,12 @@
41 <uni-datetime-picker type="date" v-model="form.validityTime" /> 41 <uni-datetime-picker type="date" v-model="form.validityTime" />
42 </template> 42 </template>
43 </uni-list-item> 43 </uni-list-item>
  44 + <view class="footer">
  45 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  46 + </view>
44 </uni-list> 47 </uni-list>
45 </scroll-view> 48 </scroll-view>
46 49
47 - <view class="footer">  
48 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
49 - </view>  
50 -  
51 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 50 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
52 @confirm="onSheetConfirm" /> 51 @confirm="onSheetConfirm" />
53 52
@@ -200,8 +199,8 @@ export default { @@ -200,8 +199,8 @@ export default {
200 uni.showToast({ title: '已提交', icon: 'none' }) 199 uni.showToast({ title: '已提交', icon: 'none' })
201 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_framework/index' }) }, 800) 200 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_framework/index' }) }, 800)
202 }) 201 })
203 - .catch(() => {  
204 - uni.showToast({ title: '提交失败', icon: 'none' }) 202 + .catch((err) => {
  203 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
205 }) 204 })
206 }, 205 },
207 validateRequired() { 206 validateRequired() {
@@ -41,13 +41,12 @@ @@ -41,13 +41,12 @@
41 <uni-datetime-picker type="date" v-model="form.validityTime" /> 41 <uni-datetime-picker type="date" v-model="form.validityTime" />
42 </template> 42 </template>
43 </uni-list-item> 43 </uni-list-item>
  44 + <view class="footer">
  45 + <button class="btn submit" type="primary" @click="onSubmit">保存</button>
  46 + </view>
44 </uni-list> 47 </uni-list>
45 </scroll-view> 48 </scroll-view>
46 49
47 - <view class="footer">  
48 - <button class="btn submit" type="primary" @click="onSubmit">保存</button>  
49 - </view>  
50 -  
51 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 50 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
52 @confirm="onSheetConfirm" /> 51 @confirm="onSheetConfirm" />
53 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 52 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -182,41 +182,42 @@ @@ -182,41 +182,42 @@
182 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 182 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
183 </template> 183 </template>
184 </uni-list-item> 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 </uni-list> 217 </uni-list>
186 218
187 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 221 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
221 v-model="sheet.value" @confirm="onSheetConfirm" /> 222 v-model="sheet.value" @confirm="onSheetConfirm" />
222 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 223 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -522,7 +523,7 @@ export default { @@ -522,7 +523,7 @@ export default {
522 openRelate(fieldKey) { 523 openRelate(fieldKey) {
523 let config = {} 524 let config = {}
524 if (fieldKey === 'buyer') { 525 if (fieldKey === 'buyer') {
525 - config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 526 + config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
526 } else if (fieldKey === 'stockUpCompanyId') { 527 } else if (fieldKey === 'stockUpCompanyId') {
527 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 528 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
528 } 529 }
@@ -598,7 +599,7 @@ export default { @@ -598,7 +599,7 @@ export default {
598 uni.showToast({ title: '新增成功', icon: 'none' }) 599 uni.showToast({ title: '新增成功', icon: 'none' })
599 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400) 600 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
600 } catch (e) { 601 } catch (e) {
601 - uni.showToast({ title: '提交失败', icon: 'none' }) 602 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
602 } 603 }
603 }, 604 },
604 validateRequired() { 605 validateRequired() {
@@ -224,7 +224,8 @@ export default { @@ -224,7 +224,8 @@ export default {
224 ] 224 ]
225 } 225 }
226 }, 226 },
227 - onLoad(options) { 227 + onShow() {
  228 + const options = this.$route.query || {}
228 const id = options && options.id ? options.id : '' 229 const id = options && options.id ? options.id : ''
229 this.id = id 230 this.id = id
230 this.loadDetail() 231 this.loadDetail()
@@ -455,7 +456,7 @@ export default { @@ -455,7 +456,7 @@ export default {
455 } 456 }
456 457
457 .label { 458 .label {
458 - width: 280rpx; 459 + width: 310rpx;
459 color: rgba(0, 0, 0, 0.6); 460 color: rgba(0, 0, 0, 0.6);
460 font-size: 28rpx; 461 font-size: 28rpx;
461 } 462 }
@@ -511,7 +512,7 @@ export default { @@ -511,7 +512,7 @@ export default {
511 } 512 }
512 513
513 .label1 { 514 .label1 {
514 - width: 280rpx; 515 + width: 310rpx;
515 color: rgba(0, 0, 0, 0.6); 516 color: rgba(0, 0, 0, 0.6);
516 font-size: 32rpx; 517 font-size: 32rpx;
517 } 518 }
@@ -162,26 +162,27 @@ @@ -162,26 +162,27 @@
162 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 162 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
163 </template> 163 </template>
164 </uni-list-item> 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 </uni-list> 183 </uni-list>
166 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 186 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
186 v-model="sheet.value" @confirm="onSheetConfirm" /> 187 v-model="sheet.value" @confirm="onSheetConfirm" />
187 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 188 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -441,7 +442,7 @@ export default { @@ -441,7 +442,7 @@ export default {
441 openRelate(fieldKey) { 442 openRelate(fieldKey) {
442 let config = {} 443 let config = {}
443 if (fieldKey === 'buyer') { 444 if (fieldKey === 'buyer') {
444 - config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 445 + config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
445 } 446 }
446 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 447 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
447 this.sheet.visible = false 448 this.sheet.visible = false
@@ -536,7 +537,7 @@ export default { @@ -536,7 +537,7 @@ export default {
536 uni.showToast({ title: '保存成功', icon: 'none' }) 537 uni.showToast({ title: '保存成功', icon: 'none' })
537 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400) 538 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
538 } catch (e) { 539 } catch (e) {
539 - uni.showToast({ title: '提交失败', icon: 'none' }) 540 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
540 } 541 }
541 } 542 }
542 } 543 }
@@ -187,20 +187,20 @@ @@ -187,20 +187,20 @@
187 <view v-if="item.thickness" class="value-spec_box"> 187 <view v-if="item.thickness" class="value-spec_box">
188 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 188 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
189 </view> 189 </view>
190 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 190 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
191 </view> 191 </view>
192 </view> 192 </view>
193 <view v-if="item.width" class="value-spec_val p12">*</view> 193 <view v-if="item.width" class="value-spec_val p12">*</view>
194 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 194 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
195 <view v-if="item.width" class="value-spec_box"> 195 <view v-if="item.width" class="value-spec_box">
196 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 196 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
197 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 197 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
198 </view> 198 </view>
199 <view v-if="item.length" class="value-spec_val p12">*</view> 199 <view v-if="item.length" class="value-spec_val p12">*</view>
200 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 200 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
201 <view v-if="item.length" class="value-spec_box"> 201 <view v-if="item.length" class="value-spec_box">
202 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 202 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
203 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 203 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
204 </view> 204 </view>
205 </view> 205 </view>
206 </view> 206 </view>
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 <view class="item-title"><text class="required">*</text><text>区域</text></view> 57 <view class="item-title"><text class="required">*</text><text>区域</text></view>
58 </template> 58 </template>
59 </uni-list-item> 59 </uni-list-item>
60 - <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" /> 60 + <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" />
61 <uni-list-item title="合计人民币金额（大写）"> 61 <uni-list-item title="合计人民币金额（大写）">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 63 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -178,41 +178,42 @@ @@ -178,41 +178,42 @@
178 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 178 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
179 </template> 179 </template>
180 </uni-list-item> 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 </uni-list> 213 </uni-list>
182 214
183 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 217 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
217 v-model="sheet.value" @confirm="onSheetConfirm" /> 218 v-model="sheet.value" @confirm="onSheetConfirm" />
218 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 219 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -515,7 +516,7 @@ export default { @@ -515,7 +516,7 @@ export default {
515 openRelate(fieldKey) { 516 openRelate(fieldKey) {
516 let config = {} 517 let config = {}
517 if (fieldKey === 'buyer') { 518 if (fieldKey === 'buyer') {
518 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 519 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
519 } else if (fieldKey === 'stockUpCompanyId') { 520 } else if (fieldKey === 'stockUpCompanyId') {
520 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 521 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
521 } 522 }
@@ -552,7 +553,7 @@ export default { @@ -552,7 +553,7 @@ export default {
552 async onSubmit() { 553 async onSubmit() {
553 if (!this.validateRequired()) return 554 if (!this.validateRequired()) return
554 const confirmRes = await new Promise(resolve => { 555 const confirmRes = await new Promise(resolve => {
555 - uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 556 + uni.showModal({ title: '提示', content: '确定新增经销标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
556 }) 557 })
557 if (!(confirmRes && confirmRes.confirm)) return 558 if (!(confirmRes && confirmRes.confirm)) return
558 const clean = (obj) => { 559 const clean = (obj) => {
@@ -586,7 +587,7 @@ export default { @@ -586,7 +587,7 @@ export default {
586 uni.showToast({ title: '新增成功', icon: 'none' }) 587 uni.showToast({ title: '新增成功', icon: 'none' })
587 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400) 588 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
588 } catch (e) { 589 } catch (e) {
589 - uni.showToast({ title: '提交失败', icon: 'none' }) 590 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
590 } 591 }
591 }, 592 },
592 validateRequired() { 593 validateRequired() {
@@ -746,11 +747,6 @@ export default { @@ -746,11 +747,6 @@ export default {
746 color: rgba(0, 0, 0, 0.9); 747 color: rgba(0, 0, 0, 0.9);
747 } 748 }
748 749
749 -.scroll {  
750 - flex: 1;  
751 - padding: 12rpx 0 160rpx;  
752 -}  
753 -  
754 .quality { 750 .quality {
755 background-color: #fff; 751 background-color: #fff;
756 display: flex; 752 display: flex;
@@ -227,7 +227,8 @@ export default { @@ -227,7 +227,8 @@ export default {
227 ] 227 ]
228 } 228 }
229 }, 229 },
230 - onLoad(options) { 230 + onShow() {
  231 + const options = this.$route.query || {}
231 const id = options && options.id ? options.id : '' 232 const id = options && options.id ? options.id : ''
232 const status = options && options.status ? options.status : '' 233 const status = options && options.status ? options.status : ''
233 this.id = id 234 this.id = id
@@ -471,7 +472,7 @@ export default { @@ -471,7 +472,7 @@ export default {
471 } 472 }
472 473
473 .label { 474 .label {
474 - width: 280rpx; 475 + width: 310rpx;
475 color: rgba(0, 0, 0, 0.6); 476 color: rgba(0, 0, 0, 0.6);
476 font-size: 28rpx; 477 font-size: 28rpx;
477 } 478 }
@@ -485,7 +486,7 @@ export default { @@ -485,7 +486,7 @@ export default {
485 } 486 }
486 487
487 .label1 { 488 .label1 {
488 - width: 280rpx; 489 + width: 310rpx;
489 color: rgba(0, 0, 0, 0.6); 490 color: rgba(0, 0, 0, 0.6);
490 font-size: 32rpx; 491 font-size: 32rpx;
491 } 492 }
@@ -177,26 +177,27 @@ @@ -177,26 +177,27 @@
177 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 177 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
178 </template> 178 </template>
179 </uni-list-item> 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 </uni-list> 198 </uni-list>
181 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 201 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
201 v-model="sheet.value" @confirm="onSheetConfirm" /> 202 v-model="sheet.value" @confirm="onSheetConfirm" />
202 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 203 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -454,7 +455,7 @@ export default { @@ -454,7 +455,7 @@ export default {
454 openRelate(fieldKey) { 455 openRelate(fieldKey) {
455 let config = {} 456 let config = {}
456 if (fieldKey === 'buyer') { 457 if (fieldKey === 'buyer') {
457 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 458 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
458 } else if (fieldKey === 'stockUpCompanyId') { 459 } else if (fieldKey === 'stockUpCompanyId') {
459 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 460 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
460 } 461 }
@@ -558,7 +559,7 @@ export default { @@ -558,7 +559,7 @@ export default {
558 uni.showToast({ title: '保存成功', icon: 'none' }) 559 uni.showToast({ title: '保存成功', icon: 'none' })
559 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400) 560 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
560 } catch (e) { 561 } catch (e) {
561 - uni.showToast({ title: '提交失败', icon: 'none' }) 562 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
562 } 563 }
563 } 564 }
564 } 565 }
@@ -158,20 +158,20 @@ @@ -158,20 +158,20 @@
158 <view v-if="item.thickness" class="value-spec_box"> 158 <view v-if="item.thickness" class="value-spec_box">
159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160 </view> 160 </view>
161 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162 </view> 162 </view>
163 </view> 163 </view>
164 <view v-if="item.width" class="value-spec_val p12">*</view> 164 <view v-if="item.width" class="value-spec_val p12">*</view>
165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166 <view v-if="item.width" class="value-spec_box"> 166 <view v-if="item.width" class="value-spec_box">
167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 168 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
169 </view> 169 </view>
170 <view v-if="item.length" class="value-spec_val p12">*</view> 170 <view v-if="item.length" class="value-spec_val p12">*</view>
171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172 <view v-if="item.length" class="value-spec_box"> 172 <view v-if="item.length" class="value-spec_box">
173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 174 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
175 </view> 175 </view>
176 </view> 176 </view>
177 </view> 177 </view>
@@ -242,10 +242,10 @@ export default { @@ -242,10 +242,10 @@ export default {
242 }, 242 },
243 list: { 243 list: {
244 handler(v) { 244 handler(v) {
245 - // const arr = Array.isArray(v) ? v : []  
246 - // this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true })) 245 + if (!v || !v.length) return
  246 + // Only update if significantly different to avoid loop/reset
  247 + // For now, assuming external update wants to reset
247 this.items = v.map(x => ({ ...this.defaultItem(), ...x, collapsed: true })) 248 this.items = v.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
248 - console.log('v', v)  
249 }, 249 },
250 deep: true 250 deep: true
251 } 251 }
@@ -176,41 +176,42 @@ @@ -176,41 +176,42 @@
176 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 176 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
177 </template> 177 </template>
178 </uni-list-item> 178 </uni-list-item>
  179 + <view class="footer">
  180 + <div class="total">
  181 + <div class="total-text">
  182 + 合计
  183 + </div>
  184 + <div class="total-item">
  185 + <div class="total-item-text">
  186 + 数量
  187 + </div>
  188 + <div class="total-item-price">
  189 + {{ (totalQuantity || 0).toFixed(2) }}kg
  190 + </div>
  191 + </div>
  192 + <div class="total-item">
  193 + <div class="total-item-text">
  194 + 不含税金额
  195 + </div>
  196 + <div class="total-item-price text-red">
  197 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  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 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  206 + </div>
  207 + </div>
  208 + </div>
  209 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  210 + </view>
179 </uni-list> 211 </uni-list>
180 212
181 </scroll-view> 213 </scroll-view>
182 - <view class="footer">  
183 - <div class="total">  
184 - <div class="total-text">  
185 - 合计  
186 - </div>  
187 - <div class="total-item">  
188 - <div class="total-item-text">  
189 - 数量  
190 - </div>  
191 - <div class="total-item-price">  
192 - {{ (totalQuantity || 0).toFixed(2) }}kg  
193 - </div>  
194 - </div>  
195 - <div class="total-item">  
196 - <div class="total-item-text">  
197 - 不含税金额  
198 - </div>  
199 - <div class="total-item-price text-red">  
200 - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}  
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 - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}  
209 - </div>  
210 - </div>  
211 - </div>  
212 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
213 - </view> 214 +
214 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 215 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
215 v-model="sheet.value" @confirm="onSheetConfirm" /> 216 v-model="sheet.value" @confirm="onSheetConfirm" />
216 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 217 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -512,7 +513,7 @@ export default { @@ -512,7 +513,7 @@ export default {
512 openRelate(fieldKey) { 513 openRelate(fieldKey) {
513 let config = {} 514 let config = {}
514 if (fieldKey === 'buyer') { 515 if (fieldKey === 'buyer') {
515 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 516 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
516 } else if (fieldKey === 'stockUpCompanyId') { 517 } else if (fieldKey === 'stockUpCompanyId') {
517 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 518 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
518 } 519 }
@@ -583,7 +584,7 @@ export default { @@ -583,7 +584,7 @@ export default {
583 uni.showToast({ title: '新增成功', icon: 'none' }) 584 uni.showToast({ title: '新增成功', icon: 'none' })
584 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400) 585 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
585 } catch (e) { 586 } catch (e) {
586 - uni.showToast({ title: '提交失败', icon: 'none' }) 587 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
587 } 588 }
588 }, 589 },
589 validateRequired() { 590 validateRequired() {
@@ -4,15 +4,18 @@ @@ -4,15 +4,18 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"> 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8 - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> 14 + <text class="label">正式合同规范性审核状态</text>
9 <text class="value"> 15 <text class="value">
10 -  
11 - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>  
12 - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>  
13 - 16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
14 </text> 17 </text>
15 - </view> 18 + </view>
16 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" /> 19 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
17 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 20 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
18 }}</text></view> 21 }}</text></view>
@@ -287,7 +290,8 @@ export default { @@ -287,7 +290,8 @@ export default {
287 ] 290 ]
288 } 291 }
289 }, 292 },
290 - onLoad(options) { 293 + onShow() {
  294 + const options = this.$route.query || {}
291 const id = options && options.id ? options.id : '' 295 const id = options && options.id ? options.id : ''
292 this.id = id 296 this.id = id
293 this.loadDetail() 297 this.loadDetail()
@@ -535,7 +539,7 @@ export default { @@ -535,7 +539,7 @@ export default {
535 } 539 }
536 540
537 .label { 541 .label {
538 - width: 280rpx; 542 + width: 310rpx;
539 color: rgba(0, 0, 0, 0.6); 543 color: rgba(0, 0, 0, 0.6);
540 font-size: 28rpx; 544 font-size: 28rpx;
541 } 545 }
@@ -591,7 +595,7 @@ export default { @@ -591,7 +595,7 @@ export default {
591 } 595 }
592 596
593 .label1 { 597 .label1 {
594 - width: 280rpx; 598 + width: 310rpx;
595 color: rgba(0, 0, 0, 0.6); 599 color: rgba(0, 0, 0, 0.6);
596 font-size: 32rpx; 600 font-size: 32rpx;
597 } 601 }
@@ -114,43 +114,43 @@ @@ -114,43 +114,43 @@
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) }}t
  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) }}t  
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 </view> 154 </view>
155 </template> 155 </template>
156 156
@@ -363,8 +363,8 @@ export default { @@ -363,8 +363,8 @@ export default {
363 setTimeout(() => { 363 setTimeout(() => {
364 uni.navigateTo({ url: '/pages/contract_stock/index' }) 364 uni.navigateTo({ url: '/pages/contract_stock/index' })
365 }, 500) 365 }, 500)
366 - }).catch(() => {  
367 - uni.showToast({ title: '提交失败', icon: 'none' }) 366 + }).catch((err) => {
  367 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 }) 368 })
369 } 369 }
370 } 370 }
@@ -180,26 +180,27 @@ @@ -180,26 +180,27 @@
180 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 180 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
181 </template> 181 </template>
182 </uni-list-item> 182 </uni-list-item>
  183 + <view class="footer">
  184 + <div class="total">
  185 + <div class="total-text">合计</div>
  186 + <div class="total-item">
  187 + <div class="total-item-text">数量</div>
  188 + <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
  189 + </div>
  190 + <div class="total-item">
  191 + <div class="total-item-text">不含税金额</div>
  192 + <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
  193 + </div>
  194 + <div class="total-item">
  195 + <div class="total-item-text">总金额</div>
  196 + <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
  197 + </div>
  198 + </div>
  199 + <button class="btn submit" type="primary" @click="onSubmit">保存</button>
  200 + </view>
183 </uni-list> 201 </uni-list>
184 </scroll-view> 202 </scroll-view>
185 - <view class="footer">  
186 - <div class="total">  
187 - <div class="total-text">合计</div>  
188 - <div class="total-item">  
189 - <div class="total-item-text">数量</div>  
190 - <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>  
191 - </div>  
192 - <div class="total-item">  
193 - <div class="total-item-text">不含税金额</div>  
194 - <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>  
195 - </div>  
196 - <div class="total-item">  
197 - <div class="total-item-text">总金额</div>  
198 - <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>  
199 - </div>  
200 - </div>  
201 - <button class="btn submit" type="primary" @click="onSubmit">保存</button>  
202 - </view> 203 +
203 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 204 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
204 v-model="sheet.value" @confirm="onSheetConfirm" /> 205 v-model="sheet.value" @confirm="onSheetConfirm" />
205 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 206 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -456,7 +457,7 @@ export default { @@ -456,7 +457,7 @@ export default {
456 openRelate(fieldKey) { 457 openRelate(fieldKey) {
457 let config = {} 458 let config = {}
458 if (fieldKey === 'buyer') { 459 if (fieldKey === 'buyer') {
459 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 460 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
460 } 461 }
461 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 462 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
462 this.sheet.visible = false 463 this.sheet.visible = false
@@ -550,7 +551,7 @@ export default { @@ -550,7 +551,7 @@ export default {
550 uni.showToast({ title: '保存成功', icon: 'none' }) 551 uni.showToast({ title: '保存成功', icon: 'none' })
551 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400) 552 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
552 } catch (e) { 553 } catch (e) {
553 - uni.showToast({ title: '提交失败', icon: 'none' }) 554 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
554 } 555 }
555 } 556 }
556 } 557 }
@@ -158,20 +158,20 @@ @@ -158,20 +158,20 @@
158 <view v-if="item.thickness" class="value-spec_box"> 158 <view v-if="item.thickness" class="value-spec_box">
159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160 </view> 160 </view>
161 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162 </view> 162 </view>
163 </view> 163 </view>
164 <view v-if="item.width" class="value-spec_val p12">*</view> 164 <view v-if="item.width" class="value-spec_val p12">*</view>
165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166 <view v-if="item.width" class="value-spec_box"> 166 <view v-if="item.width" class="value-spec_box">
167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 168 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
169 </view> 169 </view>
170 <view v-if="item.length" class="value-spec_val p12">*</view> 170 <view v-if="item.length" class="value-spec_val p12">*</view>
171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172 <view v-if="item.length" class="value-spec_box"> 172 <view v-if="item.length" class="value-spec_box">
173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 174 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
175 </view> 175 </view>
176 </view> 176 </view>
177 </view> 177 </view>
@@ -64,13 +64,14 @@ @@ -64,13 +64,14 @@
64 <uni-easyinput v-model="form.delayReason" placeholder="请输入原因" :inputBorder="false" /> 64 <uni-easyinput v-model="form.delayReason" placeholder="请输入原因" :inputBorder="false" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
  67 + <view class="footer">
  68 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  69 + </view>
67 </uni-list> 70 </uni-list>
68 </view> 71 </view>
69 </view> 72 </view>
70 </scroll-view> 73 </scroll-view>
71 - <view class="footer">  
72 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
73 - </view> 74 +
74 </view> 75 </view>
75 </template> 76 </template>
76 77
@@ -178,41 +178,42 @@ @@ -178,41 +178,42 @@
178 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 178 <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
179 </template> 179 </template>
180 </uni-list-item> 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 </uni-list> 213 </uni-list>
182 214
183 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 217 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
217 v-model="sheet.value" @confirm="onSheetConfirm" /> 218 v-model="sheet.value" @confirm="onSheetConfirm" />
218 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 219 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -517,7 +518,7 @@ export default { @@ -517,7 +518,7 @@ export default {
517 openRelate(fieldKey) { 518 openRelate(fieldKey) {
518 let config = {} 519 let config = {}
519 if (fieldKey === 'buyer') { 520 if (fieldKey === 'buyer') {
520 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 521 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
521 } 522 }
522 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 523 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
523 this.sheet.visible = false 524 this.sheet.visible = false
@@ -576,7 +577,7 @@ export default { @@ -576,7 +577,7 @@ export default {
576 uni.showToast({ title: '新增成功', icon: 'none' }) 577 uni.showToast({ title: '新增成功', icon: 'none' })
577 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400) 578 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
578 } catch (e) { 579 } catch (e) {
579 - uni.showToast({ title: '提交失败', icon: 'none' }) 580 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
580 } 581 }
581 }, 582 },
582 validateRequired() { 583 validateRequired() {
@@ -4,13 +4,16 @@ @@ -4,13 +4,16 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"> 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8 - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> 14 + <text class="label">正式合同规范性审核状态</text>
9 <text class="value"> 15 <text class="value">
10 -  
11 - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>  
12 - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>  
13 - 16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
14 </text> 17 </text>
15 </view> 18 </view>
16 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" /> 19 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
@@ -293,7 +296,8 @@ export default { @@ -293,7 +296,8 @@ export default {
293 ] 296 ]
294 } 297 }
295 }, 298 },
296 - onLoad(options) { 299 + onShow() {
  300 + const options = this.$route.query || {}
297 const id = options && options.id ? options.id : '' 301 const id = options && options.id ? options.id : ''
298 this.id = id 302 this.id = id
299 this.loadDetail() 303 this.loadDetail()
@@ -555,7 +559,7 @@ export default { @@ -555,7 +559,7 @@ export default {
555 } 559 }
556 560
557 .label { 561 .label {
558 - width: 280rpx; 562 + width: 310rpx;
559 color: rgba(0, 0, 0, 0.6); 563 color: rgba(0, 0, 0, 0.6);
560 font-size: 28rpx; 564 font-size: 28rpx;
561 } 565 }
@@ -624,7 +628,7 @@ export default { @@ -624,7 +628,7 @@ export default {
624 } 628 }
625 629
626 .label1 { 630 .label1 {
627 - width: 280rpx; 631 + width: 310rpx;
628 color: rgba(0, 0, 0, 0.6); 632 color: rgba(0, 0, 0, 0.6);
629 font-size: 32rpx; 633 font-size: 32rpx;
630 } 634 }
@@ -113,43 +113,43 @@ @@ -113,43 +113,43 @@
113 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled /> 113 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
114 </template> 114 </template>
115 </uni-list-item> 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 </uni-list> 148 </uni-list>
117 </view> 149 </view>
118 </view> 150 </view>
119 </scroll-view> 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 </view> 153 </view>
154 </template> 154 </template>
155 155
@@ -363,8 +363,8 @@ export default { @@ -363,8 +363,8 @@ export default {
363 setTimeout(() => { 363 setTimeout(() => {
364 uni.navigateTo({ url: '/pages/contract_unplan/index' }) 364 uni.navigateTo({ url: '/pages/contract_unplan/index' })
365 }, 500) 365 }, 500)
366 - }).catch(() => {  
367 - uni.showToast({ title: '提交失败', icon: 'none' }) 366 + }).catch((err) => {
  367 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 }) 368 })
369 } 369 }
370 } 370 }
@@ -64,13 +64,14 @@ @@ -64,13 +64,14 @@
64 <uni-easyinput v-model="form.delayReason" placeholder="请输入原因" :inputBorder="false" /> 64 <uni-easyinput v-model="form.delayReason" placeholder="请输入原因" :inputBorder="false" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
  67 + <view class="footer">
  68 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  69 + </view>
67 </uni-list> 70 </uni-list>
68 </view> 71 </view>
69 </view> 72 </view>
70 </scroll-view> 73 </scroll-view>
71 - <view class="footer">  
72 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
73 - </view> 74 +
74 </view> 75 </view>
75 </template> 76 </template>
76 77
@@ -177,26 +177,27 @@ @@ -177,26 +177,27 @@
177 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" /> 177 <uni-easyinput v-model="form.packaging" placeholder="请输入" :inputBorder="false" />
178 </template> 178 </template>
179 </uni-list-item> 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 </uni-list> 198 </uni-list>
181 </scroll-view> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 201 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
201 v-model="sheet.value" @confirm="onSheetConfirm" /> 202 v-model="sheet.value" @confirm="onSheetConfirm" />
202 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 203 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -453,7 +454,7 @@ export default { @@ -453,7 +454,7 @@ export default {
453 openRelate(fieldKey) { 454 openRelate(fieldKey) {
454 let config = {} 455 let config = {}
455 if (fieldKey === 'buyer') { 456 if (fieldKey === 'buyer') {
456 - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 457 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
457 } 458 }
458 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 459 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
459 this.sheet.visible = false 460 this.sheet.visible = false
@@ -550,7 +551,7 @@ export default { @@ -550,7 +551,7 @@ export default {
550 uni.showToast({ title: '保存成功', icon: 'none' }) 551 uni.showToast({ title: '保存成功', icon: 'none' })
551 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400) 552 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
552 } catch (e) { 553 } catch (e) {
553 - uni.showToast({ title: '提交失败', icon: 'none' }) 554 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
554 } 555 }
555 } 556 }
556 } 557 }
@@ -158,20 +158,20 @@ @@ -158,20 +158,20 @@
158 <view v-if="item.thickness" class="value-spec_box"> 158 <view v-if="item.thickness" class="value-spec_box">
159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160 </view> 160 </view>
161 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162 </view> 162 </view>
163 </view> 163 </view>
164 <view v-if="item.width" class="value-spec_val p12">*</view> 164 <view v-if="item.width" class="value-spec_val p12">*</view>
165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166 <view v-if="item.width" class="value-spec_box"> 166 <view v-if="item.width" class="value-spec_box">
167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 168 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
169 </view> 169 </view>
170 <view v-if="item.length" class="value-spec_val p12">*</view> 170 <view v-if="item.length" class="value-spec_val p12">*</view>
171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172 <view v-if="item.length" class="value-spec_box"> 172 <view v-if="item.length" class="value-spec_box">
173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 174 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
175 </view> 175 </view>
176 </view> 176 </view>
177 </view> 177 </view>
@@ -309,12 +309,14 @@ @@ -309,12 +309,14 @@
309 </template> 309 </template>
310 </uni-list-item> 310 </uni-list-item>
311 311
  312 + <view class="footer">
  313 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  314 + </view>
  315 +
312 </uni-list> 316 </uni-list>
313 </scroll-view> 317 </scroll-view>
314 318
315 - <view class="footer">  
316 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
317 - </view> 319 +
318 320
319 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 321 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
320 @confirm="onSheetConfirm" /> 322 @confirm="onSheetConfirm" />
@@ -307,12 +307,12 @@ @@ -307,12 +307,12 @@
307 <uni-easyinput v-model="form.annualMaterialOverview" placeholder="请输入年度款料概况" :inputBorder="false" /> 307 <uni-easyinput v-model="form.annualMaterialOverview" placeholder="请输入年度款料概况" :inputBorder="false" />
308 </template> 308 </template>
309 </uni-list-item> 309 </uni-list-item>
  310 + <view class="footer">
  311 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  312 + </view>
310 313
311 </uni-list> 314 </uni-list>
312 </scroll-view> 315 </scroll-view>
313 - <view class="footer">  
314 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
315 - </view>  
316 316
317 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 317 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
318 @confirm="onSheetConfirm" /> 318 @confirm="onSheetConfirm" />
@@ -306,12 +306,11 @@ @@ -306,12 +306,11 @@
306 <uni-easyinput v-model="form.annualMaterialOverview" placeholder="请输入年度款料概况" :inputBorder="false" /> 306 <uni-easyinput v-model="form.annualMaterialOverview" placeholder="请输入年度款料概况" :inputBorder="false" />
307 </template> 307 </template>
308 </uni-list-item> 308 </uni-list-item>
309 - 309 + <view class="footer">
  310 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  311 + </view>
310 </uni-list> 312 </uni-list>
311 </scroll-view> 313 </scroll-view>
312 - <view class="footer">  
313 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
314 - </view>  
315 314
316 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 315 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
317 @confirm="onSheetConfirm" /> 316 @confirm="onSheetConfirm" />
@@ -103,13 +103,11 @@ @@ -103,13 +103,11 @@
103 <uni-easyinput type="textarea" v-model="form.description" placeholder="请输入备注" :inputBorder="false" /> 103 <uni-easyinput type="textarea" v-model="form.description" placeholder="请输入备注" :inputBorder="false" />
104 </template> 104 </template>
105 </uni-list-item> 105 </uni-list-item>
106 - 106 + <view class="footer">
  107 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  108 + </view>
107 </uni-list> 109 </uni-list>
108 </scroll-view> 110 </scroll-view>
109 -  
110 - <view class="footer">  
111 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
112 - </view>  
113 </view> 111 </view>
114 </template> 112 </template>
115 113
@@ -103,13 +103,11 @@ @@ -103,13 +103,11 @@
103 :inputBorder="false" /> 103 :inputBorder="false" />
104 </template> 104 </template>
105 </uni-list-item> 105 </uni-list-item>
106 - 106 + <view class="footer">
  107 + <button class="btn submit" type="primary" @click="onSubmit">保存</button>
  108 + </view>
107 </uni-list> 109 </uni-list>
108 </scroll-view> 110 </scroll-view>
109 -  
110 - <view class="footer">  
111 - <button class="btn submit" type="primary" @click="onSubmit">保存</button>  
112 - </view>  
113 </view> 111 </view>
114 </template> 112 </template>
115 113
@@ -100,14 +100,13 @@ @@ -100,14 +100,13 @@
100 <uni-list-item class="select-item" :class="form.chargeUserIdName ? 'is-filled' : 'is-empty'" title="责任人" 100 <uni-list-item class="select-item" :class="form.chargeUserIdName ? 'is-filled' : 'is-empty'" title="责任人"
101 clickable @click="openRelate('chargeUserId')" :rightText="form.chargeUserIdName || '请选择责任人'" 101 clickable @click="openRelate('chargeUserId')" :rightText="form.chargeUserIdName || '请选择责任人'"
102 showArrow /> 102 showArrow />
  103 + <view class="footer">
  104 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  105 + </view>
103 </uni-list> 106 </uni-list>
104 107
105 </scroll-view> 108 </scroll-view>
106 109
107 - <view class="footer">  
108 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
109 - </view>  
110 -  
111 <!-- 单选弹框：生产厂、科办、客户类型、产品品种 --> 110 <!-- 单选弹框：生产厂、科办、客户类型、产品品种 -->
112 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 111 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
113 v-model="sheet.value" @confirm="onSheetConfirm" /> 112 v-model="sheet.value" @confirm="onSheetConfirm" />
@@ -146,6 +146,7 @@ export default { @@ -146,6 +146,7 @@ export default {
146 displayButtons() { 146 displayButtons() {
147 const s = Number(this.form && this.form.status || 0) 147 const s = Number(this.form && this.form.status || 0)
148 const t = this.todoType || ''; 148 const t = this.todoType || '';
  149 + console.log('s', s, 't', t)
149 return [ 150 return [
150 { ...this.buttons[0], visible: (s === 3 && t === '' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:modify')) }, 151 { ...this.buttons[0], visible: (s === 3 && t === '' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:modify')) },
151 { ...this.buttons[1], visible: this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:reviewDetail') }, 152 { ...this.buttons[1], visible: this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:reviewDetail') },
@@ -99,14 +99,13 @@ @@ -99,14 +99,13 @@
99 <!-- 责任人 关联页选择 --> 99 <!-- 责任人 关联页选择 -->
100 <uni-list-item class="select-item" :class="form.chargeUserIdName ? 'is-filled' : 'is-empty'" title="责任人" 100 <uni-list-item class="select-item" :class="form.chargeUserIdName ? 'is-filled' : 'is-empty'" title="责任人"
101 clickable @click="openRelate('chargeUserId')" :rightText="form.chargeUserIdName || '请选择责任人'" showArrow /> 101 clickable @click="openRelate('chargeUserId')" :rightText="form.chargeUserIdName || '请选择责任人'" showArrow />
  102 + <view class="footer">
  103 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  104 + </view>
102 </uni-list> 105 </uni-list>
103 106
104 </scroll-view> 107 </scroll-view>
105 108
106 - <view class="footer">  
107 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
108 - </view>  
109 -  
110 <!-- 单选弹框：生产厂、科办、客户类型、产品品种 --> 109 <!-- 单选弹框：生产厂、科办、客户类型、产品品种 -->
111 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" 110 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options"
112 v-model="sheet.value" @confirm="onSheetConfirm" /> 111 v-model="sheet.value" @confirm="onSheetConfirm" />
@@ -390,7 +390,7 @@ export default { @@ -390,7 +390,7 @@ export default {
390 icon: 'none' 390 icon: 'none'
391 }) 391 })
392 setTimeout(() => { 392 setTimeout(() => {
393 - uni.redirectTo({ url: '/pages/flow/approval' }) 393 + uni.redirectTo({ url: '/pages/index' })
394 }, 300) 394 }, 300)
395 } 395 }
396 }).catch(() => { }) 396 }).catch(() => { })
@@ -403,7 +403,7 @@ export default { @@ -403,7 +403,7 @@ export default {
403 icon: 'none' 403 icon: 'none'
404 }) 404 })
405 setTimeout(() => { 405 setTimeout(() => {
406 - uni.redirectTo({ url: '/pages/flow/approval' }) 406 + uni.redirectTo({ url: '/pages/index' })
407 }, 300) 407 }, 300)
408 } 408 }
409 }).catch(() => { }) 409 }).catch(() => { })
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <!-- name:MsgCenter 消息中心权限--> 6 <!-- name:MsgCenter 消息中心权限-->
7 <view class="bell-wrap" v-if="hasMenu('MsgCenter')"> 7 <view class="bell-wrap" v-if="hasMenu('MsgCenter')">
8 <image class="icon" src="/static/images/index/bell.png" mode="widthFix" /> 8 <image class="icon" src="/static/images/index/bell.png" mode="widthFix" />
9 - <view class="badge">{{ toReadCount > 99 ? '99+' : toReadCount }}</view> 9 + <view class="badge">{{ toReadCount > 99 ? '99+' : toReadCount || 0 }}</view>
10 </view> 10 </view>
11 </view> 11 </view>
12 <view class="header-title">首页</view> 12 <view class="header-title">首页</view>
@@ -20,14 +20,14 @@ @@ -20,14 +20,14 @@
20 <image class="card-bg" src="/static/images/index/card_wait.png" mode="aspectFill" /> 20 <image class="card-bg" src="/static/images/index/card_wait.png" mode="aspectFill" />
21 <view class="card-content"> 21 <view class="card-content">
22 <text class="card-title">待审批的</text> 22 <text class="card-title">待审批的</text>
23 - <text class="card-num">{{ todoCount }}</text> 23 + <text class="card-num">{{ todoCount || 0 }}</text>
24 </view> 24 </view>
25 </view> 25 </view>
26 <view class="stat-card" @click="navigateTo('/pages/flow/myflow')"> 26 <view class="stat-card" @click="navigateTo('/pages/flow/myflow')">
27 <image class="card-bg" src="/static/images/index/card_launch.png" mode="aspectFill" /> 27 <image class="card-bg" src="/static/images/index/card_launch.png" mode="aspectFill" />
28 <view class="card-content"> 28 <view class="card-content">
29 <text class="card-title">我发起的</text> 29 <text class="card-title">我发起的</text>
30 - <text class="card-num">{{ myCreateCount }}</text> 30 + <text class="card-num">{{ myCreateCount || 0 }}</text>
31 </view> 31 </view>
32 </view> 32 </view>
33 </view> 33 </view>
@@ -272,6 +272,7 @@ page { @@ -272,6 +272,7 @@ page {
272 .home-page { 272 .home-page {
273 padding: 0 32rpx 32rpx; 273 padding: 0 32rpx 32rpx;
274 padding-top: 96rpx; 274 padding-top: 96rpx;
  275 + background-color: #fff;
275 } 276 }
276 277
277 /* 自定义头部 */ 278 /* 自定义头部 */
@@ -138,20 +138,19 @@ @@ -138,20 +138,19 @@
138 <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 138 <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
139 </template> 139 </template>
140 </uni-list-item> 140 </uni-list-item>
141 - 141 + <view class="footer">
  142 + <view class="view-total">
  143 + <view class="head">合计</view>
  144 + <view class="row">
  145 + <text class="label">总数量</text><text class="value">{{ form.totalQuantity }}</text>
  146 + </view>
  147 + </view>
  148 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  149 + </view>
142 150
143 </uni-list> 151 </uni-list>
144 </scroll-view> 152 </scroll-view>
145 -  
146 - <view class="footer">  
147 - <view class="view-total">  
148 - <view class="head">合计</view>  
149 - <view class="row">  
150 - <text class="label">总数量</text><text class="value">{{ form.totalQuantity }}</text>  
151 - </view>  
152 - </view>  
153 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
154 - </view> 153 +
155 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 154 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
156 @confirm="onSheetConfirm" /> 155 @confirm="onSheetConfirm" />
157 </view> 156 </view>
@@ -83,13 +83,14 @@ @@ -83,13 +83,14 @@
83 placeholder="请输入装货特别要求/需求" :inputBorder="false" /> 83 placeholder="请输入装货特别要求/需求" :inputBorder="false" />
84 </template> 84 </template>
85 </uni-list-item> 85 </uni-list-item>
  86 + <view class="footer">
  87 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  88 + </view>
86 </view> 89 </view>
87 </uni-list> 90 </uni-list>
88 </scroll-view> 91 </scroll-view>
89 92
90 - <view class="footer">  
91 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
92 - </view> 93 +
93 </view> 94 </view>
94 </template> 95 </template>
95 96
@@ -340,6 +341,7 @@ export default { @@ -340,6 +341,7 @@ export default {
340 padding-bottom: calc(32rpx + env(safe-area-inset-bottom)); 341 padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
341 background: #fff; 342 background: #fff;
342 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06); 343 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
  344 + z-index: 10;
343 345
344 .btn { 346 .btn {
345 height: 80rpx; 347 height: 80rpx;
@@ -51,23 +51,24 @@ @@ -51,23 +51,24 @@
51 <FileUpload v-model="confirmationVoucherFile" /> 51 <FileUpload v-model="confirmationVoucherFile" />
52 </template> 52 </template>
53 </uni-list-item> 53 </uni-list-item>
  54 + <view class="footer">
  55 + <view class="view-total">
  56 + <view class="head">合计</view>
  57 + <view class="row">
  58 + <text class="label">原数量</text><text class="value">{{ form.totalQuantity || '-' }}</text>
  59 + </view>
  60 + <view class="row">
  61 + <text class="label">撤销数量</text><text class="value">{{ form.totalRevokeQuantity || '-' }}</text>
  62 + </view>
  63 + </view>
  64 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  65 + </view>
54 </view> 66 </view>
55 67
56 </uni-list> 68 </uni-list>
57 </scroll-view> 69 </scroll-view>
58 70
59 - <view class="footer">  
60 - <view class="view-total">  
61 - <view class="head">合计</view>  
62 - <view class="row">  
63 - <text class="label">原数量</text><text class="value">{{ form.totalQuantity || '-' }}</text>  
64 - </view>  
65 - <view class="row">  
66 - <text class="label">撤销数量</text><text class="value">{{ form.totalRevokeQuantity || '-' }}</text>  
67 - </view>  
68 - </view>  
69 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
70 - </view> 71 +
71 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 72 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
72 @confirm="onSheetConfirm" /> 73 @confirm="onSheetConfirm" />
73 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 74 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
@@ -50,22 +50,22 @@ @@ -50,22 +50,22 @@
50 <FileUpload v-model="confirmationVoucherFile" /> 50 <FileUpload v-model="confirmationVoucherFile" />
51 </template> 51 </template>
52 </uni-list-item> 52 </uni-list-item>
  53 + <view class="footer">
  54 + <view class="view-total">
  55 + <view class="head">合计</view>
  56 + <view class="row">
  57 + <text class="label">原数量</text><text class="value">{{ form.totalQuantity || '-' }}</text>
  58 + </view>
  59 + <view class="row">
  60 + <text class="label">撤销数量</text><text class="value">{{ form.totalRevokeQuantity || '-' }}</text>
  61 + </view>
  62 + </view>
  63 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  64 + </view>
53 </view> 65 </view>
54 </uni-list> 66 </uni-list>
55 </scroll-view> 67 </scroll-view>
56 68
57 - <view class="footer">  
58 - <view class="view-total">  
59 - <view class="head">合计</view>  
60 - <view class="row">  
61 - <text class="label">原数量</text><text class="value">{{ form.totalQuantity || '-' }}</text>  
62 - </view>  
63 - <view class="row">  
64 - <text class="label">撤销数量</text><text class="value">{{ form.totalRevokeQuantity || '-' }}</text>  
65 - </view>  
66 - </view>  
67 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
68 - </view>  
69 </view> 69 </view>
70 </template> 70 </template>
71 71