朱园亮 / erp-mobile · Commits

Commit 78e15624ce27f15be561d01465c15ea4ba2036bc

Authored by gesilong
1 parent 269e2553

commit：更改目的地字段

Inline Side-by-side
Showing 19 changed files with 125 additions and 473 deletions
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 }}</text></view> 31 }}</text></view>
32 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || 32 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode ||
33 '-'}}</text></view> 33 '-'}}</text></view>
34 - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || '-' 34 + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.foreignDestination || '-'
35 }}</text></view> 35 }}</text></view>
36 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ 36 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{
37 detail.includesPackagingFeeName || '-' }}</text></view> 37 detail.includesPackagingFeeName || '-' }}</text></view>
@@ -114,8 +114,7 @@ export default { @@ -114,8 +114,7 @@ export default {
114 packagingRequirements: '', 114 packagingRequirements: '',
115 paymentTerms: '', 115 paymentTerms: '',
116 transportMode: '', 116 transportMode: '',
117 - destinationId: '',  
118 - destinationLabel: '', 117 + foreignDestination: '',
119 specialInstructions: '', 118 specialInstructions: '',
120 remarks: '', 119 remarks: '',
121 pieceWeightHead: '', 120 pieceWeightHead: '',
@@ -154,8 +153,7 @@ export default { @@ -154,8 +153,7 @@ export default {
154 ...this.detail, 153 ...this.detail,
155 ...data, 154 ...data,
156 includesPackagingFeeName, includesTransportFeeName, 155 includesPackagingFeeName, includesTransportFeeName,
157 - destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',  
158 - destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 156 + foreignDestination: (data.foreignDestination || ''),
159 } 157 }
160 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 158 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
161 this.productList = lines 159 this.productList = lines
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 }}</text></view> 31 }}</text></view>
32 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || 32 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode ||
33 '-'}}</text></view> 33 '-'}}</text></view>
34 - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || '-' 34 + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.foreignDestination || '-'
35 }}</text></view> 35 }}</text></view>
36 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ 36 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{
37 detail.includesPackagingFeeName || '-' }}</text></view> 37 detail.includesPackagingFeeName || '-' }}</text></view>
@@ -114,8 +114,7 @@ export default { @@ -114,8 +114,7 @@ export default {
114 packagingRequirements: '', 114 packagingRequirements: '',
115 paymentTerms: '', 115 paymentTerms: '',
116 transportMode: '', 116 transportMode: '',
117 - destinationId: '',  
118 - destinationLabel: '', 117 + foreignDestination: '',
119 specialInstructions: '', 118 specialInstructions: '',
120 remarks: '', 119 remarks: '',
121 pieceWeightHead: '', 120 pieceWeightHead: '',
@@ -154,8 +153,7 @@ export default { @@ -154,8 +153,7 @@ export default {
154 ...this.detail, 153 ...this.detail,
155 ...data, 154 ...data,
156 includesPackagingFeeName, includesTransportFeeName, 155 includesPackagingFeeName, includesTransportFeeName,
157 - destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',  
158 - destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 156 + foreignDestination: (data.foreignDestination || ''),
159 } 157 }
160 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 158 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
161 this.productList = lines 159 this.productList = lines
@@ -88,11 +88,9 @@ @@ -88,11 +88,9 @@
88 </template> 88 </template>
89 </uni-list-item> 89 </uni-list-item>
90 90
91 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
92 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
93 - <template v-slot:body>  
94 - <view class="item-title"><text>目的地</text></view>  
95 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 91 + <uni-list-item title="目的地">
  92 + <template v-slot:footer>
  93 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
96 </template> 94 </template>
97 </uni-list-item> 95 </uni-list-item>
98 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable 96 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable
@@ -229,7 +227,6 @@ @@ -229,7 +227,6 @@
229 import SingleSelectSheet from '@/components/single-select/index.vue' 227 import SingleSelectSheet from '@/components/single-select/index.vue'
230 import RelateSelectSheet from '@/components/relate-select/index.vue' 228 import RelateSelectSheet from '@/components/relate-select/index.vue'
231 import ProductRel from './productRel.vue' 229 import ProductRel from './productRel.vue'
232 -import CitySelector from '@/components/city-selector/index.vue'  
233 import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract' 230 import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
234 import { getDicByCodes } from '@/utils/dic' 231 import { getDicByCodes } from '@/utils/dic'
235 import { formatCurrencyToChinese } from '@/utils/common' 232 import { formatCurrencyToChinese } from '@/utils/common'
@@ -239,7 +236,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -239,7 +236,7 @@ import { getArea } from '@/api/credit_manage.js'
239 236
240 export default { 237 export default {
241 name: 'AddContractForeignStd', 238 name: 'AddContractForeignStd',
242 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 239 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
243 data() { 240 data() {
244 return { 241 return {
245 copyId: '', 242 copyId: '',
@@ -268,8 +265,7 @@ export default { @@ -268,8 +265,7 @@ export default {
268 includesTransportFeeName: '否', 265 includesTransportFeeName: '否',
269 unit: '美元、公斤、美元/公斤', 266 unit: '美元、公斤、美元/公斤',
270 totalAmountCapital: '', 267 totalAmountCapital: '',
271 - destinationId: [],  
272 - destinationLabel: '', 268 + foreignDestination: '',
273 workshopIdName: '', 269 workshopIdName: '',
274 workshopId: '', 270 workshopId: '',
275 remarks: '', 271 remarks: '',
@@ -315,11 +311,6 @@ export default { @@ -315,11 +311,6 @@ export default {
315 this.loadRegionOptions() 311 this.loadRegionOptions()
316 if (!this.copyId) this.form.orderDate = this.formatDate(new Date()) 312 if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
317 if (this.copyId) this.loadCopyDetail(this.copyId) 313 if (this.copyId) this.loadCopyDetail(this.copyId)
318 - this.$nextTick(() => {  
319 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
320 - this.initDestinationLabel()  
321 - }  
322 - })  
323 }, 314 },
324 watch: { 315 watch: {
325 'form.buyer': { 316 'form.buyer': {
@@ -404,8 +395,7 @@ export default { @@ -404,8 +395,7 @@ export default {
404 packagingRequirements: m.packagingRequirements || '', 395 packagingRequirements: m.packagingRequirements || '',
405 paymentTerms: m.paymentTerms || '', 396 paymentTerms: m.paymentTerms || '',
406 transportMode: m.transportMode || '', 397 transportMode: m.transportMode || '',
407 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
408 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 398 + foreignDestination: (m.foreignDestination || ''),
409 specialInstructions: m.specialInstructions || '', 399 specialInstructions: m.specialInstructions || '',
410 remarks: m.remarks || '', 400 remarks: m.remarks || '',
411 pieceWeightHead: m.pieceWeightHead || '', 401 pieceWeightHead: m.pieceWeightHead || '',
@@ -551,20 +541,6 @@ export default { @@ -551,20 +541,6 @@ export default {
551 const val = m[field] 541 const val = m[field]
552 return val ? String(val) : map[field] 542 return val ? String(val) : map[field]
553 }, 543 },
554 - openCitySelector() {  
555 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
556 - },  
557 - async initDestinationLabel() {  
558 - const comp = this.$refs.citySelectorRef  
559 - if (comp && typeof comp.getLabel === 'function') {  
560 - const label = await comp.getLabel()  
561 - this.form.destinationLabel = label || ''  
562 - }  
563 - },  
564 - onCityChange(payload) {  
565 - const label = payload && payload.label != null ? payload.label : ''  
566 - this.form.destinationLabel = label  
567 - },  
568 async openSheet(field) { 544 async openSheet(field) {
569 const setSheet = (title, options) => { 545 const setSheet = (title, options) => {
570 const current = this.form[field] 546 const current = this.form[field]
@@ -664,13 +640,9 @@ export default { @@ -664,13 +640,9 @@ export default {
664 return out 640 return out
665 } 641 }
666 const lines = (this.productLineList || []).map(it => clean(it)) 642 const lines = (this.productLineList || []).map(it => clean(it))
667 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
668 - // 区id  
669 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
670 const payload = clean({ 643 const payload = clean({
671 - ...formForSubmit, 644 + ...this.form,
672 operateType: isCopy ? 'COPY' : 'ADD', 645 operateType: isCopy ? 'COPY' : 'ADD',
673 - destination,  
674 type: 'INTL_STD_CONTRACT', 646 type: 'INTL_STD_CONTRACT',
675 totalQuantity: this.totalQuantity, 647 totalQuantity: this.totalQuantity,
676 // totalAmountExcludingTax: this.totalAmountExcludingTax, 648 // totalAmountExcludingTax: this.totalAmountExcludingTax,
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 '-' }}</text></view> 38 '-' }}</text></view>
39 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-' 39 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-'
40 }}</text></view> 40 }}</text></view>
41 - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || 41 + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.foreignDestination ||
42 '-' 42 '-'
43 }}</text></view> 43 }}</text></view>
44 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ 44 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{
@@ -167,8 +167,7 @@ export default { @@ -167,8 +167,7 @@ export default {
167 packagingRequirements: '', 167 packagingRequirements: '',
168 paymentTerms: '', 168 paymentTerms: '',
169 transportMode: '', 169 transportMode: '',
170 - destinationId: '',  
171 - destinationLabel: '', 170 + foreignDestination: '',
172 specialInstructions: '', 171 specialInstructions: '',
173 remarks: '', 172 remarks: '',
174 pieceWeightHead: '', 173 pieceWeightHead: '',
@@ -435,8 +434,7 @@ export default { @@ -435,8 +434,7 @@ export default {
435 regionName: data.regionName || '', 434 regionName: data.regionName || '',
436 deptName: data.deptName || '', 435 deptName: data.deptName || '',
437 includesPackagingFeeName, includesTransportFeeName, 436 includesPackagingFeeName, includesTransportFeeName,
438 - destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',  
439 - destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 437 + foreignDestination: (data.foreignDestination || ''),
440 } 438 }
441 this.detail = await fillStandardApprovedName(this.detail) 439 this.detail = await fillStandardApprovedName(this.detail)
442 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 440 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
@@ -90,11 +90,9 @@ @@ -90,11 +90,9 @@
90 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 90 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
94 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
95 - <template v-slot:body>  
96 - <view class="item-title"><text>目的地</text></view>  
97 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 93 + <uni-list-item title="目的地">
  94 + <template v-slot:footer>
  95 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
98 </template> 96 </template>
99 </uni-list-item> 97 </uni-list-item>
100 98
@@ -214,7 +212,6 @@ @@ -214,7 +212,6 @@
214 import SingleSelectSheet from '@/components/single-select/index.vue' 212 import SingleSelectSheet from '@/components/single-select/index.vue'
215 import RelateSelectSheet from '@/components/relate-select/index.vue' 213 import RelateSelectSheet from '@/components/relate-select/index.vue'
216 import ProductRel from './productRel.vue' 214 import ProductRel from './productRel.vue'
217 -import CitySelector from '@/components/city-selector/index.vue'  
218 import { getContractApi, updateContractApi } from '@/api/contract' 215 import { getContractApi, updateContractApi } from '@/api/contract'
219 import { getDicByCodes } from '@/utils/dic' 216 import { getDicByCodes } from '@/utils/dic'
220 import { formatCurrencyToChinese } from '@/utils/common' 217 import { formatCurrencyToChinese } from '@/utils/common'
@@ -222,7 +219,7 @@ import { workshopQueryApi } from '@/api/devManage' @@ -222,7 +219,7 @@ import { workshopQueryApi } from '@/api/devManage'
222 import { getArea } from '@/api/credit_manage.js' 219 import { getArea } from '@/api/credit_manage.js'
223 export default { 220 export default {
224 name: 'ModifyContractForeignStd', 221 name: 'ModifyContractForeignStd',
225 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 222 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
226 data() { 223 data() {
227 return { 224 return {
228 id: '', 225 id: '',
@@ -259,8 +256,7 @@ export default { @@ -259,8 +256,7 @@ export default {
259 packagingRequirements: '', 256 packagingRequirements: '',
260 paymentTerms: '', 257 paymentTerms: '',
261 transportMode: '', 258 transportMode: '',
262 - destinationId: [],  
263 - destinationLabel: '', 259 + foreignDestination: '',
264 specialInstructions: '', 260 specialInstructions: '',
265 remarks: '', 261 remarks: '',
266 pieceWeightHead: '', 262 pieceWeightHead: '',
@@ -293,11 +289,6 @@ export default { @@ -293,11 +289,6 @@ export default {
293 this.loadExtraOptions() 289 this.loadExtraOptions()
294 this.loadRegionOptions() 290 this.loadRegionOptions()
295 this.loadDetail() 291 this.loadDetail()
296 - this.$nextTick(() => {  
297 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
298 - this.initDestinationLabel()  
299 - }  
300 - })  
301 }, 292 },
302 methods: { 293 methods: {
303 async loadRegionOptions() { 294 async loadRegionOptions() {
@@ -344,8 +335,7 @@ export default { @@ -344,8 +335,7 @@ export default {
344 packagingRequirements: m.packagingRequirements || '', 335 packagingRequirements: m.packagingRequirements || '',
345 paymentTerms: m.paymentTerms || '', 336 paymentTerms: m.paymentTerms || '',
346 transportMode: m.transportMode || '', 337 transportMode: m.transportMode || '',
347 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
348 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 338 + foreignDestination: (m.foreignDestination || ''),
349 specialInstructions: m.specialInstructions || '', 339 specialInstructions: m.specialInstructions || '',
350 remarks: m.remarks || '', 340 remarks: m.remarks || '',
351 pieceWeightHead: m.pieceWeightHead || '', 341 pieceWeightHead: m.pieceWeightHead || '',
@@ -366,20 +356,6 @@ export default { @@ -366,20 +356,6 @@ export default {
366 this.onProductsChange(lines) 356 this.onProductsChange(lines)
367 } catch (e) { } 357 } catch (e) { }
368 }, 358 },
369 - async initDestinationLabel() {  
370 - const comp = this.$refs.citySelectorRef  
371 - if (comp && typeof comp.getLabel === 'function') {  
372 - const label = await comp.getLabel()  
373 - this.form.destinationLabel = label || ''  
374 - }  
375 - },  
376 - openCitySelector() {  
377 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
378 - },  
379 - onCityChange(payload) {  
380 - const label = payload && payload.label != null ? payload.label : ''  
381 - this.form.destinationLabel = label  
382 - },  
383 onProductsChange(products) { 359 onProductsChange(products) {
384 const list = Array.isArray(products) ? products : [] 360 const list = Array.isArray(products) ? products : []
385 this.newProductLineList = list 361 this.newProductLineList = list
@@ -528,7 +504,6 @@ export default { @@ -528,7 +504,6 @@ export default {
528 return true 504 return true
529 }, 505 },
530 async onSubmit() { 506 async onSubmit() {
531 - console.log('onSubmit__payload', payload)  
532 if (!this.validateRequired()) return 507 if (!this.validateRequired()) return
533 const confirmRes = await new Promise(resolve => { 508 const confirmRes = await new Promise(resolve => {
534 uni.showModal({ title: '提示', content: '确定保存当前外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 509 uni.showModal({ title: '提示', content: '确定保存当前外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
@@ -546,25 +521,22 @@ export default { @@ -546,25 +521,22 @@ export default {
546 return out 521 return out
547 } 522 }
548 const lines = (this.newProductLineList || []).map(it => clean(it)) 523 const lines = (this.newProductLineList || []).map(it => clean(it))
549 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
550 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
551 - const payload = clean({  
552 - ...formForSubmit,  
553 - id: this.form.id,  
554 - destination,  
555 - type: 'INTL_STD_CONTRACT',  
556 - totalQuantity: this.totalQuantity,  
557 - // totalAmountExcludingTax: this.totalAmountExcludingTax,  
558 - totalAmountIncludingTax: this.totalAmountIncludingTax,  
559 - contractDistributorLineList: lines  
560 - })  
561 - try {  
562 - await updateContractApi(payload)  
563 - uni.showToast({ title: '保存成功', icon: 'none' })  
564 - setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)  
565 - } catch (e) {  
566 - uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })  
567 - } 524 + const payload = clean({
  525 + ...this.form,
  526 + id: this.form.id,
  527 + type: 'INTL_STD_CONTRACT',
  528 + totalQuantity: this.totalQuantity,
  529 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
  530 + totalAmountIncludingTax: this.totalAmountIncludingTax,
  531 + contractDistributorLineList: lines
  532 + })
  533 + try {
  534 + await updateContractApi(payload)
  535 + uni.showToast({ title: '保存成功', icon: 'none' })
  536 + setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
  537 + } catch (e) {
  538 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
  539 + }
568 } 540 }
569 } 541 }
570 } 542 }
@@ -809,4 +781,4 @@ export default { @@ -809,4 +781,4 @@ export default {
809 } 781 }
810 } 782 }
811 783
812 -</style>  
  784 +</style>
@@ -89,12 +89,9 @@ @@ -89,12 +89,9 @@
89 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 89 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
90 </template> 90 </template>
91 </uni-list-item> 91 </uni-list-item>
92 - <uni-list-item class="select-item"  
93 - :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
94 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
95 - <template v-slot:body>  
96 - <view class="item-title"><text>目的地</text></view>  
97 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 92 + <uni-list-item title="目的地">
  93 + <template v-slot:footer>
  94 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
98 </template> 95 </template>
99 </uni-list-item> 96 </uni-list-item>
100 97
@@ -219,7 +216,6 @@ @@ -219,7 +216,6 @@
219 import SingleSelectSheet from '@/components/single-select/index.vue' 216 import SingleSelectSheet from '@/components/single-select/index.vue'
220 import RelateSelectSheet from '@/components/relate-select/index.vue' 217 import RelateSelectSheet from '@/components/relate-select/index.vue'
221 import ProductRel from './productRel.vue' 218 import ProductRel from './productRel.vue'
222 -import CitySelector from '@/components/city-selector/index.vue'  
223 import FileUpload from '@/components/file-upload/index.vue' 219 import FileUpload from '@/components/file-upload/index.vue'
224 import { getContractApi, uploadStandardContract } from '@/api/contract' 220 import { getContractApi, uploadStandardContract } from '@/api/contract'
225 import { getDicByCodes } from '@/utils/dic' 221 import { getDicByCodes } from '@/utils/dic'
@@ -229,7 +225,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -229,7 +225,7 @@ import { getArea } from '@/api/credit_manage.js'
229 225
230 export default { 226 export default {
231 name: 'UploadStandardContractForeignStd', 227 name: 'UploadStandardContractForeignStd',
232 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector, FileUpload }, 228 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload },
233 data() { 229 data() {
234 return { 230 return {
235 id: '', 231 id: '',
@@ -269,8 +265,7 @@ export default { @@ -269,8 +265,7 @@ export default {
269 packagingRequirements: '', 265 packagingRequirements: '',
270 paymentTerms: '', 266 paymentTerms: '',
271 transportMode: '', 267 transportMode: '',
272 - destinationId: [],  
273 - destinationLabel: '', 268 + foreignDestination: '',
274 specialInstructions: '', 269 specialInstructions: '',
275 remarks: '', 270 remarks: '',
276 pieceWeightHead: '', 271 pieceWeightHead: '',
@@ -311,11 +306,6 @@ export default { @@ -311,11 +306,6 @@ export default {
311 this.loadExtraOptions() 306 this.loadExtraOptions()
312 this.loadRegionOptions() 307 this.loadRegionOptions()
313 this.loadDetail() 308 this.loadDetail()
314 - this.$nextTick(() => {  
315 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
316 - this.initDestinationLabel()  
317 - }  
318 - })  
319 }, 309 },
320 methods: { 310 methods: {
321 async loadRegionOptions() { 311 async loadRegionOptions() {
@@ -362,8 +352,7 @@ export default { @@ -362,8 +352,7 @@ export default {
362 packagingRequirements: m.packagingRequirements || '', 352 packagingRequirements: m.packagingRequirements || '',
363 paymentTerms: m.paymentTerms || '', 353 paymentTerms: m.paymentTerms || '',
364 transportMode: m.transportMode || '', 354 transportMode: m.transportMode || '',
365 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
366 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 355 + foreignDestination: (m.foreignDestination || ''),
367 specialInstructions: m.specialInstructions || '', 356 specialInstructions: m.specialInstructions || '',
368 remarks: m.remarks || '', 357 remarks: m.remarks || '',
369 pieceWeightHead: m.pieceWeightHead || '', 358 pieceWeightHead: m.pieceWeightHead || '',
@@ -387,20 +376,6 @@ export default { @@ -387,20 +376,6 @@ export default {
387 this.onProductsChange(lines) 376 this.onProductsChange(lines)
388 } catch (e) { } 377 } catch (e) { }
389 }, 378 },
390 - async initDestinationLabel() {  
391 - const comp = this.$refs.citySelectorRef  
392 - if (comp && typeof comp.getLabel === 'function') {  
393 - const label = await comp.getLabel()  
394 - this.form.destinationLabel = label || ''  
395 - }  
396 - },  
397 - openCitySelector() {  
398 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
399 - },  
400 - onCityChange(payload) {  
401 - const label = payload && payload.label != null ? payload.label : ''  
402 - this.form.destinationLabel = label  
403 - },  
404 onProductsChange(products) { 379 onProductsChange(products) {
405 const list = Array.isArray(products) ? products : [] 380 const list = Array.isArray(products) ? products : []
406 this.newProductLineList = list 381 this.newProductLineList = list
@@ -602,12 +577,9 @@ export default { @@ -602,12 +577,9 @@ export default {
602 return out 577 return out
603 } 578 }
604 const lines = (this.newProductLineList || []).map(it => clean(it)) 579 const lines = (this.newProductLineList || []).map(it => clean(it))
605 - const { destinationLabel, destinationId, ...formForSubmit } = this.form  
606 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : ''  
607 const payload = clean({ 580 const payload = clean({
608 - ...formForSubmit, 581 + ...this.form,
609 id: this.form.id, 582 id: this.form.id,
610 - destination,  
611 type: 'INTL_STD_CONTRACT', 583 type: 'INTL_STD_CONTRACT',
612 totalQuantity: this.totalQuantity, 584 totalQuantity: this.totalQuantity,
613 totalAmountIncludingTax: this.totalAmountIncludingTax, 585 totalAmountIncludingTax: this.totalAmountIncludingTax,
@@ -91,11 +91,9 @@ @@ -91,11 +91,9 @@
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 93
94 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
95 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
96 - <template v-slot:body>  
97 - <view class="item-title"><text>目的地</text></view>  
98 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 94 + <uni-list-item title="目的地">
  95 + <template v-slot:footer>
  96 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
99 </template> 97 </template>
100 </uni-list-item> 98 </uni-list-item>
101 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable 99 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable
@@ -232,7 +230,6 @@ @@ -232,7 +230,6 @@
232 import SingleSelectSheet from '@/components/single-select/index.vue' 230 import SingleSelectSheet from '@/components/single-select/index.vue'
233 import RelateSelectSheet from '@/components/relate-select/index.vue' 231 import RelateSelectSheet from '@/components/relate-select/index.vue'
234 import ProductRel from './productRel.vue' 232 import ProductRel from './productRel.vue'
235 -import CitySelector from '@/components/city-selector/index.vue'  
236 import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements, getCustomerRemarks, getDeptApi, getContractApi } from '@/api/contract' 233 import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements, getCustomerRemarks, getDeptApi, getContractApi } from '@/api/contract'
237 import { getDicByCodes } from '@/utils/dic' 234 import { getDicByCodes } from '@/utils/dic'
238 import { formatCurrencyToChinese } from '@/utils/common' 235 import { formatCurrencyToChinese } from '@/utils/common'
@@ -241,7 +238,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -241,7 +238,7 @@ import { getArea } from '@/api/credit_manage.js'
241 238
242 export default { 239 export default {
243 name: 'AddContractForeignStock', 240 name: 'AddContractForeignStock',
244 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 241 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
245 data() { 242 data() {
246 return { 243 return {
247 copyId: '', 244 copyId: '',
@@ -268,8 +265,7 @@ export default { @@ -268,8 +265,7 @@ export default {
268 includesTransportFeeName: '否', 265 includesTransportFeeName: '否',
269 unit: '美元、公斤、美元/公斤', 266 unit: '美元、公斤、美元/公斤',
270 totalAmountCapital: '', 267 totalAmountCapital: '',
271 - destinationId: [],  
272 - destinationLabel: '', 268 + foreignDestination: '',
273 workshopIdName: '', 269 workshopIdName: '',
274 workshopId: '', 270 workshopId: '',
275 deptName: '', 271 deptName: '',
@@ -317,11 +313,6 @@ export default { @@ -317,11 +313,6 @@ export default {
317 this.loadRegionOptions() 313 this.loadRegionOptions()
318 if (!this.copyId) this.form.orderDate = this.formatDate(new Date()) 314 if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
319 if (this.copyId) this.loadCopyDetail(this.copyId) 315 if (this.copyId) this.loadCopyDetail(this.copyId)
320 - this.$nextTick(() => {  
321 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
322 - this.initDestinationLabel()  
323 - }  
324 - })  
325 }, 316 },
326 watch: { 317 watch: {
327 'form.buyer': { 318 'form.buyer': {
@@ -406,8 +397,7 @@ export default { @@ -406,8 +397,7 @@ export default {
406 packagingRequirements: m.packagingRequirements || '', 397 packagingRequirements: m.packagingRequirements || '',
407 paymentTerms: m.paymentTerms || '', 398 paymentTerms: m.paymentTerms || '',
408 transportMode: m.transportMode || '', 399 transportMode: m.transportMode || '',
409 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
410 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 400 + foreignDestination: (m.foreignDestination || ''),
411 specialInstructions: m.specialInstructions || '', 401 specialInstructions: m.specialInstructions || '',
412 remarks: m.remarks || '', 402 remarks: m.remarks || '',
413 packaging: m.packaging || '', 403 packaging: m.packaging || '',
@@ -554,20 +544,6 @@ export default { @@ -554,20 +544,6 @@ export default {
554 const val = m[field] 544 const val = m[field]
555 return val ? String(val) : map[field] 545 return val ? String(val) : map[field]
556 }, 546 },
557 - openCitySelector() {  
558 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
559 - },  
560 - async initDestinationLabel() {  
561 - const comp = this.$refs.citySelectorRef  
562 - if (comp && typeof comp.getLabel === 'function') {  
563 - const label = await comp.getLabel()  
564 - this.form.destinationLabel = label || ''  
565 - }  
566 - },  
567 - onCityChange(payload) {  
568 - const label = payload && payload.label != null ? payload.label : ''  
569 - this.form.destinationLabel = label  
570 - },  
571 async openSheet(field) { 547 async openSheet(field) {
572 const setSheet = (title, options) => { 548 const setSheet = (title, options) => {
573 const current = this.form[field] 549 const current = this.form[field]
@@ -667,13 +643,9 @@ export default { @@ -667,13 +643,9 @@ export default {
667 return out 643 return out
668 } 644 }
669 const lines = (this.productLineList || []).map(it => clean(it)) 645 const lines = (this.productLineList || []).map(it => clean(it))
670 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
671 - // 区id  
672 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
673 const payload = clean({ 646 const payload = clean({
674 - ...formForSubmit, 647 + ...this.form,
675 operateType: isCopy ? 'COPY' : 'ADD', 648 operateType: isCopy ? 'COPY' : 'ADD',
676 - destination,  
677 type: 'INTL_INVENTORY_AGMT', 649 type: 'INTL_INVENTORY_AGMT',
678 totalQuantity: this.totalQuantity, 650 totalQuantity: this.totalQuantity,
679 // totalAmountExcludingTax: this.totalAmountExcludingTax, 651 // totalAmountExcludingTax: this.totalAmountExcludingTax,
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 '-' }}</text></view> 50 '-' }}</text></view>
51 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-' 51 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-'
52 }}</text></view> 52 }}</text></view>
53 - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || 53 + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.foreignDestination ||
54 '-' 54 '-'
55 }}</text></view> 55 }}</text></view>
56 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ 56 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{
@@ -188,8 +188,7 @@ export default { @@ -188,8 +188,7 @@ export default {
188 packagingRequirements: '', 188 packagingRequirements: '',
189 paymentTerms: '', 189 paymentTerms: '',
190 transportMode: '', 190 transportMode: '',
191 - destinationId: '',  
192 - destinationLabel: '', 191 + foreignDestination: '',
193 specialInstructions: '', 192 specialInstructions: '',
194 remarks: '', 193 remarks: '',
195 pieceWeightHead: '', 194 pieceWeightHead: '',
@@ -523,8 +522,7 @@ export default { @@ -523,8 +522,7 @@ export default {
523 regionName: data.regionName || '', 522 regionName: data.regionName || '',
524 deptName: data.deptName || '', 523 deptName: data.deptName || '',
525 includesPackagingFeeName, includesTransportFeeName, 524 includesPackagingFeeName, includesTransportFeeName,
526 - destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',  
527 - destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 525 + foreignDestination: (data.foreignDestination || ''),
528 } 526 }
529 this.detail = await fillStandardApprovedName(this.detail) 527 this.detail = await fillStandardApprovedName(this.detail)
530 this.detail = await fillFormalApprovedName(this.detail) 528 this.detail = await fillFormalApprovedName(this.detail)
@@ -94,11 +94,9 @@ @@ -94,11 +94,9 @@
94 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 94 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
95 </template> 95 </template>
96 </uni-list-item> 96 </uni-list-item>
97 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
98 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
99 - <template v-slot:body>  
100 - <view class="item-title"><text>目的地</text></view>  
101 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 97 + <uni-list-item title="目的地">
  98 + <template v-slot:footer>
  99 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
102 </template> 100 </template>
103 </uni-list-item> 101 </uni-list-item>
104 102
@@ -218,7 +216,6 @@ @@ -218,7 +216,6 @@
218 import SingleSelectSheet from '@/components/single-select/index.vue' 216 import SingleSelectSheet from '@/components/single-select/index.vue'
219 import RelateSelectSheet from '@/components/relate-select/index.vue' 217 import RelateSelectSheet from '@/components/relate-select/index.vue'
220 import ProductRel from './productRel.vue' 218 import ProductRel from './productRel.vue'
221 -import CitySelector from '@/components/city-selector/index.vue'  
222 import { getContractApi, updateContractApi } from '@/api/contract' 219 import { getContractApi, updateContractApi } from '@/api/contract'
223 import { getDicByCodes } from '@/utils/dic' 220 import { getDicByCodes } from '@/utils/dic'
224 import { formatCurrencyToChinese } from '@/utils/common' 221 import { formatCurrencyToChinese } from '@/utils/common'
@@ -227,7 +224,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -227,7 +224,7 @@ import { getArea } from '@/api/credit_manage.js'
227 224
228 export default { 225 export default {
229 name: 'ModifyContractForeignStock', 226 name: 'ModifyContractForeignStock',
230 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 227 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
231 data() { 228 data() {
232 return { 229 return {
233 id: '', 230 id: '',
@@ -264,8 +261,7 @@ export default { @@ -264,8 +261,7 @@ export default {
264 packagingRequirements: '', 261 packagingRequirements: '',
265 paymentTerms: '', 262 paymentTerms: '',
266 transportMode: '', 263 transportMode: '',
267 - destinationId: [],  
268 - destinationLabel: '', 264 + foreignDestination: '',
269 specialInstructions: '', 265 specialInstructions: '',
270 remarks: '', 266 remarks: '',
271 pieceWeightHead: '', 267 pieceWeightHead: '',
@@ -298,11 +294,6 @@ export default { @@ -298,11 +294,6 @@ export default {
298 this.loadExtraOptions() 294 this.loadExtraOptions()
299 this.loadRegionOptions() 295 this.loadRegionOptions()
300 this.loadDetail() 296 this.loadDetail()
301 - this.$nextTick(() => {  
302 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
303 - this.initDestinationLabel()  
304 - }  
305 - })  
306 }, 297 },
307 methods: { 298 methods: {
308 async loadRegionOptions() { 299 async loadRegionOptions() {
@@ -349,8 +340,7 @@ export default { @@ -349,8 +340,7 @@ export default {
349 packagingRequirements: m.packagingRequirements || '', 340 packagingRequirements: m.packagingRequirements || '',
350 paymentTerms: m.paymentTerms || '', 341 paymentTerms: m.paymentTerms || '',
351 transportMode: m.transportMode || '', 342 transportMode: m.transportMode || '',
352 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
353 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 343 + foreignDestination: (m.foreignDestination || ''),
354 specialInstructions: m.specialInstructions || '', 344 specialInstructions: m.specialInstructions || '',
355 remarks: m.remarks || '', 345 remarks: m.remarks || '',
356 pieceWeightHead: m.pieceWeightHead || '', 346 pieceWeightHead: m.pieceWeightHead || '',
@@ -371,20 +361,6 @@ export default { @@ -371,20 +361,6 @@ export default {
371 this.onProductsChange(lines) 361 this.onProductsChange(lines)
372 } catch (e) { } 362 } catch (e) { }
373 }, 363 },
374 - async initDestinationLabel() {  
375 - const comp = this.$refs.citySelectorRef  
376 - if (comp && typeof comp.getLabel === 'function') {  
377 - const label = await comp.getLabel()  
378 - this.form.destinationLabel = label || ''  
379 - }  
380 - },  
381 - openCitySelector() {  
382 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
383 - },  
384 - onCityChange(payload) {  
385 - const label = payload && payload.label != null ? payload.label : ''  
386 - this.form.destinationLabel = label  
387 - },  
388 onProductsChange(products) { 364 onProductsChange(products) {
389 const list = Array.isArray(products) ? products : [] 365 const list = Array.isArray(products) ? products : []
390 this.newProductLineList = list 366 this.newProductLineList = list
@@ -531,7 +507,6 @@ export default { @@ -531,7 +507,6 @@ export default {
531 return true 507 return true
532 }, 508 },
533 async onSubmit() { 509 async onSubmit() {
534 - console.log('onSubmit__payload', payload)  
535 if (!this.validateRequired()) return 510 if (!this.validateRequired()) return
536 const confirmRes = await new Promise(resolve => { 511 const confirmRes = await new Promise(resolve => {
537 uni.showModal({ title: '提示', content: '确定保存当前外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 512 uni.showModal({ title: '提示', content: '确定保存当前外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
@@ -549,12 +524,9 @@ export default { @@ -549,12 +524,9 @@ export default {
549 return out 524 return out
550 } 525 }
551 const lines = (this.newProductLineList || []).map(it => clean(it)) 526 const lines = (this.newProductLineList || []).map(it => clean(it))
552 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
553 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
554 const payload = clean({ 527 const payload = clean({
555 - ...formForSubmit, 528 + ...this.form,
556 id: this.form.id, 529 id: this.form.id,
557 - destination,  
558 type: 'INTL_INVENTORY_AGMT', 530 type: 'INTL_INVENTORY_AGMT',
559 totalQuantity: this.totalQuantity, 531 totalQuantity: this.totalQuantity,
560 // totalAmountExcludingTax: this.totalAmountExcludingTax, 532 // totalAmountExcludingTax: this.totalAmountExcludingTax,
@@ -812,4 +784,4 @@ export default { @@ -812,4 +784,4 @@ export default {
812 } 784 }
813 } 785 }
814 786
815 -</style>  
  787 +</style>
@@ -92,11 +92,9 @@ @@ -92,11 +92,9 @@
92 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 92 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
93 </template> 93 </template>
94 </uni-list-item> 94 </uni-list-item>
95 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
96 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
97 - <template v-slot:body>  
98 - <view class="item-title"><text>目的地</text></view>  
99 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 95 + <uni-list-item title="目的地">
  96 + <template v-slot:footer>
  97 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
100 </template> 98 </template>
101 </uni-list-item> 99 </uni-list-item>
102 100
@@ -217,7 +215,6 @@ @@ -217,7 +215,6 @@
217 import SingleSelectSheet from '@/components/single-select/index.vue' 215 import SingleSelectSheet from '@/components/single-select/index.vue'
218 import RelateSelectSheet from '@/components/relate-select/index.vue' 216 import RelateSelectSheet from '@/components/relate-select/index.vue'
219 import ProductRel from './productRel.vue' 217 import ProductRel from './productRel.vue'
220 -import CitySelector from '@/components/city-selector/index.vue'  
221 import FileUpload from '@/components/file-upload/index.vue' 218 import FileUpload from '@/components/file-upload/index.vue'
222 import { getContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile } from '@/api/contract' 219 import { getContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile } from '@/api/contract'
223 import { getDicByCodes } from '@/utils/dic' 220 import { getDicByCodes } from '@/utils/dic'
@@ -227,7 +224,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -227,7 +224,7 @@ import { getArea } from '@/api/credit_manage.js'
227 224
228 export default { 225 export default {
229 name: 'UploadContractForeignStock', 226 name: 'UploadContractForeignStock',
230 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector, FileUpload }, 227 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload },
231 data() { 228 data() {
232 return { 229 return {
233 id: '', 230 id: '',
@@ -268,8 +265,7 @@ export default { @@ -268,8 +265,7 @@ export default {
268 packagingRequirements: '', 265 packagingRequirements: '',
269 paymentTerms: '', 266 paymentTerms: '',
270 transportMode: '', 267 transportMode: '',
271 - destinationId: [],  
272 - destinationLabel: '', 268 + foreignDestination: '',
273 specialInstructions: '', 269 specialInstructions: '',
274 remarks: '', 270 remarks: '',
275 pieceWeightHead: '', 271 pieceWeightHead: '',
@@ -302,11 +298,6 @@ export default { @@ -302,11 +298,6 @@ export default {
302 this.loadExtraOptions() 298 this.loadExtraOptions()
303 this.loadRegionOptions() 299 this.loadRegionOptions()
304 this.loadDetail() 300 this.loadDetail()
305 - this.$nextTick(() => {  
306 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
307 - this.initDestinationLabel()  
308 - }  
309 - })  
310 }, 301 },
311 methods: { 302 methods: {
312 async loadRegionOptions() { 303 async loadRegionOptions() {
@@ -353,8 +344,7 @@ export default { @@ -353,8 +344,7 @@ export default {
353 packagingRequirements: m.packagingRequirements || '', 344 packagingRequirements: m.packagingRequirements || '',
354 paymentTerms: m.paymentTerms || '', 345 paymentTerms: m.paymentTerms || '',
355 transportMode: m.transportMode || '', 346 transportMode: m.transportMode || '',
356 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
357 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 347 + foreignDestination: (m.foreignDestination || ''),
358 specialInstructions: m.specialInstructions || '', 348 specialInstructions: m.specialInstructions || '',
359 remarks: m.remarks || '', 349 remarks: m.remarks || '',
360 pieceWeightHead: m.pieceWeightHead || '', 350 pieceWeightHead: m.pieceWeightHead || '',
@@ -383,20 +373,6 @@ export default { @@ -383,20 +373,6 @@ export default {
383 this.onProductsChange(lines) 373 this.onProductsChange(lines)
384 } catch (e) { } 374 } catch (e) { }
385 }, 375 },
386 - async initDestinationLabel() {  
387 - const comp = this.$refs.citySelectorRef  
388 - if (comp && typeof comp.getLabel === 'function') {  
389 - const label = await comp.getLabel()  
390 - this.form.destinationLabel = label || ''  
391 - }  
392 - },  
393 - openCitySelector() {  
394 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
395 - },  
396 - onCityChange(payload) {  
397 - const label = payload && payload.label != null ? payload.label : ''  
398 - this.form.destinationLabel = label  
399 - },  
400 onProductsChange(products) { 376 onProductsChange(products) {
401 const list = Array.isArray(products) ? products : [] 377 const list = Array.isArray(products) ? products : []
402 this.newProductLineList = list 378 this.newProductLineList = list
@@ -571,13 +547,9 @@ export default { @@ -571,13 +547,9 @@ export default {
571 return out 547 return out
572 } 548 }
573 const lines = (this.newProductLineList || []).map(it => clean(it)) 549 const lines = (this.newProductLineList || []).map(it => clean(it))
574 - const { destinationLabel, destinationId, ...formForSubmit } = this.form  
575 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : ''  
576 -  
577 const payload = clean({ 550 const payload = clean({
578 - ...formForSubmit, 551 + ...this.form,
579 id: this.form.id, 552 id: this.form.id,
580 - destination,  
581 type: 'INTL_INVENTORY_AGMT', 553 type: 'INTL_INVENTORY_AGMT',
582 totalQuantity: this.totalQuantity, 554 totalQuantity: this.totalQuantity,
583 totalAmountIncludingTax: this.totalAmountIncludingTax, 555 totalAmountIncludingTax: this.totalAmountIncludingTax,
@@ -89,11 +89,9 @@ @@ -89,11 +89,9 @@
89 </template> 89 </template>
90 </uni-list-item> 90 </uni-list-item>
91 91
92 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
93 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
94 - <template v-slot:body>  
95 - <view class="item-title"><text>目的地</text></view>  
96 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 92 + <uni-list-item title="目的地">
  93 + <template v-slot:footer>
  94 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
97 </template> 95 </template>
98 </uni-list-item> 96 </uni-list-item>
99 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable 97 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable
@@ -230,7 +228,6 @@ @@ -230,7 +228,6 @@
230 import SingleSelectSheet from '@/components/single-select/index.vue' 228 import SingleSelectSheet from '@/components/single-select/index.vue'
231 import RelateSelectSheet from '@/components/relate-select/index.vue' 229 import RelateSelectSheet from '@/components/relate-select/index.vue'
232 import ProductRel from './productRel.vue' 230 import ProductRel from './productRel.vue'
233 -import CitySelector from '@/components/city-selector/index.vue'  
234 import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract' 231 import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
235 import { getDicByCodes } from '@/utils/dic' 232 import { getDicByCodes } from '@/utils/dic'
236 import { formatCurrencyToChinese } from '@/utils/common' 233 import { formatCurrencyToChinese } from '@/utils/common'
@@ -239,7 +236,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -239,7 +236,7 @@ import { getArea } from '@/api/credit_manage.js'
239 236
240 export default { 237 export default {
241 name: 'AddContractForeignUnplan', 238 name: 'AddContractForeignUnplan',
242 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 239 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
243 data() { 240 data() {
244 return { 241 return {
245 copyId: '', 242 copyId: '',
@@ -266,8 +263,7 @@ export default { @@ -266,8 +263,7 @@ export default {
266 includesTransportFeeName: '否', 263 includesTransportFeeName: '否',
267 unit: '美元、公斤、美元/公斤', 264 unit: '美元、公斤、美元/公斤',
268 totalAmountCapital: '', 265 totalAmountCapital: '',
269 - destinationId: [],  
270 - destinationLabel: '', 266 + foreignDestination: '',
271 workshopIdName: '', 267 workshopIdName: '',
272 workshopId: '', 268 workshopId: '',
273 deptName: '', 269 deptName: '',
@@ -315,11 +311,6 @@ export default { @@ -315,11 +311,6 @@ export default {
315 this.loadRegionOptions() 311 this.loadRegionOptions()
316 if (!this.copyId) this.form.orderDate = this.formatDate(new Date()) 312 if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
317 if (this.copyId) this.loadCopyDetail(this.copyId) 313 if (this.copyId) this.loadCopyDetail(this.copyId)
318 - this.$nextTick(() => {  
319 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
320 - this.initDestinationLabel()  
321 - }  
322 - })  
323 }, 314 },
324 watch: { 315 watch: {
325 'form.buyer': { 316 'form.buyer': {
@@ -403,8 +394,7 @@ export default { @@ -403,8 +394,7 @@ export default {
403 packagingRequirements: m.packagingRequirements || '', 394 packagingRequirements: m.packagingRequirements || '',
404 paymentTerms: m.paymentTerms || '', 395 paymentTerms: m.paymentTerms || '',
405 transportMode: m.transportMode || '', 396 transportMode: m.transportMode || '',
406 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
407 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 397 + foreignDestination: (m.foreignDestination || ''),
408 specialInstructions: m.specialInstructions || '', 398 specialInstructions: m.specialInstructions || '',
409 remarks: m.remarks || '', 399 remarks: m.remarks || '',
410 pieceWeightHead: m.pieceWeightHead || '', 400 pieceWeightHead: m.pieceWeightHead || '',
@@ -552,20 +542,6 @@ export default { @@ -552,20 +542,6 @@ export default {
552 const val = m[field] 542 const val = m[field]
553 return val ? String(val) : map[field] 543 return val ? String(val) : map[field]
554 }, 544 },
555 - openCitySelector() {  
556 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
557 - },  
558 - async initDestinationLabel() {  
559 - const comp = this.$refs.citySelectorRef  
560 - if (comp && typeof comp.getLabel === 'function') {  
561 - const label = await comp.getLabel()  
562 - this.form.destinationLabel = label || ''  
563 - }  
564 - },  
565 - onCityChange(payload) {  
566 - const label = payload && payload.label != null ? payload.label : ''  
567 - this.form.destinationLabel = label  
568 - },  
569 async openSheet(field) { 545 async openSheet(field) {
570 const setSheet = (title, options) => { 546 const setSheet = (title, options) => {
571 const current = this.form[field] 547 const current = this.form[field]
@@ -666,13 +642,9 @@ export default { @@ -666,13 +642,9 @@ export default {
666 return out 642 return out
667 } 643 }
668 const lines = (this.productLineList || []).map(it => clean(it)) 644 const lines = (this.productLineList || []).map(it => clean(it))
669 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
670 - // 区id  
671 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
672 const payload = clean({ 645 const payload = clean({
673 - ...formForSubmit, 646 + ...this.form,
674 operateType: isCopy ? 'COPY' : 'ADD', 647 operateType: isCopy ? 'COPY' : 'ADD',
675 - destination,  
676 type: 'INTL_OPEN_SPEC_AGMT', 648 type: 'INTL_OPEN_SPEC_AGMT',
677 totalQuantity: this.totalQuantity, 649 totalQuantity: this.totalQuantity,
678 // totalAmountExcludingTax: this.totalAmountExcludingTax, 650 // totalAmountExcludingTax: this.totalAmountExcludingTax,
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 '-' }}</text></view> 50 '-' }}</text></view>
51 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-' 51 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-'
52 }}</text></view> 52 }}</text></view>
53 - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || 53 + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.foreignDestination ||
54 '-' 54 '-'
55 }}</text></view> 55 }}</text></view>
56 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ 56 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{
@@ -187,8 +187,7 @@ export default { @@ -187,8 +187,7 @@ export default {
187 packagingRequirements: '', 187 packagingRequirements: '',
188 paymentTerms: '', 188 paymentTerms: '',
189 transportMode: '', 189 transportMode: '',
190 - destinationId: '',  
191 - destinationLabel: '', 190 + foreignDestination: '',
192 specialInstructions: '', 191 specialInstructions: '',
193 remarks: '', 192 remarks: '',
194 pieceWeightHead: '', 193 pieceWeightHead: '',
@@ -536,8 +535,7 @@ export default { @@ -536,8 +535,7 @@ export default {
536 regionName: data.regionName || '', 535 regionName: data.regionName || '',
537 deptName: data.deptName || '', 536 deptName: data.deptName || '',
538 includesPackagingFeeName, includesTransportFeeName, 537 includesPackagingFeeName, includesTransportFeeName,
539 - destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',  
540 - destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 538 + foreignDestination: (data.foreignDestination || ''),
541 } 539 }
542 this.detail = await fillStandardApprovedName(this.detail) 540 this.detail = await fillStandardApprovedName(this.detail)
543 this.detail = await fillFormalApprovedName(this.detail) 541 this.detail = await fillFormalApprovedName(this.detail)
@@ -93,11 +93,9 @@ @@ -93,11 +93,9 @@
93 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 93 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
94 </template> 94 </template>
95 </uni-list-item> 95 </uni-list-item>
96 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
97 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
98 - <template v-slot:body>  
99 - <view class="item-title"><text>目的地</text></view>  
100 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 96 + <uni-list-item title="目的地">
  97 + <template v-slot:footer>
  98 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
101 </template> 99 </template>
102 </uni-list-item> 100 </uni-list-item>
103 101
@@ -217,7 +215,6 @@ @@ -217,7 +215,6 @@
217 import SingleSelectSheet from '@/components/single-select/index.vue' 215 import SingleSelectSheet from '@/components/single-select/index.vue'
218 import RelateSelectSheet from '@/components/relate-select/index.vue' 216 import RelateSelectSheet from '@/components/relate-select/index.vue'
219 import ProductRel from './productRel.vue' 217 import ProductRel from './productRel.vue'
220 -import CitySelector from '@/components/city-selector/index.vue'  
221 import { getContractApi, updateContractApi } from '@/api/contract' 218 import { getContractApi, updateContractApi } from '@/api/contract'
222 import { getDicByCodes } from '@/utils/dic' 219 import { getDicByCodes } from '@/utils/dic'
223 import { formatCurrencyToChinese } from '@/utils/common' 220 import { formatCurrencyToChinese } from '@/utils/common'
@@ -226,7 +223,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -226,7 +223,7 @@ import { getArea } from '@/api/credit_manage.js'
226 223
227 export default { 224 export default {
228 name: 'ModifyContractForeignUnplan', 225 name: 'ModifyContractForeignUnplan',
229 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 226 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
230 data() { 227 data() {
231 return { 228 return {
232 id: '', 229 id: '',
@@ -263,8 +260,7 @@ export default { @@ -263,8 +260,7 @@ export default {
263 packagingRequirements: '', 260 packagingRequirements: '',
264 paymentTerms: '', 261 paymentTerms: '',
265 transportMode: '', 262 transportMode: '',
266 - destinationId: [],  
267 - destinationLabel: '', 263 + foreignDestination: '',
268 specialInstructions: '', 264 specialInstructions: '',
269 remarks: '', 265 remarks: '',
270 pieceWeightHead: '', 266 pieceWeightHead: '',
@@ -297,11 +293,6 @@ export default { @@ -297,11 +293,6 @@ export default {
297 this.loadExtraOptions() 293 this.loadExtraOptions()
298 this.loadRegionOptions() 294 this.loadRegionOptions()
299 this.loadDetail() 295 this.loadDetail()
300 - this.$nextTick(() => {  
301 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
302 - this.initDestinationLabel()  
303 - }  
304 - })  
305 }, 296 },
306 methods: { 297 methods: {
307 async loadRegionOptions() { 298 async loadRegionOptions() {
@@ -348,8 +339,7 @@ export default { @@ -348,8 +339,7 @@ export default {
348 packagingRequirements: m.packagingRequirements || '', 339 packagingRequirements: m.packagingRequirements || '',
349 paymentTerms: m.paymentTerms || '', 340 paymentTerms: m.paymentTerms || '',
350 transportMode: m.transportMode || '', 341 transportMode: m.transportMode || '',
351 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
352 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 342 + foreignDestination: (m.foreignDestination || ''),
353 specialInstructions: m.specialInstructions || '', 343 specialInstructions: m.specialInstructions || '',
354 remarks: m.remarks || '', 344 remarks: m.remarks || '',
355 pieceWeightHead: m.pieceWeightHead || '', 345 pieceWeightHead: m.pieceWeightHead || '',
@@ -370,20 +360,6 @@ export default { @@ -370,20 +360,6 @@ export default {
370 this.onProductsChange(lines) 360 this.onProductsChange(lines)
371 } catch (e) { } 361 } catch (e) { }
372 }, 362 },
373 - async initDestinationLabel() {  
374 - const comp = this.$refs.citySelectorRef  
375 - if (comp && typeof comp.getLabel === 'function') {  
376 - const label = await comp.getLabel()  
377 - this.form.destinationLabel = label || ''  
378 - }  
379 - },  
380 - openCitySelector() {  
381 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
382 - },  
383 - onCityChange(payload) {  
384 - const label = payload && payload.label != null ? payload.label : ''  
385 - this.form.destinationLabel = label  
386 - },  
387 onProductsChange(products) { 363 onProductsChange(products) {
388 const list = Array.isArray(products) ? products : [] 364 const list = Array.isArray(products) ? products : []
389 this.newProductLineList = list 365 this.newProductLineList = list
@@ -548,12 +524,9 @@ export default { @@ -548,12 +524,9 @@ export default {
548 return out 524 return out
549 } 525 }
550 const lines = (this.newProductLineList || []).map(it => clean(it)) 526 const lines = (this.newProductLineList || []).map(it => clean(it))
551 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
552 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
553 const payload = clean({ 527 const payload = clean({
554 - ...formForSubmit, 528 + ...this.form,
555 id: this.form.id, 529 id: this.form.id,
556 - destination,  
557 type: 'INTL_OPEN_SPEC_AGMT', 530 type: 'INTL_OPEN_SPEC_AGMT',
558 totalQuantity: this.totalQuantity, 531 totalQuantity: this.totalQuantity,
559 // totalAmountExcludingTax: this.totalAmountExcludingTax, 532 // totalAmountExcludingTax: this.totalAmountExcludingTax,
@@ -811,4 +784,4 @@ export default { @@ -811,4 +784,4 @@ export default {
811 } 784 }
812 } 785 }
813 786
814 -</style>  
  787 +</style>
@@ -92,12 +92,9 @@ @@ -92,12 +92,9 @@
92 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 92 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
93 </template> 93 </template>
94 </uni-list-item> 94 </uni-list-item>
95 - <uni-list-item class="select-item"  
96 - :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
97 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
98 - <template v-slot:body>  
99 - <view class="item-title"><text>目的地</text></view>  
100 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 95 + <uni-list-item title="目的地">
  96 + <template v-slot:footer>
  97 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
101 </template> 98 </template>
102 </uni-list-item> 99 </uni-list-item>
103 100
@@ -218,7 +215,6 @@ @@ -218,7 +215,6 @@
218 import SingleSelectSheet from '@/components/single-select/index.vue' 215 import SingleSelectSheet from '@/components/single-select/index.vue'
219 import RelateSelectSheet from '@/components/relate-select/index.vue' 216 import RelateSelectSheet from '@/components/relate-select/index.vue'
220 import ProductRel from './productRel.vue' 217 import ProductRel from './productRel.vue'
221 -import CitySelector from '@/components/city-selector/index.vue'  
222 import FileUpload from '@/components/file-upload/index.vue' 218 import FileUpload from '@/components/file-upload/index.vue'
223 import { getContractApi, uploadStandardContract } from '@/api/contract' 219 import { getContractApi, uploadStandardContract } from '@/api/contract'
224 import { getDicByCodes } from '@/utils/dic' 220 import { getDicByCodes } from '@/utils/dic'
@@ -228,7 +224,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -228,7 +224,7 @@ import { getArea } from '@/api/credit_manage.js'
228 224
229 export default { 225 export default {
230 name: 'UploadContractForeignUnplan', 226 name: 'UploadContractForeignUnplan',
231 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector, FileUpload }, 227 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload },
232 data() { 228 data() {
233 return { 229 return {
234 id: '', 230 id: '',
@@ -269,8 +265,7 @@ export default { @@ -269,8 +265,7 @@ export default {
269 packagingRequirements: '', 265 packagingRequirements: '',
270 paymentTerms: '', 266 paymentTerms: '',
271 transportMode: '', 267 transportMode: '',
272 - destinationId: [],  
273 - destinationLabel: '', 268 + foreignDestination: '',
274 specialInstructions: '', 269 specialInstructions: '',
275 remarks: '', 270 remarks: '',
276 pieceWeightHead: '', 271 pieceWeightHead: '',
@@ -303,11 +298,6 @@ export default { @@ -303,11 +298,6 @@ export default {
303 this.loadExtraOptions() 298 this.loadExtraOptions()
304 this.loadRegionOptions() 299 this.loadRegionOptions()
305 this.loadDetail() 300 this.loadDetail()
306 - this.$nextTick(() => {  
307 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
308 - this.initDestinationLabel()  
309 - }  
310 - })  
311 }, 301 },
312 methods: { 302 methods: {
313 async loadRegionOptions() { 303 async loadRegionOptions() {
@@ -354,8 +344,7 @@ export default { @@ -354,8 +344,7 @@ export default {
354 packagingRequirements: m.packagingRequirements || '', 344 packagingRequirements: m.packagingRequirements || '',
355 paymentTerms: m.paymentTerms || '', 345 paymentTerms: m.paymentTerms || '',
356 transportMode: m.transportMode || '', 346 transportMode: m.transportMode || '',
357 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
358 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 347 + foreignDestination: (m.foreignDestination || ''),
359 specialInstructions: m.specialInstructions || '', 348 specialInstructions: m.specialInstructions || '',
360 remarks: m.remarks || '', 349 remarks: m.remarks || '',
361 pieceWeightHead: m.pieceWeightHead || '', 350 pieceWeightHead: m.pieceWeightHead || '',
@@ -379,20 +368,6 @@ export default { @@ -379,20 +368,6 @@ export default {
379 this.onProductsChange(lines) 368 this.onProductsChange(lines)
380 } catch (e) { } 369 } catch (e) { }
381 }, 370 },
382 - async initDestinationLabel() {  
383 - const comp = this.$refs.citySelectorRef  
384 - if (comp && typeof comp.getLabel === 'function') {  
385 - const label = await comp.getLabel()  
386 - this.form.destinationLabel = label || ''  
387 - }  
388 - },  
389 - openCitySelector() {  
390 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
391 - },  
392 - onCityChange(payload) {  
393 - const label = payload && payload.label != null ? payload.label : ''  
394 - this.form.destinationLabel = label  
395 - },  
396 onProductsChange(products) { 371 onProductsChange(products) {
397 const list = Array.isArray(products) ? products : [] 372 const list = Array.isArray(products) ? products : []
398 this.newProductLineList = list 373 this.newProductLineList = list
@@ -562,12 +537,9 @@ export default { @@ -562,12 +537,9 @@ export default {
562 return out 537 return out
563 } 538 }
564 const lines = (this.newProductLineList || []).map(it => clean(it)) 539 const lines = (this.newProductLineList || []).map(it => clean(it))
565 - const { destinationLabel, destinationId, ...formForSubmit } = this.form  
566 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : ''  
567 const payload = clean({ 540 const payload = clean({
568 - ...formForSubmit, 541 + ...this.form,
569 id: this.form.id, 542 id: this.form.id,
570 - destination,  
571 type: 'INTL_OPEN_SPEC_AGMT', 543 type: 'INTL_OPEN_SPEC_AGMT',
572 totalQuantity: this.totalQuantity, 544 totalQuantity: this.totalQuantity,
573 totalAmountIncludingTax: this.totalAmountIncludingTax, 545 totalAmountIncludingTax: this.totalAmountIncludingTax,
@@ -89,11 +89,9 @@ @@ -89,11 +89,9 @@
89 </template> 89 </template>
90 </uni-list-item> 90 </uni-list-item>
91 91
92 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
93 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
94 - <template v-slot:body>  
95 - <view class="item-title"><text>目的地</text></view>  
96 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 92 + <uni-list-item title="目的地">
  93 + <template v-slot:footer>
  94 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
97 </template> 95 </template>
98 </uni-list-item> 96 </uni-list-item>
99 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable 97 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable
@@ -230,7 +228,6 @@ @@ -230,7 +228,6 @@
230 import SingleSelectSheet from '@/components/single-select/index.vue' 228 import SingleSelectSheet from '@/components/single-select/index.vue'
231 import RelateSelectSheet from '@/components/relate-select/index.vue' 229 import RelateSelectSheet from '@/components/relate-select/index.vue'
232 import ProductRel from './productRel.vue' 230 import ProductRel from './productRel.vue'
233 -import CitySelector from '@/components/city-selector/index.vue'  
234 import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract' 231 import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
235 import { getDicByCodes } from '@/utils/dic' 232 import { getDicByCodes } from '@/utils/dic'
236 import { formatCurrencyToChinese } from '@/utils/common' 233 import { formatCurrencyToChinese } from '@/utils/common'
@@ -239,7 +236,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -239,7 +236,7 @@ import { getArea } from '@/api/credit_manage.js'
239 236
240 export default { 237 export default {
241 name: 'AddContractProcess', 238 name: 'AddContractProcess',
242 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 239 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
243 data() { 240 data() {
244 return { 241 return {
245 copyId: '', 242 copyId: '',
@@ -266,8 +263,7 @@ export default { @@ -266,8 +263,7 @@ export default {
266 includesTransportFeeName: '否', 263 includesTransportFeeName: '否',
267 unit: '元、公斤、元/公斤', 264 unit: '元、公斤、元/公斤',
268 totalAmountCapital: '', 265 totalAmountCapital: '',
269 - destinationId: [],  
270 - destinationLabel: '', 266 + foreignDestination: '',
271 workshopIdName: '', 267 workshopIdName: '',
272 workshopId: '', 268 workshopId: '',
273 deptName: '', 269 deptName: '',
@@ -318,11 +314,6 @@ export default { @@ -318,11 +314,6 @@ export default {
318 this.loadRegionOptions() 314 this.loadRegionOptions()
319 if (!this.copyId) this.form.orderDate = this.formatDate(new Date()) 315 if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
320 if (this.copyId) this.loadCopyDetail(this.copyId) 316 if (this.copyId) this.loadCopyDetail(this.copyId)
321 - this.$nextTick(() => {  
322 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
323 - this.initDestinationLabel()  
324 - }  
325 - })  
326 }, 317 },
327 watch: { 318 watch: {
328 'form.buyer': { 319 'form.buyer': {
@@ -402,8 +393,7 @@ export default { @@ -402,8 +393,7 @@ export default {
402 packagingRequirements: m.packagingRequirements || '', 393 packagingRequirements: m.packagingRequirements || '',
403 paymentTerms: m.paymentTerms || '', 394 paymentTerms: m.paymentTerms || '',
404 transportMode: m.transportMode || '', 395 transportMode: m.transportMode || '',
405 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
406 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 396 + foreignDestination: (m.foreignDestination || ''),
407 specialInstructions: m.specialInstructions || '', 397 specialInstructions: m.specialInstructions || '',
408 remarks: m.remarks || '', 398 remarks: m.remarks || '',
409 pieceWeightHead: m.pieceWeightHead || '', 399 pieceWeightHead: m.pieceWeightHead || '',
@@ -564,20 +554,6 @@ export default { @@ -564,20 +554,6 @@ export default {
564 const val = m[field] 554 const val = m[field]
565 return val ? String(val) : map[field] 555 return val ? String(val) : map[field]
566 }, 556 },
567 - openCitySelector() {  
568 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
569 - },  
570 - async initDestinationLabel() {  
571 - const comp = this.$refs.citySelectorRef  
572 - if (comp && typeof comp.getLabel === 'function') {  
573 - const label = await comp.getLabel()  
574 - this.form.destinationLabel = label || ''  
575 - }  
576 - },  
577 - onCityChange(payload) {  
578 - const label = payload && payload.label != null ? payload.label : ''  
579 - this.form.destinationLabel = label  
580 - },  
581 async openSheet(field) { 557 async openSheet(field) {
582 const setSheet = (title, options) => { 558 const setSheet = (title, options) => {
583 const current = this.form[field] 559 const current = this.form[field]
@@ -677,13 +653,9 @@ export default { @@ -677,13 +653,9 @@ export default {
677 return out 653 return out
678 } 654 }
679 const lines = (this.productLineList || []).map(it => clean(it)) 655 const lines = (this.productLineList || []).map(it => clean(it))
680 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
681 - // 区id  
682 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
683 const payload = clean({ 656 const payload = clean({
684 - ...formForSubmit, 657 + ...this.form,
685 operateType: isCopy ? 'COPY' : 'ADD', 658 operateType: isCopy ? 'COPY' : 'ADD',
686 - destination,  
687 type: 'PROCESS_STD_AGMT', 659 type: 'PROCESS_STD_AGMT',
688 totalQuantity: this.totalQuantity, 660 totalQuantity: this.totalQuantity,
689 totalAmountExcludingTax: this.totalAmountExcludingTax, 661 totalAmountExcludingTax: this.totalAmountExcludingTax,
@@ -38,7 +38,7 @@ statusStyl<template> @@ -38,7 +38,7 @@ statusStyl<template>
38 '-' }}</text></view> 38 '-' }}</text></view>
39 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-' 39 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-'
40 }}</text></view> 40 }}</text></view>
41 - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || '-' 41 + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.foreignDestination || '-'
42 }}</text></view> 42 }}</text></view>
43 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ 43 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{
44 detail.includesPackagingFeeName || '-' }}</text></view> 44 detail.includesPackagingFeeName || '-' }}</text></view>
@@ -164,8 +164,7 @@ export default { @@ -164,8 +164,7 @@ export default {
164 packagingRequirements: '', 164 packagingRequirements: '',
165 paymentTerms: '', 165 paymentTerms: '',
166 transportMode: '', 166 transportMode: '',
167 - destinationId: '',  
168 - destinationLabel: '', 167 + foreignDestination: '',
169 specialInstructions: '', 168 specialInstructions: '',
170 remarks: '', 169 remarks: '',
171 pieceWeightHead: '', 170 pieceWeightHead: '',
@@ -422,8 +421,7 @@ export default { @@ -422,8 +421,7 @@ export default {
422 regionName: data.regionName || '', 421 regionName: data.regionName || '',
423 deptName: data.deptName || '', 422 deptName: data.deptName || '',
424 includesPackagingFeeName, includesTransportFeeName, 423 includesPackagingFeeName, includesTransportFeeName,
425 - destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',  
426 - destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 424 + foreignDestination: (data.foreignDestination || ''),
427 } 425 }
428 this.detail = await fillStandardApprovedName(this.detail) 426 this.detail = await fillStandardApprovedName(this.detail)
429 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : [] 427 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : []
@@ -70,11 +70,9 @@ @@ -70,11 +70,9 @@
70 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 70 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
74 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
75 - <template v-slot:body>  
76 - <view class="item-title"><text>目的地</text></view>  
77 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 73 + <uni-list-item title="目的地">
  74 + <template v-slot:footer>
  75 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
78 </template> 76 </template>
79 </uni-list-item> 77 </uni-list-item>
80 78
@@ -195,7 +193,6 @@ @@ -195,7 +193,6 @@
195 import SingleSelectSheet from '@/components/single-select/index.vue' 193 import SingleSelectSheet from '@/components/single-select/index.vue'
196 import RelateSelectSheet from '@/components/relate-select/index.vue' 194 import RelateSelectSheet from '@/components/relate-select/index.vue'
197 import ProductRel from './productRel.vue' 195 import ProductRel from './productRel.vue'
198 -import CitySelector from '@/components/city-selector/index.vue'  
199 import { getContractApi, updateContractApi } from '@/api/contract' 196 import { getContractApi, updateContractApi } from '@/api/contract'
200 import { getDicByCodes } from '@/utils/dic' 197 import { getDicByCodes } from '@/utils/dic'
201 import { formatCurrencyToChinese } from '@/utils/common' 198 import { formatCurrencyToChinese } from '@/utils/common'
@@ -204,7 +201,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -204,7 +201,7 @@ import { getArea } from '@/api/credit_manage.js'
204 201
205 export default { 202 export default {
206 name: 'ModifyContractProcess', 203 name: 'ModifyContractProcess',
207 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 204 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
208 data() { 205 data() {
209 return { 206 return {
210 id: '', 207 id: '',
@@ -241,8 +238,7 @@ export default { @@ -241,8 +238,7 @@ export default {
241 packagingRequirements: '', 238 packagingRequirements: '',
242 paymentTerms: '', 239 paymentTerms: '',
243 transportMode: '', 240 transportMode: '',
244 - destinationId: [],  
245 - destinationLabel: '', 241 + foreignDestination: '',
246 specialInstructions: '', 242 specialInstructions: '',
247 remarks: '', 243 remarks: '',
248 pieceWeightHead: '', 244 pieceWeightHead: '',
@@ -278,11 +274,6 @@ export default { @@ -278,11 +274,6 @@ export default {
278 this.loadExtraOptions() 274 this.loadExtraOptions()
279 this.loadRegionOptions() 275 this.loadRegionOptions()
280 this.loadDetail() 276 this.loadDetail()
281 - this.$nextTick(() => {  
282 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
283 - this.initDestinationLabel()  
284 - }  
285 - })  
286 }, 277 },
287 methods: { 278 methods: {
288 async loadRegionOptions() { 279 async loadRegionOptions() {
@@ -329,8 +320,7 @@ export default { @@ -329,8 +320,7 @@ export default {
329 packagingRequirements: m.packagingRequirements || '', 320 packagingRequirements: m.packagingRequirements || '',
330 paymentTerms: m.paymentTerms || '', 321 paymentTerms: m.paymentTerms || '',
331 transportMode: m.transportMode || '', 322 transportMode: m.transportMode || '',
332 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
333 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 323 + foreignDestination: (m.foreignDestination || ''),
334 specialInstructions: m.specialInstructions || '', 324 specialInstructions: m.specialInstructions || '',
335 remarks: m.remarks || '', 325 remarks: m.remarks || '',
336 pieceWeightHead: m.pieceWeightHead || '', 326 pieceWeightHead: m.pieceWeightHead || '',
@@ -351,20 +341,6 @@ export default { @@ -351,20 +341,6 @@ export default {
351 this.onProductsChange(lines) 341 this.onProductsChange(lines)
352 } catch (e) { } 342 } catch (e) { }
353 }, 343 },
354 - async initDestinationLabel() {  
355 - const comp = this.$refs.citySelectorRef  
356 - if (comp && typeof comp.getLabel === 'function') {  
357 - const label = await comp.getLabel()  
358 - this.form.destinationLabel = label || ''  
359 - }  
360 - },  
361 - openCitySelector() {  
362 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
363 - },  
364 - onCityChange(payload) {  
365 - const label = payload && payload.label != null ? payload.label : ''  
366 - this.form.destinationLabel = label  
367 - },  
368 onProductsChange(products) { 344 onProductsChange(products) {
369 const list = Array.isArray(products) ? products : [] 345 const list = Array.isArray(products) ? products : []
370 this.newProductLineList = list 346 this.newProductLineList = list
@@ -511,7 +487,6 @@ export default { @@ -511,7 +487,6 @@ export default {
511 return true 487 return true
512 }, 488 },
513 async onSubmit() { 489 async onSubmit() {
514 - console.log('onSubmit__payload', payload)  
515 if (!this.validateRequired()) return 490 if (!this.validateRequired()) return
516 const confirmRes = await new Promise(resolve => { 491 const confirmRes = await new Promise(resolve => {
517 uni.showModal({ title: '提示', content: '确定保存当前加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 492 uni.showModal({ title: '提示', content: '确定保存当前加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
@@ -529,12 +504,9 @@ export default { @@ -529,12 +504,9 @@ export default {
529 return out 504 return out
530 } 505 }
531 const lines = (this.newProductLineList || []).map(it => clean(it)) 506 const lines = (this.newProductLineList || []).map(it => clean(it))
532 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
533 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
534 const payload = clean({ 507 const payload = clean({
535 - ...formForSubmit, 508 + ...this.form,
536 id: this.form.id, 509 id: this.form.id,
537 - destination,  
538 type: 'PROCESS_STD_AGMT', 510 type: 'PROCESS_STD_AGMT',
539 sumQuantity: this.sumQuantity, 511 sumQuantity: this.sumQuantity,
540 sumAmountExcl: this.sumAmountExcl, 512 sumAmountExcl: this.sumAmountExcl,
@@ -792,4 +764,4 @@ export default { @@ -792,4 +764,4 @@ export default {
792 } 764 }
793 } 765 }
794 766
795 -</style>  
  767 +</style>
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 '-' }}</text></view> 29 '-' }}</text></view>
30 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-' 30 <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-'
31 }}</text></view> 31 }}</text></view>
32 - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || '-' 32 + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.foreignDestination || '-'
33 }}</text></view> 33 }}</text></view>
34 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ 34 <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{
35 detail.includesPackagingFeeName || '-' }}</text></view> 35 detail.includesPackagingFeeName || '-' }}</text></view>
@@ -120,8 +120,7 @@ export default { @@ -120,8 +120,7 @@ export default {
120 packagingRequirements: '', 120 packagingRequirements: '',
121 paymentTerms: '', 121 paymentTerms: '',
122 transportMode: '', 122 transportMode: '',
123 - destinationId: '',  
124 - destinationLabel: '', 123 + foreignDestination: '',
125 specialInstructions: '', 124 specialInstructions: '',
126 remarks: '', 125 remarks: '',
127 pieceWeightHead: '', 126 pieceWeightHead: '',
@@ -155,8 +154,7 @@ export default { @@ -155,8 +154,7 @@ export default {
155 ...this.detail, 154 ...this.detail,
156 ...data, 155 ...data,
157 includesPackagingFeeName, includesTransportFeeName, 156 includesPackagingFeeName, includesTransportFeeName,
158 - destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',  
159 - destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 157 + foreignDestination: (data.foreignDestination || ''),
160 } 158 }
161 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : [] 159 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : []
162 this.productList = lines 160 this.productList = lines
@@ -280,4 +278,4 @@ export default { @@ -280,4 +278,4 @@ export default {
280 color: rgba(0, 0, 0, 0.6); 278 color: rgba(0, 0, 0, 0.6);
281 font-size: 32rpx; 279 font-size: 32rpx;
282 } 280 }
283 -</style>  
  281 +</style>
@@ -70,11 +70,9 @@ @@ -70,11 +70,9 @@
70 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" /> 70 <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable  
74 - @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>  
75 - <template v-slot:body>  
76 - <view class="item-title"><text>目的地</text></view>  
77 - <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" /> 73 + <uni-list-item title="目的地">
  74 + <template v-slot:footer>
  75 + <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
78 </template> 76 </template>
79 </uni-list-item> 77 </uni-list-item>
80 78
@@ -206,7 +204,6 @@ @@ -206,7 +204,6 @@
206 import SingleSelectSheet from '@/components/single-select/index.vue' 204 import SingleSelectSheet from '@/components/single-select/index.vue'
207 import RelateSelectSheet from '@/components/relate-select/index.vue' 205 import RelateSelectSheet from '@/components/relate-select/index.vue'
208 import ProductRel from './productRel.vue' 206 import ProductRel from './productRel.vue'
209 -import CitySelector from '@/components/city-selector/index.vue'  
210 import FileUpload from '@/components/file-upload/index.vue' 207 import FileUpload from '@/components/file-upload/index.vue'
211 import { getContractApi, uploadStandardContract } from '@/api/contract' 208 import { getContractApi, uploadStandardContract } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 209 import { getDicByCodes } from '@/utils/dic'
@@ -216,7 +213,7 @@ import { getArea } from '@/api/credit_manage.js' @@ -216,7 +213,7 @@ import { getArea } from '@/api/credit_manage.js'
216 213
217 export default { 214 export default {
218 name: 'UploadStandardContractProcess', 215 name: 'UploadStandardContractProcess',
219 - components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector, FileUpload }, 216 + components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload },
220 data() { 217 data() {
221 return { 218 return {
222 id: '', 219 id: '',
@@ -253,8 +250,7 @@ export default { @@ -253,8 +250,7 @@ export default {
253 packagingRequirements: '', 250 packagingRequirements: '',
254 paymentTerms: '', 251 paymentTerms: '',
255 transportMode: '', 252 transportMode: '',
256 - destinationId: [],  
257 - destinationLabel: '', 253 + foreignDestination: '',
258 specialInstructions: '', 254 specialInstructions: '',
259 remarks: '', 255 remarks: '',
260 pieceWeightHead: '', 256 pieceWeightHead: '',
@@ -293,11 +289,6 @@ export default { @@ -293,11 +289,6 @@ export default {
293 this.loadExtraOptions() 289 this.loadExtraOptions()
294 this.loadRegionOptions() 290 this.loadRegionOptions()
295 this.loadDetail() 291 this.loadDetail()
296 - this.$nextTick(() => {  
297 - if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {  
298 - this.initDestinationLabel()  
299 - }  
300 - })  
301 }, 292 },
302 methods: { 293 methods: {
303 async loadRegionOptions() { 294 async loadRegionOptions() {
@@ -344,8 +335,7 @@ export default { @@ -344,8 +335,7 @@ export default {
344 packagingRequirements: m.packagingRequirements || '', 335 packagingRequirements: m.packagingRequirements || '',
345 paymentTerms: m.paymentTerms || '', 336 paymentTerms: m.paymentTerms || '',
346 transportMode: m.transportMode || '', 337 transportMode: m.transportMode || '',
347 - destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),  
348 - destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''), 338 + foreignDestination: (m.foreignDestination || ''),
349 specialInstructions: m.specialInstructions || '', 339 specialInstructions: m.specialInstructions || '',
350 remarks: m.remarks || '', 340 remarks: m.remarks || '',
351 pieceWeightHead: m.pieceWeightHead || '', 341 pieceWeightHead: m.pieceWeightHead || '',
@@ -372,20 +362,6 @@ export default { @@ -372,20 +362,6 @@ export default {
372 this.onProductsChange(lines) 362 this.onProductsChange(lines)
373 } catch (e) { } 363 } catch (e) { }
374 }, 364 },
375 - async initDestinationLabel() {  
376 - const comp = this.$refs.citySelectorRef  
377 - if (comp && typeof comp.getLabel === 'function') {  
378 - const label = await comp.getLabel()  
379 - this.form.destinationLabel = label || ''  
380 - }  
381 - },  
382 - openCitySelector() {  
383 - this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()  
384 - },  
385 - onCityChange(payload) {  
386 - const label = payload && payload.label != null ? payload.label : ''  
387 - this.form.destinationLabel = label  
388 - },  
389 onProductsChange(products) { 365 onProductsChange(products) {
390 const list = Array.isArray(products) ? products : [] 366 const list = Array.isArray(products) ? products : []
391 this.newProductLineList = list 367 this.newProductLineList = list
@@ -569,12 +545,9 @@ export default { @@ -569,12 +545,9 @@ export default {
569 return out 545 return out
570 } 546 }
571 const lines = (this.newProductLineList || []).map(it => clean(it)) 547 const lines = (this.newProductLineList || []).map(it => clean(it))
572 - const { destinationLabel, destinationId, ...formForSubmit } = this.form;  
573 - const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';  
574 const payload = clean({ 548 const payload = clean({
575 - ...formForSubmit, 549 + ...this.form,
576 id: this.form.id, 550 id: this.form.id,
577 - destination,  
578 type: 'PROCESS_STD_AGMT', 551 type: 'PROCESS_STD_AGMT',
579 sumQuantity: this.totalQuantity, 552 sumQuantity: this.totalQuantity,
580 sumAmountExcl: this.totalAmountExcludingTax, 553 sumAmountExcl: this.totalAmountExcludingTax,