From f562df8d292df59e5319be095ee3f2af26f4991f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 22 十二月 2023 11:32:16 +0800
Subject: [PATCH] 11

---
 src/views/project/donationdetails/index.vue |  899 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 463 insertions(+), 436 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index d179f61..535295e 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -970,23 +970,6 @@
           label-width="100px"
           label-position="right"
         >
-          <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼">
-            <el-checkbox-group v-model="organdecision">
-              <el-checkbox v-for="item in organlist" :label="item">
-                {{ item }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="瀛愬コ鏁伴噺" prop="kinshipChildrennum">
-                <el-input
-                  v-model="affirmform.kinshipChildrennum"
-                  placeholder="璇疯緭鍏ユ暟閲�"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="浜插睘濮撳悕" prop="name">
@@ -1012,14 +995,21 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="韬唤璇佸彿" prop="idcardno">
                 <el-input
                   ref="updateBSvalue"
                   class="sfzcode"
                   v-model="affirmform.idcardno"
                   placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+                <el-input
+                  v-model="affirmform.phone"
+                  placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
                 />
               </el-form-item>
             </el-col>
@@ -1045,18 +1035,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row> </el-row>
           <el-row>
+            <el-col :span="12">
+              <el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign">
+                <el-checkbox-group v-model="organdecision">
+                  <el-checkbox v-for="item in kinshiplist" :label="item">
+                    {{ item == "瀛愬コ" ? item + "(浜�)" : item }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+              <el-form-item label="鎴愬勾瀛愬コ鏁�" prop="kinshipChildrennum">
                 <el-input
-                  v-model="affirmform.phone"
-                  placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+                  v-model="affirmform.kinshipChildrennum"
+                  placeholder="璇疯緭鍏ユ暟閲�"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="鍏朵粬" prop="organdecisionOther">
+              <el-form-item label="鍏朵粬浜插睘" prop="organdecisionOther">
                 <el-input
                   v-model="affirmform.organdecisionOther"
                   placeholder="璇疯緭鍏ュ叾浠�"
@@ -1064,6 +1062,15 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-form-item label-width="100px" label="鎹愮尞鍐冲畾">
+              <el-checkbox-group v-model="organdecision">
+                <el-checkbox v-for="item in organlist" :label="item">
+                  {{ item }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </el-form-item></el-row
+          >
           <el-row>
             <!-- <el-col :span="18">
               <el-form-item align="left" label="鎹愮尞鍐冲畾">
@@ -1078,6 +1085,18 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col> -->
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鑾峰彇缁勭粐" prop="acquisitiontissuename">
+                <org-selecter
+                  style="width: 260px"
+                  ref="orgSelecter"
+                  :org-type="'1'"
+                  v-model="form.acquisitiontissueno"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -1177,18 +1196,10 @@
           label-width="100px"
           label-position="right"
         >
-          <el-form-item label="瀹℃煡鎰忚">
-            <el-input
-              v-model="ethicform.flowcontent"
-              type="textarea"
-              placeholder="璇疯緭鍏ュ唴瀹�"
-            />
-          </el-form-item>
-
           <el-row>
             <el-col :span="18">
               <el-form-item label="瀹℃煡缁撹">
-                <el-radio-group v-model="ethicform.flowconclusion">
+                <el-radio-group v-model="ethicform.expertconclusion">
                   <el-radio
                     v-for="dict in dict.type.sys_EthicalReview"
                     :key="dict.value"
@@ -1198,22 +1209,33 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-
+          </el-row>
+          <el-row>
+            <el-col :span="18">
+              <el-form-item label="瀹℃煡鎰忚">
+                <el-input
+                  v-model="ethicform.expertopinion"
+                  type="textarea"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <!-- createtime   瀹℃煡鏃ユ湡 -->
-            <el-col :span="6" :pull="5">
+            <el-col :span="18">
               <el-form-item label="瀹℃煡鏃ユ湡">
                 <el-date-picker
                   clearable
                   size="small"
-                  v-model="ethicform.createTime"
+                  v-model="ethicform.conclusiontime"
                   type="date"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨缁撹鏃堕棿"
                 >
                 </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
+              </el-form-item> </el-col
+          ></el-row>
         </el-form>
         <div class="dialog-footer" style="min-height: 500px; margin: 20px 0; ">
           <el-button
@@ -1244,354 +1266,335 @@
           :rules="allocationrules"
           label-position="right"
         >
-          <el-form-item
-            label-width="100px"
-            label="閫夋嫨鍣ㄥ畼"
-            v-show="actives == 4"
-          >
-            <el-checkbox-group v-model="organalForm.organname">
-              <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>
-            <el-table v-loading="loading" border :data="allocationform">
-              <el-table-column
-                label="鍣ㄥ畼鍚嶇О"
-                align="center"
-                width="100"
-                prop="organname"
-              />
-              <el-table-column
-                label="鍣ㄥ畼缂栧彿"
-                align="center"
-                width="100"
-                prop="organno"
-              />
-              <el-table-column
-                label="鍒嗛厤鐘舵��"
-                align="center"
-                width="150"
-                prop="allocationstatus"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-select
-                    v-model="scope.row.allocationstatus"
-                    placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+          <el-row>
+            <el-col>
+              <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼">
+                <el-checkbox-group v-model="organalForm.organname">
+                  <el-checkbox
+                    v-for="dict in dict.type.sys_Organ"
+                    :key="dict.value"
+                    :label="dict.value"
+                    @change="changeorganState(dict.value)"
                   >
-                    <el-option
-                      v-for="dict in allocationstatuslist"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
+                    {{ dict.label }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-form-item>
+                <el-table v-loading="loading" border :data="allocationform">
+                  <el-table-column
+                    label="鍣ㄥ畼鍚嶇О"
+                    align="center"
+                    width="100"
+                    prop="organname"
+                  />
+                  <el-table-column
+                    label="鍣ㄥ畼缂栧彿"
+                    align="center"
+                    width="100"
+                    prop="organno"
+                  />
+                  <el-table-column
+                    label="绯荤粺缂栧彿"
+                    align="center"
+                    width="120"
+                    prop="ageunit"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.ageunit"
+                        placeholder="绯荤粺缂栧彿"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鎺ユ敹鏃堕棿"
+                    align="center"
+                    width="200"
+                    prop="applicanttime"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                        v-model="scope.row.applicanttime"
+                        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="120"
+                    prop="name"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.name"
+                        placeholder="鍙椾綋濮撳悕"
+                      />
+                    </template>
+                  </el-table-column>
+                  <!--
+              <el-table-column label="璇佷欢绫诲瀷" align="center" width="150" prop="idcardtype" v-if="actives == 4">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.idcardtype" placeholder="绉绘浜鸿瘉浠剁被鍨�">
+                    <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
+                      :value="parseInt(dict.value)"></el-option>
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="鑾峰彇鐘舵��"
-                align="center"
-                width="150"
-                prop="organstate"
-                v-if="actives == 5"
-              >
+              <el-table-column label="璇佷欢鍙风爜" align="center" width="200" prop="idcardno" v-if="actives == 4">
                 <template slot-scope="scope">
-                  <el-select
-                    v-model="scope.row.organstate"
-                    placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                  <el-input v-model="scope.row.idcardno" placeholder="璇佷欢鍙风爜" />
+                </template>
+              </el-table-column>
+              -->
+                  <el-table-column
+                    label="鍒嗛厤鐘舵��"
+                    align="center"
+                    width="150"
+                    prop="allocationstatus"
+                    v-if="actives == 4"
                   >
-                    <el-option
-                      v-for="dict in organstatelist"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘鐘舵��"
-                align="center"
-                width="150"
-                prop="transplantstate"
-                v-if="actives == 6"
-              >
-                <template slot-scope="scope">
-                  <el-select
-                    v-model="scope.row.transplantstate"
-                    placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                    <template slot-scope="scope">
+                      <el-select
+                        v-model="scope.row.allocationstatus"
+                        placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                      >
+                        <el-option
+                          v-for="dict in allocationstatuslist"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="reallocationreason"
+                    label="閲嶅垎閰嶈鏄�"
+                    align="center"
+                    v-if="actives == 4"
                   >
-                    <el-option
-                      v-for="dict in transplantstatelist"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘鍖婚櫌"
-                align="center"
-                width="230"
-                prop="transplanthospitalname"
-              >
-                <template slot-scope="scope">
-                  <org-selecter
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    ref="tranHosSelect"
-                    :org-type="'4'"
-                    v-model="scope.row.transplanthospitalno"
-                    style="width: 100%"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鑾峰彇缁勭粐"
-                align="center"
-                width="230"
-                prop="gainhospitalno"
-                v-if="actives == 5"
-              >
-                <template slot-scope="scope">
-                  <org-selecter
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    ref="tranHosSelect"
-                    :org-type="'4'"
-                    v-model="scope.row.gainhospitalno"
-                    style="width: 100%"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绯荤粺缂栧彿"
-                align="center"
-                width="120"
-                prop="ageunit"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.ageunit"
-                    placeholder="绯荤粺缂栧彿"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鎺ユ敹鏃堕棿"
-                align="center"
-                width="200"
-                prop="applicanttime"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    clearable
-                    size="small"
-                    style="width: 100%"
-                    v-model="scope.row.applicanttime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨鎺ユ敹鏃堕棿"
+                    <template slot-scope="scope">
+                      <el-input
+                        clearable
+                        v-model="scope.row.reallocationreason"
+                        placeholder="璇疯緭鍏ラ噸鍒嗛厤璇存槑"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鍣ㄥ畼绂讳綋鏃堕棿"
+                    align="center"
+                    width="200"
+                    prop="organgettime"
+                    v-if="actives == 5"
                   >
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鍙椾綋濮撳悕"
-                align="center"
-                width="120"
-                prop="name"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.name"
-                    placeholder="鍙椾綋濮撳悕"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘璐熻矗浜�"
-                align="center"
-                width="120"
-                prop="transplantdoct"
-                v-if="actives == 6"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.transplantdoct"
-                    placeholder="鍖诲笀濮撳悕"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘鏃堕棿"
-                align="center"
-                width="200"
-                prop="transplanttime"
-                v-if="actives == 6"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    clearable
-                    size="small"
-                    style="width: 100%"
-                    v-model="scope.row.transplanttime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨绉绘鏃堕棿"
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        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="230"
+                    prop="gainhospitalno"
+                    v-if="actives == 5"
                   >
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鑾峰彇鍖诲笀"
-                align="center"
-                width="120"
-                prop="organgetdoct"
-                v-if="actives == 5"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.organgetdoct"
-                    placeholder="鍖诲笀濮撳悕"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鑾峰彇鏃堕棿"
-                align="center"
-                width="200"
-                prop="organgettime"
-                v-if="actives == 5"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    clearable
-                    size="small"
-                    style="width: 100%"
-                    v-model="scope.row.organgettime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨鑾峰彇鏃堕棿"
+                    <template slot-scope="scope">
+                      <div class="elldiv">
+                        <org-selecter
+                          ref="tranHosSelect"
+                          :org-type="'4'"
+                          v-model="scope.row.gainhospitalno"
+                        />
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鑾峰彇鍖诲笀"
+                    align="center"
+                    width="120"
+                    prop="organgetdoct"
+                    v-if="actives == 5"
                   >
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="璇佷欢绫诲瀷"
-                align="center"
-                width="150"
-                prop="idcardtype"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-select
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.idcardtype"
-                    placeholder="绉绘浜鸿瘉浠剁被鍨�"
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.organgetdoct"
+                        placeholder="璇疯緭鍏ュ尰甯堝鍚�"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鑾峰彇鐘舵��"
+                    align="center"
+                    width="150"
+                    prop="organstate"
+                    v-if="actives == 5"
                   >
-                    <el-option
-                      v-for="dict in dict.type.sys_IDType"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="parseInt(dict.value)"
-                    ></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="璇佷欢鍙风爜"
-                align="center"
-                width="200"
-                prop="idcardno"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.idcardno"
-                    placeholder="璇佷欢鍙风爜"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="abandonreason"
-                label="寮冪敤/浣滃簾鍘熷洜"
-                align="center"
-                width="260"
-              >
-                <template slot-scope="scope">
-                  <el-row>
-                    <el-input
-                      clearable
-                      v-model="scope.row.abandonreason"
-                      placeholder="璇疯緭鍏ュ純鐢�/浣滃簾鍘熷洜"
-                    />
-                  </el-row>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form-item>
+                    <template slot-scope="scope">
+                      <el-select
+                        v-model="scope.row.organstate"
+                        placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                      >
+                        <el-option
+                          v-for="dict in organstatelist"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="璇存槑"
+                    align="center"
+                    prop="notgetreason"
+                    v-if="actives == 5"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        clearable
+                        v-model="scope.row.notgetreason"
+                        placeholder="璇疯緭鍏ユ湭鑾峰彇璇存槑"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="绉绘鍖婚櫌"
+                    align="center"
+                    width="230"
+                    prop="transplanthospitalname"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <org-selecter
+                        ref="tranHosSelect"
+                        :org-type="'4'"
+                        v-model="scope.row.transplanthospitalno"
+                        style="width: 100%"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="绉绘璐熻矗浜�"
+                    align="center"
+                    width="120"
+                    prop="transplantdoct"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.transplantdoct"
+                        placeholder="鍖诲笀濮撳悕"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="绉绘鏃堕棿"
+                    align="center"
+                    width="200"
+                    prop="transplanttime"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                        v-model="scope.row.transplanttime"
+                        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="150"
+                    prop="transplantstate"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-select
+                        v-model="scope.row.transplantstate"
+                        placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                      >
+                        <el-option
+                          v-for="dict in transplantstatelist"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="abandonreason"
+                    label="璇存槑"
+                    align="center"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        clearable
+                        v-model="scope.row.abandonreason"
+                        placeholder="璇疯緭鍏ュ純鐢ㄨ鏄�"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鎿嶄綔"
+                    width="200"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-copy-document"
+                        @click="deldistribution(scope.row)"
+                        >鍒犻櫎</el-button
+                      >
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-copy-document"
+                        @click="redistribution(scope.row)"
+                        >閲嶆柊鍒嗛厤</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div class="dialog-footer" v-show="actives == 4">
           <el-button
@@ -1980,24 +1983,7 @@
           label-position="right"
         >
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="瀹屾垚鏃堕棿" prop="completetime">
-                <el-date-picker
-                  style="width: 167px"
-                  clearable
-                  size="small"
-                  v-model="accomplishform.completetime"
-                  type="date"
-                  value-format="yyyy-MM-dd hh:mm:ss"
-                  placeholder="閫夋嫨瀹屾垚鏃堕棿"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item align="left" label="閬椾綋鎹愮尞" prop="isbodydonation">
                 <el-radio-group v-model="accomplishform.isbodydonation">
                   <el-radio
@@ -2009,7 +1995,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="12">
               <el-form-item align="left" label="鎺ユ敹鍗曚綅" prop="receivingunit">
                 <el-input
                   v-model="accomplishform.receivingunit"
@@ -2018,9 +2004,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="璐熻矗浜�" prop="responsibleuserid">
                 <el-select
                   v-model="accomplishform.responsibleuserid"
@@ -2036,7 +2021,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="鍗忚皟鍛樹竴" prop="coordinateduserido">
                 <el-select
                   v-model="accomplishform.coordinateduserido"
@@ -2052,7 +2037,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="鍗忚皟鍛樹簩" prop="coordinateduseridt">
                 <el-select
                   v-model="accomplishform.coordinateduseridt"
@@ -2066,6 +2051,20 @@
                   >
                   </el-option>
                 </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹屾垚鏃堕棿" prop="completetime">
+                <el-date-picker
+                  style="width: 167px"
+                  clearable
+                  size="small"
+                  v-model="accomplishform.completetime"
+                  type="date"
+                  value-format="yyyy-MM-dd hh:mm:ss"
+                  placeholder="閫夋嫨瀹屾垚鏃堕棿"
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -2092,17 +2091,25 @@
         </div>
       </div>
       <!-- 瀹岀粨娴佺▼ -->
-      <div class="boxdiv"  v-show="actives > 6">
+      <div class="boxdiv" v-show="actives > 6">
         <div style="display:flex; line-height: 100px; justify-content: center;">
           <!-- <el-image
             style="width: 100px; height: 100px"
             :src="require('@/assets/images/wanc.png')"
           ></el-image> -->
           <div style="padding: 20px 0; margin: 0 30px">
-            <img style="width: 60px; height: 60px" src="@/assets/images/wanc.png" class="user-avatar" />
+            <img
+              style="width: 60px; height: 60px"
+              src="@/assets/images/wanc.png"
+              class="user-avatar"
+            />
           </div>
           <div style="font-size: 28px;">鍏ㄩ儴娴佺▼宸插畬缁擄紒</div>
-          <img style="width: 100px; height: 100px" src="@/assets/images/zhan.png" class="user-avatar" />
+          <img
+            style="width: 100px; height: 100px"
+            src="@/assets/images/zhan.png"
+            class="user-avatar"
+          />
         </div>
       </div>
     </div>
@@ -2258,11 +2265,7 @@
   Modifydonationattachment
 } from "@/api/project/donateannex";
 import { listReportname } from "@/api/project/organization";
-import {
-  listnewDonatecompletioninfo,
-  addDonatecompletioninfo,
-  updateDonatecompletioninfo
-} from "@/api/project/donatecompletioninfo";
+
 import {
   getDonatebaseinfo,
   addDonatebaseinfo,
@@ -2275,15 +2278,23 @@
   updateMedicalevaluation
 } from "@/api/project/medicalevaluation";
 import {
+  listRelativesconfirmation,
+  getRelativesconfirmation,
+  addRelativesconfirmation,
+  updateRelativesconfirmation
+} from "@/api/project/relativesconfirmation";
+import {
+  listEthicalreviewopinions,
+  getEthicalreviewopinions,
+  addEthicalreviewopinions,
+  updateEthicalreviewopinions,
+  listnewEthicalreviewopinions
+} from "@/api/project/ethicalreviewopinions";
+import {
   addDonateflowchart,
   listDonateflowchart,
   updateDonateflowchart
 } from "@/api/project/DonationEvaluation";
-import {
-  listOrganallocation,
-  addOrganallocation,
-  updateOrganallocation
-} from "@/api/project/organallocation";
 import {
   listDonateorgan,
   addDonateorgan,
@@ -2291,17 +2302,21 @@
   updateDonateorgan
 } from "@/api/project/donateorgan";
 import {
+  listOrganallocation,
+  addOrganallocation,
+  updateOrganallocation
+} from "@/api/project/organallocation";
+import {
   addDonationwitness,
   updateDonationwitness,
   getDonationwitness,
   getByInfoId
 } from "@/api/project/donationwitness";
 import {
-  listRelativesconfirmation,
-  getRelativesconfirmation,
-  addRelativesconfirmation,
-  updateRelativesconfirmation
-} from "@/api/project/relativesconfirmation";
+  listnewDonatecompletioninfo,
+  addDonatecompletioninfo,
+  updateDonatecompletioninfo
+} from "@/api/project/donatecompletioninfo";
 import Li_area_select from "@/components/Address";
 import OrgSelecter from "@/views/project/components/orgselect";
 import AnnexUpload from "@/views/project/components/annexupload";
@@ -2341,37 +2356,31 @@
       ethicform: {
         infoid: null
       },
+
+      kinshiplist: ["閰嶅伓", "鐖朵翰", "姣嶄翰", "瀛愬コ", "鍙楁墭浜�"],
       organlist: [
+        "鑲濊剰",
+        "鍙岃偩鑴�",
         "蹇冭剰",
-        "鍏ㄨ倽",
-        "宸﹁倽",
-        "鍙宠倽",
-        "宸﹁偩",
-        "鍙宠偩",
-        "鍏ㄨ偩",
-        "宸﹁偤",
-        "鍙宠偤",
-        "灏忚偁",
+        "鑲鸿剰",
         "鑵轰綋",
+        "灏忚偁",
+        "鍙岀溂缁勭粐",
         "閬椾綋",
-        "宸︾溂瑙掕啘",
-        "鍙崇溂瑙掕啘",
         "鍏朵粬"
       ],
       allocationstatuslist: [
-        { value: 0, label: "鏈垎閰�" },
         { value: 1, label: "宸插垎閰�" },
         { value: 2, label: "浣滃簾" }
       ],
       organstatelist: [
-        { value: "0", label: "鏈幏鍙�" },
         { value: "1", label: "宸茶幏鍙�" },
-        { value: "2", label: "寮冪敤" }
+        { value: "2", label: "鍥炵撼" }
       ],
       transplantstatelist: [
-        { value: 0, label: "鏈Щ妞�" },
         { value: 1, label: "宸茬Щ妞�" },
-        { value: 2, label: "寮冪敤" }
+        { value: 2, label: "搴撳瓨" },
+        { value: 3, label: "寮冪敤" }
       ],
       allocationform: [],
       witnessform: {
@@ -2666,7 +2675,8 @@
         if (this.ethicform.infoid) {
           return;
         }
-        listDonateflowchart(searchParam).then(response => {
+        //listDonateflowchart(searchParam).then(response => {
+        listEthicalreviewopinions(searchParam).then(response => {
           if (response.code == 200 && response.rows.length) {
             this.ethicform = response.rows[0];
           } else {
@@ -2884,11 +2894,13 @@
         this.$refs["ethicform"].validate(valid => {
           if (valid) {
             if (this.ethicform.id != null) {
-              updateDonateflowchart(this.ethicform).then(response => {
+              // updateDonateflowchart(this.ethicform).then(response => {
+              updateEthicalreviewopinions(this.ethicform).then(response => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅淇敼鎴愬姛");
               });
             } else {
-              addDonateflowchart(this.ethicform).then(response => {
+              //addDonateflowchart(this.ethicform).then(response => {
+              addEthicalreviewopinions(this.ethicform).then(response => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
               });
             }
@@ -3329,6 +3341,7 @@
   display: -webkit-box;
   background-color: #f5f7fa;
   height: 100%;
+
   .left-course {
     background: #fff;
     width: 17vw;
@@ -3349,6 +3362,7 @@
       position: fixed;
       top: 50;
     }
+
     .title {
       background: #22a2c3;
       margin-bottom: 20px;
@@ -3357,9 +3371,11 @@
     }
   }
 }
+
 .upload-demo {
   text-align: center;
 }
+
 .pdfimg {
   display: flex; // text-align: center;
   width: 100%;
@@ -3399,11 +3415,13 @@
     text-align: center;
   }
 }
+
 .Ticket-button {
   margin-top: 10px;
   text-align: right;
   padding-right: 66px;
 }
+
 .boxdiv {
   max-width: 85vw;
   font-size: 18px;
@@ -3419,14 +3437,23 @@
     margin-bottom: 30px;
   }
 }
+
 ::v-deep .el-step__head.is-finish {
   color: #22a2c3;
   border-color: #22a2c3;
 }
+
 ::v-deep .el-step__title.is-finish {
   color: #22a2c3;
 }
+
 ::v-deep .el-step__description.is-finish {
   color: #22a2c3;
 }
+
+:v-deep .el-select {
+  display: inline-block;
+  position: relative;
+  width: 80%;
+}
 </style>

--
Gitblit v1.9.3