Merge remote-tracking branch 'origin/master'

snowy-admin-web/src/utils/tool.js

@@ -100,7 +100,7 @@ tool.dictTypeData = (dictValue, value) => {
 	}
 	const children = tree.children
 	const dict = children.find((item) => item.dictValue === value)
-	return dict ? dict.dictLabel : '无此字典项'
+	return dict ? dict.dictLabel : value
 }
 
 // 获取某个code下字典的列表，多用于字典下拉框

snowy-admin-web/src/views/yqyc/zero/enterprise-ledger/detail.vue

@@ -309,12 +309,12 @@
 						<template v-if="column.dataIndex === 'declareUnit'">
 							{{ $TOOL.dictTypeData('measurement unit', record.declareUnit) }}
 						</template>
-						<template v-if="column.dataIndex === 'legalUnit'">
-							{{ $TOOL.dictTypeData('measurement unit', record.legalUnit) }}
-						</template>
-						<template v-if="column.dataIndex === 'legalSecondUnit'">
-							{{ $TOOL.dictTypeData('measurement unit', record.legalSecondUnit) }}
-						</template>
+<!--						<template v-if="column.dataIndex === 'legalUnit'">-->
+<!--							{{ $TOOL.dictTypeData('measurement unit', record.legalUnit) }}-->
+<!--						</template>-->
+<!--						<template v-if="column.dataIndex === 'legalSecondUnit'">-->
+<!--							{{ $TOOL.dictTypeData('measurement unit', record.legalSecondUnit) }}-->
+<!--						</template>-->
 						<template v-if="column.dataIndex === 'originCountry'">
 							{{ $TOOL.dictTypeData('address', record.originCountry) }}
 						</template>
@@ -633,8 +633,8 @@ const onOpen = (record, view = false, type) => {
 		formData.value.companyLegalPhone = userInfo.contactPhone
 		formData.value.companyJyFw = userInfo.businessScope
 		formData.value.applyType = 'basq'
-		onProductReset()
 	}
+	onProductReset()
 	tzTypeOptions.value = tool.dictList('tzlx')
 	applyTypeOptions.value = tool.dictList('qybalx')
 	companyTypeOptions.value = tool.dictList('qylx')