From 6eb098b9ea2673240e802e4aa460ddc67ec7d869 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 12 八月 2025 09:50:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/doctor/check/index.vue | 1158 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 671 insertions(+), 487 deletions(-)

diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 1680390..0f9fc61 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -190,376 +190,372 @@
     </el-dialog>
 
     <el-drawer :visible.sync="drawer" :with-header="false" size="70%" :before-close="handleClose">
-      <div style="font-size: 14px">
-        <table style="
-            width: 96%;
-            height: 70px;
-            margin: 10px 10px;
-            margin-bottom: 10px;
-            border: 1px solid #dfe6ec;
-            border-collapse: collapse;
-            font-size: 16px;
-          " cellspacing="4">
-          <caption style="background-color: #f8f8f9; font-size: 18px">
-            濉啓{{ tableAll.cusName }}鐨勪綋妫�璧勬枡
-          </caption>
-          <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
-              濮撳悕锛�
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              {{ tableAll.cusName }}
-              <template slot-scope="scope">
-                <span v-if="scope.row.cusSex == '0'">鐢�</span>
-                <span v-if="scope.row.cusSex == '1'">濂�</span>
-                <span v-if="scope.row.cusSex == '2'">鏈煡</span>
-                <span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
-              </template>
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
-              鎬у埆锛�
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              {{ tableAll.cusSex == 0 ? "鐢�" : tableAll.cusSex == 1 ? "濂�" : "鏈煡" }}
-            </td>
-          </tr>
-          <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
-              浣撴鍗曞彿锛�
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              {{ tableAll.tjNumber }}
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
-              浣撴鏃堕棿锛�
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              {{ date }}
-            </td>
-          </tr>
-        </table>
-      </div>
-      <div style="display: flex">
-        <div style="margin: 10px 10px" v-if="hasdeptList.length >= 1">
-          <el-button type="primary" size="mini" @click="Changeapply()">浼氳瘖鐢宠</el-button>
+      <div v-loading="isLoading" element-loading-text="姝e湪鍔犺浇鏁版嵁锛岃绋嶅��..." element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative">
+        <div style="font-size: 14px">
+          <table style="
+              width: 96%;
+              height: 70px;
+              margin: 10px 10px;
+              margin-bottom: 10px;
+              border: 1px solid #dfe6ec;
+              border-collapse: collapse;
+              font-size: 16px;
+            " cellspacing="4">
+            <caption style="background-color: #f8f8f9; font-size: 18px">
+              濉啓{{
+                tableAll.cusName
+              }}鐨勪綋妫�璧勬枡
+            </caption>
+            <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
+                濮撳悕锛�
+              </td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                {{ tableAll.cusName }}
+                <template slot-scope="scope">
+                  <span v-if="scope.row.cusSex == '0'">鐢�</span>
+                  <span v-if="scope.row.cusSex == '1'">濂�</span>
+                  <span v-if="scope.row.cusSex == '2'">鏈煡</span>
+                  <span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
+                </template>
+              </td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
+                鎬у埆锛�
+              </td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                {{
+                  tableAll.cusSex == 0
+                    ? "鐢�"
+                    : tableAll.cusSex == 1
+                      ? "濂�"
+                      : "鏈煡"
+                }}
+              </td>
+            </tr>
+            <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
+                浣撴鍗曞彿锛�
+              </td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                {{ tableAll.tjNumber }}
+              </td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
+                浣撴鏃堕棿锛�
+              </td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                {{ date }}
+              </td>
+            </tr>
+          </table>
         </div>
-        <div style="margin: 10px 10px">
-          <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
+        <div style="display: flex">
+          <div style="margin: 10px 10px" v-if="hasdeptList.length >= 1">
+            <el-button type="primary" size="mini" @click="Changeapply()">浼氳瘖鐢宠</el-button>
+          </div>
+          <div style="margin: 10px 10px">
+            <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
+          </div>
+          <div style="margin: 10px 10px">
+            <el-button type="primary" size="mini" @click="jianqian">妫�鍓嶉棶璇�</el-button>
+          </div>
+          <div style="margin: 10px 10px">
+            <el-button type="primary" size="mini" @click="result">妫�鏌ユ楠岀粨鏋�</el-button>
+          </div>
         </div>
-        <div style="margin: 10px 10px">
-          <el-button type="primary" size="mini" @click="jianqian">妫�鍓嶉棶璇�</el-button>
-        </div>
-        <div style="margin: 10px 10px">
-          <el-button type="primary" size="mini" @click="result">妫�鏌ユ楠岀粨鏋�</el-button>
-        </div>
-      </div>
 
-      <el-row>
-        <el-col v-show="baogaoqian">
-          <template>
-            <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
-              <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index"
-                :lazy="false">
-                <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
-                  style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
-                  <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150">
-                  </el-table-column>
-                  <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
-                    <template slot-scope="{ row, $index }">
-                      <el-input
-                        type="textarea"
-                        autosize
-                        size="mini"
-                        v-model="row.proResult"
-                        :ref="`input-item${index}-row${$index}`"
-                        @keydown.enter.native="keyInputConfirm($event, index, $index)"
-                        @focus="handleFocus(row)"
-                        @blur="handleInputConfirm(row)"
-                        @input="vale($event, row)"
-                        :disabled="row.project.proName === 'BMI'"
-                      ></el-input>
-                    </template>
-                  </el-table-column>
-                  <!-- <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
+        <el-row>
+          <el-col v-show="baogaoqian">
+            <template>
+              <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
+                <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index"
+                  :lazy="false">
+                  <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
+                    style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
+                    <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150">
+                    </el-table-column>
+                    <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
+                      <template slot-scope="{ row, $index }">
+                        <el-input type="textarea" autosize size="mini" v-model="row.proResult"
+                          :ref="`input-item${index}-row${$index}`" @keydown.enter.native="
+                            keyInputConfirm($event, index, $index)
+                            " @focus="handleFocus(row)" @blur="handleInputConfirm(row)" @input="vale($event, row)"
+                          :disabled="row.project.proName === 'BMI'"></el-input>
+                      </template>
+                    </el-table-column>
+                    <!-- <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
                     <template slot-scope="scope">
                       <el-checkbox v-model="scope.row.exceptionDesc" @change="changDesc(scope.row)"
                         :disabled="scope.row.project.sfcyyc === 1"></el-checkbox>
                     </template>
                   </el-table-column> -->
-                   <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
-                    <template slot-scope="scope">
-                      <el-checkbox v-model="scope.row.exceptionDesc" @change="changDesc(scope.row)"
-                        :disabled="scope.row.project.sfcyyc === 1 || scope.row.project.proName === 'BMI'"></el-checkbox>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="瑙勫垯" width="70">
-                    <template slot-scope="scope">
-                      <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
-                  </el-table-column>
-                  <el-table-column label="鍙傝�冭寖鍥�" width="70">
-                     <template slot-scope="scope">
+                    <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
+                      <template slot-scope="scope">
+                        <el-checkbox v-model="scope.row.exceptionDesc" @change="changDesc(scope.row)" :disabled="scope.row.project.sfcyyc === 1 ||
+                          scope.row.project.proName === 'BMI'
+                          "></el-checkbox>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="瑙勫垯" width="70">
+                      <template slot-scope="scope">
+                        <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
+                    </el-table-column>
+                    <el-table-column label="鍙傝�冭寖鍥�" width="70">
+                      <template slot-scope="scope">
+                        {{ scope.row.project.proScope }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="conclusion" label="缁撴灉缁撹" width="200">
+                      <template slot-scope="scope">
+                        <el-input size="mini" type="textarea" autosize v-model="scope.row.conclusion" autocomplete="off"
+                          placeholder="璇疯緭鍏ョ粨鏋滅粨璁�" disabled></el-input>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="isReturn" label="澶嶈瘖" width="60px" align="center">
+                      <template slot-scope="scope">
+                        <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
+                      <template slot-scope="scope">
+                        <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+                          @change="checkboxchange(scope.row)"></el-switch>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="proAdvice" label="缁撴灉寤鸿">
+                      <template slot-scope="scope">
+                        <el-popover placement="top" trigger="hover" width="400">
+                          <div>
+                            {{ scope.row.proAdvice }}
+                          </div>
+                          <div slot="reference" class="jianyi">
+                            <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+                              :disabled="true"></el-input>
+                          </div>
+                        </el-popover>
+                      </template>
+                    </el-table-column>
+                  </el-table>
 
-                      {{ scope.row.project.proScope }}
-
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="conclusion" label="缁撴灉缁撹" width="200">
-                    <template slot-scope="scope">
-                      <el-input size="mini" type="textarea" autosize v-model="scope.row.conclusion" autocomplete="off"
-                        placeholder="璇疯緭鍏ョ粨鏋滅粨璁�" disabled></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="isReturn" label="澶嶈瘖" width="60px" align="center">
-                    <template slot-scope="scope">
-                      <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
-                    <template slot-scope="scope">
-                      <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
-                        @change="checkboxchange(scope.row)"></el-switch>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="proAdvice" label="缁撴灉寤鸿">
-                    <template slot-scope="scope">
-                      <el-popover placement="top" trigger="hover" width="400">
-                        <div>
-                          {{ scope.row.proAdvice }}
-                        </div>
-                        <div slot="reference" class="jianyi">
-                          <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
-                            :disabled="true"></el-input>
-                        </div>
-                      </el-popover>
-                    </template>
-                  </el-table-column>
-                </el-table>
-
-                <div style="font-size: 14px; overflow-y: auto; height: 286px" class="a">
-                  <table style="
-                      width: 96%;
-                      margin: 4px 10px;
-                      border: 1px solid #dfe6ec;
-                      border-collapse: collapse;
-                    " cellspacing="4">
-                    <tr style="
+                  <div style="font-size: 14px; overflow-y: auto; height: 286px" class="a">
+                    <table style="
+                        width: 96%;
+                        margin: 4px 10px;
                         border: 1px solid #dfe6ec;
                         border-collapse: collapse;
-                      ">
-                      <td style="
+                      " cellspacing="4">
+                      <tr style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                         ">
-                        鐥呯閫夋嫨锛�
-                      </td>
-                      <td @click="bzxz" style="
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          鐥呯閫夋嫨锛�
+                        </td>
+                        <td @click="bzxz" style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
+                          </el-input>
+                        </td>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          涓绘鍖诲笀锛�
+                        </td>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+                            @change="selName" filterable>
+                            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
+                              :value="item.userId">
+                            </el-option>
+                          </el-select>
+                        </td>
+                      </tr>
+                      <tr style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                         ">
-                        <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
-                        </el-input>
-                      </td>
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        ">
-                        涓绘鍖诲笀锛�
-                      </td>
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        ">
-                        <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
-                          @change="selName" filterable>
-                          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
-                            :value="item.userId">
-                          </el-option>
-                        </el-select>
-                      </td>
-                    </tr>
-                    <tr style="
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          寤鸿锛�
+                        </td>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          " colspan="2">
+                          <div style="margin: 0 0px 10px 15px">
+                            <el-button type="primary" @click="propoChange"
+                              style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button>
+                            <el-button type="primary" @click="proposalChange"
+                              style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button>
+                          </div>
+                          <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
+                          </el-input>
+                        </td>
+                      </tr>
+                    </table>
+
+                    <div slot="footer" class="dialog-footers1">
+                      <el-button :disabled="minedis" type="primary" @click="determine">鎻� 浜�</el-button>
+                    </div>
+                  </div>
+                </el-tab-pane>
+              </el-tabs>
+            </template>
+          </el-col>
+          <el-col :span="18" v-show="baogaohou">
+            <template>
+              <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
+                <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index"
+                  :lazy="false">
+                  <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
+                    style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
+                    <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="100">
+                    </el-table-column>
+                    <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
+                      <template slot-scope="{ row, $index }">
+                        <el-input type="textarea" autosize size="mini" v-model="row.proResult"
+                          :ref="`input-item${index}-row${$index}`" @keydown.enter.native="
+                            keyInputConfirm($event, index, $index)
+                            " @focus="handleFocus(row)" @blur="handleInputConfirm(row)" @input="vale($event, row)"
+                          :disabled="row.project.proName === 'BMI'"></el-input>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="瑙勫垯" width="70">
+                      <template slot-scope="scope">
+                        <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
+                    </el-table-column>
+                    <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�" width="80">
+                    </el-table-column>
+                    <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
+                      <template slot-scope="scope">
+                        <el-checkbox v-model="scope.row.exceptionDesc" :disabled="scope.row.project.sfcyyc === 1"
+                          @change="changDesc(scope.row)"></el-checkbox>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="isReturn" label="澶嶈瘖" width="55px" align="center">
+                      <template slot-scope="scope">
+                        <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
+                      <template slot-scope="scope">
+                        <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+                          @change="checkboxchange(scope.row)"></el-switch>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="proAdvice" label="缁撴灉寤鸿">
+                      <template slot-scope="scope">
+                        <el-popover placement="top" trigger="hover" width="400">
+                          <div>
+                            {{ scope.row.proAdvice }}
+                          </div>
+                          <div slot="reference" class="jianyi">
+                            <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+                              :disabled="true"></el-input>
+                          </div>
+                        </el-popover>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+
+                  <div style="font-size: 14px; overflow-y: auto; height: 286px">
+                    <table style="
+                        width: 96%;
+                        margin: 4px 10px;
                         border: 1px solid #dfe6ec;
                         border-collapse: collapse;
-                      ">
-                      <td style="
+                      " cellspacing="4">
+                      <tr style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                         ">
-                        寤鸿锛�
-                      </td>
-                      <td style="
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          鐥呯閫夋嫨锛�
+                        </td>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
+                          </el-input>
+                        </td>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          涓绘鍖诲笀锛�
+                        </td>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+                            @change="selName" filterable>
+                            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
+                              :value="item.userId">
+                            </el-option>
+                          </el-select>
+                        </td>
+                      </tr>
+                      <tr style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
-                        " colspan="2">
+                        ">
                         <div style="margin: 0 0px 10px 15px">
                           <el-button type="primary" @click="propoChange"
                             style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button>
                           <el-button type="primary" @click="proposalChange"
                             style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button>
                         </div>
-                        <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
-                        </el-input>
-                      </td>
-                    </tr>
-                  </table>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          ">
+                          寤鸿锛�
+                        </td>
+                        <td style="
+                            border: 1px solid #dfe6ec;
+                            border-collapse: collapse;
+                          " colspan="2">
+                          <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
+                          </el-input>
+                        </td>
+                      </tr>
+                    </table>
 
-                  <div slot="footer" class="dialog-footers1">
-                    <el-button type="primary" @click="determine">鎻� 浜�</el-button>
+                    <div slot="footer" class="dialog-footers">
+                      <el-button :disabled="minedis" type="primary" @click="determine">鎻� 浜�</el-button>
+                    </div>
                   </div>
-                </div>
-              </el-tab-pane>
-            </el-tabs>
-          </template>
-        </el-col>
-        <el-col :span="18" v-show="baogaohou">
-          <template>
-            <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
-              <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index"
-                :lazy="false">
-                <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
-                  style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
-                  <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="100">
-                  </el-table-column>
-                  <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
-                    <template slot-scope="{ row, $index }">
-                      <el-input
-                        type="textarea"
-                        autosize
-                        size="mini"
-                        v-model="row.proResult"
-                        :ref="`input-item${index}-row${$index}`"
-                        @keydown.enter.native="keyInputConfirm($event, index, $index)"
-                        @focus="handleFocus(row)"
-                        @blur="handleInputConfirm(row)"
-                        @input="vale($event, row)"
-                        :disabled="row.project.proName === 'BMI'"
-                      ></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="瑙勫垯" width="70">
-                    <template slot-scope="scope">
-                      <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
-                  </el-table-column>
-                  <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�" width="80">
-                  </el-table-column>
-                  <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
-                    <template slot-scope="scope">
-                      <el-checkbox v-model="scope.row.exceptionDesc" :disabled="scope.row.project.sfcyyc === 1"
-                        @change="changDesc(scope.row)"></el-checkbox>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="isReturn" label="澶嶈瘖" width="55px" align="center">
-                    <template slot-scope="scope">
-                      <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
-                    <template slot-scope="scope">
-                      <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
-                        @change="checkboxchange(scope.row)"></el-switch>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="proAdvice" label="缁撴灉寤鸿">
-                    <template slot-scope="scope">
-                      <el-popover placement="top" trigger="hover" width="400">
-                        <div>
-                          {{ scope.row.proAdvice }}
-                        </div>
-                        <div slot="reference" class="jianyi">
-                          <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
-                            :disabled="true"></el-input>
-                        </div>
-                      </el-popover>
-                    </template>
-                  </el-table-column>
-                </el-table>
-
-                <div style="font-size: 14px; overflow-y: auto; height: 286px">
-                  <table style="
-                      width: 96%;
-                      margin: 4px 10px;
-                      border: 1px solid #dfe6ec;
-                      border-collapse: collapse;
-                    " cellspacing="4">
-                    <tr style="
-                        border: 1px solid #dfe6ec;
-                        border-collapse: collapse;
-                      ">
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        ">
-                        鐥呯閫夋嫨锛�
-                      </td>
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        ">
-                        <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
-                        </el-input>
-                      </td>
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        ">
-                        涓绘鍖诲笀锛�
-                      </td>
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        ">
-                        <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
-                          @change="selName" filterable>
-                          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
-                            :value="item.userId">
-                          </el-option>
-                        </el-select>
-                      </td>
-                    </tr>
-                    <tr style="
-                        border: 1px solid #dfe6ec;
-                        border-collapse: collapse;
-                      ">
-                      <div style="margin: 0 0px 10px 15px">
-                        <el-button type="primary" @click="propoChange"
-                          style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button>
-                        <el-button type="primary" @click="proposalChange"
-                          style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button>
-                      </div>
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        ">
-                        寤鸿锛�
-                      </td>
-                      <td style="
-                          border: 1px solid #dfe6ec;
-                          border-collapse: collapse;
-                        " colspan="2">
-                        <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
-                        </el-input>
-                      </td>
-                    </tr>
-                  </table>
-
-                  <div slot="footer" class="dialog-footers">
-                    <el-button type="primary" @click="determine">鎻� 浜�</el-button>
-                  </div>
-                </div>
-              </el-tab-pane>
-            </el-tabs>
-          </template>
-        </el-col>
-        <el-col :span="6" style="margin-top: 15px">
-          <Historicalreport v-show="lishi" :reportHistorydata="reportHistorydata"></Historicalreport>
-        </el-col>
-      </el-row>
+                </el-tab-pane>
+              </el-tabs>
+            </template>
+          </el-col>
+          <el-col :span="6" style="margin-top: 15px">
+            <Historicalreport v-show="lishi" :reportHistorydata="reportHistorydata"></Historicalreport>
+          </el-col>
+        </el-row>
+      </div>
     </el-drawer>
     <Public ref="aaa" :row="row" @add="handleChanges" />
     <jianceResult ref="bbb" @add="handleChangesZt" />
@@ -686,7 +682,7 @@
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="taocan = false">鍙� 娑�</el-button>
+        <el-button @click="quzxiao">鍙� 娑�</el-button>
         <el-button type="primary" @click="queding">纭� 瀹�</el-button>
       </span>
     </el-dialog>
@@ -745,6 +741,8 @@
       vaids1: [],
       activeNames: "first",
       taocan: false,
+      minedis: false,
+      lastClickedTab: null,
       creatobj: {},
       dataText: [],
       propform: {},
@@ -758,6 +756,7 @@
       selected: false,
       checkval: false,
       loading: false,
+      isLoading: false,
       open: false,
       foropen: false,
       dialogVisible: false,
@@ -888,46 +887,48 @@
         const bmi = weightInKg / (heightInMeters * heightInMeters);
         return bmi.toFixed(1); // 淇濈暀涓�浣嶅皬鏁�
       }
-      return '';
+      return "";
     },
 
     getBMIStatus(row) {
       const bmi = parseFloat(row.proResult);
-      if (isNaN(bmi) || !row.proResult) return ''; // 澶勭悊鏃犳晥鎴栫┖鐨凚MI鍊�
+      if (isNaN(bmi) || !row.proResult) return ""; // 澶勭悊鏃犳晥鎴栫┖鐨凚MI鍊�
       if (bmi > 28) {
         row.exceptionDesc = true; // 鑷姩鍕鹃�夊紓甯稿閫夋
-        row.conclusion = '鍋忛珮'; // 璁剧疆缁撹
-        return '鍋忛珮';
+        row.conclusion = "鍋忛珮"; // 璁剧疆缁撹
+        return "鍋忛珮";
       }
       if (bmi < 12) {
         row.exceptionDesc = true; // 鑷姩鍕鹃�夊紓甯稿閫夋
-        row.conclusion = '鍋忎綆'; // 璁剧疆缁撹
-        return '鍋忎綆';
+        row.conclusion = "鍋忎綆"; // 璁剧疆缁撹
+        return "鍋忎綆";
       }
       row.exceptionDesc = false; // 姝e父鑼冨洿鍐呭彇娑堝嬀閫�
-      row.conclusion = '姝e父'; // 璁剧疆缁撹
-      return '姝e父';
+      row.conclusion = "姝e父"; // 璁剧疆缁撹
+      return "姝e父";
     },
 
     // 瀹炴椂鏇存柊 BMI 骞堕獙璇佽緭鍏�
-     vale(value, row) {
-      console.log(3333)
-      if (row.project.proName === '韬珮' || row.project.proName === '浣撻噸') {
+    vale(value, row) {
+      console.log(3333);
+      if (row.project.proName === "韬珮" || row.project.proName === "浣撻噸") {
         const heightRow = this.proParentList.sons.find(
-          item => item.project.proName === '韬珮'
+          (item) => item.project.proName === "韬珮"
         );
         const weightRow = this.proParentList.sons.find(
-          item => item.project.proName === '浣撻噸'
+          (item) => item.project.proName === "浣撻噸"
         );
         const bmiRow = this.proParentList.sons.find(
-          item => item.project.proName === 'BMI'
+          (item) => item.project.proName === "BMI"
         );
 
         if (heightRow && weightRow && bmiRow) {
-          const height = row.project.proName === '韬珮' ? value : heightRow.proResult;
-          const weight = row.project.proName === '浣撻噸' ? value : weightRow.proResult;
+          const height =
+            row.project.proName === "韬珮" ? value : heightRow.proResult;
+          const weight =
+            row.project.proName === "浣撻噸" ? value : weightRow.proResult;
           const bmi = this.calculateBMI(height, weight);
-          bmiRow.proResult = bmi || ''; // 瀹炴椂鏇存柊BMI鍊�
+          bmiRow.proResult = bmi || ""; // 瀹炴椂鏇存柊BMI鍊�
           this.getBMIStatus(bmiRow); // 妫�鏌MI鐘舵�佸苟鏇存柊寮傚父澶嶉�夋
         }
       }
@@ -936,7 +937,8 @@
       this.focusrow = row;
       this.proResult = row;
       const pattern3 = new RegExp("[0-9]+");
-      if (row.proResult) { }
+      if (row.proResult) {
+      }
       if (pattern3.test(row.proResult)) {
         let data = {
           proId: this.focusrow.proId,
@@ -961,11 +963,16 @@
                 this.focusrow.exceptionDesc = false;
               }
             }
-            if (this.autorule.length !== 0 && (this.autorule[0] || this.autorule[0].nr)) {
+            if (
+              this.autorule.length !== 0 &&
+              (this.autorule[0] || this.autorule[0].nr)
+            ) {
               this.focusrow.proAdvice = this.autorule[0].nr;
             }
             this.autorule.forEach((item) => {
-              this.focusrow.conclusion += this.focusrow.conclusion ? item.bz : item.bz;
+              this.focusrow.conclusion += this.focusrow.conclusion
+                ? item.bz
+                : item.bz;
             });
           }
         });
@@ -1013,22 +1020,22 @@
     // 杈撳叆纭鏃舵洿鏂� BMI
     handleInputConfirm(row) {
       if (row.proResult) {
-        if (row.project.proName === '韬珮' || row.project.proName === '浣撻噸') {
+        if (row.project.proName === "韬珮" || row.project.proName === "浣撻噸") {
           const heightRow = this.proParentList.sons.find(
-            item => item.project.proName === '韬珮'
+            (item) => item.project.proName === "韬珮"
           );
           const weightRow = this.proParentList.sons.find(
-            item => item.project.proName === '浣撻噸'
+            (item) => item.project.proName === "浣撻噸"
           );
           const bmiRow = this.proParentList.sons.find(
-            item => item.project.proName === 'BMI'
+            (item) => item.project.proName === "BMI"
           );
 
           if (heightRow && weightRow && bmiRow) {
             const height = heightRow.proResult;
             const weight = weightRow.proResult;
             const bmi = this.calculateBMI(height, weight);
-            bmiRow.proResult = bmi || '';
+            bmiRow.proResult = bmi || "";
             this.getBMIStatus(bmiRow); // 妫�鏌MI鐘舵�佸苟鏇存柊寮傚父澶嶉�夋
           }
         }
@@ -1061,11 +1068,16 @@
                 this.focusrow.exceptionDesc = false;
               }
             }
-            if (this.autorule.length !== 0 && (this.autorule[0] || this.autorule[0].nr)) {
+            if (
+              this.autorule.length !== 0 &&
+              (this.autorule[0] || this.autorule[0].nr)
+            ) {
               this.focusrow.proAdvice = this.autorule[0].nr;
             }
             this.autorule.forEach((item) => {
-              this.focusrow.conclusion += this.focusrow.conclusion ? item.bz : item.bz;
+              this.focusrow.conclusion += this.focusrow.conclusion
+                ? item.bz
+                : item.bz;
             });
           }
         });
@@ -1185,6 +1197,7 @@
 
     // 鍒濆鍖栨暟鎹椂璁$畻 BMI
     getParentIdsss() {
+      this.proParentList = {}
       let data = {
         tjNumber: this.tjNumber,
         proParentId: this.nums,
@@ -1193,17 +1206,20 @@
         if (response.data != {}) {
           this.proParentList = response.data;
           const heightRow = this.proParentList.sons.find(
-            item => item.project.proName === '韬珮'
+            (item) => item.project.proName === "韬珮"
           );
           const weightRow = this.proParentList.sons.find(
-            item => item.project.proName === '浣撻噸'
+            (item) => item.project.proName === "浣撻噸"
           );
           const bmiRow = this.proParentList.sons.find(
-            item => item.project.proName === 'BMI'
+            (item) => item.project.proName === "BMI"
           );
           if (heightRow && weightRow && bmiRow) {
-            const bmi = this.calculateBMI(heightRow.proResult, weightRow.proResult);
-            bmiRow.proResult = bmi || '';
+            const bmi = this.calculateBMI(
+              heightRow.proResult,
+              weightRow.proResult
+            );
+            bmiRow.proResult = bmi || "";
           } else {
             // this.$message.error('缂哄皯韬珮銆佷綋閲嶆垨 BMI 椤圭洰');
           }
@@ -1236,9 +1252,13 @@
           if (item.isReturn == 1) item.isReturn = true;
           if (item.isReturn == 0) item.isReturn = false;
           if (item.exceptionDesc == "1") item.exceptionDesc = true;
-          if (item.exceptionDesc == "0" || item.project.sfcyyc == 1) item.exceptionDesc = false;
+          if (item.exceptionDesc == "0" || item.project.sfcyyc == 1)
+            item.exceptionDesc = false;
         });
-        if (this.proParentList.xiaoJie && this.proParentList.xiaoJie.length != 0) {
+        if (
+          this.proParentList.xiaoJie &&
+          this.proParentList.xiaoJie.length != 0
+        ) {
           this.Parent.forEach((item3) => {
             if (item3.proId === this.nums) {
               this.proParentList.remark = item3.remark;
@@ -1310,17 +1330,51 @@
 
     bzxz() {
       this.taocan = true;
-      let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
-      getAdviceByTjNumAndPro(data).then((res) => {
-        if (res.data) {
-          this.deptAdviceList3 = res.data;
-          this.deptAdviceList1 = [...new Set(this.deptAdviceList2.concat(this.deptAdviceList3))];
-          this.deptAdviceList3.forEach((items) => {
-            this.idss.push(items.id);
-            this.remakes += items.advice + ",";
-          });
-        }
-      });
+      var deptAdviceList1 = []
+      // let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
+      // getAdviceByTjNumAndPro(data).then((res) => {
+        // if (res.data) {
+        //   this.deptAdviceList3 = res.data;
+          if (this.proParentList.xiaoJieIds.length != 0) {
+            if (this.vaids.length != 0) {
+              const result = this.vaids.reduce((acc, item) => {
+                const matches = this.deptAdviceList.filter(items => {
+                  return item == items.id;  // 鎴� === 鏍规嵁闇�姹�
+                });
+                return acc.concat(matches);
+              }, []);
+              deptAdviceList1 = result;
+
+              return this.deptAdviceList1 = [
+                ...new Set(deptAdviceList1),
+              ];
+            } else {
+              this.proParentList.xiaoJieIds.forEach(item => {
+                this.deptAdviceList.forEach((items) => {
+                  if (item == items.id) {
+                    deptAdviceList1.push(items)
+                  }
+                });
+              })
+              return this.deptAdviceList1 = [
+                ...new Set(deptAdviceList1),
+              ];
+            }
+
+
+          } else if (this.proParentList.xiaoJieIds == null) {
+            this.deptAdviceList1 = []
+          }
+
+          // this.deptAdviceList1 = [
+          //   ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
+          // ];
+          // this.deptAdviceList3.forEach((items) => {
+          //   this.idss.push(items.id);
+          //   this.remakes += items.advice + ",";
+          // });
+      //   }
+      // });
     },
 
     result() {
@@ -1358,29 +1412,51 @@
 
     handleDelete(row) {
       this.deptAdviceList1.forEach((item, index) => {
-        if (item.id == row.id) this.deptAdviceList1.splice(index, 1);
+        if (item.id == row.id) {
+          this.deptAdviceList1.splice(index, 1);
+          this.$refs.multipleTable.toggleRowSelection(item, false);
+        }
+
       });
     },
 
     handleSelectionChanges(selection) {
-      this.deptAdviceList2 = this.deptAdviceList1;
+      if (this.deptAdviceList1.length != 0) {
+        this.deptAdviceList2 = this.deptAdviceList1;
+      }
       if (selection.length > 1) {
         const del_row = selection.shift();
         this.$refs.multipleTable.toggleRowSelection(del_row, false);
       }
       selection.forEach((item) => this.deptAdviceList2.push(item));
-      this.deptAdviceList1 = [...new Set(this.deptAdviceList2.concat(this.deptAdviceList3))];
-    },
+      // this.deptAdviceList1 = [
+      //   ...new Set(this.deptAdviceList2),
+      // ];
+      this.deptAdviceList1 = [...new Set(
+        this.deptAdviceList2.map(item => JSON.stringify(item))
+      )].map(str => JSON.parse(str));
+      // if( this.deptAdviceList1.length == 0){
+      //   this.deptAdviceList1 = selection
+      // }else{
+      //   selection.forEach((item) => this.deptAdviceList1.push(item));
+      // }
 
+    },
+    quzxiao() {
+      this.taocan = false;
+      this.deptAdviceList1 = []
+    },
     queding() {
       if (this.proParentList.xiaoJie.length != 0) {
         this.remakes = "";
         this.titles = "";
+        this.vaids = []
         this.deptAdviceList1.forEach((item1) => {
           if (this.proParentList.remark != null) {
             this.titles += item1.title + ",";
             this.remakes += item1.advice + ",";
-            this.proParentList.remark = this.proParentList.remark + this.remakes;
+            this.proParentList.remark =
+              this.proParentList.remark + this.remakes;
             this.value += item1.title + ",";
             this.vaids.push(item1.id);
             this.vaids1 = this.vaids.concat(this.idss);
@@ -1452,8 +1528,13 @@
         this.deptAdviceList.forEach((item) => {
           this.ids = item.id;
           val.forEach((item1) => {
-            if (item1 === item.id && !this.proParentList.remark.includes(item.title)) {
-              this.proParentList.remark = this.proParentList.remark ? this.proParentList.remark + item.title + "," : item.title + ",";
+            if (
+              item1 === item.id &&
+              !this.proParentList.remark.includes(item.title)
+            ) {
+              this.proParentList.remark = this.proParentList.remark
+                ? this.proParentList.remark + item.title + ","
+                : item.title + ",";
             }
           });
         });
@@ -1462,8 +1543,13 @@
         this.deptAdviceList.forEach((item) => {
           this.ids = item.id;
           val.forEach((item1) => {
-            if (item1 === item.id && !this.proParentList.remark.includes(item.title)) {
-              this.proParentList.remark = this.proParentList.remark ? this.proParentList.remark + item.title + "," : item.title + ",";
+            if (
+              item1 === item.id &&
+              !this.proParentList.remark.includes(item.title)
+            ) {
+              this.proParentList.remark = this.proParentList.remark
+                ? this.proParentList.remark + item.title + ","
+                : item.title + ",";
             }
           });
         });
@@ -1471,8 +1557,10 @@
     },
 
     initInputDOM() {
-      const inputDoms = document.querySelectorAll('.el-input__inner');
-      inputDoms.forEach((item, index) => item.setAttribute('data-index', index));
+      const inputDoms = document.querySelectorAll(".el-input__inner");
+      inputDoms.forEach((item, index) =>
+        item.setAttribute("data-index", index)
+      );
       this.inputDoms = inputDoms;
     },
 
@@ -1503,7 +1591,8 @@
         if (response.code == 200) {
           this.loading = false;
           if (response.data) {
-            this.tableList = response.data.date || response.data.customers || [];
+            this.tableList =
+              response.data.date || response.data.customers || [];
             this.total = response.data.total;
           } else {
             this.tableList = [];
@@ -1526,7 +1615,7 @@
       });
     },
 
-    hb() {},
+    hb() { },
 
     propoChange() {
       this.cusobj = { sex: this.tableAll.cusSex, isZj: 1 };
@@ -1536,7 +1625,7 @@
 
     eventchange(data) {
       this.dataText = data;
-      data.forEach((item) => this.proParentList.remark += item.advice);
+      data.forEach((item) => (this.proParentList.remark += item.advice));
     },
 
     proposalChange() {
@@ -1575,7 +1664,7 @@
       this.open = true;
       this.form = row;
       this.form.hzDoctorId = this.info.userId;
-      getChildList().then((res) => this.deptList = res.data);
+      getChildList().then((res) => (this.deptList = res.data));
       this.Hzlog(this.form.tjNumber);
     },
 
@@ -1629,7 +1718,8 @@
           if (item.hzType != "0") {
             item.hzDeptIdList.forEach((item1) => {
               this.deptList.forEach((item2) => {
-                if (item1 == item2.deptId) item.hzDeptName += item2.deptName + ",";
+                if (item1 == item2.deptId)
+                  item.hzDeptName += item2.deptName + ",";
               });
             });
           }
@@ -1653,7 +1743,8 @@
     submitFormapply() {
       let data = {};
       this.userList.forEach((item1) => {
-        if (this.form.hzDoctorId == item1.userId) this.form.hzDoctorName = item1.nickName;
+        if (this.form.hzDoctorId == item1.userId)
+          this.form.hzDoctorName = item1.nickName;
       });
       if (this.form.hzType != undefined) {
         this.$refs["form"].validate((valid) => {
@@ -1753,7 +1844,10 @@
             background: "rgba(0, 0, 0, 0.7)",
           });
           setTimeout(() => loading.close(), 3000);
-          this.$message({ type: "warning", message: "鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�" });
+          this.$message({
+            type: "warning",
+            message: "鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
+          });
         } else {
           this.dialogVisible = true;
           this.url = window.webkitURL.createObjectURL(response);
@@ -1796,7 +1890,8 @@
       } else {
         this.allList = [];
         if (selection[0]) {
-          if (selection[0].hzReplyLogsList) this.hzReplyLogsList = selection[0].hzReplyLogsList;
+          if (selection[0].hzReplyLogsList)
+            this.hzReplyLogsList = selection[0].hzReplyLogsList;
         } else {
           this.hzReplyLogsList = [];
         }
@@ -1808,31 +1903,47 @@
       this.getDept(row.tjNumber);
       this.loading = true;
       this.drawer = true;
+      this.isLoading = true;
+      this.titles = ""
+      this.Parent = []
+      this.tableAll = []
+      this.proParentList = {}
       this.$nextTick(() => this.initInputDOM());
       this.tableAll = row;
       this.tjNumber = row.tjNumber;
       let num = 0;
-      getParentList(this.tjNumber,this.tjStatus).then((response) => {
-        if (response.data) {
+      getParentList(this.tjNumber, this.tjStatus)
+        .then((response) => {
+          if (response.data) {
+            this.loading = false;
+            this.isLoading = false;
+            this.Parent = response.data;
+            this.Parent.forEach((item) => {
+              if (item.type === 1) item.proName += "    鉁�";
+              if (num === 0) {
+                this.nums = item.proId;
+                this.radio = item.proId;
+                this.proId = item.proId;
+                this.getParentIdsss();
+                this.getbzlist();
+              }
+              num = num + 1;
+            });
+          } else {
+            // this.loading = false;
+            // this.isLoading = false;
+            this.Parent = [];
+            this.$modal.msgError("璇ョ瀹や笅鏃犻」鐩紒");
+          }
+        })
+        .catch((error) => {
+          console.error("璇锋眰澶辫触:", error);
+          // this.$modal.msgError("鏁版嵁鍔犺浇澶辫触");
+        })
+        .finally(() => {
           this.loading = false;
-          this.Parent = response.data;
-          this.Parent.forEach((item) => {
-            if (item.type === 1) item.proName += "    鉁�";
-            if (num === 0) {
-              this.nums = item.proId;
-              this.radio = item.proId;
-              this.proId = item.proId;
-              this.getParentIdsss();
-              this.getbzlist();
-            }
-            num = num + 1;
-          });
-        } else {
-          this.loading = false;
-          this.Parent = [];
-          this.$modal.msgError("璇ョ瀹や笅鏃犻」鐩紒");
-        }
-      });
+          this.isLoading = false; // 纭繚鏈�缁堢姸鎬侀噸缃�
+        });
       this.getbzlist();
     },
 
@@ -1846,7 +1957,8 @@
             if (item.hzType != "0") {
               item.hzDeptIdList.forEach((item1) => {
                 this.deptList.forEach((item2) => {
-                  if (item1 == item2.deptId) item.hzDeptName += item2.deptName + ",";
+                  if (item1 == item2.deptId)
+                    item.hzDeptName += item2.deptName + ",";
                 });
               });
             }
@@ -1856,15 +1968,22 @@
     },
 
     handleTabClick(tab, event) {
+      if (this.lastClickedTab == null) {
+        this.lastClickedTab = tab
+      }
       this.Parent.forEach((item) => {
         if (tab.name == item.proId) this.Parentcheck = item;
       });
 
-      this.$confirm("妫�娴嬪埌浣撴缁撴灉鏈彁浜わ紝鏄惁鍦ㄧ寮�璇ラ」鐩墠鎻愪氦淇敼锛�", "纭淇℃伅", {
-        distinguishCancelAndClose: true,
-        confirmButtonText: "鎻愪氦",
-        cancelButtonText: "涓嶄繚瀛橈紝绂诲紑",
-      })
+      this.$confirm(
+        "妫�娴嬪埌浣撴缁撴灉鏈彁浜わ紝鏄惁鍦ㄧ寮�璇ラ」鐩墠鎻愪氦淇敼锛�",
+        "纭淇℃伅",
+        {
+          distinguishCancelAndClose: true,
+          confirmButtonText: "鎻愪氦",
+          cancelButtonText: "涓嶄繚瀛橈紝绂诲紑",
+        }
+      )
         .then(() => {
           let tjNumber = this.tableAll.tjNumber;
           this.userList.forEach((item) => {
@@ -1876,42 +1995,77 @@
                 if (item1 === item) item = item1;
               });
             }
-            this.tjOrderDetail.push({
-              proAdvice: item.proAdvice,
-              proName: item.project.proName,
-              proId: item.project.proId,
-              orderDetailId: item.orderDetailId,
-              flowingWaterId: item.flowingWaterId,
-              proResult: item.proResult,
-              tjStatus: 1,
-              isReturn: item.isReturn === true ? 1 : 0,
-              exceptionDesc: item.exceptionDesc === true ? 1 : 0,
-              conclusion: item.conclusion,
-              rulesList: item.rulesList,
-            });
+            // this.tjOrderDetail.push({
+            //   proAdvice: item.proAdvice,
+            //   proName: item.project.proName,
+            //   proId: item.project.proId,
+            //   orderDetailId: item.orderDetailId,
+            //   flowingWaterId: item.flowingWaterId,
+            //   proResult: item.proResult,
+            //   tjStatus: 1,
+            //   isReturn: item.isReturn === true ? 1 : 0,
+            //   exceptionDesc: item.exceptionDesc === true ? 1 : 0,
+            //   conclusion: item.conclusion,
+            //   rulesList: item.rulesList,
+            // });
           });
 
-          var data = [{
-            tjNumber,
-            proId: this.proId,
-            remark: this.proParentList.remark,
-            proName: this.proName,
-            summaryList: this.value,
-            doctorName: this.doctorName,
-            tjOrderDetailList: this.tjOrderDetail,
-          }];
-          getaddRemark(data).then((res) => this.$modal.msgSuccess("鎻愪氦鎴愬姛"));
-          this.proName = this.Parentcheck.proName;
-          this.nums = tab.name;
-          this.proId = tab.name;
-          this.getParentIdsss();
-          this.getbzlist();
+          for (var i = 0; i < this.proParentList.sons.length; i++) {
+            //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓�
+            if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
+              this.radio = this.lastClickedTab.name
+              this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�");
+              this.minedis = true
+              return
+            } else if (this.proParentList.sons[i].proResult.includes(" ")) {
+              this.$modal.msgError("璇锋鏌ュ~鍐欓」鐩腑鏄惁鏈夌┖鏍�");
+              this.radio = this.lastClickedTab.name
+              this.minedis = true
+              return
+            } else {
+              this.minedis = false
+              this.tjOrderDetail.push({
+                proAdvice: this.proParentList.sons[i].proAdvice,
+                proName: this.proParentList.sons[i].project.proName,
+                proId: this.proParentList.sons[i].project.proId,
+                orderDetailId: this.proParentList.sons[i].orderDetailId,
+                flowingWaterId: this.proParentList.sons[i].flowingWaterId,
+                proResult: this.proParentList.sons[i].proResult,
+                tjStatus: 1,
+                isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
+                exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
+                conclusion: this.proParentList.sons[i].conclusion,
+                rulesList: this.proParentList.sons[i].rulesList,
+              });
+            }
+          }
+
+          if (this.minedis == false) {
+            var data = [{
+              tjNumber,
+              proId: this.proId,
+              remark: this.proParentList.remark,
+              proName: this.proName,
+              summaryList: this.vaids,
+              doctorName: this.doctorName,
+              tjOrderDetailList: this.tjOrderDetail,
+            }];
+            getaddRemark(data).then((res) => this.$modal.msgSuccess("鎻愪氦鎴愬姛"));
+            this.proName = this.Parentcheck.proName;
+            this.nums = tab.name;
+            this.proId = tab.name;
+            this.lastClickedTab = tab
+            this.getParentIdsss();
+            this.getbzlist();
+          }
         })
         .catch((action) => {
-          if (action === "cancel") this.$message({ type: "warning", message: "鏀惧純淇濆瓨骞剁寮�" });
+          if (action === "cancel")
+            this.$message({ type: "warning", message: "鏀惧純淇濆瓨骞剁寮�" });
           this.proName = this.Parentcheck.proName;
           this.nums = tab.name;
           this.proId = tab.name;
+          this.lastClickedTab = tab
           this.getParentIdsss();
           this.getbzlist();
         });
@@ -1929,36 +2083,66 @@
             if (item1 === item) item = item1;
           });
         }
-        this.tjOrderDetail.push({
-          proAdvice: item.proAdvice,
-          proName: item.project.proName,
-          proId: item.project.proId,
-          orderDetailId: item.orderDetailId,
-          flowingWaterId: item.flowingWaterId,
-          proResult: item.proResult,
-          tjStatus: 1,
-          isReturn: item.isReturn === true ? 1 : 0,
-          exceptionDesc: item.exceptionDesc === true ? 1 : 0,
-          conclusion: item.conclusion,
-          rulesList: item.rulesList,
+        // this.tjOrderDetail.push({
+        //   proAdvice: item.proAdvice,
+        //   proName: item.project.proName,
+        //   proId: item.project.proId,
+        //   orderDetailId: item.orderDetailId,
+        //   flowingWaterId: item.flowingWaterId,
+        //   proResult: item.proResult,
+        //   tjStatus: 1,
+        //   isReturn: item.isReturn === true ? 1 : 0,
+        //   exceptionDesc: item.exceptionDesc === true ? 1 : 0,
+        //   conclusion: item.conclusion,
+        //   rulesList: item.rulesList,
+        // });
+      });
+      for (var i = 0; i < this.proParentList.sons.length; i++) {
+        //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓�
+        if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
+          this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�");
+          this.minedis = true
+          return
+        } else if (this.proParentList.sons[i].proResult.includes(" ")) {
+          this.$modal.msgError("璇锋鏌ュ~鍐欓」鐩腑鏄惁鏈夌┖鏍�");
+          this.minedis = true
+          return
+        } else {
+          this.minedis = false
+          this.tjOrderDetail.push({
+            proAdvice: this.proParentList.sons[i].proAdvice,
+            proName: this.proParentList.sons[i].project.proName,
+            proId: this.proParentList.sons[i].project.proId,
+            orderDetailId: this.proParentList.sons[i].orderDetailId,
+            flowingWaterId: this.proParentList.sons[i].flowingWaterId,
+            proResult: this.proParentList.sons[i].proResult,
+            tjStatus: 1,
+            isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
+            exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
+            conclusion: this.proParentList.sons[i].conclusion,
+            rulesList: this.proParentList.sons[i].rulesList,
+          });
+        }
+      }
+      if (this.minedis == false) {
+        let data = [
+          {
+            tjNumber,
+            proId: this.proId,
+            remark: this.proParentList.remark,
+            proName: this.proName,
+            summaryList: this.vaids,
+            doctorName: this.doctorName,
+            tjOrderDetailList: this.tjOrderDetail,
+          },
+        ];
+        getaddRemark(data).then((res) => {
+          this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+          this.rows = []; // 鎻愪氦鎴愬姛鍚庢竻绌� this.rows
+          this.drawer = false;
         });
-      });
-
-      let data = [{
-        tjNumber,
-        proId: this.proId,
-        remark: this.proParentList.remark,
-        proName: this.proName,
-        summaryList: this.vaids1,
-        doctorName: this.doctorName,
-        tjOrderDetailList: this.tjOrderDetail,
-      }];
-      getaddRemark(data).then((res) => {
-        this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-        this.rows = []; // 鎻愪氦鎴愬姛鍚庢竻绌� this.rows
-        this.drawer = false;
-      });
-      this.handleClose();
+        this.handleClose();
+      }
     },
   },
 };

--
Gitblit v1.8.0