Merge branch 'cjerp-contract-1.0' into test_cjerp

gesilong
2 parents 51aa83bb e3fbd569
Showing 6 changed files with 160 additions and 29 deletions
pages/contract_process/add.vue
pages/contract_process/agmtViewer.vue
pages/contract_process/detail.vue
pages/contract_process/modify.vue
pages/contract_process/processStdAgmtViewer.vue
pages/contract_process/uploadStandard.vue
--- a/pages/contract_process/add.vue
View file @03ffa65
+++ b/pages/contract_process/add.vue
View file @03ffa65
@@ -88,10 +88,12 @@
                         <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                
-                <uni-list-item title="目的地">
-                    <template v-slot:footer>
-                        <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
+
+                <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable
+                    @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>目的地</text></view>
+                        <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" />
                     </template>
                 </uni-list-item>
                 <uni-list-item class="select-item" :class="form.includesPackagingFeeName ? 'is-filled' : 'is-empty'" clickable
@@ -228,6 +230,7 @@
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
+import CitySelector from '@/components/city-selector/index.vue'
 import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
@@ -236,7 +239,7 @@ import { getArea } from '@/api/credit_manage.js'
 export default {
     name: 'AddContractProcess',
-    components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
+    components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
         return {
             copyId: '',
@@ -263,6 +266,8 @@ export default {
                 includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
+                destinationId: [],
+                destinationLabel: '',
                 foreignDestination: '',
                 workshopIdName: '',
                 workshopId: '',
@@ -314,6 +319,11 @@ export default {
         this.loadRegionOptions()
         if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
         if (this.copyId) this.loadCopyDetail(this.copyId)
+        this.$nextTick(() => {
+            if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
+                this.initDestinationLabel()
+            }
+        })
     },
     watch: {
         'form.buyer': {
@@ -365,6 +375,8 @@ export default {
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
                 const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+                const destinationId = (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : [])
+                const destinationLabel = (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || m.foreignDestination || '')
                 const code = this.form.code
                 this.form = {
@@ -393,7 +405,9 @@ export default {
                     packagingRequirements: m.packagingRequirements || '',
                     paymentTerms: m.paymentTerms || '',
                     transportMode: m.transportMode || '',
-                    foreignDestination: (m.foreignDestination || ''),
+                    destinationId,
+                    destinationLabel,
+                    foreignDestination: (destinationLabel || m.foreignDestination || ''),
                     specialInstructions: m.specialInstructions || '',
                     remarks: m.remarks || '',
                     pieceWeightHead: m.pieceWeightHead || '',
@@ -410,9 +424,13 @@ export default {
                     deptId: m.deptId || this.form.deptId,
                     code,
                 }
+                await this.$nextTick()
+                if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
+                    await this.initDestinationLabel()
+                    this.form.foreignDestination = this.form.destinationLabel || this.form.foreignDestination || ''
+                }
                 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
-                await this.$nextTick()
                 const comp = this.$refs.productRel
                 if (comp && typeof comp.defaultItem === 'function') {
                     const nextItems = (lines.length ? lines : [{}]).map(x => ({
@@ -432,6 +450,21 @@ export default {
                 uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
             }
         },
+        async initDestinationLabel() {
+            const comp = this.$refs.citySelectorRef
+            if (comp && typeof comp.getLabel === 'function') {
+                const label = await comp.getLabel()
+                this.form.destinationLabel = label || this.form.destinationLabel || ''
+            }
+        },
+        openCitySelector() {
+            this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()
+        },
+        onCityChange(payload) {
+            const label = payload && payload.label != null ? payload.label : ''
+            this.form.destinationLabel = label
+            this.form.foreignDestination = label
+        },
         async loadRegionOptions() {
             try {
                 const res = await getArea()
@@ -653,10 +686,13 @@ export default {
                 return out
             }
             const lines = (this.productLineList || []).map(it => clean(it))
+            const { destinationLabel, destinationId, ...formForSubmit } = this.form
+            const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : ''
             const payload = clean({
-                ...this.form,
+                ...formForSubmit,
                 operateType: isCopy ? 'COPY' : 'ADD',
                 type: 'PROCESS_STD_AGMT',
+                destination,
                 totalQuantity: this.totalQuantity,
                 totalAmountExcludingTax: this.totalAmountExcludingTax,
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
--- a/pages/contract_process/agmtViewer.vue
View file @03ffa65
+++ b/pages/contract_process/agmtViewer.vue
View file @03ffa65
@@ -70,9 +70,11 @@
                         <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="目的地">
-                    <template v-slot:footer>
-                        <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
+                <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable
+                    @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>目的地</text></view>
+                        <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" />
                     </template>
                 </uni-list-item>
@@ -204,6 +206,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import FileUpload from '@/components/file-upload/index.vue'
+import CitySelector from '@/components/city-selector/index.vue'
 import { getContractApi, uploadStandardContract } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
@@ -212,7 +215,7 @@ import { getArea } from '@/api/credit_manage.js'
 export default {
     name: 'AgmtViewer',
-    components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload },
+    components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload, CitySelector },
     props: {
         id: {
             type: [String, Number],
@@ -255,6 +258,8 @@ export default {
                 packagingRequirements: '',
                 paymentTerms: '',
                 transportMode: '',
+                destinationId: [],
+                destinationLabel: '',
                 foreignDestination: '',
                 specialInstructions: '',
                 remarks: '',
@@ -323,6 +328,8 @@ export default {
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
                 const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+                const destinationId = (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : [])
+                const destinationLabel = (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || m.foreignDestination || '')
                 this.form = {
                     ...this.form,
                     id: m.id || '',
@@ -350,7 +357,9 @@ export default {
                     packagingRequirements: m.packagingRequirements || '',
                     paymentTerms: m.paymentTerms || '',
                     transportMode: m.transportMode || '',
-                    foreignDestination: (m.foreignDestination || ''),
+                    destinationId,
+                    destinationLabel,
+                    foreignDestination: (destinationLabel || m.foreignDestination || ''),
                     specialInstructions: m.specialInstructions || '',
                     remarks: m.remarks || '',
                     pieceWeightHead: m.pieceWeightHead || '',
@@ -375,8 +384,28 @@ export default {
                 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
                 this.productLineList = lines
                 this.onProductsChange(lines)
+                await this.$nextTick()
+                if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
+                    await this.initDestinationLabel()
+                    this.form.foreignDestination = this.form.destinationLabel || this.form.foreignDestination || ''
+                }
             } catch (e) { }
         },
+        async initDestinationLabel() {
+            const comp = this.$refs.citySelectorRef
+            if (comp && typeof comp.getLabel === 'function') {
+                const label = await comp.getLabel()
+                this.form.destinationLabel = label || this.form.destinationLabel || ''
+            }
+        },
+        openCitySelector() {
+            this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()
+        },
+        onCityChange(payload) {
+            const label = payload && payload.label != null ? payload.label : ''
+            this.form.destinationLabel = label
+            this.form.foreignDestination = label
+        },
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
             this.newProductLineList = list
--- a/pages/contract_process/detail.vue
View file @03ffa65
+++ b/pages/contract_process/detail.vue
View file @03ffa65
@@ -414,6 +414,7 @@ export default {
                 const data = res && res.data ? res.data : {}
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const destinationLabel = (data.provinceName && data.cityName && data.districtName) ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : (data.destinationLabel || data.foreignDestination || '')
                 this.detail = {
                     ...this.detail,
                     ...data,
@@ -421,7 +422,7 @@ export default {
                     regionName: data.regionName || '',
                     deptName: data.deptName || '',
                     includesPackagingFeeName, includesTransportFeeName,
-                    foreignDestination: (data.foreignDestination || ''),
+                    foreignDestination: destinationLabel,
                 }
                 this.detail = await fillStandardApprovedName(this.detail)
                 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : []
--- a/pages/contract_process/modify.vue
View file @03ffa65
+++ b/pages/contract_process/modify.vue
View file @03ffa65
@@ -70,9 +70,11 @@
                         <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="目的地">
-                    <template v-slot:footer>
-                        <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
+                <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable
+                    @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>目的地</text></view>
+                        <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" />
                     </template>
                 </uni-list-item>
@@ -193,6 +195,7 @@
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
+import CitySelector from '@/components/city-selector/index.vue'
 import { getContractApi, updateContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
@@ -201,7 +204,7 @@ import { getArea } from '@/api/credit_manage.js'
 export default {
     name: 'ModifyContractProcess',
-    components: { SingleSelectSheet, RelateSelectSheet, ProductRel },
+    components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
         return {
             id: '',
@@ -238,6 +241,8 @@ export default {
                 packagingRequirements: '',
                 paymentTerms: '',
                 transportMode: '',
+                destinationId: [],
+                destinationLabel: '',
                 foreignDestination: '',
                 specialInstructions: '',
                 remarks: '',
@@ -293,6 +298,8 @@ export default {
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
                 const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+                const destinationId = (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : [])
+                const destinationLabel = (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || m.foreignDestination || '')
                 this.form = {
                     ...this.form,
                     id: m.id || '',
@@ -320,7 +327,9 @@ export default {
                     packagingRequirements: m.packagingRequirements || '',
                     paymentTerms: m.paymentTerms || '',
                     transportMode: m.transportMode || '',
-                    foreignDestination: (m.foreignDestination || ''),
+                    destinationId,
+                    destinationLabel,
+                    foreignDestination: (destinationLabel || m.foreignDestination || ''),
                     specialInstructions: m.specialInstructions || '',
                     remarks: m.remarks || '',
                     pieceWeightHead: m.pieceWeightHead || '',
@@ -339,8 +348,28 @@ export default {
                 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
                 this.productLineList = lines
                 this.onProductsChange(lines)
+                await this.$nextTick()
+                if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
+                    await this.initDestinationLabel()
+                    this.form.foreignDestination = this.form.destinationLabel || this.form.foreignDestination || ''
+                }
             } catch (e) { }
         },
+        async initDestinationLabel() {
+            const comp = this.$refs.citySelectorRef
+            if (comp && typeof comp.getLabel === 'function') {
+                const label = await comp.getLabel()
+                this.form.destinationLabel = label || this.form.destinationLabel || ''
+            }
+        },
+        openCitySelector() {
+            this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()
+        },
+        onCityChange(payload) {
+            const label = payload && payload.label != null ? payload.label : ''
+            this.form.destinationLabel = label
+            this.form.foreignDestination = label
+        },
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
             this.newProductLineList = list
@@ -504,9 +533,12 @@ export default {
                 return out
             }
             const lines = (this.newProductLineList || []).map(it => clean(it))
+            const { destinationLabel, destinationId, ...formForSubmit } = this.form
+            const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : ''
             const payload = clean({
-                ...this.form,
-                id: this.form.id,
+                ...formForSubmit,
+                destination,
+                id: formForSubmit.id,
                 type: 'PROCESS_STD_AGMT',
                 sumQuantity: this.sumQuantity,
                 sumAmountExcl: this.sumAmountExcl,
--- a/pages/contract_process/processStdAgmtViewer.vue
View file @03ffa65
+++ b/pages/contract_process/processStdAgmtViewer.vue
View file @03ffa65
@@ -150,11 +150,12 @@ export default {
                 const data = res && res.data ? res.data : {}
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const destinationLabel = (data.provinceName && data.cityName && data.districtName) ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : (data.destinationLabel || data.foreignDestination || '')
                 this.detail = {
                     ...this.detail,
                     ...data,
                     includesPackagingFeeName, includesTransportFeeName,
-                    foreignDestination: (data.foreignDestination || ''),
+                    foreignDestination: destinationLabel,
                 }
                 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : []
                 this.productList = lines
--- a/pages/contract_process/uploadStandard.vue
View file @03ffa65
+++ b/pages/contract_process/uploadStandard.vue
View file @03ffa65
@@ -70,9 +70,11 @@
                         <uni-easyinput v-model="form.transportMode" placeholder="请输入运输方式" :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="目的地">
-                    <template v-slot:footer>
-                        <uni-easyinput v-model="form.foreignDestination" placeholder="请输入目的地" :inputBorder="false" />
+                <uni-list-item class="select-item" :class="(Array.isArray(form.destinationId) && form.destinationId.length) ? 'is-filled' : 'is-empty'" clickable
+                    @click="openCitySelector" :rightText="form.destinationLabel || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>目的地</text></view>
+                        <CitySelector ref="citySelectorRef" v-model="form.destinationId" @change="onCityChange" />
                     </template>
                 </uni-list-item>
@@ -205,6 +207,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import FileUpload from '@/components/file-upload/index.vue'
+import CitySelector from '@/components/city-selector/index.vue'
 import { getContractApi, uploadStandardContract } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
@@ -213,7 +216,7 @@ import { getArea } from '@/api/credit_manage.js'
 export default {
     name: 'UploadStandardContractProcess',
-    components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload },
+    components: { SingleSelectSheet, RelateSelectSheet, ProductRel, FileUpload, CitySelector },
     data() {
         return {
             id: '',
@@ -250,6 +253,8 @@ export default {
                 packagingRequirements: '',
                 paymentTerms: '',
                 transportMode: '',
+                destinationId: [],
+                destinationLabel: '',
                 foreignDestination: '',
                 specialInstructions: '',
                 remarks: '',
@@ -308,6 +313,8 @@ export default {
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
                 const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+                const destinationId = (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : [])
+                const destinationLabel = (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || m.foreignDestination || '')
                 this.form = {
                     ...this.form,
                     id: m.id || '',
@@ -335,7 +342,9 @@ export default {
                     packagingRequirements: m.packagingRequirements || '',
                     paymentTerms: m.paymentTerms || '',
                     transportMode: m.transportMode || '',
-                    foreignDestination: (m.foreignDestination || ''),
+                    destinationId,
+                    destinationLabel,
+                    foreignDestination: (destinationLabel || m.foreignDestination || ''),
                     specialInstructions: m.specialInstructions || '',
                     remarks: m.remarks || '',
                     pieceWeightHead: m.pieceWeightHead || '',
@@ -360,8 +369,28 @@ export default {
                 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
                 this.productLineList = lines
                 this.onProductsChange(lines)
+                await this.$nextTick()
+                if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
+                    await this.initDestinationLabel()
+                    this.form.foreignDestination = this.form.destinationLabel || this.form.foreignDestination || ''
+                }
             } catch (e) { }
         },
+        async initDestinationLabel() {
+            const comp = this.$refs.citySelectorRef
+            if (comp && typeof comp.getLabel === 'function') {
+                const label = await comp.getLabel()
+                this.form.destinationLabel = label || this.form.destinationLabel || ''
+            }
+        },
+        openCitySelector() {
+            this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()
+        },
+        onCityChange(payload) {
+            const label = payload && payload.label != null ? payload.label : ''
+            this.form.destinationLabel = label
+            this.form.foreignDestination = label
+        },
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
             this.newProductLineList = list
@@ -545,9 +574,12 @@ export default {
                 return out
             }
             const lines = (this.newProductLineList || []).map(it => clean(it))
+            const { destinationLabel, destinationId, ...formForSubmit } = this.form
+            const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : ''
             const payload = clean({
-                ...this.form,
-                id: this.form.id,
+                ...formForSubmit,
+                destination,
+                id: formForSubmit.id,
                 type: 'PROCESS_STD_AGMT',
                 sumQuantity: this.totalQuantity,
                 sumAmountExcl: this.totalAmountExcludingTax,