From 3b4c3e1552545541d27ad9cee0cc526f04bd183f Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Wed, 18 Dec 2024 21:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MemberCommonController.java    |   2 +-
 .../components/member/MemChangeApply.vue      | 112 ++++++++++--------
 .../static/components/member/MemberInfo.vue   |   2 +-
 3 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java b/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java
index 53114bf..8bc5a93 100644
--- a/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java
+++ b/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java
@@ -266,7 +266,7 @@ public class MemberCommonController {
                             COLUMN_COMMENT
                         FROM INFORMATION_SCHEMA.COLUMNS
                             WHERE TABLE_NAME = 'sys_user'
-                            AND TABLE_SCHEMA = 'union_cpu'
+                            AND TABLE_SCHEMA = 'zhgh_hmc'
                     """);
             List<NutMap> userTableColumnInfos = sysUserService.listMap(userColumnSql);
 
diff --git a/src/main/resources/static/components/member/MemChangeApply.vue b/src/main/resources/static/components/member/MemChangeApply.vue
index 6789810..896418c 100644
--- a/src/main/resources/static/components/member/MemChangeApply.vue
+++ b/src/main/resources/static/components/member/MemChangeApply.vue
@@ -88,22 +88,22 @@
 
       <div v-else-if="welfare_member&&['2'].includes(formData.type)">
         <el-row :gutter="20">
-         <el-col :span="12">
-           <el-form-item prop="updateWelfareMember" label="福利会员">
-             <el-radio-group v-model="formData.updateWelfareMember" size="small">
-               <el-radio :label="true" border>享受福利</el-radio>
-               <el-radio :label="false" border>不享受福利</el-radio>
-             </el-radio-group>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12">
-           <el-form-item prop="updateMember" label="工会会员">
-             <el-radio-group v-model="formData.updateMember" size="small">
-               <el-radio :label="true" border>成为会员</el-radio>
-               <el-radio :label="false" border>不成为会员</el-radio>
-             </el-radio-group>
-           </el-form-item>
-         </el-col>
+          <el-col :span="12">
+            <el-form-item prop="updateWelfareMember" label="福利会员">
+              <el-radio-group v-model="formData.updateWelfareMember" size="small">
+                <el-radio :label="true" border>享受福利</el-radio>
+                <el-radio :label="false" border>不享受福利</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="updateMember" label="工会会员">
+              <el-radio-group v-model="formData.updateMember" size="small">
+                <el-radio :label="true" border>成为会员</el-radio>
+                <el-radio :label="false" border>不成为会员</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </div>
 
@@ -118,39 +118,52 @@
 
       <div v-else-if="welfare_member&&['3','4','5','6','8'].includes(formData.type)">
         <el-row :gutter="20">
-         <el-col :span="12">
-           <el-form-item prop="updateWelfareMember" label="福利会员">
-             <el-radio-group v-model="formData.updateWelfareMember" size="small">
-               <el-radio :label="true" border>保留享受福利</el-radio>
-               <el-radio :label="false" border>取消享受福利</el-radio>
-             </el-radio-group>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12">
-           <el-form-item prop="updateMember" label="工会会员">
-             <el-radio-group v-model="formData.updateMember" size="small">
-               <el-radio :label="true" border>保留会员资格</el-radio>
-               <el-radio :label="false" border>取消会员资格</el-radio>
-             </el-radio-group>
-           </el-form-item>
-         </el-col>
+          <el-col :span="12">
+            <el-form-item prop="updateWelfareMember" label="福利会员">
+              <el-radio-group v-model="formData.updateWelfareMember" size="small">
+                <el-radio :label="true" border>保留享受福利</el-radio>
+                <el-radio :label="false" border>取消享受福利</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="updateMember" label="工会会员">
+              <el-radio-group v-model="formData.updateMember" size="small">
+                <el-radio :label="true" border>保留会员资格</el-radio>
+                <el-radio :label="false" border>取消会员资格</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
 
-        <template v-if="welfare_member&&['3','4','5','6','8'].includes(formData.type)">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item prop="userState" label="原在职状态">
+              <el-input v-model="formData.userState" readonly placeholder="原在职状态"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="updateUserState" label="是否改变在职状态" style="width: 100%">
+              <dict-select v-model="formData.changeUserState" style="width: 100%" clearable placeholder="是否改变在职状态"
+                           code="userState"></dict-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        </template>
-
-        <el-form-item prop="updateUserState" label="是否改变在职状态" style="width: 100%">
-          <dict-select v-model="formData.changeUserState" style="width: 100%" clearable placeholder="变更类型"
-                       code="userState"></dict-select>
-        </el-form-item>
-
-        <el-form-item prop="updateUserState" label="是否改变人员类型" style="width: 100%"
-                      v-if="welfare_member&&['3','4','5','6','8'].includes(formData.type)">
-          <dict-select v-model="formData.changePersonType" style="width: 100%" clearable
-                       placeholder="人员类型"
-                       code="UserType"></dict-select>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item prop="personType" label="原人员类型">
+              <el-input v-model="formData.personType" readonly placeholder="原人员类型"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="updateUserState" label="是否改变人员类型" style="width: 100%">
+              <dict-select v-model="formData.changePersonType" style="width: 100%" clearable
+                           placeholder="是否改变人员类型"
+                           code="UserType"></dict-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
 
 
@@ -249,11 +262,12 @@ module.exports = {
     }
   },
   methods: {
-    typeChange() {
+    typeChange(val) {
+      console.log(val)
       this.$set(this.formData, "updateWelfareMember", ['2','7'].includes(this.formData.type))
-      this.$set(this.formData, "updateWelfareMember", ['2', '3', '4', '5', '6', '8'].includes(this.formData.type))
-      this.$set(this.formData, "updateMember", ['2', '3', '4', '5', '6', '8'].includes(this.formData.type))
+      this.$set(this.formData, "updateWelfareMember", !['3', '4', '5', '6', '8'].includes(this.formData.type))
       this.$set(this.formData, "updateMember", ['2'].includes(this.formData.type))
+      this.$set(this.formData, "updateMember", !['3', '4', '5', '6', '8'].includes(this.formData.type))
     },
     async doSubmit() {
       this.$refs["form"].validate((valid) => {
diff --git a/src/main/resources/static/components/member/MemberInfo.vue b/src/main/resources/static/components/member/MemberInfo.vue
index 996a3f9..5de135c 100644
--- a/src/main/resources/static/components/member/MemberInfo.vue
+++ b/src/main/resources/static/components/member/MemberInfo.vue
@@ -326,7 +326,7 @@
 
         <div v-else>
             <h3 style="text-align: center; letter-spacing: 6px">工会会员登记表</h3>
-            <div style="text-align: right; letter-spacing: 2px">填表日期：{{ moment(formData.applyTime).format("YYYY年MM月DD日") }}</div>
+<!--            <div style="text-align: right; letter-spacing: 2px">填表日期：{{ moment(formData.applyTime).format("YYYY年MM月DD日") }}</div>-->
 
             <el-descriptions :column="3" border class="descriptions-form">
                 <el-descriptions-item label="姓名">{{ formData.username }}</el-descriptions-item>