From d5786ed5bcb549ad4ea37437b2acc48d0bac9413 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 21 二月 2024 16:05:50 +0800
Subject: [PATCH] 11

---
 src/views/project/organallocation/index.vue |   95 ++++++++++++++++++++++++-----------------------
 1 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index c99a149..a6586ab 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -64,27 +64,37 @@
     </el-form>
 
     <el-row :gutter="20">
-      <el-col :span="8">
+      <el-col :span="24">
         <el-card shadow="never">
           <!-- 鎹愮尞妗堜緥鍒楄〃 -->
-          <el-table v-loading="loading" border :data="donationCaseTableData" @row-click="selectDonotor">
-            <el-table-column label="濮撳悕" align="center" prop="name" />
-
-            <el-table-column label="鎬у埆" align="center" prop="sex">
+          <el-table v-loading="loading" border :data="donationCaseTableData">
+            <el-table-column label="妗堜緥鏃堕棿" align="center" prop="donatetime" width="150">
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+                <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="鍖荤枟鏈烘瀯" width="200px" align="center" prop="treatmenthospitalname" />
+            <el-table-column label="濮撳悕" align="center" prop="name" width="120" />
+            <el-table-column label="鎬у埆" align="center" prop="sex" width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
+              </template>
+            </el-table-column>
+            <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+            <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="120" />
+            <el-table-column label="妗堜緥褰掑睘" align="center" width="200px" prop="deptname" />
+            <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
+            <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
+              <template slot-scope="scope">
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="selectDonotor(scope.row)">鎹愮尞璇︽儏</el-button>
+              </template>
+            </el-table-column>
           </el-table>
           <!-- hide-on-single-page -->
           <pagination v-show="total > 0" small layout="prev, pager, next" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
         </el-card>
       </el-col>
-      <el-col :span="16">
-      <!-- <div class="grid-content bg-purple-dark" style="width:100%;height:800px;background-color:purple">
-                                         </div> -->
+      <!-- <el-col :span="16">
         <el-card shadow="never">
           <el-form ref="infoForm" :model="organalForm" label-width="80px">
             <el-row>
@@ -105,7 +115,7 @@
             <el-form-item label="閫夋嫨鍣ㄥ畼">
               <el-checkbox-group v-model="organalForm.organname">
                 <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value"
-                  @click="changeorganState(dict.value)" @change="changeorganState(dict.value)">
+                  @change="changeorganState(dict.value)">
                   {{ dict.label }}
                 </el-checkbox>
               </el-checkbox-group>
@@ -135,7 +145,7 @@
             </el-form-item>
           </el-form>
         </el-card>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <!-- 娣诲姞鎴栦慨鏀瑰櫒瀹樺垎閰嶅璇濇 -->
@@ -538,6 +548,7 @@
         // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
         listDonatebaseinfo(this.queryParams).then((response) => {
           this.donationCaseTableData = response.rows;
+          console.log(this.donationCaseTableData, "Donation");
           this.total = response.total;
           this.loading = false;
         });
@@ -641,13 +652,20 @@
     },
     //鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
     selectDonotor(row, column, event) {
-      this.selectedRow = row;
-      this.curdonorno = row.donorno;
-      this.curdonorname = row.name;
-      this.curage = row.age;
-      this.curInfoid = row.id;
-      this.distributionForm.donorno = row.donorno;
-      this.GetDonortedList();
+      this.$router.push({
+        path: "/organ/donationdetails/",
+        query: {
+          id: row.id,
+          organType: "edit",
+        }
+      });
+      // this.selectedRow = row;
+      // this.curdonorno = row.donorno;
+      // this.curdonorname = row.name;
+      // this.curage = row.age;
+      // this.curInfoid = row.id;
+      // this.distributionForm.donorno = row.donorno;
+      // this.GetDonortedList();
     },
     //鑾峰彇鐥呬汉宸叉崘鐚殑鍣ㄥ畼鍒楄〃
     GetDonortedList() {
@@ -688,7 +706,6 @@
             //鏇存柊鎹愮尞鍣ㄥ畼琛�
             this.form.allocationstatus = this.form.organstate;
             updateOrganallocation(this.form).then((response) => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
             });
             //鑾峰彇鍣ㄥ畼淇℃伅
             getDonateorgan(this.form.organid).then((response2) => {
@@ -699,13 +716,9 @@
 
               organData.transplanthospitalno = this.form.transplanthospitalno;
               try {
-                organData.transplanthospitalname =
-                  this.$refs.tranHosSelect.getOptionByValue(
-                    organData.transplanthospitalno
-                  ).organizationname;
+                organData.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organData.transplanthospitalno).organizationname;
               } catch {
-                organData.transplanthospitalname =
-                  organData.transplanthospitalno;
+                organData.transplanthospitalname = organData.transplanthospitalno;
               }
               //鏇存柊鎹愮尞鍣ㄥ畼琛�
               updateDonateorgan(organData).then((response3) => {
@@ -731,15 +744,10 @@
               transplantdoct: this.form.transplantdoct,
             };
             try {
-              organaManageForm.transplanthospitalname =
-                this.$refs.tranHosSelect.getOptionByValue(
-                  organaManageForm.transplanthospitalno
-                ).organizationname;
+              organaManageForm.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organaManageForm.transplanthospitalno).organizationname;
             } catch {
-              organaManageForm.transplanthospitalname =
-                organaManageForm.transplanthospitalno;
+              organaManageForm.transplanthospitalname = organaManageForm.transplanthospitalno;
             }
-
 
             addDonateorgan(organaManageForm).then((response) => {
               this.loading = false;
@@ -747,36 +755,29 @@
                 //鏌ヨ鑾峰彇鏂板鐨勫櫒瀹樿〃id
                 let organSearchParam = {
                   infoid: this.curInfoid,
-                  donorno: this.curdonorno,
+                  // donorno: this.curdonorno,
                   organno: this.form.organnumber,
                   //donorname: this.curdonorname,
                   //organname: this.$refs.organNameSelect.label,
                 };
-                this.loading = false;
 
                 listDonateorgan(organSearchParam).then((response2) => {
-                  this.showDistributionForm = false;
                   if (response2.code == 200 && response2.rows.length > 0) {
                     for (let i = 0; i < response2.rows.length; i++) {
-                      console.log('1', this.form)
                       if (response2.rows[i].organstate == '2') {
                         this.form.organid = response2.rows[i].id;
-                        this.form.residenceprovincename = this.defultAddress.sheng;
-                        this.form.residencecityname = this.defultAddress.shi;
-                        this.form.residencetownname = this.defultAddress.qu;
+                        // this.form.residenceprovincename = this.defultAddress.sheng;
+                        // this.form.residencecityname = this.defultAddress.shi;
+                        // this.form.residencetownname = this.defultAddress.qu;
 
-                        console.log('2', this.form)
                         addOrganallocation(this.form).then((response) => {
-
-                          console.log('3', response)
-                          //this.$modal.msgSuccess("鏂板鎴愬姛");
-                          this.loading = false;
-                          this.GetDonortedList();
-                          this.showDistributionForm = false;
+                          this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
                         });
                       }
                     }
                   }
+                  this.GetDonortedList();
+                  this.showDistributionForm = false;
                 });
               }
             });

--
Gitblit v1.9.3