From 26c14f0c6defe02f2b6f15b498bcd454461ee7a8 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 05 一月 2024 14:01:43 +0800
Subject: [PATCH] yxh

---
 src/views/project/ethicalReview/index.vue |  216 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 116 insertions(+), 100 deletions(-)

diff --git a/src/views/project/ethicalReview/index.vue b/src/views/project/ethicalReview/index.vue
index efdf86e..3405e2b 100644
--- a/src/views/project/ethicalReview/index.vue
+++ b/src/views/project/ethicalReview/index.vue
@@ -61,36 +61,34 @@
     </el-form>
 
     <el-table :default-sort="{ prop: 'createTime' }" v-loading="loading" :data="listnews" border>
-      <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reporttime, "{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="name" width="120" />
       <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
       <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="treatmenthospitalname" />
-      <el-table-column label="瀹℃煡缁撹" align="center" prop="flowconclusion" width="100">
+      <el-table-column label="浼︾悊瀹℃煡缁撹" align="center" prop="flowconclusion" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_EthicalReview" :value="scope.row.flowconclusion" />
         </template>
       </el-table-column>
+      <el-table-column label="瀹℃煡鎰忚" align="center" prop="flowcontent" />
       <el-table-column label="瀹℃煡鏃堕棿" align="center" prop="createTime" width="160" />
       <!-- <el-table-column label="韬唤璇佸彿" prop="idcardno" width="200" /> -->
       <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" />
-
+      <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <!--
       <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column label="鎿嶄綔" align="center" width="150px" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
@@ -113,7 +111,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="濮撳悕">
+            <el-form-item label="鎹愮尞鑰呭鍚�">
               <el-input v-model="curCase.name" placeholder="璇疯緭鍏ュ鍚�" disabled />
             </el-form-item>
           </el-col>
@@ -216,7 +214,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button type="primary" :loading="loading" @click="submitForm">纭� 瀹�</el-button>
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
@@ -684,100 +682,114 @@
       this.handleQuery();
     },
     /** 浼︾悊瀹℃煡寮圭獥 */
-    showDonationEvaluationDialog(dontateInfo) {
-      console.log("浼︾悊瀹℃煡11", dontateInfo);
+    showDonationEvaluationDialog(row) {
+      this.$router.push({
+        path: "/organ/donationdetails/",
+        query: {
+          id: row.id,
+          organType: "edit",
+        }
+      });
       //鏌ユ壘鏄惁瀛樺湪浼︾悊瀹℃煡璁板綍
       //this.curCase = dontateInfo;
-      this.curCase = {
-        id: dontateInfo.id,
-        recordstate: null,
-        donorno: dontateInfo.donorno,
-      };
-      this.reset();
-      this.form.donorno = dontateInfo.donorno;
-      this.form.infoid = dontateInfo.id;
-      this.expertAdviceQueryParam.infoid = dontateInfo.id;
-      this.expertAdviceQueryParam.donorno = dontateInfo.donorno;
-      // this.listnews.ConclusionTime = this.expertAdviceForm.conclusiontime;
-      // this.getExpertList();
-      this.form.flowname = "浼︾悊瀹℃煡";
-      if (dontateInfo.fcid) {
-        let queryParam = {
-          id: dontateInfo.fcid,
-          flowname: "浼︾悊瀹℃煡",
-        };
-        // flowname: "浼︾悊瀹℃煡",
-        listDonateflowchart(queryParam).then((response) => {
-          let evaluationList = response.rows;
-          console.log("浼︾悊瀹℃煡", response.rows);
-          if (evaluationList.length == 1) {
-            this.form = evaluationList[0];
-            this.open = true;
-            this.$nextTick(function () {
-              this.$refs.ethicalannex.getAnnexList();
-            });
-            this.title = "淇敼浼︾悊瀹℃煡";
-          } else if (evaluationList.length == 0) {
-            this.$modal.msgError("鏈壘鍒版湰妗堜緥鐨勪鸡鐞嗗鏌ヨ褰曪紝璇疯仈绯荤鐞嗗憳锛�");
-          } else {
-            this.$modal.msgError("鏁版嵁閲嶅");
-          }
-        });
-      } else {
-        this.title = "鏂板浼︾悊瀹℃煡";
-        this.open = true;
-        this.$nextTick(function () {
-          this.$refs.ethicalannex.getAnnexList();
-        });
-      }
+      // this.curCase = {
+      //   id: dontateInfo.id,
+      //   donorno: dontateInfo.donorno,
+      //   name: dontateInfo.name,
+      //   recordstate: null,
+      // };
+
+      // this.reset();
+      // this.form.donorno = dontateInfo.donorno;
+      // this.form.infoid = dontateInfo.id;
+      // this.expertAdviceQueryParam.infoid = dontateInfo.id;
+      // this.expertAdviceQueryParam.donorno = dontateInfo.donorno;
+      // // this.listnews.ConclusionTime = this.expertAdviceForm.conclusiontime;
+      // // this.getExpertList();
+      // this.form.flowname = "浼︾悊瀹℃煡";
+      // if (dontateInfo.fcid) {
+      //   let queryParam = {
+      //     id: dontateInfo.fcid,
+      //     flowname: "浼︾悊瀹℃煡",
+      //   };
+      //   // flowname: "浼︾悊瀹℃煡",
+      //   listDonateflowchart(queryParam).then((response) => {
+      //     let evaluationList = response.rows;
+      //     console.log("浼︾悊瀹℃煡", response.rows);
+      //     if (evaluationList.length == 1) {
+      //       this.form = evaluationList[0];
+      //       this.open = true;
+      //       this.$nextTick(function () {
+      //         this.$refs.ethicalannex.getAnnexList();
+      //       });
+      //       this.title = "淇敼浼︾悊瀹℃煡";
+      //     } else if (evaluationList.length == 0) {
+      //       this.$modal.msgError("鏈壘鍒版湰妗堜緥鐨勪鸡鐞嗗鏌ヨ褰曪紝璇疯仈绯荤鐞嗗憳锛�");
+      //     } else {
+      //       this.$modal.msgError("鏁版嵁閲嶅");
+      //     }
+      //   });
+      // } else {
+      //   this.title = "鏂板浼︾悊瀹℃煡";
+      //   this.open = true;
+      //   this.$nextTick(function () {
+      //     this.$refs.ethicalannex.getAnnexList();
+      //   });
+      // }
     },
     /** 淇濆瓨鎹愮尞璇勪及 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          //鍒ゆ柇瀹℃煡鎰忚褰曞叆
-          if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
-            var exp = this.form.flowcontent;
-            if (typeof exp == "undefined" || exp == null || exp == "") {
-              this.$modal.msgError("璇疯緭鍏ュ鏌ユ剰瑙�!");
-              return;
+      this.loading = true;
+      this.$nextTick(() => {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            //鍒ゆ柇瀹℃煡鎰忚褰曞叆
+            if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
+              var exp = this.form.flowcontent;
+              if (typeof exp == "undefined" || exp == null || exp == "") {
+                this.$modal.msgError("璇疯緭鍏ュ鏌ユ剰瑙�!");
+                return;
+              }
+            }
+
+            //鍒ゆ柇鏄惁鏄柊绾綍
+            if (this.form.id != null) {
+              // updateEthicalreviewopinions娌℃湁鏉冮檺
+              updateDonateflowchart(this.form).then((response) => {
+                this.$modal.msgSuccess("淇敼鎴愬姛");
+                //鏇存柊鎹愮尞鐘舵��
+                if (this.form.flowconclusion == 1) {
+                  this.curCase.recordstate = 8;
+                } else {
+                  this.curCase.recordstate = 9;
+                }
+                updateDonatebaseinfo(this.curCase).then((response) => {
+                  this.open = false;
+                  this.getList();
+                });
+              });
+            } else {
+              addDonateflowchart(this.form).then((response) => {
+                //鏇存柊鎹愮尞鐘舵��
+                if (this.form.flowconclusion == 1) {
+                  this.curCase.recordstate = 8;
+                } else {
+                  this.curCase.recordstate = 9;
+                }
+                updateDonatebaseinfo(this.curCase).then((response) => {
+                  this.$modal.msgSuccess("鏂板鎴愬姛");
+                  this.open = false;
+                  this.getList();
+                });
+              });
             }
           }
-
-          //鍒ゆ柇鏄惁鏄柊绾綍
-          if (this.form.id != null) {
-            // updateEthicalreviewopinions娌℃湁鏉冮檺
-            updateDonateflowchart(this.form).then((response) => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              //鏇存柊鎹愮尞鐘舵��
-              if (this.form.flowconclusion == 1) {
-                this.curCase.recordstate = 8;
-              } else {
-                this.curCase.recordstate = 9;
-              }
-              updateDonatebaseinfo(this.curCase).then((response) => {
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addDonateflowchart(this.form).then((response) => {
-              //鏇存柊鎹愮尞鐘舵��
-              if (this.form.flowconclusion == 1) {
-                this.curCase.recordstate = 8;
-              } else {
-                this.curCase.recordstate = 9;
-              }
-              updateDonatebaseinfo(this.curCase).then((response) => {
-                this.$modal.msgSuccess("鏂板鎴愬姛");
-                this.open = false;
-                this.getList();
-              });
-            });
-          }
-        }
-      });
+        });
+        
+      this.loading = false;
+      })
     },
+
     /** 鑾峰彇鎹愮尞璇勪及 */
     getDonationEvaluation(dontateInfo) {
       //this.loading = true;
@@ -800,6 +812,7 @@
         }
       });
     },
+
     /** 鍒ゆ柇鏂板鎴栨槸缂栬緫 */
     checkEditOrAdd(dontateInfo) {
       if (dontateInfo.recordstate == 4) {
@@ -813,6 +826,7 @@
     handlePreview(file) {
       console.log(file);
     },
+
     //鏄剧ず涓撳鎰忚寮圭獥
     showExpertAdviceDialog() {
       this.resetExperAdviceForm();
@@ -820,6 +834,7 @@
       this.expertAdviceForm.donorno = this.curCase.donorno;
       this.isShowExpertAdviceDialog = true;
     },
+
     //淇濆瓨涓撳鎰忚
     saveExpertAdvice() {
       this.$refs["expertAdviceForm"].validate((valid) => {
@@ -869,6 +884,7 @@
         })
         .catch(() => { });
     },
+
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdateExpert(row) {
       this.reset();

--
Gitblit v1.9.3