From 9f468e0447a71eb7fcc4f1d78df3be9d348f6fe0 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 25 三月 2024 11:33:02 +0800
Subject: [PATCH] 11

---
 src/views/project/organallocation/index.vue |  421 ++++++++++++++++++++++++++--------------------------
 1 files changed, 209 insertions(+), 212 deletions(-)

diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index 685839f..5d1e5f1 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -13,13 +13,13 @@
         <el-col :span="6">
           <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
             <el-select
-              v-model="queryParams.recordstate"
+              v-model="queryParams.workflow"
               placeholder="璇烽�夋嫨鎹愮尞杩涘害"
               clearable
               size="small"
             >
               <el-option
-                v-for="dict in dict.type.sys_DonationStatus"
+                v-for="dict in dict.type.sys_donornode"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -67,12 +67,14 @@
             </el-select>
           </el-form-item>
         </el-col>
-        
       </el-row>
       <el-row :gutter="8">
         <el-col :span="6">
           <el-form-item label="鎶ュ憡浜�">
-            <el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�">
+            <el-select
+              v-model="queryParams.reporterno"
+              placeholder="璇烽�夋嫨鎶ュ憡浜�"
+            >
               <el-option
                 v-for="item in reportlist"
                 :key="item.index"
@@ -118,31 +120,76 @@
     </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">
+                <span>{{
+                  parseTime(scope.row.donatetime, "{y}-{m}-{d}")
+                }}</span>
+              </template>
+            </el-table-column>
+            <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="scope.row.sex"
+                  :value="parseInt(scope.row.sex)"
                 />
               </template>
             </el-table-column>
             <el-table-column
-              label="鍖荤枟鏈烘瀯"
+              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
@@ -156,30 +203,19 @@
           />
         </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>
               <el-col :span="12">
                 <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
-                  <el-input
-                    v-model="curdonorno"
-                    disabled
-                    placeholder="璇烽�夋嫨鎹愮尞妗堜緥"
-                  />
+                  <el-input v-model="curdonorno" disabled placeholder="璇烽�夋嫨鎹愮尞妗堜緥" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="濮撳悕" prop="donorname">
-                  <el-input
-                    v-model="curdonorname"
-                    disabled
-                    placeholder="璇烽�夋嫨鎹愮尞妗堜緥"
-                  />
-                </el-form-item> </el-col
-              ><el-col :span="6">
+                  <el-input v-model="curdonorname" disabled placeholder="璇烽�夋嫨鎹愮尞妗堜緥" />
+                </el-form-item> </el-col><el-col :span="6">
                 <el-form-item label="骞撮緞" align="center" prop="age">
                   <el-input v-model="curage" disabled />
                 </el-form-item>
@@ -187,88 +223,38 @@
             </el-row>
             <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)"
-                >
+                <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value"
+                  @change="changeorganState(dict.value)">
                   {{ dict.label }}
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="鍣ㄥ畼鍒嗛厤">
               <el-table v-loading="loading" border :data="organalTableData">
-                <el-table-column
-                  label="鍣ㄥ畼鍚嶇О"
-                  align="center"
-                  width="90"
-                  prop="organname"
-                />
-                <el-table-column
-                  label="鍣ㄥ畼缂栧彿"
-                  align="center"
-                  width="80"
-                  prop="organno"
-                />
-                <el-table-column
-                  label="鍒嗛厤鐘舵��"
-                  align="center"
-                  width="90"
-                  prop="organstate"
-                >
+                <el-table-column label="鍣ㄥ畼鍚嶇О" align="center" width="90" prop="organname" />
+                <el-table-column label="鍣ㄥ畼缂栧彿" align="center" width="80" prop="organno" />
+                <el-table-column label="鍒嗛厤鐘舵��" align="center" width="90" prop="organstate">
                   <template slot-scope="scope">
-                    <dict-tag
-                      :options="dict.type.sys_organstate"
-                      :value="scope.row.organstate"
-                    />
+                    <dict-tag :options="dict.type.sys_organstate" :value="scope.row.organstate" />
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="绉绘鍖婚櫌"
-                  align="center"
-                  prop="transplanthospitalname"
-                >
+                <el-table-column label="绉绘鍖婚櫌" align="center" prop="transplanthospitalname">
                 </el-table-column>
-                <el-table-column
-                  label="鎿嶄綔"
-                  width="200"
-                  align="center"
-                  class-name="small-padding fixed-width"
-                >
+                <el-table-column label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
                   <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      v-if="scope.row.id == null"
-                      type="text"
-                      icon="el-icon-copy-document"
-                      @click="distributionDialog(scope.row)"
-                      >鍒嗛厤</el-button
-                    >
-                    <el-button
-                      size="mini"
-                      v-else
-                      type="text"
-                      icon="el-icon-copy-document"
-                      @click="distributionDialog(scope.row)"
-                      >淇敼</el-button
-                    >
-                    <el-button
-                      size="mini"
-                      v-if="scope.row.organstate != 99"
-                      type="text"
-                      icon="el-icon-copy-document"
-                      @click="redistribution(scope.row)"
-                      >閲嶆柊鍒嗛厤</el-button
-                    >
+                    <el-button size="mini" v-if="scope.row.id == null" type="text" icon="el-icon-copy-document"
+                      @click="distributionDialog(scope.row)">鍒嗛厤</el-button>
+                    <el-button size="mini" v-else type="text" icon="el-icon-copy-document"
+                      @click="distributionDialog(scope.row)">淇敼</el-button>
+                    <el-button size="mini" v-if="scope.row.organstate != 99" type="text" icon="el-icon-copy-document"
+                      @click="redistribution(scope.row)">閲嶆柊鍒嗛厤</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
         </el-card>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <!-- 娣诲姞鎴栦慨鏀瑰櫒瀹樺垎閰嶅璇濇 -->
@@ -350,8 +336,8 @@
               >
               </el-date-picker>
             </el-form-item> </el-col
-          ><el-col :span="8">
-            <el-form-item label="绉绘鏈烘瀯" prop="treatmenthospitalno">
+          ><el-col :span="16">
+            <el-form-item label="绉绘鍖婚櫌" prop="treatmenthospitalno">
               <org-selecter
                 ref="tranHosSelect"
                 :org-type="'4'"
@@ -361,8 +347,8 @@
             </el-form-item> </el-col></el-row
         ><el-row>
           <el-col :span="8">
-            <el-form-item label="鍙椾綋濮撳悕" prop="name">
-              <el-input v-model="form.name" placeholder="濮撳悕" />
+            <el-form-item label="鍙椾綋濮撴皬" prop="name">
+              <el-input v-model="form.name" placeholder="濮撴皬" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -401,7 +387,7 @@
 //杩欓噷鍙互瀵煎叆鍏朵粬鏂囦欢锛堟瘮濡傦細缁勪欢锛屽伐鍏穓s锛岀涓夋柟鎻掍欢js锛宩son鏂囦欢锛屽浘鐗囨枃浠剁瓑绛夛級
 //渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
 import {
-  listDonatebaseinfo,
+  listDonatebaseinfo
   // exportProvincemessage,
 } from "@/api/project/donatebaseinfo";
 import OrgSelecter from "@/views/project/components/orgselect";
@@ -411,21 +397,21 @@
   addDonateorgan,
   delDonateorgan,
   getDonateorgan,
-  updateDonateorgan,
+  updateDonateorgan
 } from "@/api/project/donateorgan";
 import {
   listOrganallocation,
   getOrganallocation,
   addOrganallocation,
   delOrganallocation,
-  updateOrganallocation,
+  updateOrganallocation
 } from "@/api/project/organallocation";
 import Li_area_select from "@/components/Address";
 export default {
   //import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
   components: {
     Li_area_select,
-    OrgSelecter,
+    OrgSelecter
   },
   name: "Organallocation",
 
@@ -435,7 +421,7 @@
     "sys_user_sex",
     "sys_IDType",
     "sys_AgeUnit",
-    "sys_DonationStatus",
+    "sys_donornode"
   ],
   data() {
     //杩欓噷瀛樻斁鏁版嵁
@@ -462,13 +448,13 @@
         { label: "琛㈠窞甯�", value: "8" },
         { label: "鑸熷北甯�", value: "9" },
         { label: "鍙板窞甯�", value: "A" },
-        { label: "涓芥按甯�", value: "B" },
+        { label: "涓芥按甯�", value: "B" }
       ],
       searchAddress: {
         sheng: "",
         shi: "",
         qu: "",
-        organizationname: null,
+        organizationname: null
       },
 
       //鎼滅储鍙傛暟
@@ -484,7 +470,7 @@
         endtime: null,
         endReporttime: null,
         reportervalue: null,
-        city: null,
+        city: null
       },
 
       //褰撳墠閫変腑鎹愮尞妗堜緥缂栧彿
@@ -504,7 +490,7 @@
       //閫夋嫨鍣ㄥ畼琛ㄥ崟
       organalForm: {
         //鍣ㄥ畼鍒楄〃
-        organname: [],
+        organname: []
       },
       //鍣ㄥ畼鍒嗛厤鍒楄〃
       organalTableData: [],
@@ -516,18 +502,18 @@
       defultAddress: {
         sheng: "娴欐睙鐪�",
         shi: "",
-        qu: "",
+        qu: ""
       },
       form: {},
       rules: {
         applicanttime: [
-          { required: true, message: "璇疯緭鍏ユ崘鐚�呭鍚�", trigger: "blur" },
-        ],
+          { required: true, message: "璇疯緭鍏ユ帴鏀舵椂闂�", trigger: "blur" }
+        ]
       },
       // 閬僵灞�
       loading: true,
       title: "",
-      selectedRow: null,
+      selectedRow: null
     };
   },
   //鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
@@ -545,9 +531,7 @@
     if (this.$route.params.starttime != null && this.$route.params.endtime) {
       this.selecttime = [
         this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
-        this.$moment(this.$route.params.endtime)
-          .add(-1, "month")
-          .format("YYYY-MM-DD"),
+        this.$moment(this.$route.params.endtime).format("YYYY-MM-DD")
       ];
     }
     if (this.$route.params.reporterno != "") {
@@ -582,14 +566,14 @@
   //鏂规硶闆嗗悎
   methods: {
     LoadReportList() {
-      listDonatebaseinfo().then((res) => {
+      listDonatebaseinfo().then(res => {
         console.log("娼滃湪鎹愮尞琛�", res);
         let list = res.rows;
         let reportlist = [];
-        list.forEach((element) => {
+        list.forEach(element => {
           reportlist.push({
             reporterno: element.reporterno,
-            reportername: element.reportername,
+            reportername: element.reportername
           });
         });
         console.log("dwada", reportlist);
@@ -601,7 +585,7 @@
     },
     resetArr(Arr) {
       var hash = {};
-      Arr = Arr.reduce(function (arr, current) {
+      Arr = Arr.reduce(function(arr, current) {
         hash[current.reporterno]
           ? ""
           : (hash[current.reporterno] = true && arr.push(current));
@@ -664,49 +648,49 @@
         this.endtime = "2998-01-01 00:00:00";
       }
     },
-    updateStatus(data) {
-      getDonateorgan(data.id).then((res) => {
-        let obj = res.data;
-        obj.organstate = 99;
-        updateDonateorgan(obj).then((res) => {
-          console.log("閲嶆柊鍒嗛厤鐨�", res);
-          // if(res.code === 200){
-          this.form.organstate = data.organstate;
-          this.form.organno = data.organno;
-          this.form.organnumber = data.organno;
 
-          let loactionSearcParam = {
-            organid: data.id,
-          };
-
-          listOrganallocation(loactionSearcParam).then((res) => {
-            console.log("allocation鏁版嵁", res.rows);
-            if (res.rows != 0) {
-              let list = res.rows[0];
-              // this.form.ageunit = list.ageunit;
-              this.form.applicanttime = list.applicanttime;
-              // this.form.treatmenthospitalno = list.treatmenthospitalno;
-              // this.form.transplanthospitalname = list.transplanthospitalname
-              console.log("ididididid", this.form.id);
-            }
-          });
-          // }
-        });
-      });
-    },
+    //閲嶆柊鍒嗛厤
     redistribution(data) {
       console.log("閲嶆柊鍒嗛厤", data);
       //寮圭獥
       this.showDistributionForm = true;
       this.reset();
 
-      this.updateStatus(data);
+      getDonateorgan(data.id).then(res => {
+        let obj = res.data;
+        obj.organstate = 99;
+        updateDonateorgan(obj).then(res => {
+          // if(res.code === 200){
+          this.form.organstate = data.organstate;
+          this.form.organno = data.organno;
+          this.form.organnumber = data.organno;
 
-  
+          let loactionSearcParam = {
+            organid: data.id
+          };
+
+          listOrganallocation(loactionSearcParam).then(res => {
+            if (res.rows != 0) {
+              let list = res.rows[0];
+              // this.form.ageunit = list.ageunit;
+              this.form.applicanttime = list.applicanttime;
+              // this.form.treatmenthospitalno = list.treatmenthospitalno;
+              // this.form.transplanthospitalname = list.transplanthospitalname
+            }
+          });
+          console.log("Organallocation", this.form);
+        });
+      });
     },
+
     /** 鏌ヨ鎹愮尞鍩虹鍒楄〃 */
     getBaseInfoList(e) {
       this.loading = true;
+      sessionStorage.removeItem("organallocation");
+      sessionStorage.setItem(
+        "organallocation",
+        JSON.stringify(this.queryParams)
+      );
       if (this.queryParams.recordstate == "") {
         this.queryParams.recordstate = null;
       }
@@ -729,8 +713,9 @@
         // this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
         // this.queryParams.residencecity = this.$refs.areaSelect.getShi();
         // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
-        listDonatebaseinfo(this.queryParams).then((response) => {
+        listDonatebaseinfo(this.queryParams).then(response => {
           this.donationCaseTableData = response.rows;
+          console.log(this.donationCaseTableData, "Donation");
           this.total = response.total;
           this.loading = false;
         });
@@ -758,7 +743,7 @@
         reportername: null,
         reporttime: null,
         city: null,
-        treatmenthospitalno: null,
+        treatmenthospitalno: null
       };
       this.selecttime = [];
       this.getTimeList();
@@ -766,7 +751,7 @@
         sheng: "",
         shi: "",
         qu: "",
-        organizationname: null,
+        organizationname: null
       };
       //this.$refs.areaSelect.clean();
 
@@ -784,7 +769,7 @@
             this.organalTableData.push({
               organname: this.dict.type.sys_Organ[i].label,
               organno: this.dict.type.sys_Organ[i].value,
-              id: null,
+              id: null
             });
           }
         }
@@ -806,10 +791,10 @@
       if (data.id != null) {
         //鎼滅储鍣ㄥ畼鍒嗛厤璁板綍
         let loactionSearcParam = {
-          organid: data.id,
+          organid: data.id
         };
         this.showDistributionForm = true;
-        listOrganallocation(loactionSearcParam).then((response) => {
+        listOrganallocation(loactionSearcParam).then(response => {
           if (response.rows.length == 1) {
             let resData = response.rows[0];
             resData.organstate = data.organstate;
@@ -834,22 +819,29 @@
     },
     //鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
     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() {
       this.loading = true;
       let oraganqueryParam = {
-        infoid: this.curInfoid,
+        infoid: this.curInfoid
       };
       // donorno: this.curdonorno,
-      listDonateorgan(oraganqueryParam).then((response) => {
+      listDonateorgan(oraganqueryParam).then(response => {
         this.loading = false;
         if (response.code == 200) {
           this.organalTableData = [];
@@ -862,7 +854,7 @@
               organname: response.rows[i].organname,
               transplanthospitalno: response.rows[i].transplanthospitalno,
               transplanthospitalname: response.rows[i].transplanthospitalname,
-              organstate: response.rows[i].organstate,
+              organstate: response.rows[i].organstate
             });
           }
         } else {
@@ -874,16 +866,14 @@
 
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             //鏇存柊鎹愮尞鍣ㄥ畼琛�
             this.form.allocationstatus = this.form.organstate;
-            updateOrganallocation(this.form).then((response) => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-            });
+            updateOrganallocation(this.form).then(response => {});
             //鑾峰彇鍣ㄥ畼淇℃伅
-            getDonateorgan(this.form.organid).then((response2) => {
+            getDonateorgan(this.form.organid).then(response2 => {
               let organData = response2.data;
               (organData.organname = this.$refs.organNameSelect.selectedLabel),
                 (organData.organstate = this.form.allocationstatus);
@@ -891,16 +881,15 @@
 
               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;
               }
               //鏇存柊鎹愮尞鍣ㄥ畼琛�
-              updateDonateorgan(organData).then((response3) => {
+              updateDonateorgan(organData).then(response3 => {
                 this.$modal.msgSuccess("淇敼鍣ㄥ畼淇℃伅鎴愬姛");
                 this.GetDonortedList();
                 this.showDistributionForm = false;
@@ -919,43 +908,46 @@
               organstate: this.form.organstate,
               transplanthospitalno: this.form.transplanthospitalno,
               transplanthospitalname: null,
-              transplantdoct: this.form.transplantdoct,
+              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;
             }
-            addDonateorgan(organaManageForm).then((response) => {
+
+            addDonateorgan(organaManageForm).then(response => {
               this.loading = false;
               if (response.code === 200) {
                 //鏌ヨ鑾峰彇鏂板鐨勫櫒瀹樿〃id
                 let organSearchParam = {
-                  donorno: this.curdonorno,
-                  donorname: this.curdonorname,
-                  organname: this.$refs.organNameSelect.label,
-                  organno: this.form.organnumber,
                   infoid: this.curInfoid,
+                  // 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 == 1) {
-                    this.form.organid = response2.rows[0].id;
-                    this.form.residenceprovincename = this.defultAddress.sheng;
-                    this.form.residencecityname = this.defultAddress.shi;
-                    this.form.residencetownname = this.defultAddress.qu;
-                    addOrganallocation(this.form).then((response) => {
-                      //this.$modal.msgSuccess("鏂板鎴愬姛");
-                      this.loading = false;
-                      this.GetDonortedList();
-                      this.showDistributionForm = false;
-                    });
+
+                listDonateorgan(organSearchParam).then(response2 => {
+                  if (response2.code == 200 && response2.rows.length > 0) {
+                    for (let i = 0; i < response2.rows.length; i++) {
+                      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;
+
+                        addOrganallocation(this.form).then(response => {
+                          this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
+                        });
+                      }
+                    }
                   }
+                  this.GetDonortedList();
+                  this.showDistributionForm = false;
                 });
               }
             });
@@ -1004,7 +996,7 @@
         updateTime: null,
         //绉绘鍖婚櫌
         transplanthospitalno: null,
-        transplanthospitalname: null,
+        transplanthospitalname: null
       };
       this.distributionForm.donorno = this.curdonorno;
     },
@@ -1046,7 +1038,7 @@
         updateBy: null,
         updateTime: null,
         transplanthospitalno: null,
-        organstate: null,
+        organstate: null
       };
       this.resetForm("form");
     },
@@ -1054,7 +1046,7 @@
     changeorganState(value) {
       //organalTableData
       let organIndex = this.organalTableData.findIndex(
-        (item) => item.organno == value
+        item => item.organno == value
       );
       //鍒ゆ柇褰撳墠閫変腑鍊兼槸鍚﹀湪鏁扮粍涓�
       if (organIndex == -1) {
@@ -1073,26 +1065,27 @@
             id: null,
             transplanthospitalname: null,
             transplanthospitalno: null,
-            organstate: null,
+            organstate: "2"
           });
         }
       } else {
         this.$confirm("鏄惁纭鍒犻櫎鍣ㄥ畼鍒嗛厤璁板綍", "鎻愮ず", {
           confirmButtonText: "纭畾",
           cancelButtonText: "鍙栨秷",
-          type: "warning",
+          type: "warning"
         })
           .then(() => {
             if (organIndex != -1) {
               let tempOrgan = this.organalTableData[organIndex];
               if (tempOrgan.organstate != 1 && tempOrgan.id > 0) {
-                this.$modal.msgWarning("鍙湁鏈垎閰嶅櫒瀹樺彲杩涜鍒犻櫎");
+                this.$modal.msgWarning("鍙湁鏈垎閰嶅櫒瀹樺彲杩涜鍒犻櫎锛�");
+                this.organalForm.organname.push(value);
                 return;
               }
               if (tempOrgan.id > 0) {
                 //鏌ユ壘鍣ㄥ畼琛ㄨ褰曪紝鍒ゆ柇鍣ㄥ畼鐘舵��
                 this.loading = true;
-                delDonateorgan(tempOrgan.id).then((delLocationRes) => {
+                delDonateorgan(tempOrgan.id).then(delLocationRes => {
                   //璋冪敤鍒犻櫎鍣ㄥ畼璁板綍api
                   // delDonateorgan(searchedOrganData.id).then(
                   //   (delOrganRes) => {
@@ -1112,13 +1105,17 @@
             this.selectDonotor(this.selectedRow);
           });
       }
-    },
+    }
   },
   //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
   created() {
+    if (sessionStorage.getItem("organallocation")) {
+      this.queryParams = JSON.parse(sessionStorage.getItem("organallocation"));
+      console.log(this.queryParams, "queryParams");
+    }
     this.getBaseInfoList();
     this.resetForm();
-  },
+  }
   //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
   // mounted() {},
   // beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
@@ -1130,6 +1127,6 @@
   // activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 //@import url(); 寮曞叆鍏叡css绫�
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3