Merge branch 'cjerp-2.0' into test_cjerp

gesilong
2 parents a07513c5 a9831143
Showing 8 changed files with 415 additions and 52 deletions
api/procure-manage/domesticCustomerCredit.js
pages/domestic_trade/add.vue
pages/domestic_trade/detail.vue
pages/domestic_trade/domesticCreditViewer.vue
pages/domestic_trade/modify.vue
pages/foreign_trade/add.vue
pages/foreign_trade/modify.vue
pages/index.vue
--- a/api/procure-manage/domesticCustomerCredit.js
View file @61fa90f
+++ b/api/procure-manage/domesticCustomerCredit.js
View file @61fa90f
@@ -48,3 +48,16 @@ export function getPurchaseDeptApi() {
     method: 'get'
   })
 }
+export function getRegionApi() {
+  return request({
+    url: '/system/dept/getRegion',
+    method: 'get'
+  })
+}
+export function getAllRegionApi(purchaseDepartment) {
+  return request({
+    url: '/system/dept/getAllRegion',
+    method: 'get',
+     params: { purchaseDepartment }
+  })
+}
--- a/pages/domestic_trade/add.vue
View file @61fa90f
+++ b/pages/domestic_trade/add.vue
View file @61fa90f
@@ -299,9 +299,17 @@
 					</template>
 				</uni-list-item>
-				<uni-list-item title="采购处">
-					<template v-slot:footer>
-						<uni-easyinput v-model="form.purchaseDepartmentName" disabled placeholder="" :inputBorder="false" />
+				<uni-list-item class="select-item" :class="form.purchaseDepartment ? 'is-filled' : 'is-empty'" clickable
+					@click="openSheet('purchaseDepartment')" :rightText="displayLabel('purchaseDepartmentName')" showArrow>
+					<template v-slot:body>
+						<view class="item-title"><text>采购处</text></view>
+					</template>
+				</uni-list-item>
+
+				<uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+					@click="openSheet('region')" :rightText="displayLabel('region')" showArrow>
+					<template v-slot:body>
+						<view class="item-title"><text>区域</text></view>
 					</template>
 				</uni-list-item>
@@ -343,7 +351,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import MultiSelectSheet from '@/components/multi-select/index.vue'
 import { getDicByCodes, getDicName } from '@/utils/dic.js'
-import { domesticCustomerCreditSaveApi, getPurchaseDeptApi } from '@/api/procure-manage/domesticCustomerCredit.js'
+import { domesticCustomerCreditSaveApi, getPurchaseDeptApi, getAllRegionApi, getRegionApi } from '@/api/procure-manage/domesticCustomerCredit.js'
 export default {
 	name: 'DomesticTradeAdd',
@@ -369,6 +377,8 @@ export default {
 			operationMethodOptions: [],
 			developNewOptions: [],
 			purchaseSourceOptions: [],
+			regionOptions: [],
+			purchaseDeptOptions: [],
 			form: {
 				unitName: '',
 				customerShortName: '',
@@ -419,16 +429,14 @@ export default {
 				investigatorName: '',
 				purchaseDepartment: '',
 				purchaseDepartmentName: '',
+				region: '',
+				regionName: '',
 				reviewValidUntil: ''
 			}
 		}
 	},
 	created() {
-		this.loadDicData()
-		this.loadPurchaseDeptOptions()
-		const u = (this.$store && this.$store.state && this.$store.state.user) ? this.$store.state.user : {}
-		this.form.investigatorId = u && u.id ? String(u.id) : ''
-		this.form.investigatorName = u && u.name ? String(u.name) : ''
+		this.initPage()
 	},
 	computed: {
 		showCompanyNatureOther() {
@@ -437,6 +445,14 @@ export default {
 		}
 	},
 	methods: {
+		async initPage() {
+			const u = (this.$store && this.$store.state && this.$store.state.user) ? this.$store.state.user : {}
+			this.form.investigatorId = u && u.id ? String(u.id) : ''
+			this.form.investigatorName = u && u.name ? String(u.name) : ''
+			await this.loadDicData()
+			await this.loadPurchaseDeptList()
+			await this.loadRegionOptions()
+		},
 		async loadDicData() {
 			try {
 				const results = await getDicByCodes(['COMPANY_NATURE', 'DEVELOP_NEW', 'OPERATION_METHOD', 'PURCHASE_SOURCE'])
@@ -447,6 +463,7 @@ export default {
 					PURCHASE_SOURCE: (results.PURCHASE_SOURCE && results.PURCHASE_SOURCE.data) || []
 				}
 				this.dicOptions = next
+				console.log(next,'next')
 				this.companyNatureOptions = this.dicToSheetOptions(next.COMPANY_NATURE)
 				this.developNewOptions = this.dicToSheetOptions(next.DEVELOP_NEW)
 				this.operationMethodOptions = this.dicToSheetOptions(next.OPERATION_METHOD)
@@ -461,20 +478,102 @@ export default {
 				uni.showToast({ title: '字典加载失败', icon: 'none' })
 			}
 		},
-		async loadPurchaseDeptOptions() {
+		dicToSheetOptions(items) {
+			const list = Array.isArray(items) ? items : []
+			return list.map(it => ({ label: it && it.name != null ? String(it.name) : '', value: it && it.code != null ? String(it.code) : '' })).filter(it => it.value)
+		},
+		async loadPurchaseDeptList() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const data = (res && res.data) ? res.data : {}
-				this.form.purchaseDepartment = data && data.id != null ? String(data.id) : ''
-				this.form.purchaseDepartmentName = data && data.name != null ? String(data.name) : ''
+				const raw = res && res.data != null ? res.data : []
+				this.purchaseDeptOptions = this.normalizeRegionOptions(raw)
 			} catch (e) {
-				this.form.purchaseDepartment = ''
-				this.form.purchaseDepartmentName = ''
+				this.purchaseDeptOptions = []
 			}
 		},
-		dicToSheetOptions(items) {
-			const list = Array.isArray(items) ? items : []
-			return list.map(it => ({ label: it && it.name != null ? String(it.name) : '', value: it && it.code != null ? String(it.code) : '' })).filter(it => it.value)
+		normalizeRegionOptions(raw) {
+			const list = Array.isArray(raw)
+				? raw
+				: (Array.isArray(raw && raw.data) ? raw.data : (Array.isArray(raw && raw.rows) ? raw.rows : []))
+			return list.map(it => {
+				const id = it && (it.id != null ? it.id : (it.value != null ? it.value : (it.regionId != null ? it.regionId : '')))
+				const name = it && (it.name != null ? it.name : (it.label != null ? it.label : (it.regionName != null ? it.regionName : '')))
+				return { label: name != null ? String(name) : '', value: id != null ? String(id) : '' }
+			}).filter(it => it.value)
+		},
+		getOptionLabel(options, value) {
+			const v = value != null ? String(value) : ''
+			if (!v) return ''
+			const match = (options || []).find(o => String(o.value) === v)
+			return match ? String(match.label || '') : ''
+		},
+		syncRegionWithOptions() {
+			const label = this.getOptionLabel(this.regionOptions, this.form.region)
+			if (!label) {
+				this.form.region = ''
+				this.form.regionName = ''
+				return
+			}
+			this.form.regionName = label
+		},
+		async loadRegionOptions() {
+			let defaultRegionId = ''
+			let defaultRegionName = ''
+			try {
+				const regionRes = await getRegionApi()
+				const regionData = (regionRes && regionRes.data != null) ? regionRes.data : null
+				const parsed = regionData ? this.parseRegionIdAndName(regionData) : { id: '', name: '' }
+				if (parsed.id) {
+					defaultRegionId = parsed.id
+					defaultRegionName = parsed.name
+				}
+			} catch (e) {
+				// fall through to getAllRegionApi
+			}
+			const purchaseDepartment = this.form.purchaseDepartment ? String(this.form.purchaseDepartment) : ''
+			if (!purchaseDepartment) {
+				if (defaultRegionId) {
+					this.regionOptions = [{ label: defaultRegionName || String(defaultRegionId), value: defaultRegionId }]
+					this.form.region = defaultRegionId
+					this.form.regionName = defaultRegionName || String(defaultRegionId)
+				} else {
+					this.regionOptions = []
+					this.form.region = ''
+					this.form.regionName = ''
+				}
+				return
+			}
+			try {
+				const res = await getAllRegionApi(purchaseDepartment)
+				const raw = res && res.data != null ? res.data : []
+				this.regionOptions = this.normalizeRegionOptions(raw)
+				if (defaultRegionId) {
+					const label = this.getOptionLabel(this.regionOptions, defaultRegionId)
+					if (label) {
+						this.form.region = defaultRegionId
+						this.form.regionName = label
+					} else {
+						// 默认区域不在完整列表中，仍保留为选中项
+						this.regionOptions.push({ label: defaultRegionName || String(defaultRegionId), value: defaultRegionId })
+						this.form.region = defaultRegionId
+						this.form.regionName = defaultRegionName || String(defaultRegionId)
+					}
+				} else {
+					this.syncRegionWithOptions()
+				}
+			} catch (e) {
+				this.regionOptions = []
+				this.form.region = ''
+				this.form.regionName = ''
+			}
+		},
+		parseRegionIdAndName(raw) {
+			if (!raw) return { id: '', name: '' }
+			if (Array.isArray(raw)) return this.parseRegionIdAndName(raw[0])
+			if (typeof raw === 'string' || typeof raw === 'number') return { id: String(raw), name: '' }
+			const id = raw.id != null ? raw.id : (raw.value != null ? raw.value : (raw.regionId != null ? raw.regionId : ''))
+			const name = raw.name != null ? raw.name : (raw.label != null ? raw.label : (raw.regionName != null ? raw.regionName : ''))
+			return { id: id != null ? String(id) : '', name: name != null ? String(name) : '' }
 		},
 		labelsOfOptions(options, csv) {
 			const v = csv == null ? '' : String(csv)
@@ -491,7 +590,9 @@ export default {
 		displayLabel(field) {
 			const m = this.form || {}
 			const map = {
+				purchaseDepartmentName: '请选择采购处',
 				companyNatureName: '请选择公司性质',
+				region: '请选择区域',
 				purchaseSource: '请选择',
 				operationMode: '请选择',
 				isNewDevelopment: '请选择',
@@ -520,6 +621,14 @@ export default {
 				const v = m.isNewDevelopment
 				return v ? getDicName('DEVELOP_NEW', String(v), this.dicOptions.DEVELOP_NEW) : map[field]
 			}
+			if (field === 'region') {
+				const v = m.region
+				if (!v) return map[field]
+				return this.getOptionLabel(this.regionOptions, v) || map[field]
+			}
+			if (field === 'purchaseDepartmentName') {
+				return this.getOptionLabel(this.purchaseDeptOptions, m.purchaseDepartment) || map[field]
+			}
 			const v = m[field]
 			if (v === true) return '是'
 			if (v === false) return '否'
@@ -527,6 +636,8 @@ export default {
 		},
 		openSheet(field) {
 			const map = {
+				region: { title: '区域', options: this.regionOptions },
+				purchaseDepartment: { title: '采购处', options: this.purchaseDeptOptions },
 				purchaseSource: { title: '收购来源', options: this.purchaseSourceOptions },
 				operationMode: { title: '操作方式', options: this.operationMethodOptions },
 				isNewDevelopment: { title: '是否新开发', options: this.developNewOptions },
@@ -567,6 +678,14 @@ export default {
 			const field = this.sheet.field
 			if (!field) return
 			this.form[field] = value
+			if (field === 'region') this.form.regionName = label != null ? String(label) : this.getOptionLabel(this.regionOptions, value)
+			if (field === 'purchaseDepartment') {
+				this.form.purchaseDepartmentName = label != null ? String(label) : this.getOptionLabel(this.purchaseDeptOptions, value)
+				console.log(value,'value')
+				console.log(this.purchaseDeptOptions,'purchaseDeptOptions')
+				console.log(this.form.purchaseDepartmentName ,'purchasthis.form.purchaseDepartmentName eDeptOptions')
+				this.loadRegionOptions()
+			}
 			this.sheet.visible = false
 		},
 		onMultiSheetConfirm({ value, label }) {
@@ -649,6 +768,9 @@ export default {
 				{ key: 'reviewValidUntil', label: '评审有效期' },
 				{ key: 'investigatorId', label: '资信调查人ID' }
 			]
+			if (Array.isArray(this.regionOptions) && this.regionOptions.length) {
+				requiredTextFields.push({ key: 'region', label: '区域' })
+			}
 			for (let i = 0; i < requiredTextFields.length; i++) {
 				const f = requiredTextFields[i]
 				const v = this.form && this.form[f.key]
@@ -707,6 +829,7 @@ export default {
 			delete payload.companyNatureName
 			delete payload.investigatorName
 			delete payload.purchaseDepartmentName
+			delete payload.regionName
 			payload.registeredCapital = Number(payload.registeredCapital)
 			const files = (Array.isArray(this.attachmentFiles) ? this.attachmentFiles : []).filter(it => it && it.id)
 			payload.attachmentFileIds = files.map(it => String(it.id || '')).filter(Boolean).join(',')
@@ -722,7 +845,7 @@ export default {
 				await domesticCustomerCreditSaveApi(payload)
 				uni.showToast({ title: '提交成功', icon: 'success' })
 				try { uni.setStorageSync('DOMESTIC_TRADE_LIST_NEED_REFRESH', '1') } catch (e) {}
-				setTimeout(() => { uni.navigateBack() }, 300)
+				setTimeout(() => { uni.redirectTo({ url: '/pages/domestic_trade/index' }) }, 300)
 			} catch (e) {
 				uni.showToast({ title: (e && e.msg) || '提交失败', icon: 'none' })
 			} finally {
--- a/pages/domestic_trade/detail.vue
View file @61fa90f
+++ b/pages/domestic_trade/detail.vue
View file @61fa90f
@@ -75,6 +75,7 @@
 				<view class="section">
 					<view class="row"><text class="label">资信调查人</text><text class="value">{{ safeText(form.investigatorName) }}</text></view>
 					<view class="row"><text class="label">采购处</text><text class="value">{{ safeText(purchaseDepartmentName) }}</text></view>
+					<view class="row"><text class="label">区域</text><text class="value">{{ safeText(regionName) }}</text></view>
 					<view class="row"><text class="label">评审有效期</text><text class="value">{{ safeText(form.reviewValidUntil) }}</text></view>
 					<view class="row">
 						<text class="label">附件</text>
@@ -96,8 +97,7 @@
 import { downloadFile } from '@/utils/downloadFile.js'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import { getDicByCodes, getDicName } from '@/utils/dic.js'
-import { domesticCustomerCreditCancelApi, domesticCustomerCreditGetApi } from '@/api/procure-manage/domesticCustomerCredit.js'
-import { getPurchaseDeptApi } from '@/api/procure-manage/domesticCustomerCredit.js'
+import { domesticCustomerCreditCancelApi, domesticCustomerCreditGetApi, getPurchaseDeptApi, getAllRegionApi } from '@/api/procure-manage/domesticCustomerCredit.js'
 export default {
 	name: 'DomesticTradeDetail',
@@ -116,6 +116,7 @@ export default {
 				PURCHASE_SOURCE: []
 			},
 			purchaseDept: null,
+			regionOptions: [],
             buttons: [{
 				text: '审核详情',
 				visible: true,
@@ -131,7 +132,14 @@ export default {
                 visible: true,
                 variant: 'outline',
                 event: 'edit',
-            },{
+            },
+			// {
+            //     text: '申请变更',
+            //     visible: true,
+            //     variant: 'outline',
+            //     event: 'changeApply',
+            // },
+			{
                 text: '取消',
                 visible: true,
                 variant: 'outline',
@@ -142,11 +150,14 @@ export default {
 	computed: {
         displayButtons() {
 			const s = this.form && this.form.status || false
+			const d = this.form && this.form.showExamineDetail || false
+			const e = this.form && this.form.showExamine || false
             return [
-                { ...this.buttons[0], visible: s  && this.$auth.hasPermi('procure-manage:domestic-trade:review') },
-                { ...this.buttons[1], visible: s === 'AUDIT' && this.$auth.hasPermi('procure-manage:domestic-trade:approve') },
-                { ...this.buttons[2], visible: this.$auth.hasPermi('procure-manage:domestic-trade:modify') },
-                { ...this.buttons[3], visible: this.$auth.hasPermi('procure-manage:domestic-trade:cancel') },
+                { ...this.buttons[0], visible: d && this.$auth.hasPermi('procure-manage:domestic-trade:review') },
+                { ...this.buttons[1], visible: s === 'AUDIT' && e && this.$auth.hasPermi('procure-manage:domestic-trade:approve') },
+                { ...this.buttons[2], visible: s === 'REFUSE' && this.$auth.hasPermi('procure-manage:domestic-trade:modify') },
+                // { ...this.buttons[3], visible: s === 'PASS' && this.$auth.hasPermi('procure-manage:domestic-trade:change') },
+                { ...this.buttons[3], visible: s === 'REFUSE' && this.$auth.hasPermi('procure-manage:domestic-trade:cancel') },
             ]
         },
 		companyNatureOptions() {
@@ -187,6 +198,14 @@ export default {
 			if (this.purchaseDept && this.purchaseDept.name != null) return String(this.purchaseDept.name)
 			const v = this.form && this.form.purchaseDepartmentName != null ? String(this.form.purchaseDepartmentName) : ''
 			return v || '-'
+		},
+		regionName() {
+			const name = this.safeText(this.form && this.form.regionName)
+			if (name) return name
+			const id = this.form && this.form.region != null ? String(this.form.region) : ''
+			const labelFromOptions = this.getOptionLabel(this.regionOptions, id)
+			if (labelFromOptions) return labelFromOptions
+			return id || '-'
 		}
 	},
 	created() {
@@ -218,8 +237,45 @@ export default {
 				const res = await getPurchaseDeptApi()
 				const data = (res && res.data) ? res.data : {}
 				this.purchaseDept = (data && typeof data === 'object') ? data : null
+				await this.loadRegionOptions()
 			} catch (e) {
 				this.purchaseDept = null
+				this.regionOptions = []
+			}
+		},
+		normalizeRegionOptions(raw) {
+			const list = Array.isArray(raw)
+				? raw
+				: (Array.isArray(raw && raw.data) ? raw.data : (Array.isArray(raw && raw.rows) ? raw.rows : []))
+			return list.map(it => {
+				const id = it && (it.id != null ? it.id : (it.value != null ? it.value : (it.regionId != null ? it.regionId : '')))
+				const name = it && (it.name != null ? it.name : (it.label != null ? it.label : (it.regionName != null ? it.regionName : '')))
+				return { label: name != null ? String(name) : '', value: id != null ? String(id) : '' }
+			}).filter(it => it.value)
+		},
+		getOptionLabel(options, value) {
+			const v = value != null ? String(value) : ''
+			if (!v) return ''
+			const match = (options || []).find(o => String(o.value) === v)
+			return match ? String(match.label || '') : ''
+		},
+		getPurchaseDepartmentId() {
+			if (this.purchaseDept && this.purchaseDept.id != null) return String(this.purchaseDept.id)
+			const v = this.form && this.form.purchaseDepartment != null ? String(this.form.purchaseDepartment) : ''
+			return v || ''
+		},
+		async loadRegionOptions() {
+			const purchaseDepartment = this.getPurchaseDepartmentId()
+			if (!purchaseDepartment) {
+				this.regionOptions = []
+				return
+			}
+			try {
+				const res = await getAllRegionApi(purchaseDepartment)
+				const raw = res && res.data != null ? res.data : []
+				this.regionOptions = this.normalizeRegionOptions(raw)
+			} catch (e) {
+				this.regionOptions = []
 			}
 		},
 		dicToSheetOptions(items) {
@@ -231,6 +287,7 @@ export default {
             if (typeof btn.onClick === 'function') return btn.onClick(this.form, btn.params)
             const e = btn.event || ''
             if (e === 'edit') return this.onEdit(btn && btn.params)
+            if (e === 'changeApply') return this.onChangeApply(btn && btn.params)
             if (e === 'audit') return this.onAudit(btn && btn.params)
             if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
             if (e === 'cancel') return this.onCancel(btn && btn.params)
@@ -238,6 +295,9 @@ export default {
         onEdit(params) {
             uni.navigateTo({ url: '/pages/domestic_trade/modify?id=' + this.id })
         },
+		onChangeApply(params) {
+			uni.navigateTo({ url: '/pages/domestic_trade/change?id=' + this.id })
+		},
 		onAudit(params) {
 			const id = this.id || (this.form && this.form.id) || ''
 			if (!id) return
@@ -308,8 +368,10 @@ export default {
 					data.investigatorName = u && u.name ? String(u.name) : ''
 				}
 				this.form = data
+				await this.loadRegionOptions()
 			} catch (e) {
 				this.form = {}
+				this.regionOptions = []
 				uni.showToast({ title: '详情加载失败', icon: 'none' })
 			} finally {
 				this.loading = false
--- a/pages/domestic_trade/domesticCreditViewer.vue
View file @61fa90f
+++ b/pages/domestic_trade/domesticCreditViewer.vue
View file @61fa90f
@@ -73,6 +73,7 @@
 			<view class="section">
 				<view class="row"><text class="label">资信调查人</text><text class="value">{{ safeText(form.investigatorName) }}</text></view>
 				<view class="row"><text class="label">采购处</text><text class="value">{{ safeText(purchaseDepartmentName) }}</text></view>
+				<view class="row"><text class="label">区域</text><text class="value">{{ safeText(regionName) }}</text></view>
 				<view class="row"><text class="label">评审有效期</text><text class="value">{{ safeText(form.reviewValidUntil) }}</text></view>
 				<view class="row">
 					<text class="label">附件</text>
@@ -91,7 +92,7 @@
 <script>
 import { downloadFile } from '@/utils/downloadFile.js'
 import { getDicByCodes, getDicName } from '@/utils/dic.js'
-import { domesticCustomerCreditGetExamineByIdApi, getPurchaseDeptApi } from '@/api/procure-manage/domesticCustomerCredit.js'
+import { domesticCustomerCreditGetExamineByIdApi, getPurchaseDeptApi, getAllRegionApi } from '@/api/procure-manage/domesticCustomerCredit.js'
 export default {
 	name: 'DomesticCustomerCreditViewer',
@@ -105,7 +106,8 @@ export default {
 				OPERATION_METHOD: [],
 				PURCHASE_SOURCE: []
 			},
-			purchaseDept: null
+			purchaseDept: null,
+			regionOptions: []
 		}
 	},
 	computed: {
@@ -143,6 +145,14 @@ export default {
 			if (this.purchaseDept && this.purchaseDept.name != null) return String(this.purchaseDept.name)
 			const v = this.form && this.form.purchaseDepartmentName != null ? String(this.form.purchaseDepartmentName) : ''
 			return v || '-'
+		},
+		regionName() {
+			const name = this.safeText(this.form && this.form.regionName)
+			if (name) return name
+			const id = this.form && this.form.region != null ? String(this.form.region) : ''
+			const labelFromOptions = this.getOptionLabel(this.regionOptions, id)
+			if (labelFromOptions) return labelFromOptions
+			return id || '-'
 		}
 	},
 	created() {
@@ -177,8 +187,45 @@ export default {
 				const res = await getPurchaseDeptApi()
 				const data = (res && res.data) ? res.data : {}
 				this.purchaseDept = (data && typeof data === 'object') ? data : null
+				await this.loadRegionOptions()
 			} catch (e) {
 				this.purchaseDept = null
+				this.regionOptions = []
+			}
+		},
+		normalizeRegionOptions(raw) {
+			const list = Array.isArray(raw)
+				? raw
+				: (Array.isArray(raw && raw.data) ? raw.data : (Array.isArray(raw && raw.rows) ? raw.rows : []))
+			return list.map(it => {
+				const id = it && (it.id != null ? it.id : (it.value != null ? it.value : (it.regionId != null ? it.regionId : '')))
+				const name = it && (it.name != null ? it.name : (it.label != null ? it.label : (it.regionName != null ? it.regionName : '')))
+				return { label: name != null ? String(name) : '', value: id != null ? String(id) : '' }
+			}).filter(it => it.value)
+		},
+		getOptionLabel(options, value) {
+			const v = value != null ? String(value) : ''
+			if (!v) return ''
+			const match = (options || []).find(o => String(o.value) === v)
+			return match ? String(match.label || '') : ''
+		},
+		getPurchaseDepartmentId() {
+			if (this.purchaseDept && this.purchaseDept.id != null) return String(this.purchaseDept.id)
+			const v = this.form && this.form.purchaseDepartment != null ? String(this.form.purchaseDepartment) : ''
+			return v || ''
+		},
+		async loadRegionOptions() {
+			const purchaseDepartment = this.getPurchaseDepartmentId()
+			if (!purchaseDepartment) {
+				this.regionOptions = []
+				return
+			}
+			try {
+				const res = await getAllRegionApi(purchaseDepartment)
+				const raw = res && res.data != null ? res.data : []
+				this.regionOptions = this.normalizeRegionOptions(raw)
+			} catch (e) {
+				this.regionOptions = []
 			}
 		},
 		dicToSheetOptions(items) {
@@ -210,8 +257,10 @@ export default {
 			try {
 				const res = await domesticCustomerCreditGetExamineByIdApi(id)
 				this.form = (res && res.data) ? res.data : {}
+				await this.loadRegionOptions()
 			} catch (e) {
 				this.form = {}
+				this.regionOptions = []
 			}
 		},
 		onDownload(item) {
--- a/pages/domestic_trade/modify.vue
View file @61fa90f
+++ b/pages/domestic_trade/modify.vue
View file @61fa90f
@@ -299,9 +299,17 @@
 					</template>
 				</uni-list-item>
-				<uni-list-item title="采购处">
-					<template v-slot:footer>
-						<uni-easyinput v-model="form.purchaseDepartmentName" disabled placeholder="" :inputBorder="false" />
+				<uni-list-item class="select-item" :class="form.purchaseDepartment ? 'is-filled' : 'is-empty'" clickable
+					@click="openSheet('purchaseDepartment')" :rightText="displayLabel('purchaseDepartmentName')" showArrow>
+					<template v-slot:body>
+						<view class="item-title"><text>采购处</text></view>
+					</template>
+				</uni-list-item>
+
+				<uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+					@click="openSheet('region')" :rightText="displayLabel('region')" showArrow>
+					<template v-slot:body>
+						<view class="item-title"><text>区域</text></view>
 					</template>
 				</uni-list-item>
@@ -343,7 +351,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import MultiSelectSheet from '@/components/multi-select/index.vue'
 import { getDicByCodes, getDicName } from '@/utils/dic.js'
-import { domesticCustomerCreditGetApi, domesticCustomerCreditSaveApi, getPurchaseDeptApi } from '@/api/procure-manage/domesticCustomerCredit.js'
+import { domesticCustomerCreditGetApi, domesticCustomerCreditSaveApi, getPurchaseDeptApi, getAllRegionApi, getRegionApi } from '@/api/procure-manage/domesticCustomerCredit.js'
 export default {
 	name: 'DomesticTradeModify',
@@ -371,7 +379,8 @@ export default {
 			operationMethodOptions: [],
 			developNewOptions: [],
 			purchaseSourceOptions: [],
-			purchaseDept: null,
+			regionOptions: [],
+			purchaseDeptOptions: [],
 			form: {
 				id: '',
 				unitName: '',
@@ -423,6 +432,8 @@ export default {
 				investigatorName: '',
 				purchaseDepartment: '',
 				purchaseDepartmentName: '',
+				region: '',
+				regionName: '',
 				reviewValidUntil: ''
 			}
 		}
@@ -437,7 +448,8 @@ export default {
 		const id = (query && (query.id || query.code)) ? String(query.id || query.code) : ''
 		this.id = id
 		await this.loadDicData()
-		await this.loadPurchaseDeptOptions()
+		await this.loadPurchaseDeptList()
+		await this.loadRegionOptions()
 		await this.loadDetail()
 	},
 	methods: {
@@ -468,23 +480,111 @@ export default {
 			const list = Array.isArray(items) ? items : []
 			return list.map(it => ({ label: it && it.name != null ? String(it.name) : '', value: it && it.code != null ? String(it.code) : '' })).filter(it => it.value)
 		},
-		async loadPurchaseDeptOptions() {
+		async loadPurchaseDeptList() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const data = (res && res.data) ? res.data : {}
-				this.purchaseDept = (data && typeof data === 'object') ? data : null
-				this.form.purchaseDepartment = data && data.id != null ? String(data.id) : ''
-				this.form.purchaseDepartmentName = data && data.name != null ? String(data.name) : ''
+				const raw = res && res.data != null ? res.data : []
+				this.purchaseDeptOptions = this.normalizeRegionOptions(raw)
+			} catch (e) {
+				this.purchaseDeptOptions = []
+			}
+		},
+		normalizeRegionOptions(raw) {
+			const list = Array.isArray(raw)
+				? raw
+				: (Array.isArray(raw && raw.data) ? raw.data : (Array.isArray(raw && raw.rows) ? raw.rows : []))
+			return list.map(it => {
+				const id = it && (it.id != null ? it.id : (it.value != null ? it.value : (it.regionId != null ? it.regionId : '')))
+				const name = it && (it.name != null ? it.name : (it.label != null ? it.label : (it.regionName != null ? it.regionName : '')))
+				return { label: name != null ? String(name) : '', value: id != null ? String(id) : '' }
+			}).filter(it => it.value)
+		},
+		getOptionLabel(options, value) {
+			const v = value != null ? String(value) : ''
+			if (!v) return ''
+			const match = (options || []).find(o => String(o.value) === v)
+			return match ? String(match.label || '') : ''
+		},
+		syncRegionWithOptions() {
+			const label = this.getOptionLabel(this.regionOptions, this.form.region)
+			if (!label) {
+				this.form.region = ''
+				this.form.regionName = ''
+				return
+			}
+			this.form.regionName = label
+		},
+		async loadRegionOptions() {
+			let defaultRegionId = ''
+			let defaultRegionName = ''
+			try {
+				const regionRes = await getRegionApi()
+				const regionData = (regionRes && regionRes.data != null) ? regionRes.data : null
+				const parsed = regionData ? this.parseRegionIdAndName(regionData) : { id: '', name: '' }
+				if (parsed.id) {
+					defaultRegionId = parsed.id
+					defaultRegionName = parsed.name
+				}
+			} catch (e) {
+				// fall through to getAllRegionApi
+			}
+			const purchaseDepartment = this.form.purchaseDepartment ? String(this.form.purchaseDepartment) : ''
+			if (!purchaseDepartment) {
+				if (defaultRegionId) {
+					this.regionOptions = [{ label: defaultRegionName || String(defaultRegionId), value: defaultRegionId }]
+					if (!this.form.region) {
+						this.form.region = defaultRegionId
+						this.form.regionName = defaultRegionName || String(defaultRegionId)
+					}
+				} else {
+					this.regionOptions = []
+					this.form.region = ''
+					this.form.regionName = ''
+				}
+				return
+			}
+			try {
+				const res = await getAllRegionApi(purchaseDepartment)
+				const raw = res && res.data != null ? res.data : []
+				this.regionOptions = this.normalizeRegionOptions(raw)
+				if (defaultRegionId) {
+					const label = this.getOptionLabel(this.regionOptions, defaultRegionId)
+					if (label) {
+						if (!this.form.region) {
+							this.form.region = defaultRegionId
+							this.form.regionName = label
+						}
+					} else {
+						// 默认区域不在完整列表中，仍保留为选中项
+						this.regionOptions.push({ label: defaultRegionName || String(defaultRegionId), value: defaultRegionId })
+						if (!this.form.region) {
+							this.form.region = defaultRegionId
+							this.form.regionName = defaultRegionName || String(defaultRegionId)
+						}
+					}
+				} else {
+					this.syncRegionWithOptions()
+				}
 			} catch (e) {
-				this.purchaseDept = null
-				this.form.purchaseDepartment = ''
-				this.form.purchaseDepartmentName = ''
+				this.regionOptions = []
+				this.form.region = ''
+				this.form.regionName = ''
 			}
 		},
+		parseRegionIdAndName(raw) {
+			if (!raw) return { id: '', name: '' }
+			if (Array.isArray(raw)) return this.parseRegionIdAndName(raw[0])
+			if (typeof raw === 'string' || typeof raw === 'number') return { id: String(raw), name: '' }
+			const id = raw.id != null ? raw.id : (raw.value != null ? raw.value : (raw.regionId != null ? raw.regionId : ''))
+			const name = raw.name != null ? raw.name : (raw.label != null ? raw.label : (raw.regionName != null ? raw.regionName : ''))
+			return { id: id != null ? String(id) : '', name: name != null ? String(name) : '' }
+		},
 		displayLabel(field) {
 			const m = this.form
 			const map = {
+				purchaseDepartmentName: '请选择采购处',
 				companyNatureName: '请选择公司性质',
+				region: '请选择区域',
 				purchaseSource: '请选择',
 				operationMode: '请选择',
 				isNewDevelopment: '请选择',
@@ -513,6 +613,14 @@ export default {
 				const v = m.isNewDevelopment
 				return v ? getDicName('DEVELOP_NEW', String(v), this.dicOptions.DEVELOP_NEW) : map[field]
 			}
+			if (field === 'region') {
+				const v = m.region
+				if (!v) return map[field]
+				return this.getOptionLabel(this.regionOptions, v) || map[field]
+			}
+			if (field === 'purchaseDepartmentName') {
+				return this.getOptionLabel(this.purchaseDeptOptions, m.purchaseDepartment) || map[field]
+			}
 			const v = m[field]
 			if (v === true) return '是'
 			if (v === false) return '否'
@@ -520,6 +628,8 @@ export default {
 		},
 		openSheet(field) {
 			const map = {
+				region: { title: '区域', options: this.regionOptions },
+				purchaseDepartment: { title: '采购处', options: this.purchaseDeptOptions },
 				purchaseSource: { title: '收购来源', options: this.purchaseSourceOptions },
 				operationMode: { title: '操作方式', options: this.operationMethodOptions },
 				isNewDevelopment: { title: '是否新开发', options: this.developNewOptions },
@@ -556,10 +666,15 @@ export default {
 				value: this.form.companyNature || ''
 			}
 		},
-		onSheetConfirm({ value }) {
+		onSheetConfirm({ value, label }) {
 			const field = this.sheet.field
 			if (!field) return
 			this.form[field] = value
+			if (field === 'region') this.form.regionName = label != null ? String(label) : this.getOptionLabel(this.regionOptions, value)
+			if (field === 'purchaseDepartment') {
+				this.form.purchaseDepartmentName = label != null ? String(label) : this.getOptionLabel(this.purchaseDeptOptions, value)
+				this.loadRegionOptions()
+			}
 			this.sheet.visible = false
 		},
 		onMultiSheetConfirm({ value }) {
@@ -642,6 +757,9 @@ export default {
 				{ key: 'reviewValidUntil', label: '评审有效期' },
 				{ key: 'investigatorId', label: '资信调查人ID' }
 			]
+			if (Array.isArray(this.regionOptions) && this.regionOptions.length) {
+				requiredTextFields.push({ key: 'region', label: '区域' })
+			}
 			for (let i = 0; i < requiredTextFields.length; i++) {
 				const f = requiredTextFields[i]
 				const v = this.form && this.form[f.key]
@@ -700,6 +818,7 @@ export default {
 			delete payload.companyNatureName
 			delete payload.investigatorName
 			delete payload.purchaseDepartmentName
+			delete payload.regionName
 			payload.registeredCapital = Number(payload.registeredCapital)
 			const files = (Array.isArray(this.attachmentFiles) ? this.attachmentFiles : []).filter(it => it && it.id)
 			payload.attachmentFileIds = files.map(it => String(it.id || '')).filter(Boolean).join(',')
@@ -714,7 +833,7 @@ export default {
 			try {
 				await domesticCustomerCreditSaveApi(payload)
 				uni.showToast({ title: '保存成功', icon: 'success' })
-				setTimeout(() => { uni.navigateBack() }, 300)
+				setTimeout(() => { uni.redirectTo({ url: '/pages/domestic_trade/index' }) }, 300)
 			} catch (e) {
 				uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
 			} finally {
@@ -727,15 +846,12 @@ export default {
 				const res = await domesticCustomerCreditGetApi(this.id)
 				const data = res && res.data ? res.data : {}
 				const next = { ...this.form, ...(data || {}) }
-				if (this.purchaseDept && this.purchaseDept.id != null) {
-					next.purchaseDepartment = String(this.purchaseDept.id)
-					next.purchaseDepartmentName = this.purchaseDept.name != null ? String(this.purchaseDept.name) : ''
-				}
 				next.id = next.id || this.id || ''
 				const u = (this.$store && this.$store.state && this.$store.state.user) ? this.$store.state.user : {}
 				if (!next.investigatorId) next.investigatorId = u && u.id ? String(u.id) : ''
 				if (!next.investigatorName) next.investigatorName = u && u.name ? String(u.name) : ''
 				this.form = next
+				this.syncRegionWithOptions()
 				this.form.companyNatureName = this.labelsOf(this.companyNatureOptions, this.form.companyNature)
 				this.attachmentFiles = this.normalizeAttachmentFiles(data || next)
 			} catch (e) {
--- a/pages/foreign_trade/add.vue
View file @61fa90f
+++ b/pages/foreign_trade/add.vue
View file @61fa90f
@@ -469,7 +469,7 @@ export default {
 				await foreignTradeCreditSaveApi(payload)
 				uni.showToast({ title: '提交成功', icon: 'success' })
 				try { uni.setStorageSync('FOREIGN_TRADE_LIST_NEED_REFRESH', '1') } catch (e) {}
-				setTimeout(() => { uni.navigateBack() }, 300)
+				setTimeout(() => { uni.redirectTo({ url: '/pages/foreign_trade/index' }) }, 300)
 			} catch (e) {
 				uni.showToast({ title: (e && e.msg) || '提交失败', icon: 'none' })
 			} finally {
--- a/pages/foreign_trade/modify.vue
View file @61fa90f
+++ b/pages/foreign_trade/modify.vue
View file @61fa90f
@@ -491,7 +491,7 @@ export default {
 				await foreignTradeCreditSaveApi(payload)
 				uni.showToast({ title: '保存成功', icon: 'success' })
 				try { uni.setStorageSync('FOREIGN_TRADE_LIST_NEED_REFRESH', '1') } catch (e) {}
-				setTimeout(() => { uni.navigateBack() }, 300)
+				setTimeout(() => { uni.redirectTo({ url: '/pages/foreign_trade/index' }) }, 300)
 			} catch (e) {
 				uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
 			} finally {
--- a/pages/index.vue
View file @61fa90f
+++ b/pages/index.vue
View file @61fa90f
@@ -145,13 +145,13 @@ export default {
 			{
 				title: '采购管理',
 				items: [{
-					text: '内贸客户资信',
+					text: '内贸客户资信管理',
 					icon: '/static/images/index/order_list.png',
 					link: '/pages/domestic_trade/index',
 					name: 'DomesticTrade'
 				},
 				{
-					text: '外客户资信',
+					text: '外贸客户资信管理',
 					icon: '/static/images/index/order_list.png',
 					link: '/pages/foreign_trade/index',
 					name: 'ForeignTrade'