From edf132557e5eee4e8607ca83d987c5f6b830f025 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期五, 17 十月 2025 16:43:10 +0800
Subject: [PATCH] 档案相关发布

---
 src/views/project/donationdetails/index.vue |   57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 38ef758..84bc3be 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -640,7 +640,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item align="left" label="鏈汉鎰忔効 ">
+              <el-form-item align="left" label="鏈汉鎰忔効 " prop="selfwill">
                 <el-checkbox-group v-model="form.selfwill">
                   <el-checkbox
                     v-for="dict in dict.type.sys_SelfWill || []"
@@ -1707,7 +1707,7 @@
                   clearable
                   v-model="witnessform.coordinatorSignTime"
                   type="datetime"
-                  value-format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
                 >
                 </el-date-picker>
@@ -1878,6 +1878,9 @@
                   border
                   :key="tableKey"
                   :data="procureddata"
+                  lazy
+                  :load="loadRowData"
+                  :row-key="row => row.organno"
                 >
                   <el-table-column
                     label="鍣ㄥ畼鍚嶇О"
@@ -1913,7 +1916,7 @@
                     </template>
                   </el-table-column> -->
                   <el-table-column
-                    label="鑾峰彇寮�濮嬫椂闂�"
+                    label="鍣ㄥ畼绂讳綋鏃堕棿"
                     align="center"
                     width="200"
                     prop="organgettime"
@@ -1924,6 +1927,25 @@
                         size="small"
                         style="width: 100%"
                         v-model="scope.row.organgettime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"
+                      >
+                      </el-date-picker>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鑾峰彇寮�濮嬫椂闂�"
+                    align="center"
+                    width="200"
+                    prop="organStartTime"
+                  >
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                        v-model="scope.row.organStartTime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
@@ -2898,6 +2920,12 @@
         majorrelatives: [
           { required: true, message: "璇疯緭鍏ヤ富瑕佷翰灞�", trigger: "blur" }
         ],
+        selfwill: [
+          { required: true, message: "璇烽�夋嫨鏈汉鎰忔効", trigger: "blur" }
+        ],
+        registerAddresss: [
+          { required: true, message: "璇疯緭鍏ョ幇鎵�鍦ㄥ湴", trigger: "blur" }
+        ],
         familyrelations: [
           { required: true, message: "璇烽�夋嫨浜插睘涓庢崘鐚�呭叧绯�", trigger: "blur" }
         ],
@@ -3053,8 +3081,8 @@
           return;
         }
         this.customOrganSort();
-      },
-      deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+      }
+      // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
     },
     allocateddata: {
       handler(newVal) {
@@ -3062,12 +3090,17 @@
           return;
         }
         this.allocateddataSort();
-      },
-      deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+      }
+      // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
     }
   },
 
   methods: {
+    loadRowData(row, treeNode, resolve) {
+      // 鍙湁褰撹灞曞紑鎴栭渶瑕佹椂鎵嶅畬鏁存覆鏌撳唴閮ㄧ粍浠�
+      this.$set(row, "loaded", true);
+      resolve();
+    },
     // 鑾峰彇涓昏〃鍙婇檮灞炴暟鎹�
     Getbasicinformation() {
       // 宸︿晶娴佺▼鏁版嵁
@@ -3155,7 +3188,9 @@
           if (response.code == 200 && response.rows[0]) {
             this.affirmform = response.rows[0];
             if (this.affirmform.organdecision) {
-              this.organdecision = this.affirmform.organdecision.split(",");
+              this.organdecision = this.affirmform.organdecision
+                .split(",")
+                .flatMap(item => (item === "鍙岃偩鑴�" ? ["宸﹁偩", "鍙宠偩"] : item));
             }
             if (this.affirmform.kinship) {
               this.kinship = this.affirmform.kinship.split(",");
@@ -3334,6 +3369,8 @@
       this.$refs["form"].validate(valid => {
         console.log("鎻愪氦鐨勬暟鎹滑锛�", this.form);
         if (valid) {
+          console.log(112);
+
           this.form.birthday = this.$moment(this.form.birthday).format(
             "YYYY-MM-DD HH:mm:ss"
           );
@@ -3420,6 +3457,8 @@
               }
             });
           }
+        } else {
+          this.$modal.msgError("鍓嶉儴娼滃湪鎹愮尞琛ㄥ崟淇℃伅鏈夌己婕忚鎺掓煡鍚庨噸鏂颁繚瀛�");
         }
       });
     },
@@ -3666,6 +3705,7 @@
 
       // 1. 鍔犻攣锛岄樆姝㈢洃鍚櫒鎵ц
       this.isSorting = true;
+      this.loading = true;
       // 鑷畾涔夋帓搴忓嚱鏁�
       this.procureddata.sort((a, b) => {
         const indexA = this.organOrder.indexOf(a.organname);
@@ -3692,6 +3732,7 @@
       this.procureddata = [...this.procureddata];
       this.$nextTick(() => {
         this.isSorting = false;
+        this.loading = false;
       });
     },
     allocateddataSort() {

--
Gitblit v1.9.3