From 3e36bd9dab0f00ad99a933fae9c8327058296e98 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 27 Jun 2024 11:11:56 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=B5=B7=E5=A4=96=E4=BC=9A=E8=AE=AE]?=
 =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=95=E4=BD=8D=E8=81=8C=E5=8A=A1=E6=8B=86=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue  | 30 ++++++++++++--
 .../meetManage/SignUpInfoEditOverseas.vue     | 40 ++++++++++---------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 1490785..84302a5 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -282,8 +282,8 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="职务及单位">
-                <a-input placeholder="请输入职务及单位" v-model="queryParam.unit" :maxLength='50'></a-input>
+              <a-form-item label="性别">
+                <a-input placeholder="请输入性别" v-model="queryParam.sex" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -291,6 +291,16 @@
                 <a-input placeholder="请输入国籍" v-model="queryParam.nationality" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="单位">
+                <a-input placeholder="请输入单位" v-model="queryParam.unit" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="职务">
+                <a-input placeholder="请输入职务" v-model="queryParam.post" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="地址">
                 <a-input placeholder="请输入地址" v-model="queryParam.address" :maxLength='50'></a-input>
@@ -631,9 +641,9 @@ export default {
           width: 100
         },
         {
-          title: '职务及单位',
+          title: '性别',
           align: 'center',
-          dataIndex: 'unit',
+          dataIndex: 'sex',
           width: 100
         },
         {
@@ -642,6 +652,18 @@ export default {
           dataIndex: 'nationality',
           width: 100
         },
+        {
+          title: '单位',
+          align: 'center',
+          dataIndex: 'unit',
+          width: 200
+        },
+        {
+          title: '职务',
+          align: 'center',
+          dataIndex: 'post',
+          width: 200
+        },
         {
           title: '地址',
           align: 'center',
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEditOverseas.vue b/src/views/incomePayments/meetManage/SignUpInfoEditOverseas.vue
index 97a3fcb..a00d280 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEditOverseas.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEditOverseas.vue
@@ -25,10 +25,10 @@
               </a-form-item>
             </a-col>
             <a-col :xxl="8" :xl="12" :sm="24">
-              <a-form-item label="职务及单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入职务及单位"
+              <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入性别"
                          :maxLength='50'
-                         v-decorator="['unit',validatorRules.unit]"></a-input>
+                         v-decorator="['sex',validatorRules.sex]"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xxl="8" :xl="12" :sm="24">
@@ -38,6 +38,20 @@
                          v-decorator="['nationality',validatorRules.nationality]"></a-input>
               </a-form-item>
             </a-col>
+            <a-col :xxl="8" :xl="12" :sm="24">
+              <a-form-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入单位"
+                         :maxLength='50'
+                         v-decorator="['unit',validatorRules.unit]"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="8" :xl="12" :sm="24" key="post">
+              <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入职务"
+                         :maxLength='50'
+                         v-decorator="['post',validatorRules.post]"></a-input>
+              </a-form-item>
+            </a-col>
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入地址"
@@ -70,20 +84,6 @@
               </a-form-item>
             </a-col>
             <template v-if="isNeedVisa">
-              <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="外文姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入外文姓名"
-                           :maxLength='50'
-                           v-decorator="['foreignName',validatorRules.foreignName]"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入性别"
-                           :maxLength='50'
-                           v-decorator="['sex',validatorRules.sex]"></a-input>
-                </a-form-item>
-              </a-col>
               <a-col :xxl="8" :xl="12" :sm="24">
                 <a-form-item label="出生日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-date placeholder="请选择出生日期" style="width: 100%;"
@@ -188,8 +188,12 @@ export default {
           rules: [{required: true, message: '请输入姓名'}],
           validateTrigger: 'blur'
         },
+        post: {
+          rules: [{required: true, message: '请输入职务'}],
+          validateTrigger: 'blur'
+        },
         unit: {
-          rules: [{required: true, message: '请输入职务及单位'}],
+          rules: [{required: true, message: '请输入单位'}],
           validateTrigger: 'blur'
         },
         international: {