1.优化新增页面

2.优化编辑页面
3.优化入会页面

src/pages/register/index.vue

@@ -4,7 +4,7 @@
     <!-- <div>
       <img src="https://hnyea.0rui.cn/uploads/1/20240820/7c06389c1dd2fbd4f2d191cdb6c67bb1.png" style="width: 100%"/>
     </div> -->
-    <div style="width: 88%;">
+    <div class="reg_box">
       <div>
         <div style="background-color: #fff;border-radius: 10px;padding: 20px;">
           <div
@@ -75,7 +75,7 @@
                   :data="{ association_id: 1 }" accept="image/*"
                   :format-response="(response) => formatResponse(response, 1)">
                   <div class="sfz">
-                    <img v-if="formData.cardz_image == ''" src="/src/assets/card1.png"
+                    <img v-if="formData.cardz_image == ''" src="@/assets/card1.png"
                       style="width: 220px; height: 124px;">
                     <img v-if="formData.cardz_image != ''" :src="$store.state.user.apiUrl + formData.cardz_image"
                       style="width: 220px; height: 124px;object-fit: cover;" />
@@ -90,7 +90,7 @@
                 <t-upload :action="$store.state.user.apiUrl + '/api/common/upload'" :data="{ association_id: 1 }"
                   theme="custom" accept="image/*" :format-response="(response) => formatResponse(response, 2)">
                   <div class="sfz">
-                    <img v-if="formData.cardf_image == ''" src="/src/assets/card2.png"
+                    <img v-if="formData.cardf_image == ''" src="@/assets/card2.png"
                       style="width: 220px; height: 124px;">
                     <img v-if="formData.cardf_image != ''" :src="$store.state.user.apiUrl + formData.cardf_image"
                       style="width: 220px; height: 124px;object-fit: cover;" />
@@ -110,7 +110,7 @@
                   <t-upload :action="$store.state.user.apiUrl + '/api/common/upload'" :data="{ association_id: 1 }"
                     theme="custom" accept="image/*" :format-response="(response) => formatResponse(response, 0)">
                     <div class="sfz">
-                      <img v-if="formData.photo_image == ''" src="/src/assets/card3.png"
+                      <img v-if="formData.photo_image == ''" src="@/assets/card3.png"
                         style="width: 220px; height: 310px" />
                       <img v-if="formData.photo_image != ''" :src="$store.state.user.apiUrl + formData.photo_image"
                         style="width: 220px; height: 310px" />
@@ -123,7 +123,7 @@
                   ">
                     <img :src="$store.state.user.apiUrl + formData.photo_image" style="width: 200px; display: block"
                       v-if="formData.photo_image != ''" />
-                    <img v-if="formData.photo_image == ''" src="/src/assets/card3.png">
+                    <img v-if="formData.photo_image == ''" src="@/assets/card3.png">
                   </div>
                 </div> -->
                 <t-form layout="inline" labelAlign="top">
@@ -269,7 +269,7 @@
                     </t-form-item>
                     <t-form-item label=" ">
                       <div>
-                        <img src="/src/assets/del.png" @click="delHj(index)"
+                        <img src="@/assets/del.png" @click="delHj(index)"
                           style="cursor: pointer;width: 30px;height: 30px;" />
                       </div>
                     </t-form-item>
@@ -295,7 +295,7 @@
                     </t-form-item>
                     <t-form-item label=" ">
                       <div>
-                        <img src="/src/assets/del.png" @click="delWork(index)"
+                        <img src="@/assets/del.png" @click="delWork(index)"
                           style="cursor: pointer;width: 30px;height: 30px;" />
                       </div>
                     </t-form-item>
@@ -316,7 +316,7 @@
                   <t-space direction="vertical">
                     <t-form>
                       <t-form-item>
-                        <t-checkbox-group v-model="formData.main_social_positions">
+                        <t-checkbox-group v-model="formData.main_social">
                           <t-checkbox value="全国人大代表">全国人大代表</t-checkbox>
                           <t-checkbox value="全国政协委员">全国政协委员</t-checkbox>
                           <t-checkbox value="全国青联委员">全国青联委员</t-checkbox>
@@ -451,7 +451,7 @@
                   :data="{ association_id: 1 }" accept="image/*,.pdf"
                   :format-response="(response) => formatResponse(response, 3)">
                   <div class="sfz">
-                    <img v-if="formData.business_license_image == ''" src="/src/assets/c4.png"
+                    <img v-if="formData.business_license_image == ''" src="@/assets/c4.png"
                       style="width:220px; height: 124px" />
                     <img
                       v-if="formData.business_license_image != '' && getExt(formData.business_license_image) != 'pdf'"
@@ -472,8 +472,7 @@
                   :data="{ association_id: 1 }" accept="image/*"
                   :format-response="(response) => formatResponse(response, 6)">
                   <div class="sfz">
-                    <img v-if="formData.company_image == ''" src="/src/assets/c5.png"
-                      style="width:220px; height: 124px" />
+                    <img v-if="formData.company_image == ''" src="@/assets/c5.png" style="width:220px; height: 124px" />
                     <img v-if="formData.company_image != ''" :src="$store.state.user.apiUrl + formData.company_image"
                       style="width:220px; height: 124px;object-fit: cover;" />
                   </div>
@@ -488,7 +487,7 @@
                   :data="{ association_id: 1 }" accept="image/*,.pdf"
                   :format-response="(response) => formatResponse(response, 7)">
                   <div class="sfz">
-                    <img v-if="formData.enterprise_credit_report == ''" src="/src/assets/c3.png"
+                    <img v-if="formData.enterprise_credit_report == ''" src="@/assets/c3.png"
                       style="width:220px; height: 124px" />
                     <img
                       v-if="formData.enterprise_credit_report != '' && getExt(formData.enterprise_credit_report) != 'pdf'"
@@ -510,7 +509,7 @@
                   :data="{ association_id: 1 }" accept="image/*,.pdf"
                   :format-response="(response) => formatResponse(response, 9)">
                   <div class="sfz">
-                    <img v-if="formData.certificate_of_no_criminal_record == ''" src="/src/assets/c1.png"
+                    <img v-if="formData.certificate_of_no_criminal_record == ''" src="@/assets/c1.png"
                       style="width:220px; height: 124px" />
                     <img
                       v-if="formData.certificate_of_no_criminal_record != '' && getExt(formData.certificate_of_no_criminal_record) != 'pdf'"
@@ -533,7 +532,7 @@
                   :format-response="(response) => formatResponse(response, 10)">
                   <div class="sfz">
                     <img v-if="formData.certificate_of_business_tax_payment_for_the_previous_year == ''"
-                      src="/src/assets/c1.png" style="width:220px; height: 124px" />
+                      src="@/assets/c1.png" style="width:220px; height: 124px" />
                     <img
                       v-if="formData.certificate_of_business_tax_payment_for_the_previous_year != '' && getExt(formData.certificate_of_business_tax_payment_for_the_previous_year) != 'pdf'"
                       :src="$store.state.user.apiUrl + formData.certificate_of_business_tax_payment_for_the_previous_year"
@@ -554,7 +553,7 @@
                   :data="{ association_id: 1 }" accept="image/*"
                   :format-response="(response) => formatResponse(response, 8)">
                   <div class="sfz">
-                    <img v-if="formData.enterprise_credit_information_report == ''" src="/src/assets/c1.png"
+                    <img v-if="formData.enterprise_credit_information_report == ''" src="@/assets/c1.png"
                       style="width:220px; height: 124px" />
                     <img
                       v-if="formData.enterprise_credit_information_report != '' && getExt(formData.enterprise_credit_information_report) != 'pdf'"
@@ -587,7 +586,7 @@
                     </t-form-item>
                     <t-form-item label=" ">
                       <div>
-                        <img src="/src/assets/del.png" @click="delContacts(index)"
+                        <img src="@/assets/del.png" @click="delContacts(index)"
                           style="cursor: pointer;width: 30px;height: 30px;" />
                       </div>
                     </t-form-item>
@@ -653,7 +652,7 @@
                         <div @click.stop="delZl(index)"
                           style="z-index: 100;width: 100%; height: 100%;background-color: rgba(0, 0, 0, 0.5);position: absolute;top: 0;left: 0;">
                           <div style="position: absolute;left: 0;right: 0;top:35%;bottom: 0;margin: auto;">
-                            <img src="/src/assets/del.png" style="width: 30px;height: 30px;">
+                            <img src="@/assets/del.png" style="width: 30px;height: 30px;">
                             <div style="color: #ffffff;font-size: 14px;">删除文件</div>
                           </div>
                         </div>
@@ -662,7 +661,7 @@
                         <img v-if="getExt(item) != 'pdf'" :src="$store.state.user.apiUrl + item"
                           style="width: 100%; height: 100%;object-fit: cover;" />
                       </div>
-                      <img src="/src/assets/card4.png" style="width: 220px;height: 293px;" />
+                      <img src="@/assets/card4.png" style="width: 220px;height: 293px;" />
                     </div>
                   </t-upload>
                 </div>
@@ -737,9 +736,8 @@
                       <span style="color: #d54941;">*</span>
                       <span>国家/城市</span>
                     </div>
-                    <t-cascader :load="load"  size="large" :input-props="inputProps"
-                      v-model="formData.abroad_region" value-type="full" :options="internationa_list"
-                      style="width:500px;"></t-cascader>
+                    <t-cascader :load="load" size="large" :input-props="inputProps" v-model="formData.abroad_region_arr"
+                    value-type="full"  :options="internationa_list" style="width:500px;"></t-cascader>
                   </div>
                   <div>
                     <div style="margin-bottom: 10px;">
@@ -870,7 +868,7 @@
                       </t-form-item>
                       <t-form-item label=" ">
                         <div>
-                          <img src="/src/assets/del.png" @click="delParty(index)"
+                          <img src="@/assets/del.png" @click="delParty(index)"
                             style="cursor: pointer;width: 30px;height: 30px;" />
                         </div>
                       </t-form-item>
@@ -943,7 +941,7 @@
                       </t-form-item>
                       <t-form-item label=" ">
                         <div>
-                          <img src="/src/assets/del.png" @click="delTuan(index)"
+                          <img src="@/assets/del.png" @click="delTuan(index)"
                             style="cursor: pointer;width: 30px;height: 30px;" />
                         </div>
                       </t-form-item>
@@ -954,7 +952,7 @@
               </div>
             </div>
             <div style="height: 1px; background-color: #EEEEEE; width: 100%; margin-top: 20px"></div>
-            <div id="submit" style="padding: 50px 0px; text-align: center">
+            <div id="submit" style="text-align: center;margin-top: 20px;">
               <t-button @click="submit" size="large">确定保存</t-button>
               <!-- <t-button size="large" @click="download" theme="warning" style="margin-left: 50px">生成PDF</t-button> -->
             </div>
@@ -999,8 +997,7 @@
         </div>
       </t-dialog> -->
     </div>
-    <div class="right_card_box"
-      style="background-color: #fff;border-radius: 10px;width: 12%;height: 80%;;position: fixed;right: 0;overflow-y: auto;">
+    <div class="right_card_box">
       <t-collapse v-model="collapse" :expand-icon="false" :borderless="true" style="width: 100%;">
         <t-collapse-panel v-for="(item, index) in right_card_list" :key="index">
           <template #header>
@@ -1144,7 +1141,8 @@ export default {
           post: '',
           phone: '',
         }],
-        main_social_positions: [],//社会职务
+        main_social_positions: '',//社会职务
+        main_social: [],
         other_social_positions: '',//其他社会职务
         enterprise_name: '',//企业名称
         unified_code: '',//统一社会信用代码
@@ -1175,8 +1173,9 @@ export default {
         qitaqiyerenzhiqingkuang: '',//其他企业人员资质情况
         enterprise_lvxingzeren: '',//企业履行社会责任情况
         if_abroad: null,//是否海外业务 1开展 2不开展
-        abroad_region_id: null,//海外业务区域
-        abroad_region: [],//海外业务区域
+        abroad_region_id: '',//海外业务区域
+        abroad_region_arr: [],
+        abroad_region: '',
         staff_size: '',//人员规模
         last_year_local_revenue: '',//上年度本地营业收入
         business_case: '',//经营情况
@@ -1384,6 +1383,8 @@ export default {
         //1.3
         if (newVal.region_id != '' && newVal.mail_address != '' && newVal.phone != '' && newVal.zip_code != '' && newVal.photo_image != '' && newVal.nikename != '' && newVal.gender != null && newVal.birth_time != '' && newVal.nation != '' && newVal.political != '' && newVal.jiguan != '' && newVal.institution != '' && newVal.education != '' && newVal.academic_degree != '' && newVal.card_number != '' && newVal.work_unit != '' && newVal.unit_position != '') {
           this.right_card_list[0].content[2].ok = true;
+        } else {
+          this.right_card_list[0].content[2].ok = false;
         }
         //1111111
         if (this.right_card_list[0].content[0].ok && this.right_card_list[0].content[1].ok && this.right_card_list[0].content[2].ok) {
@@ -1405,7 +1406,7 @@ export default {
             this.right_card_list[1].content[2].ok = true;
           }
         }//2.4
-        if (newVal.main_social_positions.length > 0) {
+        if (newVal.main_social.length > 0) {
           this.right_card_list[1].content[3].ok = true;
         } else {
           this.right_card_list[1].content[3].ok = false;
@@ -1451,7 +1452,7 @@ export default {
           this.right_card_list[4].content[0].ok = false;
         }
         if (newVal.if_abroad == 1) {
-          if (newVal.abroad_region_id != null && newVal.staff_size != '') {
+          if (newVal.abroad_region_arr.length > 0 || newVal.abroad_region_id != '' && newVal.staff_size != '') {
             this.right_card_list[4].content[1].ok = true;
           }
           if (newVal.business_case != '') {
@@ -1493,7 +1494,7 @@ export default {
           //     id: 'duihuahezuo',
           //     ok: false,
           //   });
-          console.log(this.right_card_list[4].content);
+          //console.log(this.right_card_list[4].content);
         } else {
           this.right_card_list[4].content = [
             {
@@ -1514,6 +1515,9 @@ export default {
   beforeDestroy() {
     window.removeEventListener('scroll', this.handleScroll);
   },
+  destroyed() {
+    window.removeEventListener('scroll', this.handleScroll)
+  },
   mounted() {
     window.addEventListener('scroll', this.handleScroll);
     console.log(this.$route.query.id);
@@ -1586,10 +1590,10 @@ export default {
         .then((res) => {
           console.log(res);
           const nodes = res.data.map(item => ({
-              value: item.id,
-              label: item.name,
-              children: item.children
-            }));
+            value: item.id,
+            label: item.name,
+            children: item.children
+          }));
           this.internationa_list = nodes;
         })
         .catch((e) => {
@@ -1640,7 +1644,7 @@ export default {
         return;
       }
       const link = document.createElement('a');
-      link.href = `https://hnyea.0rui.cn/api/move/pdf_member/exportPdf?openid=${this.formData.openid}`;
+      link.href = `http://192.168.10.140/api/move/pdf_member/exportPdf?openid=${this.formData.openid}`;
       link.target = '_blank'; // 新标签页打开
       link.rel = 'noopener noreferrer'; // 安全考虑
       link.style.display = 'none';
@@ -1817,11 +1821,12 @@ export default {
             } else {
               this.formData.other = JSON.parse(res.data.other_contacts);
             }
+            this.formData.main_social_positions = res.data.main_social_positions;
             //社会职务
             if (res.data.main_social_positions == '' || res.data.main_social_positions == null) {
-              this.formData.main_social_positions = [];
+              this.formData.main_social = [];
             } else {
-              this.formData.main_social_positions = res.data.main_social_positions.split(',');
+              this.formData.main_social = res.data.main_social_positions.split(',');
             }
             //其他社会职务
             this.formData.other_social_positions = res.data.other_social_positions;
@@ -1885,11 +1890,40 @@ export default {
             this.formData.enterprise_lvxingzeren = res.data.enterprise_lvxingzeren;
             //是否海外业务
             this.formData.if_abroad = res.data.if_abroad;
+            if (res.data.if_abroad == 1) {
+              this.right_card_list[4].content.push(
+                {
+                  title: '2.区域与资源',
+                  active: false,
+                  id: 'haiwiquyu',
+                  ok: false,
+                },
+                {
+                  title: '3.财务与运营',
+                  active: false,
+                  id: 'caiwuyunying',
+                  ok: false,
+                },
+                {
+                  title: '4.对华合作',
+                  active: false,
+                  id: 'duihuahezuo',
+                  ok: false,
+                });
+            }
             //海外业务区域
-            this.formData.abroad_region_id = res.data.abroad_region_id;
-            //var arr = res.data.abroad_region_id.split(',');
-            //const result = arr.map((_, i) => arr.slice(0, i + 1).join('-'));
-            this.inputProps.value = '1 / 2 / 3 / 4';
+            if (res.data.abroad_region_id == '' || res.data.abroad_region_id == null) {
+              this.formData.abroad_region_id = '';
+            } else {
+              //var arr = res.data.abroad_region_id.split(',');
+              //const result = arr.map((_, i) => arr.slice(0, i + 1).join('-'));
+              //选择
+             // this.formData.abroad_region_arr = result;
+              //信息
+              this.formData.abroad_region_id = res.data.abroad_region_id;
+              //名字
+              this.inputProps.value = res.data.abroad_region;
+            }
             //人员规模
             this.formData.staff_size = res.data.staff_size;
             //上年度本地营业收入
@@ -1911,11 +1945,11 @@ export default {
             //上级党组织
             this.formData.manager_party = res.data.manager_party;
             //党组织负责人 
-            this.formData.dangweifuzerenxinxi = res.data.dangweifuzerenxinxi;
-            if (res.data.dangweifuzerenxinxi == '' || res.data.dangweifuzerenxinxi == null) {
+            this.formData.party_json = res.data.party_json;
+            if (res.data.party_json == '' || res.data.party_json == null) {
               this.formData.dang = [];
             } else {
-              this.formData.dang = JSON.parse(res.data.dangweifuzerenxinxi);
+              this.formData.dang = JSON.parse(res.data.party_json);
             }
             //是否建立团组织
             this.formData.if_organization = res.data.if_organization;
@@ -2096,18 +2130,26 @@ export default {
         return;
       } else {
         //转json字符串
+        console.log(typeof this.formData.work);
+
         //把work里面的time转成年月日 至 年月日
-        this.formData.work.forEach(item => {
-          item.time = item.time[0] + '至' + item.time[1];
-        });
-        this.formData.work_experience = JSON.stringify(this.formData.work);
+        if (typeof this.formData.work == 'object') {
+          this.formData.work.forEach(item => {
+            if (typeof item.time == 'object') {
+              item.time = item.time[0] + '至' + item.time[1];
+            } else {
+              item.time = item.time;
+            }
+          });
+          this.formData.work_experience = JSON.stringify(this.formData.work);
+        }
       }
-      if (this.formData.main_social_positions == null || this.formData.main_social_positions.length == 0) {
+      if (this.formData.main_social == null || this.formData.main_social.length == 0) {
         this.$message.error('请选择主要社会职务！');
         return;
       } else {
         //数组转字符串
-        this.formData.main_social_positions = this.formData.main_social_positions.join(',');
+        this.formData.main_social_positions = this.formData.main_social.join(',');
       }
       // if (this.formData.other_social_positions == null || this.formData.other_social_positions == '') {
       //   this.$message.error('请输入其他社会职务资料！');
@@ -2227,11 +2269,11 @@ export default {
         return;
       }
       if (this.formData.if_abroad == 1) {
-        if (this.formData.abroad_region.length == 0) {
+        if (this.formData.abroad_region_arr.length == 0) {
           this.$message.error('请选择国家/城市!');
           return;
         } else {
-          this.formData.abroad_region_id = this.formData.abroad_region.join(',');
+          this.formData.abroad_region_id = this.formData.abroad_region_arr.join(',');
         }
         if (this.formData.staff_size == null || this.formData.staff_size == '') {
           this.$message.error('请输入人员规模!');
@@ -2272,7 +2314,7 @@ export default {
           this.$message.error('请输入党委负责人信息!');
           return;
         } else {
-          this.formData.party = JSON.stringify(this.formData.party);
+          this.formData.party_json = JSON.stringify(this.formData.dang);
         }
       }
 
@@ -2281,7 +2323,7 @@ export default {
         this.$message.error('请选择是否成立团组织!');
         return;
       }
-      if (this.formData.if_party == 1) {
+      if (this.formData.if_organization == 0) {
         if (this.formData.nature == null) {
           this.$message.error('请选择团组织性质!');
           return;
@@ -2302,7 +2344,7 @@ export default {
           this.$message.error('请输入上级团组织!');
           return;
         }
-        if (this.formData.party.length == 0) {
+        if (this.formData.tuan.length == 0) {
           this.$message.error('请输入团组织负责人信息!');
           return;
         } else {
@@ -2325,7 +2367,7 @@ export default {
           // setTimeout(() => {
           //   this.$router.push(`/login?id=`+this.id);
           // }, 1000);
-          //this.getInfo();
+          this.getInfo();
         })
         .catch((e) => {
           console.log(e);
@@ -2381,10 +2423,10 @@ export default {
       this.formData.enterprise.splice(index, 1);
     },
     delParty(index) {
-      this.formData.party.splice(index, 1);
+      this.formData.dang.splice(index, 1);
     },
     addParty() {
-      this.formData.party.push({
+      this.formData.dang.push({
         name: '',
         sex: '',
         danwei_zhiwu: '',
@@ -2713,4 +2755,27 @@ export default {
 .input_box_end {
   width: 565px;
 }
+
+.reg_box {
+  width: 88%;
+}
+
+.right_card_box {
+  background-color: #fff;
+  border-radius: 10px;
+  width: 12%;
+  height: 80%;
+  position: fixed;
+  right: 0;
+  overflow-y: auto;
+}
+@media screen and (max-width: 1440px) {
+  .reg_box {
+    width: 84%;
+  }
+  .right_card_box{
+    width: 16%;
+    right: 0px;
+  }
+}
 </style>

src/pages/user/user_info.vue

@@ -435,7 +435,7 @@
                   {{ info.last_year_local_revenue }}
                 </td>
                 <td>
-                  {{ info.business_case }}
+                  <div v-html="info.business_case"></div>
                 </td>
                 <td>
                   <div v-html="info.economic_and_trade_exchanges_with_china"></div>
@@ -487,9 +487,9 @@
                         </tr>
                       </thead>
                       <tbody>
-                        <tr v-for="(item, index) in info.dangweifuzerenxinxi">
+                        <tr v-for="(item, index) in info.party_json">
                           <td>{{ item.name }}</td>
-                          <td>{{ item.sex }}</td>
+                          <td>{{ item.sex==0?'女':'男' }}</td>
                           <td>{{ item.danwei_zhiwu }}</td>
                           <td>{{ item.party_zhiwu }}</td>
                           <td>{{ item.phone }}</td>
@@ -546,7 +546,7 @@
                       <tbody>
                         <tr v-for="(item, index) in info.tuanweifuzerenxinxi">
                           <td>{{ item.name }}</td>
-                          <td>{{ item.sex }}</td>
+                          <td>{{ item.sex==0?'女':'男' }}</td>
                           <td>{{ item.job }}</td>
                           <td>{{ item.tun_job }}</td>
                           <td>{{ item.phone }}</td>
@@ -637,6 +637,7 @@ export default {
           key.tuanweifuzerenxinxi = key.tuanweifuzerenxinxi != '' ? JSON.parse(key.tuanweifuzerenxinxi) : '';
           key.achievement_award = key.achievement_award != '' ? JSON.parse(key.achievement_award) : '';
           key.enterprise_honor = key.enterprise_honor != '' ? JSON.parse(key.enterprise_honor) : '';
+          key.party_json = key.party_json != '' ? JSON.parse(key.party_json) : '';
           this.info = key;
         })
         .catch((e) => {