Merge branch 'master' of https://github.com/maxVaJp/va_admin_frontend

src/modules/payment/views/business.vue

@@ -37,6 +37,12 @@ const { service } = useCool();
 
 // cl-upsert
 const Upsert = useUpsert({
+	// dialog: {
+	// 	width: '600px'
+	// },
+	props: {
+		labelWidth: '140px'
+	},
 	items: [
 		{
 			label: '商户ID',
@@ -128,13 +134,19 @@ const Upsert = useUpsert({
 			required: true
 		},
 		{
-			label: '合作伙伴文件编号',
-			prop: 'partners_document_number',
+			label: '合伙人类型',
+			prop: 'partners_kind',
+			component: { name: 'el-input', props: { clearable: true } },
+			required: true
+		},
+		{
+			label: '合伙人名称',
+			prop: 'partners_name',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
 		{
-			label: '合作伙伴文件类型',
+			label: '合伙人证件类型',
 			prop: 'partners_document_type',
 			component: {
 				name: 'el-select',
@@ -149,25 +161,19 @@ const Upsert = useUpsert({
 			required: true
 		},
 		{
-			label: '合作伙伴类型',
-			prop: 'partners_kind',
-			component: { name: 'el-input', props: { clearable: true } },
-			required: true
-		},
-		{
-			label: '合作伙伴名称',
-			prop: 'partners_name',
+			label: '合伙人证件编号',
+			prop: 'partners_document_number',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
 		{
-			label: '合作伙伴百分比',
+			label: '合伙人百分比',
 			prop: 'partners_percentage_share',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
 		{
-			label: '合作伙伴地址国家',
+			label: '合伙人地址国家',
 			prop: 'partners_address_country',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true

src/modules/payment/views/components/business.vue

@@ -119,23 +119,23 @@ const Upsert = useUpsert({
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
-		// {
-		// 	label: '注册日期',
-		// 	prop: 'registration_date',
-		// 	component: {
-		// 		name: 'el-date-picker',
-		// 		props: { type: 'date', valueFormat: 'YYYY-MM-DD' }
-		// 	},
-		// 	required: true
-		// },
-		{
-			label: '合作伙伴文件编号',
+		{
+			label: '注册日期',
+			prop: 'registration_date',
+			component: {
+				name: 'el-date-picker',
+				props: { type: 'datetime', valueFormat: 'YYYY-MM-DD HH:mm:ss' }
+			},
+			required: true
+		},
+		{
+			label: '合伙人文件编号',
 			prop: 'partners_document_number',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
 		{
-			label: '合作伙伴文件类型',
+			label: '合伙人文件类型',
 			prop: 'partners_document_type',
 			component: {
 				name: 'el-select',
@@ -150,25 +150,25 @@ const Upsert = useUpsert({
 			required: true
 		},
 		{
-			label: '合作伙伴类型',
+			label: '合伙人类型',
 			prop: 'partners_kind',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
 		{
-			label: '合作伙伴名称',
+			label: '合伙人名称',
 			prop: 'partners_name',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
 		{
-			label: '合作伙伴百分比',
+			label: '合伙人百分比',
 			prop: 'partners_percentage_share',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true
 		},
 		{
-			label: '合作伙伴地址国家',
+			label: '合伙人地址国家',
 			prop: 'partners_address_country',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true

src/modules/payment/views/individual.vue

@@ -93,7 +93,7 @@ const Upsert = useUpsert({
 			required: true
 		},
 		{
-			label: '证书类型',
+			label: '证件类型',
 			prop: 'certificate_type',
 			component: {
 				name: 'el-select',
@@ -103,7 +103,7 @@ const Upsert = useUpsert({
 			required: true
 		},
 		{
-			label: '身份证号',
+			label: '证件号码',
 			prop: 'id_number',
 			component: { name: 'el-input', props: { clearable: true } },
 			required: true