commit：联调外贸

gesilong
1 parent e24d713a
Showing 8 changed files with 133 additions and 136 deletions
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/detail.vue
pages/foreign_trade/foreignTradeCreditViewer.vue
pages/foreign_trade/modify.vue
--- a/pages/domestic_trade/add.vue
View file @f5b8492
+++ b/pages/domestic_trade/add.vue
View file @f5b8492
@@ -12,7 +12,11 @@
 						<uni-easyinput v-model="form.unitName" placeholder="请输入单位名称" :inputBorder="false" />
 					</template>
 				</uni-list-item>
-
+				<uni-list-item title="客户简称">
+					<template v-slot:footer>
+						<uni-easyinput v-model="form.customerShortName" placeholder="请输入客户简称" :inputBorder="false" />
+					</template>
+				</uni-list-item>
 				<uni-list-item class="select-item" :class="form.companyNatureName ? 'is-filled' : 'is-empty'" clickable
 					@click="openMultiSheet('companyNature')" :rightText="displayLabel('companyNatureName')" showArrow>
 					<template v-slot:body>
@@ -295,10 +299,9 @@
 					</template>
 				</uni-list-item>
-				<uni-list-item class="select-item" :class="form.purchaseDepartment ? 'is-filled' : 'is-empty'" clickable
-					@click="openSheet('purchaseDepartment')" :rightText="displayLabel('purchaseDepartment')" showArrow>
-					<template v-slot:body>
-						<view class="item-title"><text>采购处</text></view>
+				<uni-list-item title="采购处">
+					<template v-slot:footer>
+						<uni-easyinput v-model="form.purchaseDepartmentName" disabled placeholder="" :inputBorder="false" />
 					</template>
 				</uni-list-item>
@@ -366,9 +369,9 @@ export default {
 			operationMethodOptions: [],
 			developNewOptions: [],
 			purchaseSourceOptions: [],
-			purchaseDeptOptions: [],
 			form: {
 				unitName: '',
+				customerShortName: '',
 				companyNature: '',
 				companyNatureName: '',
 				companyNatureOther: '',
@@ -415,6 +418,7 @@ export default {
 				investigatorId: '',
 				investigatorName: '',
 				purchaseDepartment: '',
+				purchaseDepartmentName: '',
 				reviewValidUntil: ''
 			}
 		}
@@ -460,21 +464,14 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				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) : ''
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.form.purchaseDepartment = ''
+				this.form.purchaseDepartmentName = ''
 			}
 		},
-		getOptionLabel(options, value) {
-			const v = value == null ? '' : String(value)
-			if (!v) return ''
-			const found = (options || []).find(o => String(o.value) === v)
-			return found ? String(found.label || '') : ''
-		},
 		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)
@@ -498,7 +495,6 @@ export default {
 				purchaseSource: '请选择',
 				operationMode: '请选择',
 				isNewDevelopment: '请选择',
-				purchaseDepartment: '请选择',
 				hasPreferentialPolicy: '请选择',
 				investInFutures: '请选择',
 				hasPenaltyRecord: '请选择',
@@ -524,10 +520,6 @@ export default {
 				const v = m.isNewDevelopment
 				return v ? getDicName('DEVELOP_NEW', String(v), this.dicOptions.DEVELOP_NEW) : map[field]
 			}
-			if (field === 'purchaseDepartment') {
-				const label = this.getOptionLabel(this.purchaseDeptOptions, m.purchaseDepartment)
-				return label || map[field]
-			}
 			const v = m[field]
 			if (v === true) return '是'
 			if (v === false) return '否'
@@ -538,7 +530,6 @@ export default {
 				purchaseSource: { title: '收购来源', options: this.purchaseSourceOptions },
 				operationMode: { title: '操作方式', options: this.operationMethodOptions },
 				isNewDevelopment: { title: '是否新开发', options: this.developNewOptions },
-				purchaseDepartment: { title: '采购处', options: this.purchaseDeptOptions },
 				hasPreferentialPolicy: { title: '是否享有优惠政策', options: this.yesNoOptions },
 				investInFutures: { title: '是否投资期货', options: this.yesNoOptions },
 				hasPenaltyRecord: { title: '是否有被处罚记录', options: this.yesNoOptions },
@@ -623,6 +614,7 @@ export default {
 		validate() {
 			const requiredTextFields = [
 				{ key: 'unitName', label: '单位名称' },
+				{ key: 'customerShortName', label: '客户简称' },
 				{ key: 'companyNature', label: '公司性质' },
 				{ key: 'bankName', label: '开户行' },
 				{ key: 'bankAccount', label: '账号' },
@@ -714,6 +706,7 @@ export default {
 			if (!this.showCompanyNatureOther) payload.companyNatureOther = ''
 			delete payload.companyNatureName
 			delete payload.investigatorName
+			delete payload.purchaseDepartmentName
 			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(',')
--- a/pages/domestic_trade/detail.vue
View file @f5b8492
+++ b/pages/domestic_trade/detail.vue
View file @f5b8492
@@ -4,6 +4,7 @@
 			<view class="detail-page">
 				<view class="section">
 					<text class="row company">{{ safeText(form.unitName) }}</text>
+					<view class="row"><text class="label">客户简称</text><text class="value">{{ safeText(form.customerShortName) }}</text></view>
 					<view class="row"><text class="label">公司性质</text><text class="value">{{ safeText(companyNatureName) }}</text></view>
 					<view v-if="showCompanyNatureOther" class="row"><text class="label">其他</text><text class="value">{{ safeText(form.companyNatureOther) }}</text></view>
 					<view class="row"><text class="label">开户行</text><text class="value">{{ safeText(form.bankName) }}</text></view>
@@ -114,7 +115,7 @@ export default {
 				OPERATION_METHOD: [],
 				PURCHASE_SOURCE: []
 			},
-			purchaseDeptOptions: [],
+			purchaseDept: null,
             buttons: [{
 				text: '审核详情',
 				visible: true,
@@ -183,10 +184,9 @@ export default {
 			return v ? getDicName('DEVELOP_NEW', v, this.dicOptions.DEVELOP_NEW) : '-'
 		},
 		purchaseDepartmentName() {
-			const v = this.form && this.form.purchaseDepartment != null ? String(this.form.purchaseDepartment) : ''
-			if (!v) return '-'
-			const found = (this.purchaseDeptOptions || []).find(o => String(o.value) === v)
-			return found ? String(found.label || '') : v
+			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 || '-'
 		}
 	},
 	created() {
@@ -216,13 +216,10 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				const data = (res && res.data) ? res.data : {}
+				this.purchaseDept = (data && typeof data === 'object') ? data : null
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.purchaseDept = null
 			}
 		},
 		dicToSheetOptions(items) {
--- a/pages/domestic_trade/domesticCreditViewer.vue
View file @f5b8492
+++ b/pages/domestic_trade/domesticCreditViewer.vue
View file @f5b8492
@@ -3,6 +3,7 @@
 		<scroll-view class="scroll" scroll-y>
 			<view class="section">
 				<text class="row company">{{ safeText(form.unitName) }}</text>
+				<view class="row"><text class="label">客户简称</text><text class="value">{{ safeText(form.customerShortName) }}</text></view>
 				<view class="row"><text class="label">公司性质</text><text class="value">{{ safeText(companyNatureName) }}</text></view>
 				<view class="row"><text class="label">开户行</text><text class="value">{{ safeText(form.bankName) }}</text></view>
 				<view class="row"><text class="label">账号</text><text class="value">{{ safeText(form.bankAccount) }}</text></view>
@@ -104,7 +105,7 @@ export default {
 				OPERATION_METHOD: [],
 				PURCHASE_SOURCE: []
 			},
-			purchaseDeptOptions: []
+			purchaseDept: null
 		}
 	},
 	computed: {
@@ -139,10 +140,9 @@ export default {
 			return v ? getDicName('DEVELOP_NEW', v, this.dicOptions.DEVELOP_NEW) : '-'
 		},
 		purchaseDepartmentName() {
-			const v = this.form && this.form.purchaseDepartment != null ? String(this.form.purchaseDepartment) : ''
-			if (!v) return '-'
-			const found = (this.purchaseDeptOptions || []).find(o => String(o.value) === v)
-			return found ? String(found.label || '') : v
+			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 || '-'
 		}
 	},
 	created() {
@@ -175,13 +175,10 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				const data = (res && res.data) ? res.data : {}
+				this.purchaseDept = (data && typeof data === 'object') ? data : null
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.purchaseDept = null
 			}
 		},
 		dicToSheetOptions(items) {
--- a/pages/domestic_trade/modify.vue
View file @f5b8492
+++ b/pages/domestic_trade/modify.vue
View file @f5b8492
@@ -12,7 +12,11 @@
 						<uni-easyinput v-model="form.unitName" placeholder="请输入单位名称" :inputBorder="false" />
 					</template>
 				</uni-list-item>
-
+				<uni-list-item title="客户简称">
+					<template v-slot:footer>
+						<uni-easyinput v-model="form.customerShortName" placeholder="请输入客户简称" :inputBorder="false" />
+					</template>
+				</uni-list-item>
 				<uni-list-item class="select-item" :class="form.companyNatureName ? 'is-filled' : 'is-empty'" clickable
 					@click="openMultiSheet('companyNature')" :rightText="displayLabel('companyNatureName')" showArrow>
 					<template v-slot:body>
@@ -295,10 +299,9 @@
 					</template>
 				</uni-list-item>
-				<uni-list-item class="select-item" :class="form.purchaseDepartment ? 'is-filled' : 'is-empty'" clickable
-					@click="openSheet('purchaseDepartment')" :rightText="displayLabel('purchaseDepartment')" showArrow>
-					<template v-slot:body>
-						<view class="item-title"><text>采购处</text></view>
+				<uni-list-item title="采购处">
+					<template v-slot:footer>
+						<uni-easyinput v-model="form.purchaseDepartmentName" disabled placeholder="" :inputBorder="false" />
 					</template>
 				</uni-list-item>
@@ -368,10 +371,11 @@ export default {
 			operationMethodOptions: [],
 			developNewOptions: [],
 			purchaseSourceOptions: [],
-			purchaseDeptOptions: [],
+			purchaseDept: null,
 			form: {
 				id: '',
 				unitName: '',
+				customerShortName: '',
 				companyNature: '',
 				companyNatureName: '',
 				companyNatureOther: '',
@@ -418,6 +422,7 @@ export default {
 				investigatorId: '',
 				investigatorName: '',
 				purchaseDepartment: '',
+				purchaseDepartmentName: '',
 				reviewValidUntil: ''
 			}
 		}
@@ -466,21 +471,16 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				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) : ''
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.purchaseDept = null
+				this.form.purchaseDepartment = ''
+				this.form.purchaseDepartmentName = ''
 			}
 		},
-		getOptionLabel(options, value) {
-			const v = value == null ? '' : String(value)
-			if (!v) return ''
-			const found = (options || []).find(o => String(o.value) === v)
-			return found ? String(found.label || '') : ''
-		},
 		displayLabel(field) {
 			const m = this.form
 			const map = {
@@ -488,7 +488,6 @@ export default {
 				purchaseSource: '请选择',
 				operationMode: '请选择',
 				isNewDevelopment: '请选择',
-				purchaseDepartment: '请选择',
 				hasPreferentialPolicy: '请选择',
 				investInFutures: '请选择',
 				hasPenaltyRecord: '请选择',
@@ -514,10 +513,6 @@ export default {
 				const v = m.isNewDevelopment
 				return v ? getDicName('DEVELOP_NEW', String(v), this.dicOptions.DEVELOP_NEW) : map[field]
 			}
-			if (field === 'purchaseDepartment') {
-				const label = this.getOptionLabel(this.purchaseDeptOptions, m.purchaseDepartment)
-				return label || map[field]
-			}
 			const v = m[field]
 			if (v === true) return '是'
 			if (v === false) return '否'
@@ -528,7 +523,6 @@ export default {
 				purchaseSource: { title: '收购来源', options: this.purchaseSourceOptions },
 				operationMode: { title: '操作方式', options: this.operationMethodOptions },
 				isNewDevelopment: { title: '是否新开发', options: this.developNewOptions },
-				purchaseDepartment: { title: '采购处', options: this.purchaseDeptOptions },
 				hasPreferentialPolicy: { title: '是否享有优惠政策', options: this.yesNoOptions },
 				investInFutures: { title: '是否投资期货', options: this.yesNoOptions },
 				hasPenaltyRecord: { title: '是否有被处罚记录', options: this.yesNoOptions },
@@ -613,6 +607,7 @@ export default {
 		validate() {
 			const requiredTextFields = [
 				{ key: 'unitName', label: '单位名称' },
+				{ key: 'customerShortName', label: '客户简称' },
 				{ key: 'companyNature', label: '公司性质' },
 				{ key: 'bankName', label: '开户行' },
 				{ key: 'bankAccount', label: '账号' },
@@ -704,6 +699,7 @@ export default {
 			if (!this.showCompanyNatureOther) payload.companyNatureOther = ''
 			delete payload.companyNatureName
 			delete payload.investigatorName
+			delete payload.purchaseDepartmentName
 			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(',')
@@ -731,6 +727,10 @@ 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) : ''
--- a/pages/foreign_trade/add.vue
View file @f5b8492
+++ b/pages/foreign_trade/add.vue
View file @f5b8492
@@ -169,13 +169,19 @@
 					<span>供应商分类</span>
 				</view>
-				<uni-list-item class="select-item mgb10" :class="form.supplierCategory ? 'is-filled' : 'is-empty'" clickable
+				<uni-list-item class="select-item" :class="form.supplierCategory ? 'is-filled' : 'is-empty'" clickable
 					@click="openSheet('supplierCategory')" :rightText="displayLabel('supplierCategory')" showArrow>
 					<template v-slot:body>
 						<view class="item-title"><text>供应商分类</text></view>
 					</template>
 				</uni-list-item>
+				<uni-list-item v-if="form.supplierCategory" class="mgb10" title="分类说明">
+					<template v-slot:footer>
+						<uni-easyinput type="textarea" :value="supplierCategoryDesc" :inputBorder="false" disabled placeholder="选择供应商分类后自动显示" maxlength="2000" />
+					</template>
+				</uni-list-item>
+
 				<view class="title-header">
 					<image class="title-header_icon" src="/static/images/title.png" />
 					<span>操作方案</span>
@@ -235,10 +241,9 @@
 					</template>
 				</uni-list-item>
-				<uni-list-item class="select-item mgb10" :class="form.purchase_department ? 'is-filled' : 'is-empty'" clickable
-					@click="openSheet('purchase_department')" :rightText="displayLabel('purchase_departmentName')" showArrow>
-					<template v-slot:body>
-						<view class="item-title"><text>采购处</text></view>
+				<uni-list-item class="mgb10" title="采购处">
+					<template v-slot:footer>
+						<uni-easyinput v-model="form.purchaseDepartmentName" :inputBorder="false" disabled />
 					</template>
 				</uni-list-item>
 			</uni-list>
@@ -271,7 +276,6 @@ export default {
 				{ label: 'D类供应商', value: 'D' }
 			],
 			companyNatureOptions: [],
-			purchaseDeptOptions: [],
 			sheet: { visible: false, title: '', options: [], field: '', value: '' },
 			form: {
 				id: '',
@@ -313,8 +317,8 @@ export default {
 				reviewDepartment: '',
 				investigatorId: '',
 				investigatorName: '',
-				purchase_department: '',
-				purchase_departmentName: ''
+				purchaseDepartment: '',
+				purchaseDepartmentName: ''
 			}
 		}
 	},
@@ -325,6 +329,18 @@ export default {
 		this.form.investigatorId = u && u.id ? String(u.id) : ''
 		this.form.investigatorName = u && u.name ? String(u.name) : ''
 	},
+	computed: {
+		supplierCategoryDesc() {
+			const v = this.form && this.form.supplierCategory != null ? String(this.form.supplierCategory) : ''
+			const map = {
+				A: '资信调查有担保函无资金风险、资料齐全，料质可控，价格较好，若出现质量、磅差问题可以索赔解决，进口倒挂时可协商延迟点价，可推迟发货，可试操作（前3个月每月操作量300-500吨）；第一次计划货到厂验收结束后进行评审，正常后可以增量操作，要求每年评审一次；',
+				B: '资信调查无担保函，国外企业属国内企业控股，无资金风险、资料齐全，价格较好，料质可控，若出现质量、磅差问题可以索赔解决（前3个月每月操作量200-400吨），第一次货到厂验收合格后可增量操作；操作正常每年评审一次；',
+				C: '资信调查无担保函，资料齐全，料质可控，价格一般，出现质量、磅差问题可以索赔解决，可试单限量操作（前3个月每月操作量100-200吨），第一次货到厂验收合格后可增量操作，新开发供应商首年操作按每半年评审一次，操作正常则次年调整为每年评审一次；若出现索赔问题不及时解决可中止后续开信用证和中止到港货物的DP/TT付款，且立即暂停业务操作。',
+				D: '资信调查无担保函，通过委托第三方机构调查无风险，虽然资料不齐全，但料质可控，价格略高，出现质量、磅差问题索赔解决有难度，一单一议，D类供应商第一次货到厂验收、付款、退款或者索赔正常后，可继续操作逐步增量（每月操作量100-200吨），每半年评审一次，操作正常到则次年调整为每年评审一次；若出现索赔问题不及时解决可终止后续到港货物的付款，且立即停止业务操作。'
+			}
+			return map[v] || ''
+		}
+	},
 	methods: {
 		async loadDicData() {
 			try {
@@ -341,20 +357,18 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				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) : ''
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.form.purchaseDepartment = ''
+				this.form.purchaseDepartmentName = ''
 			}
 		},
 		displayLabel(field) {
 			const m = this.form || {}
 			const map = {
 				companyNatureName: '请选择',
-				purchase_departmentName: '请选择',
 				supplierCategory: '请选择'
 			}
 			if (field === 'supplierCategory') {
@@ -369,8 +383,7 @@ export default {
 		openSheet(field) {
 			const map = {
 				companyNature: { title: '公司性质', options: this.companyNatureOptions, valueField: 'companyNature', labelField: 'companyNatureName' },
-				supplierCategory: { title: '供应商分类', options: this.supplierCategoryOptions, valueField: 'supplierCategory', labelField: '' },
-				purchase_department: { title: '采购处', options: this.purchaseDeptOptions, valueField: 'purchase_department', labelField: 'purchase_departmentName' }
+				supplierCategory: { title: '供应商分类', options: this.supplierCategoryOptions, valueField: 'supplierCategory', labelField: '' }
 			}
 			const cfg = map[field]
 			if (!cfg) return
@@ -391,9 +404,7 @@ export default {
 			if (field === 'supplierCategory') {
 				this.form.supplierCategory = value
 			}
-			if (field === 'purchase_department') this.form.purchase_departmentName = label
 			if (field === 'companyNature') this.form.companyNature = value
-			if (field === 'purchase_department') this.form.purchase_department = value
 			this.sheet.visible = false
 		},
 		validate() {
@@ -434,7 +445,7 @@ export default {
 				{ key: 'nextReviewTime', label: '下次评审时间' },
 				{ key: 'reviewDepartment', label: '评审部门' },
 				{ key: 'investigatorId', label: '资信调查人ID' },
-				{ key: 'purchase_department', label: '采购处' }
+				{ key: 'purchaseDepartment', label: '采购处' }
 			]
 			for (let i = 0; i < requiredFields.length; i++) {
 				const f = requiredFields[i]
--- a/pages/foreign_trade/detail.vue
View file @f5b8492
+++ b/pages/foreign_trade/detail.vue
View file @f5b8492
@@ -85,7 +85,7 @@ export default {
 				AUDIT_STATUS: [],
 				COMPANY_NATURE: []
 			},
-			purchaseDeptOptions: [],
+			purchaseDept: null,
 			buttons: [{
 				text: '审核详情',
 				visible: true,
@@ -130,10 +130,9 @@ export default {
 			return getDicName('AUDIT_STATUS', v, this.dicOptions.AUDIT_STATUS) || v
 		},
 		purchaseDeptName() {
-			const v = this.form && this.form.purchase_department != null ? String(this.form.purchase_department) : ''
-			if (!v) return '-'
-			const found = (this.purchaseDeptOptions || []).find(o => String(o.value) === v)
-			return found ? String(found.label || '') : v
+			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 || '-'
 		},
 		supplierCategoryName() {
 			const v = this.form && this.form.supplierCategory != null ? String(this.form.supplierCategory) : ''
@@ -185,13 +184,10 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				const data = (res && res.data) ? res.data : {}
+				this.purchaseDept = data && typeof data === 'object' ? data : null
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.purchaseDept = null
 			}
 		},
 		handleButtonClick(btn) {
--- a/pages/foreign_trade/foreignTradeCreditViewer.vue
View file @f5b8492
+++ b/pages/foreign_trade/foreignTradeCreditViewer.vue
View file @f5b8492
@@ -64,7 +64,7 @@ export default {
 			dicOptions: {
 				COMPANY_NATURE: []
 			},
-			purchaseDeptOptions: []
+			purchaseDept: null
 		}
 	},
 	computed: {
@@ -79,10 +79,9 @@ export default {
 			return map[v] || (v ? v : '-')
 		},
 		purchaseDeptName() {
-			const v = this.form && this.form.purchase_department != null ? String(this.form.purchase_department) : ''
-			if (!v) return '-'
-			const found = (this.purchaseDeptOptions || []).find(o => String(o.value) === v)
-			return found ? String(found.label || '') : v
+			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 || '-'
 		}
 	},
 	created() {
@@ -110,13 +109,10 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				const data = (res && res.data) ? res.data : {}
+				this.purchaseDept = data && typeof data === 'object' ? data : null
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.purchaseDept = null
 			}
 		},
 		safeText(v) {
--- a/pages/foreign_trade/modify.vue
View file @f5b8492
+++ b/pages/foreign_trade/modify.vue
View file @f5b8492
@@ -169,13 +169,19 @@
 					<span>供应商分类</span>
 				</view>
-				<uni-list-item class="select-item mgb10" :class="form.supplierCategory ? 'is-filled' : 'is-empty'" clickable
+				<uni-list-item class="select-item" :class="form.supplierCategory ? 'is-filled' : 'is-empty'" clickable
 					@click="openSheet('supplierCategory')" :rightText="displayLabel('supplierCategory')" showArrow>
 					<template v-slot:body>
 						<view class="item-title"><text>供应商分类</text></view>
 					</template>
 				</uni-list-item>
+				<uni-list-item v-if="form.supplierCategory" class="mgb10" title="分类说明">
+					<template v-slot:footer>
+						<uni-easyinput type="textarea" :value="supplierCategoryDesc" :inputBorder="false" disabled placeholder="选择供应商分类后自动显示" maxlength="2000" />
+					</template>
+				</uni-list-item>
+
 				<view class="title-header">
 					<image class="title-header_icon" src="/static/images/title.png" />
 					<span>操作方案</span>
@@ -235,10 +241,9 @@
 					</template>
 				</uni-list-item>
-				<uni-list-item class="select-item mgb10" :class="form.purchase_department ? 'is-filled' : 'is-empty'" clickable
-					@click="openSheet('purchase_department')" :rightText="displayLabel('purchase_departmentName')" showArrow>
-					<template v-slot:body>
-						<view class="item-title"><text>采购处</text></view>
+				<uni-list-item class="mgb10" title="采购处">
+					<template v-slot:footer>
+						<uni-easyinput v-model="form.purchaseDepartmentName" :inputBorder="false" disabled />
 					</template>
 				</uni-list-item>
 			</uni-list>
@@ -273,7 +278,6 @@ export default {
 				{ label: 'D类供应商', value: 'D' }
 			],
 			companyNatureOptions: [],
-			purchaseDeptOptions: [],
 			sheet: { visible: false, title: '', options: [], field: '', value: '' },
 			form: {
 				id: '',
@@ -315,9 +319,21 @@ export default {
 				reviewDepartment: '',
 				investigatorId: '',
 				investigatorName: '',
-				purchase_department: '',
-				purchase_departmentName: ''
+				purchaseDepartment: '',
+				purchaseDepartmentName: ''
+			}
+		}
+	},
+	computed: {
+		supplierCategoryDesc() {
+			const v = this.form && this.form.supplierCategory != null ? String(this.form.supplierCategory) : ''
+			const map = {
+				A: '资信调查有担保函无资金风险、资料齐全，料质可控，价格较好，若出现质量、磅差问题可以索赔解决，进口倒挂时可协商延迟点价，可推迟发货，可试操作（前3个月每月操作量300-500吨）；第一次计划货到厂验收结束后进行评审，正常后可以增量操作，要求每年评审一次；',
+				B: '资信调查无担保函，国外企业属国内企业控股，无资金风险、资料齐全，价格较好，料质可控，若出现质量、磅差问题可以索赔解决（前3个月每月操作量200-400吨），第一次货到厂验收合格后可增量操作；操作正常每年评审一次；',
+				C: '资信调查无担保函，资料齐全，料质可控，价格一般，出现质量、磅差问题可以索赔解决，可试单限量操作（前3个月每月操作量100-200吨），第一次货到厂验收合格后可增量操作，新开发供应商首年操作按每半年评审一次，操作正常则次年调整为每年评审一次；若出现索赔问题不及时解决可中止后续开信用证和中止到港货物的DP/TT付款，且立即暂停业务操作。',
+				D: '资信调查无担保函，通过委托第三方机构调查无风险，虽然资料不齐全，但料质可控，价格略高，出现质量、磅差问题索赔解决有难度，一单一议，D类供应商第一次货到厂验收、付款、退款或者索赔正常后，可继续操作逐步增量（每月操作量100-200吨），每半年评审一次，操作正常到则次年调整为每年评审一次；若出现索赔问题不及时解决可终止后续到港货物的付款，且立即停止业务操作。'
 			}
+			return map[v] || ''
 		}
 	},
 	async onLoad(query) {
@@ -343,20 +359,18 @@ export default {
 		async loadPurchaseDeptOptions() {
 			try {
 				const res = await getPurchaseDeptApi()
-				const list = (res && res.data) ? res.data : []
-				this.purchaseDeptOptions = (Array.isArray(list) ? list : []).map(it => ({
-					label: it && it.name != null ? String(it.name) : '',
-					value: it && it.id != null ? String(it.id) : ''
-				})).filter(it => it.value)
+				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) : ''
 			} catch (e) {
-				this.purchaseDeptOptions = []
+				this.form.purchaseDepartment = ''
+				this.form.purchaseDepartmentName = ''
 			}
 		},
 		displayLabel(field) {
 			const m = this.form || {}
 			const map = {
 				companyNatureName: '请选择',
-				purchase_departmentName: '请选择',
 				supplierCategory: '请选择'
 			}
 			if (field === 'supplierCategory') {
@@ -371,8 +385,7 @@ export default {
 		openSheet(field) {
 			const map = {
 				companyNature: { title: '公司性质', options: this.companyNatureOptions, valueField: 'companyNature', labelField: 'companyNatureName' },
-				supplierCategory: { title: '供应商分类', options: this.supplierCategoryOptions, valueField: 'supplierCategory', labelField: '' },
-				purchase_department: { title: '采购处', options: this.purchaseDeptOptions, valueField: 'purchase_department', labelField: 'purchase_departmentName' }
+				supplierCategory: { title: '供应商分类', options: this.supplierCategoryOptions, valueField: 'supplierCategory', labelField: '' }
 			}
 			const cfg = map[field]
 			if (!cfg) return
@@ -393,9 +406,7 @@ export default {
 			if (field === 'supplierCategory') {
 				this.form.supplierCategory = value
 			}
-			if (field === 'purchase_department') this.form.purchase_departmentName = label
 			if (field === 'companyNature') this.form.companyNature = value
-			if (field === 'purchase_department') this.form.purchase_department = value
 			this.sheet.visible = false
 		},
 		async loadDetail() {
@@ -412,10 +423,6 @@ export default {
 					const found = (this.companyNatureOptions || []).find(o => String(o.value) === String(this.form.companyNature))
 					if (found) this.form.companyNatureName = String(found.label || '')
 				}
-				if (!this.form.purchase_departmentName && this.form.purchase_department) {
-					const found = (this.purchaseDeptOptions || []).find(o => String(o.value) === String(this.form.purchase_department))
-					if (found) this.form.purchase_departmentName = String(found.label || '')
-				}
 			} catch (e) {
 				uni.showToast({ title: '详情加载失败', icon: 'none' })
 			} finally {
@@ -460,7 +467,7 @@ export default {
 				{ key: 'nextReviewTime', label: '下次评审时间' },
 				{ key: 'reviewDepartment', label: '评审部门' },
 				{ key: 'investigatorId', label: '资信调查人ID' },
-				{ key: 'purchase_department', label: '采购处' }
+				{ key: 'purchaseDepartment', label: '采购处' }
 			]
 			for (let i = 0; i < requiredFields.length; i++) {
 				const f = requiredFields[i]