From 69a56969fe9ee4084a03f88a5c93123587b1df65 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 18 九月 2025 13:43:06 +0800
Subject: [PATCH] 档案管理

---
 src/views/project/donationdetails/index.vue |  120 ++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index dca6278..02e0119 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -278,7 +278,11 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="骞撮緞" prop="age">
-                  <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+                  <el-input
+                    disabled
+                    v-model="form.andAge"
+                    placeholder="璇疯緭鍏ュ勾榫�"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -377,7 +381,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="姘戞棌" prop="nation">
                 <el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌">
                   <el-option
@@ -393,14 +397,14 @@
               <el-form-item label="绫嶈疮" prop="nativeplace">
                 <el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="鍥界睄" prop="nationality">
                 <el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <!-- <el-row>
             <el-col :span="6">
               <el-form-item label="鑱屼笟" prop="occupation">
                 <el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟">
@@ -425,15 +429,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
           <el-row>
             <el-col :span="6">
-              <el-form-item label="褰撳墠鍖荤枟鏈烘瀯" prop="occupation">
-                <el-input v-model="form.currentMedicalInstitution" placeholder="璇疯緭鍏�" />
+              <el-form-item label="鎵�鍦ㄥ尰鐤楁満鏋�" prop="occupation">
+                <el-input
+                  v-model="form.currentMedicalInstitution"
+                  placeholder="璇疯緭鍏�"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label-width="130px" label="褰撳墠鍖荤枟鏈烘瀯绉戝" prop="education">
+              <el-form-item
+                label-width="130px"
+                label="鎵�鍦ㄥ尰鐤楁満鏋勭瀹�"
+                prop="education"
+              >
                 <el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
               </el-form-item>
             </el-col>
@@ -441,18 +452,25 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="棣栨鍖荤枟鏈烘瀯" prop="occupation">
-                <el-input v-model="form.firstMedicalInstitution" placeholder="璇疯緭鍏�" />
+                <el-input
+                  v-model="form.firstMedicalInstitution"
+                  placeholder="璇疯緭鍏�"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label-width="130px" label="棣栨鍖荤枟鏈烘瀯绉戝" prop="education">
+              <el-form-item
+                label-width="130px"
+                label="棣栨鍖荤枟鏈烘瀯绉戝"
+                prop="education"
+              >
                 <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="浣忓潃" prop="residenceaddress">
+              <el-form-item label="浣忓潃(涓庤韩浠借瘉涓�鑷�)" prop="residenceaddress">
                 <div>
                   <li_area_select
                     ref="residenceSelect"
@@ -695,7 +713,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="淇℃伅鍛�" prop="infoname">
                 <el-input v-model="form.infoname" placeholder="璇疯緭鍏ヤ俊鎭憳" />
               </el-form-item>
@@ -707,7 +725,7 @@
                   placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -1024,7 +1042,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="韬唤璇佸彿" prop="idcardno">
+              <el-form-item label="浜插睘韬唤璇�" prop="idcardno">
                 <el-input
                   ref="updateBSvalue"
                   class="sfzcode"
@@ -1034,7 +1052,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+              <el-form-item label="浜插睘鐢佃瘽" prop="phone">
                 <el-input
                   v-model="affirmform.phone"
                   placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
@@ -1044,7 +1062,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="姘戞棌" prop="nation">
+              <el-form-item label="鎹愯禒鑰呮皯鏃�" prop="nation">
                 <el-select v-model="affirmform.nation" placeholder="璇烽�夋嫨姘戞棌">
                   <el-option
                     v-for="dict in dict.type.sys_nation || []"
@@ -1056,8 +1074,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="瀛﹀巻" prop="education">
-                <el-select v-model="affirmform.education" placeholder="璇烽�夋嫨瀛﹀巻">
+              <el-form-item label="鎹愯禒鑰呭鍘�" prop="education">
+                <el-select
+                  v-model="affirmform.education"
+                  placeholder="璇烽�夋嫨瀛﹀巻"
+                >
                   <el-option
                     v-for="dict in dict.type.sys_education || []"
                     :key="dict.value"
@@ -1067,9 +1088,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-           <el-col :span="6">
-              <el-form-item label="鑱屼笟" prop="occupation">
-                <el-select v-model="affirmform.occupation" placeholder="璇烽�夋嫨鑱屼笟">
+            <el-col :span="6">
+              <el-form-item label="鎹愯禒鑰呰亴涓�" prop="occupation">
+                <el-select
+                  v-model="affirmform.occupation"
+                  placeholder="璇烽�夋嫨鑱屼笟"
+                >
                   <el-option
                     v-for="dict in dict.type.sys_occupation || []"
                     :key="dict.value"
@@ -1081,17 +1105,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="浜插睘绫嶈疮" prop="residenceaddresss">
                 <div>
                   <li_area_select
                     v-model="defultAddresss"
                     ref="residenceaddresss"
                   ></li_area_select>
-                  <!-- <div>{{defultAddress}}</div> -->
                 </div>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="12">
               <el-form-item label="鐜颁綇鍦板潃" prop="residenceaddress">
                 <el-input
@@ -1103,7 +1126,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign">
+              <el-form-item label="浜插睘鍏崇郴" prop="kinshipconfirmationsign">
                 <el-checkbox-group v-model="kinship">
                   <el-checkbox
                     v-for="dict in dict.type.sys_kinshipConfirm || []"
@@ -1235,7 +1258,7 @@
                   size="small"
                   v-model="affirmform.signdate"
                   type="date"
-                  value-format="yyyy-MM-dd hh:mm:ss"
+                  value-format="yyyy-MM-dd"
                   placeholder="閫夋嫨绛惧瓧鏃ユ湡"
                 >
                 </el-date-picker>
@@ -1668,11 +1691,11 @@
                 align="left"
                 label="绛惧瓧鏃堕棿"
                 label-width="120px"
-                prop="coorinatorSignTime"
+                prop="coordinatorSignTime"
               >
                 <el-date-picker
                   clearable
-                  v-model="witnessform.coorinatorSignTime"
+                  v-model="witnessform.coordinatorSignTime"
                   type="datetime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
@@ -1875,7 +1898,7 @@
                     </template>
                   </el-table-column> -->
                   <el-table-column
-                    label="鍣ㄥ畼绂讳綋鏃堕棿"
+                    label="鑾峰彇寮�濮嬫椂闂�"
                     align="center"
                     width="200"
                     prop="organgettime"
@@ -1888,7 +1911,7 @@
                         v-model="scope.row.organgettime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"
+                        placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
                       >
                       </el-date-picker>
                     </template>
@@ -2811,13 +2834,7 @@
         residenceaddress: [
           { required: true, message: "璇疯緭鍏ヤ綇鍧�", trigger: "blur" }
         ],
-        contacttime: [
-          {
-            required: true,
-            message: "璇疯緭鍏ョ孩鍗佸瓧浼氳仈绯绘椂闂�",
-            trigger: "blur"
-          }
-        ],
+
         idcardno: [
           { required: true, message: "璇锋纭緭鍏ヨ瘉浠跺彿鐮�", trigger: "blur" }
         ],
@@ -2846,16 +2863,6 @@
         infophone: [
           { required: true, message: "璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽", trigger: "blur" }
         ],
-        redorganno: [
-          { required: true, message: "璇烽�夋嫨绾㈠崄瀛椾細鏈烘瀯", trigger: "blur" }
-        ],
-        contactperson: [
-          {
-            required: true,
-            message: "绾㈠崄瀛椾細鑱旂郴浜轰笉鑳戒负绌�",
-            trigger: "blur"
-          }
-        ],
         acquisitiontissueno: [
           { required: true, message: "鍣ㄥ畼鑾峰彇缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
         ],
@@ -2876,6 +2883,15 @@
           { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
         ],
         phone: [
+          { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
+        ],
+        nation: [
+          { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        education: [
+          { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
+        ],
+         occupation: [
           { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
         ],
         signfamilyrelations: [
@@ -2982,7 +2998,15 @@
       // 琛ㄥ崟鏁版嵁
       getDonatebaseinfo(this.infoid).then(response => {
         this.form = response.data;
-        console.log(this.form, "form");
+        this.form.andAge = `${
+          this.form.age && this.form.age !== 0
+            ? `${this.form.age}${this.form.ageunit}`
+            : ""
+        } ${
+          this.form.age2 && this.form.age2 !== 0
+            ? `${this.form.age2}${this.form.ageunit2}`
+            : ""
+        }`.trim();
 
         if (response.data.terminationCase) {
           this.showTerminationBtn = response.data.terminationCase;

--
Gitblit v1.9.3