From 24112d26079c0010f0baff217d9ddcd9dfb595b4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 05 十一月 2023 17:31:05 +0800
Subject: [PATCH] 11

---
 src/views/project/donatebaseinfo/index.vue |  158 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 87 insertions(+), 71 deletions(-)

diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index c79b633..ea365c8 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -124,15 +124,15 @@
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['project:donatebaseinfo:edit']">淇敼</el-button>
+            v-hasPermi="['project:donatebaseinfo:edit']">璇︽儏</el-button>
 
-          <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
+          <!-- <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
             @click="handleDelete(scope.row)" v-hasPermi="['project:donatebaseinfo:remove']">鍒犻櫎</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handletermination(scope.row)"
             v-hasPermi="['project:donatebaseinfo:edit']">缁堟</el-button>
           <el-button size="mini" type="text" icon="el-icon-refrigerator" @click="handledownload(scope.row)">涓嬭浇</el-button>
           <el-button v-if="scope.row.recordstate == 0 || scope.row.recordstate == 3" size="mini" type="text"
-            icon="el-icon-thumb" @click="handleapproval(scope.row)">涓婃姤瀹℃牳</el-button>
+            icon="el-icon-thumb" @click="handleapproval(scope.row)">涓婃姤瀹℃牳</el-button> -->
           <!-- 鎾ら攢鐢宠 -->
         </template>
       </el-table-column>
@@ -167,15 +167,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item align="left" label="濮撳悕" prop="name">
-                <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鎬у埆" prop="sex">
-                <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
-                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
-                    :value="parseInt(dict.value)"></el-option>
-                </el-select>
+                <el-input v-model="form.name" placeholder="蹇呭~椤�" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -191,8 +183,12 @@
                 <el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" />
               </el-form-item>
             </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-col :span="6">
               <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
@@ -206,9 +202,27 @@
               <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
                 <el-input style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno"
                   placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" @blur="updateMessage" />
-              </el-form-item> </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-col :span="6">
+              <el-form-item label="鎬у埆" prop="sex">
+                <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
+                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
+                    :value="parseInt(dict.value)"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="骞撮緞" prop="age">
+                <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>            
+            <el-col :span="6">
+              <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
+                <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
+                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡">
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -219,20 +233,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row>
             <el-col :span="6">
-              <el-form-item label="骞撮緞" prop="age">
-                <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
-                <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
-                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡">
-                </el-date-picker>
-              </el-form-item> </el-col><el-col :span="6">
               <el-form-item label="瀛﹀巻" prop="education">
                 <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
                   <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label"
@@ -241,7 +242,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="12">
               <el-form-item label="浣忓潃" prop="residenceaddress">
@@ -646,6 +646,9 @@
       rules: {
         name: [
           { required: true, message: "璇疯緭鍏ユ崘鐚�呭鍚�", trigger: "blur" },
+        ],
+        birthday: [
+          { required: true, message: "璇烽�夋嫨鍑虹敓鏃ユ湡", trigger: "blur" },
         ],
         idcardtype: [
           { required: true, message: "璇烽�夋嫨璇佷欢绫诲瀷", trigger: "blur" },
@@ -1176,55 +1179,68 @@
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      this.reset();
-      //璁剧疆鎶ュ憡浜哄拰閮ㄩ棬/缁�
-      this.form.reporterno = this.currentuser.userName;
-      this.form.reportername = this.currentuser.nickName;
-      this.form.deptid = this.currentuser.deptid;
-
-      this.showSaveBtn = true;
-      //this.$refs.annex.getAnnexList();
-      this.open = true;
-      this.$nextTick(function () {
-        this.$refs.annex.getAnnexList();
+      this.$router.push({
+        path: "/organ/donationdetails/",
+        query: {
+          organType: "add",
+        }
       });
+      // this.reset();
+      // //璁剧疆鎶ュ憡浜哄拰閮ㄩ棬/缁�
+      // this.form.reporterno = this.currentuser.userName;
+      // this.form.reportername = this.currentuser.nickName;
+      // this.form.deptid = this.currentuser.deptid;
 
-      this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
+      // this.showSaveBtn = true;
+      // //this.$refs.annex.getAnnexList();
+      // this.open = true;
+      // this.$nextTick(function () {
+      //   this.$refs.annex.getAnnexList();
+      // });
+
+      // this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
 
     handleUpdate(row) {
-      this.showSaveBtn = true;
-      const id = row.id || this.ids;
-      //this.$refs.annex.getAnnexList();
-
-      getDonatebaseinfo(id).then((response) => {
-        this.reset();
-
-        this.$nextTick(function () {
-          this.$refs.annex.getAnnexList();
-        });
-        this.form = response.data;
-        response.data.sex = parseInt(response.data.sex);
-        this.form.id = response.data.id;
-        this.form.diseasetype = this.form.diseasetype.split(",");
-        this.form.infectious = this.form.infectious.split(",");
-        this.form.selfwill = this.form.selfwill.split(",");
-        this.form.othercases = this.form.othercases.split(",");
-        this.form.infosources = this.form.infosources.split(",");
-        this.form.kinship = this.form.kinship.split(",");
-        this.form.patientstate = this.form.patientstate.split(",");
-        this.open = true;
-        this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
-        this.registerAddresss.sheng = response.data.registerprovincename;
-        this.residenceAddresss.sheng = response.data.residenceprovincename;
-        this.registerAddresss.shi = response.data.registercityname;
-        this.residenceAddresss.shi = response.data.residencecityname;
-        this.residenceAddresss.qu = response.data.residencetownname;
-        this.registerAddresss.qu = response.data.registertownname;
+      this.$router.push({
+        path: "/organ/donationdetails/",
+        query: {
+          id: row.id,
+          organType: "edit",
+        }
       });
-    },
+      // this.showSaveBtn = true;
+      // const id = row.id || this.ids;
+      // //this.$refs.annex.getAnnexList();
 
+      // getDonatebaseinfo(id).then((response) => {
+      //   this.reset();
+
+      //   this.$nextTick(function () {
+      //     this.$refs.annex.getAnnexList();
+      //   });
+      //   this.form = response.data;
+      //   response.data.sex = parseInt(response.data.sex);
+      //   this.form.id = response.data.id;
+      //   this.form.diseasetype = this.form.diseasetype.split(",");
+      //   this.form.infectious = this.form.infectious.split(",");
+      //   this.form.selfwill = this.form.selfwill.split(",");
+      //   this.form.othercases = this.form.othercases.split(",");
+      //   this.form.infosources = this.form.infosources.split(",");
+      //   this.form.kinship = this.form.kinship.split(",");
+      //   this.form.patientstate = this.form.patientstate.split(",");
+      //   this.open = true;
+      //   this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
+      //   this.registerAddresss.sheng = response.data.registerprovincename;
+      //   this.residenceAddresss.sheng = response.data.residenceprovincename;
+      //   this.registerAddresss.shi = response.data.registercityname;
+      //   this.residenceAddresss.shi = response.data.residencecityname;
+      //   this.residenceAddresss.qu = response.data.residencetownname;
+      //   this.registerAddresss.qu = response.data.registertownname;
+      // });
+    },
+// 缁堟妗堜緥
     handletermination(row) {
       this.reset();
       this.showSaveBtn = false;

--
Gitblit v1.9.3