From c6650e3743bd1e9e19cffb41e07853b47ad56ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?=
 =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com>
Date: Thu, 20 Feb 2025 14:57:51 +0800
Subject: [PATCH] 1

---
 src/pages/pc/pc_message.vue  | 20 ++++-----
 src/pages/register/index.vue | 46 +++++++++++--------
 src/pages/user/user_edit.vue | 85 +++++++++++++++++++-----------------
 3 files changed, 82 insertions(+), 69 deletions(-)

diff --git a/src/pages/pc/pc_message.vue b/src/pages/pc/pc_message.vue
index 357bef6..7dddbd7 100644
--- a/src/pages/pc/pc_message.vue
+++ b/src/pages/pc/pc_message.vue
@@ -24,27 +24,26 @@
       </div>
     </div>
   </t-card>
-
 </template>
 <script lang="ts">
-import store from "@/store";
+import store from '@/store';
 
 export default {
   data() {
     return {
       list: [],
       columns: [
-        {colKey: 'name', title: '姓名', align: 'center', width: 300},
-        {colKey: 'phone', title: '联系方式', align: 'center'},
-        {colKey: 'text', title: '内容', align: 'center'},
-        {colKey: 'createtime', title: '留言时间', align: 'center'},
+        { colKey: 'name', title: '姓名', align: 'center', width: 300 },
+        { colKey: 'phone', title: '联系方式', align: 'center' },
+        { colKey: 'text', title: '内容', align: 'center' },
+        { colKey: 'createtime', title: '留言时间', align: 'center' },
       ],
       pagination: {
         page: 1,
         size: 10,
         total: 0,
       },
-    }
+    };
   },
   mounted() {
     this.getList();
@@ -57,19 +56,18 @@ export default {
 
     getList() {
       this.$request
-        .post("/pc_leave_message/index", {page: this.pagination.page, size: this.pagination.size})
+        .post('/pc_leave_message/index', { page: this.pagination.page, size: this.pagination.size })
         .then((res) => {
           console.log(res);
           if (res.code == 1) {
             this.list = res.data.ret;
             this.pagination.total = res.data.count;
           }
-
         })
         .catch((e) => {
           console.log(e);
         });
     },
-  }
-}
+  },
+};
 </script>
diff --git a/src/pages/register/index.vue b/src/pages/register/index.vue
index 6fb8083..4faeed8 100644
--- a/src/pages/register/index.vue
+++ b/src/pages/register/index.vue
@@ -77,22 +77,22 @@
             <div style="margin-left: 50px">
               <t-space direction="vertical">
                 <t-form layout="inline" labelAlign="top" :labelWidth="100">
-                  <t-form-item label="姓名" :rules="[ { required: true, message: '此项必填' }]">
+                  <t-form-item label="姓名" :requiredMark="true">
                     <t-input size="large" v-model="formData.nikename" placeholder="请输入姓名"/>
                   </t-form-item>
-                  <t-form-item label="性别" name="name">
+                  <t-form-item label="性别" name="name" :requiredMark="true">
                     <t-select size="large" v-model="formData.gender" :style="{ width: '200px' }">
                       <t-option :key="0" label="女" :value="0"></t-option>
                       <t-option :key="1" label="男" :value="1"></t-option>
                     </t-select>
                   </t-form-item>
-                  <t-form-item label="出生年月日">
+                  <t-form-item label="出生年月日" :requiredMark="true">
                     <t-date-picker size="large" :style="{ width: '200px' }" v-model="formData.birth_time"/>
                   </t-form-item>
-                  <t-form-item label="民族">
+                  <t-form-item label="民族" :requiredMark="true">
                     <t-input size="large" v-model="formData.nation" placeholder="请输入民族"/>
                   </t-form-item>
-                  <t-form-item label="政治面貌">
+                  <t-form-item label="政治面貌" :requiredMark="true">
                     <t-select size="large" v-model="formData.political" placeholder="请选择政治面貌"
                               :style="{ width: '200px' }">
                       <t-option value="中共党员" label="中共党员" key="中共党员"></t-option>
@@ -110,19 +110,19 @@
                       <t-option value="无党派人士" label="无党派人士" key="无党派人士"></t-option>
                     </t-select>
                   </t-form-item>
-                  <t-form-item label="身份证号码">
+                  <t-form-item label="身份证号码" :requiredMark="true">
                     <t-input size="large" v-model="formData.card_number" placeholder="请输入身份证号码"/>
                   </t-form-item>
-                  <t-form-item label="工作单位">
+                  <t-form-item label="工作单位" :requiredMark="true">
                     <t-input size="large" v-model="formData.work_unit" placeholder="请输入工作单位"/>
                   </t-form-item>
-                  <t-form-item label="单位职务">
+                  <t-form-item label="单位职务" :requiredMark="true">
                     <t-input size="large" v-model="formData.unit_position" placeholder="请输入单位职务"/>
                   </t-form-item>
-                  <t-form-item label="通讯地址">
+                  <t-form-item label="通讯地址" :requiredMark="true">
                     <t-input size="large" v-model="formData.mail_address" placeholder="请输入通讯地址"/>
                   </t-form-item>
-                  <t-form-item label="籍贯">
+                  <t-form-item label="籍贯" :requiredMark="true">
                     <t-input size="large" v-model="formData.jiguan" placeholder="请输入籍贯"/>
                   </t-form-item>
                   <t-form-item label="毕业院校">
@@ -398,22 +398,22 @@
             <div style="width: 100%">
               <t-space direction="vertical">
                 <t-form layout="inline" labelAlign="top" :labelWidth="100">
-                  <t-form-item label="企业名称">
+                  <t-form-item label="企业名称" :requiredMark="true">
                     <t-input size="large" v-model="formData.enterprise_name" placeholder="请输入企业名称"/>
                   </t-form-item>
-                  <t-form-item label="统一社会信用代码">
+                  <t-form-item label="统一社会信用代码" :requiredMark="true">
                     <t-input size="large" v-model="formData.unified_code" placeholder="请输入统一社会信用代码"/>
                   </t-form-item>
-                  <t-form-item label="企业注册地">
+                  <t-form-item label="企业注册地" :requiredMark="true">
                     <t-input size="large" v-model="formData.enterprise_location" placeholder="请输入企业注册地"/>
                   </t-form-item>
-                  <t-form-item label="企业位置经度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
+                  <t-form-item :requiredMark="true" label="企业位置经度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
                     <t-input size="large" v-model="formData.longitude" placeholder="地图经度（如：116.xxx ）"/>
                   </t-form-item>
-                  <t-form-item label="企业位置纬度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
+                  <t-form-item :requiredMark="true" label="企业位置纬度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
                     <t-input size="large" v-model="formData.dimension" placeholder="地图纬度（如：39.xxx ）"/>
                   </t-form-item>
-                  <t-form-item label="注册资金（万元）">
+                  <t-form-item label="注册资金（万元）" :requiredMark="true">
                     <t-input size="large" v-model="formData.registered_capital" placeholder="注册资金（万元）"/>
                   </t-form-item>
                   <t-form-item label="是否上市" name="name">
@@ -425,7 +425,7 @@
                   <t-form-item label="员工人数">
                     <t-input size="large" v-model="formData.employee" placeholder="请输入员工人数"/>
                   </t-form-item>
-                  <t-form-item label="所属行业" name="name">
+                  <t-form-item label="所属行业" name="name" :requiredMark="true">
                     <t-select size="large" v-model="formData.industry_id" :style="{ width: '200px' }">
                       <t-option v-for="(item,index) in industry_list" :label="item.industry_name"
                                 :value="item.id"></t-option>
@@ -1370,8 +1370,16 @@ export default {
         this.$message.error('请输入身份证号码！');
         return;
       }
-      if (this.formData.jiguan == '') {
-        this.$message.error('请输入籍贯！');
+      if (this.formData.work_unit == '') {
+        this.$message.error('请输入工作单位！');
+        return;
+      }
+      if (this.formData.unit_position == '') {
+        this.$message.error('请输入单位职务！');
+        return;
+      }
+      if (this.formData.mail_address == '') {
+        this.$message.error('请输入通讯地址！');
         return;
       }
       if (this.formData.business_license_image == '') {
diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue
index 83cca75..1d0c715 100644
--- a/src/pages/user/user_edit.vue
+++ b/src/pages/user/user_edit.vue
@@ -1205,7 +1205,7 @@ export default {
           this.formData.phone = res.data.phone;
           this.formData.position_id = res.data.position_id;
           this.formData.industry_id = res.data.industry_id==0?null:res.data.industry_id;
-          this.formData.region_id = res.data.region_id;
+          this.formData.region_id = res.data.region_id==0?null:res.data.region_id;
           this.formData.password = res.data.password;
           this.formData.nikename = res.data.nikename;
           this.formData.gender = res.data.gender;
@@ -1226,35 +1226,10 @@ export default {
           this.formData.other_contacts = res.data.other_contacts;
           this.formData.other_social_positions = res.data.other_social_positions;
           this.formData.position = res.data.position;
-          if (res.data.cardf_image == '') {
-            this.formData.cardf_image_show = [];
-          } else {
-            this.formData.cardf_image_show = [{url: store.state.user.apiUrl + res.data.cardf_image}];
-          }
-          if (res.data.cardz_image == '') {
-            this.formData.cardz_image_show = [];
-          } else {
-            this.formData.cardz_image_show = [{url: store.state.user.apiUrl + res.data.cardz_image}];
-          }
-          if (res.data.photo_image == '') {
-            this.formData.photo_image_show = [];
-          } else {
-            this.formData.photo_image_show = [{url: store.state.user.apiUrl + res.data.photo_image}];
-          }
-          if (res.data.company_image == '') {
-            this.formData.company_image_show = [];
-          } else {
-            this.formData.company_image_show = [{url: store.state.user.apiUrl + res.data.company_image}];
-          }
           this.formData.cardf_image = res.data.cardf_image;
           this.formData.cardz_image = res.data.cardz_image;
           this.formData.photo_image = res.data.photo_image;
           this.formData.company_image = res.data.company_image;
-          if (res.data.business_license_image == '') {
-            this.formData.business_license_image_show = [];
-          } else {
-            this.formData.business_license_image_show = [{url: store.state.user.apiUrl + res.data.business_license_image}];
-          }
           this.formData.business_license_image = res.data.business_license_image;
           this.formData.unified_code = res.data.unified_code;
           this.formData.enterprise_nature = res.data.enterprise_nature;
@@ -1286,17 +1261,6 @@ export default {
           this.formData.documents_file_show = [{url: store.state.user.apiUrl + res.data.documents_file}];
           this.formData.introduction = res.data.introduction;
           this.formData.enterprise_name = res.data.enterprise_name;
-          if(res.data.work_experience==null||res.data.work_experience==''){
-            this.workList = [];
-          }else{
-            this.workList = JSON.parse(res.data.work_experience);
-          }
-          this.social_duties = res.data.main_social_positions.split(',');
-          if(res.data.other_contacts==null||res.data.other_contacts==''){
-            this.contactsList = [];
-          }else{
-            this.contactsList = JSON.parse(res.data.other_contacts);
-          }
           this.formData.longitude = res.data.longitude;
           this.formData.dimension=res.data.dimension;
           this.formData.reporting_method = res.data.reporting_method;
@@ -1308,8 +1272,51 @@ export default {
           this.formData.mail_address=res.data.mail_address;
           this.formData.zip_code=res.data.zip_code;
           this.formData.registered_capital=res.data.registered_capital;
-          this.tuan_list = JSON.parse(res.data.tuanweifuzerenxinxi);
-
+          if(res.data.tuanweifuzerenxinxi!=''&&res.data.tuanweifuzerenxinxi!=null){
+            this.tuan_list = JSON.parse(res.data.tuanweifuzerenxinxi);
+          }else{
+            this.tuan_list = [];
+          }
+          if (res.data.business_license_image == '') {
+            this.formData.business_license_image_show = [];
+          } else {
+            this.formData.business_license_image_show = [{url: store.state.user.apiUrl + res.data.business_license_image}];
+          }
+          if (res.data.cardf_image == '') {
+            this.formData.cardf_image_show = [];
+          } else {
+            this.formData.cardf_image_show = [{url: store.state.user.apiUrl + res.data.cardf_image}];
+          }
+          if (res.data.cardz_image == '') {
+            this.formData.cardz_image_show = [];
+          } else {
+            this.formData.cardz_image_show = [{url: store.state.user.apiUrl + res.data.cardz_image}];
+          }
+          if (res.data.photo_image == '') {
+            this.formData.photo_image_show = [];
+          } else {
+            this.formData.photo_image_show = [{url: store.state.user.apiUrl + res.data.photo_image}];
+          }
+          if (res.data.company_image == '') {
+            this.formData.company_image_show = [];
+          } else {
+            this.formData.company_image_show = [{url: store.state.user.apiUrl + res.data.company_image}];
+          }
+          if(res.data.work_experience==null||res.data.work_experience==''){
+            this.workList = [];
+          }else{
+            this.workList = JSON.parse(res.data.work_experience);
+          }
+          if( res.data.main_social_positions==''|| res.data.main_social_positions==null){
+            this.social_duties = [];
+          }else {
+            this.social_duties = res.data.main_social_positions.split(',');
+          }
+          if(res.data.other_contacts==null||res.data.other_contacts==''){
+            this.contactsList = [];
+          }else{
+            this.contactsList = JSON.parse(res.data.other_contacts);
+          }
         })
         .catch((e) => {
           console.log(e);