From 88a79bd2b6b136b6b9bb28cd720fa14daff82443 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 01 七月 2025 14:59:07 +0800
Subject: [PATCH] 1

---
 src/views/doctor/checkAll/index.vue | 1988 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1,066 insertions(+), 922 deletions(-)

diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 57df29e..82d066e 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -6,6 +6,118 @@
       :inline="true"
       label-width="76px"
       style="margin-top: 10px"
+      v-if="tjStatus == 1"
+    >
+      <el-form-item label="濮撳悕" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          style="width: 120px"
+          placeholder="璇疯緭鍏ュ鍚�"
+          clearable
+          @keyup.enter.native="submitForm"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="浣撴鍙�" prop="tjNumber">
+        <el-input
+          ref="inputName"
+          v-model="queryParams.tjNumber"
+          style="width: 180px"
+          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+          clearable
+          @keyup.enter.native="submitForm"
+          @blur="hb"
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item
+        label="鍗曚綅鍚嶇О"
+        prop="tjCompName"
+        style="margin-left: 20px"
+      >
+        <el-select
+          :remote-method="getRemoteData"
+          v-model="queryParams.tjCompName"
+          value-key="drugManufacturerId"
+          style="width: 180px"
+          remote
+          filterable
+          placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+          clearable
+          @change="searchSelect"
+        >
+          <el-option
+            v-for="dict in CompanyList"
+            :key="dict.drugManufacturerId"
+            :label="dict.cnName"
+            :value="dict"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
+        <el-input
+          ref="inputName"
+          v-model="queryParams.shys"
+          style="width: 180px"
+          placeholder="璇疯緭鍏ュ鏍稿尰甯�"
+          clearable
+          @keyup.enter.native="submitForm"
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="submitForm"
+          style="margin-right: 15px"
+          >鎼滅储</el-button
+        >
+        <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="toggleCollapse"
+          style="margin-right: 15px"
+          v-show="isCollapsed == 0"
+          >楂樼骇鎼滅储</el-button
+        >
+        <el-button
+          type="primary"
+          size="mini"
+          @click="toggleCollapse3"
+          style="margin-right: 15px"
+          v-show="isCollapsed == 1"
+          >楂樼骇鎼滅储</el-button
+        >
+      </el-form-item>
+      <el-row v-show="isCollapsed == 1" :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="浣撴鏃堕棿" prop="tjTime">
+            <el-date-picker
+              v-model="startTime"
+              type="datetimerange"
+              align="right"
+              :picker-options="pickerOptions"
+              style="width: 310px"
+              start-placeholder="寮�濮嬫棩鏈�"
+              end-placeholder="缁撴潫鏃ユ湡"
+              :default-time="['00:00:00', '23:00:00']"
+              format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd HH:mm"
+              @change="dateChangebirthday1"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <el-form
+      :model="queryParams"
+      ref="tableList"
+      :inline="true"
+      label-width="76px"
+      style="margin-top: 10px"
+      v-else
     >
       <el-form-item label="濮撳悕" prop="name">
         <el-input
@@ -97,7 +209,6 @@
         style="margin: 20px; width: 98%"
         @current-change="handleCurrentChange"
       >
-        <!-- <template slot="empty">鏁版嵁姝e湪鍔犺浇涓�</template> -->
         <el-table-column
           label="浣撴鍙�"
           align="center"
@@ -114,7 +225,6 @@
           width="100px"
           fixed="left"
         />
-
         <el-table-column
           label="鎬у埆"
           align="center"
@@ -143,30 +253,23 @@
           :show-overflow-tooltip="true"
           width="130px"
         />
-
-        <!-- <el-table-column
-          label="浣撴鏃堕棿"
-          align="center"
-          prop="tjTime"
-          :show-overflow-tooltip="true"
-          width="110px"
-        /> -->
         <el-table-column
-          v-if="tjStatus === '1'"
           label="瀹℃牳鏃堕棿"
           align="center"
           prop="shsj"
           :show-overflow-tooltip="true"
           width="180px"
+          v-if="tjStatus == 1"
         />
         <el-table-column
-          v-if="tjStatus === '0'"
-          label="瀹屾垚鏃堕棿"
+          label="浣撴鏃堕棿"
           align="center"
-          prop="finishTime"
+          prop="tjTime"
           :show-overflow-tooltip="true"
-          width="160px"
+          width="180px"
+          v-if="tjStatus == 0"
         />
+        <!-- <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" /> -->
         <el-table-column
           label="濂楅鍚嶇О"
           align="center"
@@ -180,11 +283,19 @@
           prop="tjStatus"
           :show-overflow-tooltip="true"
           width="120px"
+          v-if="tjStatus == 0"
         >
-          <template slot-scope="scope">
+          <template slot-scope="scope" v-if="tjStatus == 0">
             <span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="瀹℃牳鍖诲笀"
+          align="center"
+          prop="shys"
+          width="120px"
+          v-if="tjStatus == 1"
+        />
         <el-table-column
           label="鍗曚綅鍚嶇О"
           align="center"
@@ -208,31 +319,20 @@
           <template slot-scope="scope">
             <el-button
               fixed="right"
-              title="璇︽儏"
-              type="text"
-              size="mini"
-              @click.stop="handleClick(scope.row)"
-              icon="el-icon-document-copy"
-            ></el-button>
-            <el-button
-              fixed="right"
-              title="鍚屾"
-              type="text"
-              size="mini"
-              @click.stop="tongbu(scope.row)"
-              v-if="scope.row.tjStatus != '1'"
-              icon="el-icon-upload2"
-            ></el-button>
-            <el-button
-              fixed="right"
               title="澶勬柟"
               type="text"
               size="mini"
               @click.stop="rowClick(scope.row)"
               icon="el-icon-edit-outline"
             ></el-button>
-
-            <!-- <el-button type="text" size="mini" @click="generate(scope.row)" v-if="scope.row.tjStatus=='1'">鐢熸垚</el-button> -->
+            <el-button
+              fixed="right"
+              title="璇︽儏"
+              type="text"
+              size="mini"
+              @click.stop="handleClick(scope.row)"
+              icon="el-icon-document-copy"
+            ></el-button>
             <el-button
               type="text"
               size="mini"
@@ -266,7 +366,7 @@
       </div>
     </template>
 
-    <!-- 鐐瑰嚮寮瑰嚭妗�   show-close="true"-->
+    <!-- 鐐瑰嚮寮瑰嚭妗� -->
     <el-drawer
       custom-class="tanchu"
       :visible.sync="drawer"
@@ -311,7 +411,8 @@
                 {{ tableAll.cusName }}
               </td>
               <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-                鎬у埆锛歿{
+                鎬у埆锛�
+                {{
                   tableAll.cusSex == 0
                     ? "鐢�"
                     : tableAll.cusSex == 1
@@ -368,7 +469,6 @@
               ><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button
             >
           </div>
-
           <div class="btn1">
             <el-button @click="xiangmuqingkuang()" type="primary"
               ><span class="vertical-text">椤圭洰鎯呭喌</span></el-button
@@ -382,6 +482,11 @@
           <div class="btn1">
             <el-button @click="fuchaxiangmu()" type="primary"
               ><span class="vertical-text">澶嶆煡椤圭洰</span></el-button
+            >
+          </div>
+          <div class="btn1">
+            <el-button @click="yichanghuifu()" type="primary"
+              ><span class="vertical-text">寮傚父鎭㈠</span></el-button
             >
           </div>
         </div>
@@ -420,8 +525,7 @@
                       prop="proResult"
                       label="妫�娴嬬粨鏋�"
                       width="180"
-                    >
-                    </el-table-column>
+                    ></el-table-column>
                     <el-table-column align="center" prop="" label="鍗曚綅">
                       <template slot-scope="scope">
                         <div v-if="scope.row.project != null">
@@ -517,15 +621,7 @@
                           v-model="changedate[index].remark"
                           v-on:input="change"
                           style="width: 100%"
-                        >
-                        </el-input>
-                        <!-- <textarea
-                        placeholder="璇疯緭鍏ュ唴瀹�"
-                        :autosize="{ minRows: 2 }"
-                        style="width: 100%; height: 240px; resize: none"
-                        v-model="changedate[index].remark"
-                        v-on:input="change"
-                      ></textarea> -->
+                        ></el-input>
                       </td>
                     </tr>
                   </table>
@@ -553,14 +649,7 @@
                           placeholder="璇疯緭鍏ュ唴瀹�"
                           v-model="item.jgbx"
                           style="width: 100%"
-                        >
-                        </el-input>
-                        <!-- <textarea
-                        placeholder="璇疯緭鍏ュ唴瀹�"
-                        :autosize="{ minRows: 3}"
-                        style="width: 100%; height: auto; resize: none"
-                        v-model="item.jgbx"
-                      ></textarea> -->
+                        ></el-input>
                       </td>
                     </tr>
                     <tr
@@ -591,14 +680,7 @@
                           placeholder="璇疯緭鍏ュ唴瀹�"
                           v-model="item.remark"
                           style="width: 100%"
-                        >
-                        </el-input>
-                        <!-- <textarea
-      
-                        placeholder="璇疯緭鍏ュ唴瀹�"
-                        style="width: 100%;  resize: none"
-                        v-model="item.remark"
-                      ></textarea> -->
+                        ></el-input>
                       </td>
                     </tr>
                     <tr
@@ -630,7 +712,37 @@
                   </table>
                 </div>
               </div>
-
+              <div
+                v-if="tableAll && tableAll.tjCategory === '02'"
+                class="section-title"
+              >
+                鑱屼笟鐥呮�绘
+              </div>
+              <el-form
+                v-if="tableAll && tableAll.tjCategory === '02'"
+                ref="numberValidateForm"
+                label-width="80px"
+                class="demo-ruleForm"
+              >
+                <el-form-item label="妫�鏌ョ粨璁�">
+                  <el-input
+                    type="textarea"
+                    placeholder="璇疯緭鍏ュ唴瀹�"
+                    v-model="zhiyeJl"
+                    :rows="3"
+                    style="width: 96%"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="浣撴缁撴灉">
+                  <el-input
+                    type="textarea"
+                    placeholder="璇疯緭鍏ュ唴瀹�"
+                    v-model="zhiyeJg"
+                    :rows="3"
+                    style="width: 96%"
+                  ></el-input>
+                </el-form-item>
+              </el-form>
               <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'">
                 <el-button type="primary" @click="propoChange"
                   >蹇嵎寤鸿</el-button
@@ -653,8 +765,7 @@
                     v-model="textarea1"
                     :rows="3"
                     style="width: 96%"
-                  >
-                  </el-input>
+                  ></el-input>
                 </el-form-item>
               </el-form>
               <div slot="footer" class="dialog-footers">
@@ -723,6 +834,7 @@
                                     size="small"
                                     type="textarea"
                                     autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"
                                   ></el-input>
                                 </div>
                                 <div>
@@ -732,11 +844,11 @@
                                     size="small"
                                     type="textarea"
                                     autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"
                                   ></el-input>
                                 </div>
                               </div>
                             </div>
-
                             <!-- 濡傛灉 advices 涓虹┖鏃讹紝娓叉煋绌虹殑杈撳叆妗� -->
                             <div v-else>
                               <div>
@@ -746,6 +858,7 @@
                                   size="small"
                                   type="textarea"
                                   autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"
                                 ></el-input>
                               </div>
                               <div>
@@ -755,10 +868,10 @@
                                   size="small"
                                   type="textarea"
                                   autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"
                                 ></el-input>
                               </div>
                             </div>
-
                             <div style="margin-top: 10px">
                               <el-button
                                 @click="shanchu(props.row)"
@@ -770,7 +883,6 @@
                           </div>
                         </template>
                       </el-table-column>
-
                       <el-table-column
                         align="center"
                         label="妫�娴嬮」鐩�"
@@ -786,24 +898,19 @@
                         prop="proResult"
                         label="妫�娴嬬粨鏋�"
                         width="85"
-                      >
-                      </el-table-column>
-
+                      ></el-table-column>
                       <el-table-column
                         align="center"
                         prop="stanId"
                         label=" 鍙傝�冭寖鍥�"
                         width="117"
-                      >
-                      </el-table-column>
-
+                      ></el-table-column>
                       <el-table-column
                         align="center"
                         prop="proAdvice"
                         label="鍗曚綅"
                         width="78"
-                      >
-                      </el-table-column>
+                      ></el-table-column>
                     </el-table>
                   </template>
                   <template v-if="item.jyjc == '1'">
@@ -839,6 +946,7 @@
                                     size="small"
                                     type="textarea"
                                     autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"
                                   ></el-input>
                                 </div>
                                 <div>
@@ -848,11 +956,11 @@
                                     size="small"
                                     type="textarea"
                                     autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"
                                   ></el-input>
                                 </div>
                               </div>
                             </div>
-
                             <!-- 濡傛灉 advices 涓虹┖鏃讹紝娓叉煋绌虹殑杈撳叆妗� -->
                             <div v-else>
                               <div>
@@ -862,6 +970,7 @@
                                   size="small"
                                   type="textarea"
                                   autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"
                                 ></el-input>
                               </div>
                               <div>
@@ -871,10 +980,10 @@
                                   size="small"
                                   type="textarea"
                                   autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"
                                 ></el-input>
                               </div>
                             </div>
-
                             <div style="margin-top: 10px">
                               <el-button
                                 @click="shanchu(props.row)"
@@ -886,7 +995,6 @@
                           </div>
                         </template>
                       </el-table-column>
-
                       <el-table-column
                         align="center"
                         label="妫�娴嬮」鐩�"
@@ -894,7 +1002,10 @@
                         :show-overflow-tooltip="true"
                       >
                         <template slot-scope="scope">
-                          <div>{{ scope.row.proName }}</div>
+                          <span v-if="scope.row.type == '0'">鏈鏍�</span>
+                          <span v-if="scope.row.type == '1'">宸插鏍�</span>
+                          <span v-if="scope.row.type == '2'">寮冩</span>
+                          <span v-if="scope.row.type == '3'">寤舵湡</span>
                         </template>
                       </el-table-column>
                       <el-table-column
@@ -902,8 +1013,7 @@
                         prop="proResult"
                         label="妫�娴嬬粨鏋�"
                         width="403"
-                      >
-                      </el-table-column>
+                      ></el-table-column>
                     </el-table>
                   </template>
                 </div>
@@ -930,16 +1040,13 @@
                       label="閮ㄩ棬"
                       width="144"
                       prop="deptName"
-                    >
-                    </el-table-column>
+                    ></el-table-column>
                     <el-table-column
                       align="center"
                       prop="proName"
                       label="椤圭洰"
                       width="260"
-                    >
-                    </el-table-column>
-
+                    ></el-table-column>
                     <el-table-column
                       label="鐘舵��"
                       align="center"
@@ -960,9 +1067,21 @@
                       prop="bcupdateTime"
                       width="160"
                     />
+                    <el-table-column label="鎿嶄綔" align="center" width="130px">
+                      <template slot-scope="scope">
+                        <el-button
+                          type="primary"
+                          size="mini"
+                          @click="huifu"
+                          v-if="scope.row.type == '2'"
+                          >鎭㈠</el-button
+                        >
+                      </template>
+                    </el-table-column>
                   </el-table>
                 </div>
               </template>
+
               <template v-if="status1 == 2">
                 <div>
                   <div style="text-align: center; margin-top: 10px">
@@ -984,7 +1103,7 @@
                       <div style="margin: 0 40px; font-size: 0.8vw">
                         椤圭洰鍚嶇О锛歿{ xmChange[0].proName || "" }}
                       </div>
-                      <div style="margin: 0 40px; font-size: 0.8vw">
+                      <div style="margin: 0 80px; font-size: 0.8vw">
                         浠锋牸锛歿{ xmChange[0].price || "" }}
                       </div>
                     </div>
@@ -992,7 +1111,7 @@
                       <div style="margin: 0 40px; font-size: 0.8vw">
                         椤圭洰鍚嶇О锛歿{}}
                       </div>
-                      <div style="margin: 0 40px; font-size: 0.8vw">
+                      <div style="margin: 0 80px; font-size: 0.8vw">
                         浠锋牸锛歿{}}
                       </div>
                     </div>
@@ -1008,6 +1127,7 @@
                     :row-style="redxiangmu"
                     :data="fcList"
                     style="width: 100%"
+                    border
                   >
                     <el-table-column
                       type="selection"
@@ -1195,7 +1315,6 @@
                       <el-collapse-item title="鐑熼厭鍙�" name="4">
                         <div style="width: 100%">
                           <el-form-item label="鏄惁鍚哥儫" prop="xiyan">
-                            <!-- <el-input v-model="form.xiyanpinlv" placeholder="璇疯緭鍏ュ惛鐑熼鐜�" /> -->
                             <el-select
                               disabled
                               filterable
@@ -1227,7 +1346,6 @@
                             />骞� </el-form-item
                           ><br />
                           <el-form-item label="鏄惁楗厭" prop="yinjiu">
-                            <!-- <el-input v-model="form.yinjiupinlv" placeholder="璇疯緭鍏ラギ閰掗鐜�" /> -->
                             <el-select
                               filterable
                               v-model="formobj.yinjiu"
@@ -1329,7 +1447,6 @@
                             </el-table-column>
                             <el-table-column label="鏄惁鐥婃剤" prop="isOk">
                               <template slot-scope="scope">
-                                <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
                                 <el-select
                                   disabled
                                   filterable
@@ -1360,7 +1477,6 @@
                           </el-table>
                         </div>
                       </el-collapse-item>
-
                       <el-collapse-item title="鑱屼笟鍙�" name="7">
                         <div style="width: 100%">
                           <el-table
@@ -1442,7 +1558,6 @@
                               prop="harmTypeLogs"
                             >
                               <template slot-scope="scope">
-                                <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
                                 <el-select
                                   filterable
                                   disabled
@@ -1478,6 +1593,38 @@
                   </el-form>
                 </div>
               </template>
+              <template v-if="status1 == 4">
+                <div>
+                  <el-table
+                    :data="ychfList"
+                    style="width: 100%"
+                    :header-cell-style="{ background: '#e6a23c' }"
+                  >
+                    <el-table-column
+                      align="center"
+                      prop="jcxm"
+                      label="椤圭洰鍚�"
+                      width="260"
+                    ></el-table-column>
+                    <el-table-column
+                      label="缁撴灉"
+                      align="center"
+                      prop="jcjg"
+                      width="160"
+                    />
+                    <el-table-column label="鎿嶄綔" align="center" width="130px">
+                      <template v-slot="scope">
+                        <el-button
+                          type="primary"
+                          size="mini"
+                          @click="hfyc(scope.row.id)"
+                          >鎭㈠</el-button
+                        >
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </template>
               <el-button
                 type="primary"
                 @click="addnew"
@@ -1491,42 +1638,132 @@
       </div>
     </el-drawer>
 
-
-     <el-dialog title="鏂板寮傚父缁撴灉" :visible.sync="addNewDialogVisible" width="900px" class="custom-dialog">
-      <el-form :model="newItem" ref="newItemForm" label-width="100px" class="custom-form">
+    <el-dialog
+      title="PDF 棰勮"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      width="50%"
+    >
+      <div class="main">
+        <iframe
+          id="printIframe"
+          :src="url"
+          frameborder="0"
+          style="width: 100%; height: 100%"
+        ></iframe>
+      </div>
+    </el-dialog>
+    <el-dialog
+      title="鎻愮ず"
+      :visible.sync="jianqians"
+      width="1000px"
+      :before-close="handleClose1"
+    >
+      <jianqianwenzhen
+        :jianqianwenzhendata="jianqianwenzhendata"
+        v-if="flags"
+      ></jianqianwenzhen>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="jianqians = false">鍙� 娑�</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="鏂板寮傚父缁撴灉"
+      :visible.sync="addNewDialogVisible"
+      width="900px"
+      class="custom-dialog"
+    >
+      <el-form
+        :model="newItem"
+        ref="newItemForm"
+        label-width="100px"
+        class="custom-form"
+      >
         <el-form-item label="椤圭洰鍒嗙被" prop="parentName">
-          <el-select v-model="newItem.parentName" placeholder="璇烽�夋嫨椤圭洰鍒嗙被" clearable filterable
-            @change="handleCategoryChange">
-            <el-option v-for="item in projectCategories" :key="item.proId" :label="item.proName"
-              :value="item.proName" />
+          <el-select
+            v-model="newItem.parentName"
+            placeholder="璇烽�夋嫨椤圭洰鍒嗙被"
+            clearable
+            filterable
+            @change="handleCategoryChange"
+          >
+            <el-option
+              v-for="item in projectCategories"
+              :key="item.proId"
+              :label="item.proName"
+              :value="item.proName"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="妫�娴嬮」鐩�" prop="jcxm">
-          <el-input v-model="newItem.jcxm" placeholder="璇疯緭鍏ユ娴嬮」鐩垨浠庡垎绫婚�夋嫨" clearable></el-input>
+          <el-input
+            v-model="newItem.jcxm"
+            placeholder="璇疯緭鍏ユ娴嬮」鐩垨浠庡垎绫婚�夋嫨"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item label="妫�娴嬬粨鏋�" prop="jcjg">
-          <el-input v-model="newItem.jcjg" placeholder="璇疯緭鍏ユ娴嬬粨鏋�" clearable></el-input>
+          <el-input
+            v-model="newItem.jcjg"
+            placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item label="鍙傝�冭寖鍥�" prop="ckfw">
-          <el-input v-model="newItem.ckfw" placeholder="璇疯緭鍏ュ弬鑰冭寖鍥�" clearable></el-input>
+          <el-input
+            v-model="newItem.ckfw"
+            placeholder="璇疯緭鍏ュ弬鑰冭寖鍥�"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item label="鍗曚綅" prop="dw">
-          <el-input v-model="newItem.dw" placeholder="璇疯緭鍏ュ崟浣�" clearable></el-input>
+          <el-input
+            v-model="newItem.dw"
+            placeholder="璇疯緭鍏ュ崟浣�"
+            clearable
+          ></el-input>
         </el-form-item>
         <!-- 鍔ㄦ�佸缓璁粍 -->
-        <div v-for="(advice, index) in newItem.map" :key="index" class="advice-group">
+        <div
+          v-for="(advice, index) in newItem.map"
+          :key="index"
+          class="advice-group"
+        >
           <el-form-item label="寤鸿鏍囬" :prop="'map.' + index + '.bt'">
-            <el-input v-model="advice.bt" placeholder="璇疯緭鍏ュ缓璁爣棰�" clearable @focus="tan($event)"></el-input>
+            <el-input
+              v-model="advice.bt"
+              placeholder="璇疯緭鍏ュ缓璁爣棰�"
+              clearable
+              @focus="tan($event)"
+            ></el-input>
           </el-form-item>
           <el-form-item label="寤鸿鍐呭" :prop="'map.' + index + '.nr'">
-            <el-input v-model="advice.nr" type="textarea" rows="3" placeholder="璇疯緭鍏ュ缓璁唴瀹�" resize="none"
-              @focus="tan($event)"></el-input>
+            <el-input
+              v-model="advice.nr"
+              type="textarea"
+              rows="3"
+              placeholder="璇疯緭鍏ュ缓璁唴瀹�"
+              resize="none"
+              @focus="tan($event)"
+            ></el-input>
           </el-form-item>
-          <el-button v-if="index > 0" type="danger" size="small" @click="removeAdvice(index)"
-            style="margin-left: 100px; margin-bottom: 10px;">鍒犻櫎</el-button>
+          <el-button
+            v-if="index > 0"
+            type="danger"
+            size="small"
+            @click="removeAdvice(index)"
+            style="margin-left: 100px; margin-bottom: 10px"
+            >鍒犻櫎</el-button
+          >
         </div>
         <el-form-item>
-          <el-button type="primary" size="small" @click="addAdvice" style="margin-left: 100px;">娣诲姞寤鸿</el-button>
+          <el-button
+            type="primary"
+            size="small"
+            @click="addAdvice"
+            style="margin-left: 100px"
+            >娣诲姞寤鸿</el-button
+          >
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -1534,22 +1771,40 @@
         <el-button type="primary" @click="submitNewItem">纭畾</el-button>
       </span>
     </el-dialog>
-     <el-dialog title="蹇嵎寤鸿閫夋嫨" :visible.sync="showjianyi" width="1000px" class="custom-dialog"
-      :before-close="handleCloseAdviceDialog">
+    <el-dialog
+      title="蹇嵎寤鸿閫夋嫨"
+      :visible.sync="showjianyi"
+      width="1000px"
+      class="custom-dialog"
+      :before-close="handleCloseAdviceDialog"
+    >
       <!-- 鎼滅储鍖哄煙 -->
-      <div style="margin-bottom: 15px;">
-        <el-form :inline="true" @submit.native.prevent>
+      <div style="margin-bottom: 15px">
+        <el-form :inline="true">
           <el-form-item label="寤鸿鍚嶇О">
-            <el-input v-model="queryParams1.zyzd" placeholder="璇疯緭鍏ュ缓璁悕绉拌繘琛岀瓫閫�" clearable style="width: 200px"
-              @input="filterAdvices(true)" @keyup.enter.native="filterAdvices(true)" />
+            <el-input
+              v-model="queryParams1.zyzd"
+              placeholder="璇疯緭鍏ュ缓璁悕绉拌繘琛岀瓫閫�"
+              clearable
+              style="width: 200px"
+              @input="filterAdvices(true)"
+              @keyup.enter.native="filterAdvices(true)"
+            />
           </el-form-item>
         </el-form>
       </div>
 
       <!-- 寤鸿琛ㄦ牸 -->
-      <el-table v-loading="adviceLoading" :data="advicerulesList" ref="adviceTable" border highlight-current-row
-        @current-change="handleCurrentChangeAdvice" style="max-height: 400px; overflow-y: auto;"
-        :empty-text="adviceEmptyText">
+      <el-table
+        v-loading="adviceLoading"
+        :data="advicerulesList"
+        ref="adviceTable"
+        border
+        highlight-current-row
+        @current-change="handleCurrentChangeAdvice"
+        style="max-height: 400px; overflow-y: auto"
+        :empty-text="adviceEmptyText"
+      >
         <el-table-column label="绉戝" prop="ks" width="100" align="center" />
         <el-table-column label="寤鸿鍚嶇О" prop="jymc" align="center" />
         <el-table-column label="寤鸿鍐呭" prop="jynr" align="center" />
@@ -1558,15 +1813,25 @@
       <!-- 鍒嗛〉 -->
       <div class="pag">
         <div class="pag2">
-          <pagination v-show="total1 > 0" :total="total1" :page.sync="queryParams1.pageNum"
-            :limit.sync="queryParams1.pageSize" @pagination="filterAdvices(false)" />
+          <pagination
+            v-show="total1 > 0"
+            :total="total1"
+            :page.sync="queryParams1.pageNum"
+            :limit.sync="queryParams1.pageSize"
+            @pagination="filterAdvices(false)"
+          />
         </div>
       </div>
 
       <!-- 搴曢儴鎸夐挳 -->
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancelAdviceDialog">鍙栨秷</el-button>
-        <el-button type="primary" @click="applySelectedAdvice" :disabled="!selectedAdvice">纭畾</el-button>
+        <el-button
+          type="primary"
+          @click="applySelectedAdvice"
+          :disabled="!selectedAdvice"
+          >纭畾</el-button
+        >
       </span>
     </el-dialog>
 
@@ -1597,58 +1862,20 @@
         <el-button @click="cancels">鍙� 娑�</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      title="PDF 棰勮"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      width="50%"
-    >
-      <div class="main">
-        <iframe
-          id="printIframe"
-          :src="url"
-          frameborder="0"
-          style="width: 100%; height: 100%"
-        ></iframe>
-      </div>
-    </el-dialog>
-    <el-dialog
-      title="鎻愮ず"
-      :visible.sync="jianqians"
-      width="1000px"
-      :before-close="handleClose1"
-    >
-      <jianqianwenzhen
-        :jianqianwenzhendata="jianqianwenzhendata"
-        v-if="flags"
-      ></jianqianwenzhen>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="jianqians = false">鍙� 娑�</el-button>
-      </span>
-    </el-dialog>
     <Packages ref="bbb" :baogao="baogao" />
     <Prescription ref="Pre" :preObj="preObj" />
-    <proposal
-      ref="proposal"
-      :cusobj="cusobj"
-      :tjNumber="tjNumber"
-      @event1="eventchange($event)"
-    />
+    <proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
     <createproposal ref="createproposal" :creatobj="creatobj" />
-
     <el-dialog
       title="甯哥敤寤鸿缁存姢"
       :visible.sync="propdialog"
       width="500px"
       append-to-body
-    >
-    </el-dialog>
+    ></el-dialog>
   </div>
 </template>
-
-
 <script>
-import _ from 'lodash';
+import _ from "lodash";
 import jianqianwenzhen from "@/components/jianqianwenzhen";
 import Packages from "@/components/Packages";
 import Prescription from "@/components/Prescription";
@@ -1668,15 +1895,17 @@
   isPdfOrJimu,
   addOrder,
   addOrder1,
-  UpdFcPro,
   getFcList,
+  UpdFcPro,
+  huiFuyichangxiangmu,
+  hfbt,
 } from "@/api/doctor/checkAll";
 import { getInfoById } from "@/api/hosp/history";
 import { getInfo } from "@/api/login";
 import { getCompany, queryCompany } from "@/api/team/tuanti";
 import { reportHistory, yichang, shanchu } from "@/api/doctor/check";
 import { getPdf, revoke } from "@/api/hosp/order";
-import { cSWebGetPro, dataSynchronization } from "@/api/doctor/examination";
+import { cSWebGetPro, huifu } from "@/api/doctor/examination";
 import ViewPdf from "@/components/ViewPdf";
 import Historicalreport from "@/components/Historicalreport";
 import { getDicts } from "@/api/system/dict/data";
@@ -1710,7 +1939,38 @@
   name: "checkAll",
   data() {
     return {
-      // 鏇存柊鎬绘寤鸿
+      zhiyeJl: "", // 鍒濆鍖栨鏌ョ粨璁轰负绌�
+      zhiyeJg: "鏈彂鐜扮洰鏍囨�х柧鐥�", // 鍒濆鍖栦綋妫�缁撴灉涓洪粯璁ゅ��
+      selectedAdvice: null,
+      activeAdviceIndex: 0,
+      advicerulesList: [],
+      xmChange: [],
+      ychfList: [],
+      showjianyi: false,
+      adviceLoading: false,
+      adviceEmptyText: "鏆傛棤鏁版嵁",
+      total1: 0,
+      forms: {
+        pacName: "",
+      },
+      xmopen: false,
+      datasList: [],
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        zyzd: "",
+      },
+      adviceCache: new Map(),
+      addNewDialogVisible: false,
+      newItem: {
+        parentName: "",
+        jcxm: "",
+        jcjg: "",
+        ckfw: "",
+        dw: "",
+        map: [{ bt: "", nr: "" }],
+      },
+      projectCategories: [],
       emptyAdvice: {
         bt: "",
         nr: "",
@@ -1720,15 +1980,12 @@
       preObj: {},
       baogao: [],
       flags: false,
-      fcList: [],
-      xmopen: false,
-      datasList: [],
-      advicerulesList: [],
       jianqianwenzhendata: [],
       jianqians: false,
       adviceLoading: false,
       sex: true,
       activeName: "1",
+      hosproy: true,
       remarks: "",
       remark: "",
       creatobj: {},
@@ -1740,21 +1997,21 @@
       isdisabled: false,
       showjianyi: false,
       addNewDialogVisible: false,
-      adviceEmptyText: '鏆傛棤鏁版嵁',
+      adviceEmptyText: "鏆傛棤鏁版嵁",
       total1: 0,
       adviceCache: new Map(),
       queryParams1: {
         pageNum: 1,
         pageSize: 10,
-        zyzd: '',
+        zyzd: "",
       },
-       newItem: {
-        parentName: '',
-        jcxm: '',
-        jcjg: '',
-        ckfw: '',
-        dw: '',
-        map: [{ bt: '', nr: '' }]
+      newItem: {
+        parentName: "",
+        jcxm: "",
+        jcjg: "",
+        ckfw: "",
+        dw: "",
+        map: [{ bt: "", nr: "" }],
       },
       projectCategories: [],
       src: "",
@@ -1799,9 +2056,7 @@
       msgtuwen: "",
       msgjianqian: "",
       msgkcf: "",
-      // 椤甸潰鍏ㄩ儴鏁版嵁
       checkList: [],
-      // 缁戝畾鍗曢�夋寜閽�
       tjStatus: "0",
       tjproject: "0",
       total: 0,
@@ -1809,25 +2064,21 @@
       Testitems: [],
       CheckBox: {},
       startTime: [],
+      isCollapsed: 0,
       textarea1: "",
       loading: true,
-      // 褰撳墠鐢ㄦ埛閫変腑鐨勫��
       selectLettercurrent: " ",
-      // 鎶藉眽鎵撳紑鏂瑰紡
       drawer: false,
       isLoading: false,
       xmopen: false,
       tableAll: {},
       tjNumber: "",
-      // 鍏ㄩ儴灏忕粨
       DeptadviceAll: [],
       MsgId: "",
       Deptobj: "",
-      // 鐐瑰嚮鍙傛暟
       changedate: [],
       dataText: [],
       status: {},
-      // 鏌ヨ鍙傛暟
       queryParams: {
         page: 1,
         pageSize: 10,
@@ -1837,12 +2088,12 @@
         compId: null,
         name: null,
         checkStatus: null,
+        shys: null,
       },
       formobj: {},
-      // 鏌ヨ鍙傛暟
       yichangList: [],
+      fcList: [],
       statusList: [],
-      xmChange: [],
       queryParam: {
         pageNum: 1,
         pageSize: 10,
@@ -1867,15 +2118,14 @@
         tjCategory: undefined,
         payType: undefined,
       },
-      status1: 0, // 0灞曠ず寮傚父1灞曠ず椤圭洰鎯呭喌
+      status1: 0,
       viewportHeight: 0,
       expends: [],
-      clearTimeSet: null,
     };
   },
 
   created() {
-    // this.getNowTime();
+    console.log(this.dict.type.dict_tjtype, "鑱屼笟浣撴");
     this.getConfigKey();
     this.getdate();
   },
@@ -1887,15 +2137,18 @@
         window.innerHeight || document.documentElement.clientHeight;
     });
   },
+
   methods: {
+    // 鎵撳紑寤鸿閫夋嫨寮圭獥
     tan(event) {
-      this.activeAdviceIndex = event.target.closest('.advice-group')
-        ? Array.from(event.target.closest('.el-form').querySelectorAll('.advice-group'))
-          .indexOf(event.target.closest('.advice-group'))
+      this.activeAdviceIndex = event.target.closest(".advice-group")
+        ? Array.from(
+            event.target.closest(".el-form").querySelectorAll(".advice-group")
+          ).indexOf(event.target.closest(".advice-group"))
         : 0;
       this.queryParams1.pageNum = 1;
       this.queryParams1.pageSize = 10;
-      this.queryParams1.zyzd = '';
+      this.queryParams1.zyzd = "";
       this.selectedAdvice = null;
       this.advicerulesList = [];
       this.total1 = 0;
@@ -1910,18 +2163,21 @@
         this.queryParams1.pageNum = 1;
       }
 
-      const cacheKey = `${this.queryParams1.zyzd || ''}_${this.queryParams1.pageNum}_${this.queryParams1.pageSize}`;
+      const cacheKey = `${this.queryParams1.zyzd || ""}_${
+        this.queryParams1.pageNum
+      }_${this.queryParams1.pageSize}`;
 
       if (this.adviceCache.has(cacheKey)) {
         const cachedData = this.adviceCache.get(cacheKey);
         this.advicerulesList = cachedData.rows;
         this.total1 = cachedData.total;
-        this.adviceEmptyText = this.advicerulesList.length === 0 ? '鏆傛棤鍖归厤鐨勫缓璁�' : '鏆傛棤鏁版嵁';
+        this.adviceEmptyText =
+          this.advicerulesList.length === 0 ? "鏆傛棤鍖归厤鐨勫缓璁�" : "鏆傛棤鏁版嵁";
         return;
       }
 
       this.adviceLoading = true;
-      this.adviceEmptyText = '鍔犺浇涓�...';
+      this.adviceEmptyText = "鍔犺浇涓�...";
 
       listAdvicerules(this.queryParams1)
         .then((response) => {
@@ -1933,38 +2189,30 @@
             total: this.total1,
           });
 
-          this.adviceEmptyText = this.advicerulesList.length === 0 ? '鏆傛棤鍖归厤鐨勫缓璁�' : '鏆傛棤鏁版嵁';
+          this.adviceEmptyText =
+            this.advicerulesList.length === 0 ? "鏆傛棤鍖归厤鐨勫缓璁�" : "鏆傛棤鏁版嵁";
         })
         .catch((error) => {
-          console.error('绛涢�夊揩鎹峰缓璁け璐�:', error);
+          console.error("绛涢�夊揩鎹峰缓璁け璐�:", error);
           this.advicerulesList = [];
           this.total1 = 0;
-          this.adviceEmptyText = '鍔犺浇澶辫触锛岃绋嶅悗閲嶈瘯';
-          this.$message.error('鍔犺浇寤鸿澶辫触锛岃妫�鏌ョ綉缁滃悗閲嶈瘯');
+          this.adviceEmptyText = "鍔犺浇澶辫触锛岃绋嶅悗閲嶈瘯";
+          this.$message.error("鍔犺浇寤鸿澶辫触锛岃妫�鏌ョ綉缁滃悗閲嶈瘯");
         })
         .finally(() => {
           this.adviceLoading = false;
         });
     }, 800),
 
-     handleCurrentChangeAdvice(currentRow) {
+    handleCurrentChangeAdvice(currentRow) {
       this.selectedAdvice = currentRow;
     },
 
-
-    submitFormxm() {
-      this.xmopen = false;
+    toggleCollapse3() {
+      this.isCollapsed = 0;
     },
-
-    cancels() {
-      this.xmopen = false;
-      this.xmChange = [];
-    },
-
-    handleCategoryChange(value) {
-      if (value) {
-        this.newItem.jcxm = value;
-      }
+    toggleCollapse() {
+      this.isCollapsed = 1;
     },
 
     applySelectedAdvice() {
@@ -1976,97 +2224,174 @@
         this.showjianyi = false;
         this.selectedAdvice = null;
       } else {
-        this.$message.warning('璇峰厛閫夋嫨涓�鏉″缓璁�');
-      }
-    },
-
-
-    handleCloseAdviceDialog(done) {
-      if (this.selectedAdvice) {
-        this.$confirm('鎮ㄥ凡閫夋嫨涓�鏉″缓璁紝纭畾瑕佸叧闂悧锛�', '鎻愮ず', {
-          confirmButtonText: '纭畾',
-          cancelButtonText: '鍙栨秷',
-          type: 'warning',
-        })
-          .then(() => {
-            this.cancelAdviceDialog();
-            done();
-          })
-          .catch(() => { });
-      } else {
-        this.cancelAdviceDialog();
-        done();
+        this.$message.warning("璇峰厛閫夋嫨涓�鏉″缓璁�");
       }
     },
 
     cancelAdviceDialog() {
       this.showjianyi = false;
       this.selectedAdvice = null;
-      this.queryParams1.zyzd = '';
+      this.queryParams1.zyzd = "";
       this.queryParams1.pageNum = 1;
       this.advicerulesList = [];
       this.total1 = 0;
       this.adviceCache.clear();
     },
 
-    setTime() {
-      //璁剧疆瀹氭椂鍣�
-      this.clearTimeSet = setInterval(() => {
-        this.$modal.closeLoading();
-      }, 300000);
+    handleCloseAdviceDialog(done) {
+      if (this.selectedAdvice) {
+        this.$confirm("鎮ㄥ凡閫夋嫨涓�鏉″缓璁紝纭畾瑕佸叧闂悧锛�", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning",
+        })
+          .then(() => {
+            this.cancelAdviceDialog();
+            done();
+          })
+          .catch(() => {});
+      } else {
+        this.cancelAdviceDialog();
+        done();
+      }
     },
-    tongbu(row) {
-      this.$modal.loading("姝e湪鍚屾锛岃绋嶅��...");
-      this.setTime();
-      let tjNumber = row.tjNumber;
-      dataSynchronization(tjNumber)
-        .then((res, error) => {
-          if (res.code == 200) {
-            this.clearTimeSet = null;
-            this.$modal.closeLoading();
-            this.$modal.msgSuccess("鍚屾鎴愬姛锛�");
+
+    handleAdviceBlur(row, index) {
+      let advicesToSubmit = [];
+
+      if (index === -1) {
+        if (this.emptyAdvice.bt || this.emptyAdvice.nr) {
+          advicesToSubmit = [
+            { bt: this.emptyAdvice.bt || "", nr: this.emptyAdvice.nr || "" },
+          ];
+          this.$set(row, "advices", advicesToSubmit);
+        }
+      } else {
+        advicesToSubmit = row.advices;
+      }
+
+      if (!advicesToSubmit || advicesToSubmit.length === 0) {
+        return;
+      }
+
+      const parentItem = this.yichangList.find((item) =>
+        item.sone.some(
+          (soneItem) => soneItem.orderDetailId === row.orderDetailId
+        )
+      );
+
+      if (!parentItem) {
+        this.$message.error("鏈壘鍒板搴旂殑鐖剁骇椤圭洰");
+        return;
+      }
+
+      const data = {
+        tjh: this.tableAll.tjNumber,
+        parentName: parentItem.proName,
+        jcxm: row.proName,
+        jcjg: row.proResult,
+        ckfw: row.stanId,
+        dw: row.proAdvice,
+        map: advicesToSubmit,
+        jyjc: parentItem.jyjc,
+        id: row.orderDetailId,
+      };
+
+      addOrder1(data)
+        .then((res) => {
+          if (res.code === 200) {
+            // 鎴愬姛鏇存柊寤鸿
+          } else {
+            this.$message.error("寤鸿鏇存柊澶辫触锛�" + (res.msg || "鏈煡閿欒"));
           }
         })
         .catch((error) => {
-          this.clearTimeSet = null;
-          this.$modal.closeLoading();
+          console.error("寤鸿鏇存柊澶辫触:", error);
+          this.$message.error("寤鸿鏇存柊澶辫触锛�" + error.message);
         });
     },
-    /*  shanchu(row) {
-      console.log(row);
-      shanchu({
-        id: row.orderDetailId,
-      }).then((res) => {
-        console.log(res);
-        // 鎵惧埌瑕佸垹闄ら」鎵�鍦ㄧ殑鐖剁骇鏁扮粍
-        const parentItem = this.yichangList.find((item) =>
-          item.sone.some((soneItem) => soneItem.proId === row.proId)
-        );
 
-        if (parentItem) {
-          // 浠庣埗绾х殑 sone 鏁扮粍涓垹闄よ椤�
-          const index = parentItem.sone.findIndex(
-            (item) => item.proId === row.proId
-          );
-          if (index > -1) {
-            parentItem.sone.splice(index, 1);
+    handleSelectionChange(selection) {
+      console.log(selection);
+    },
 
-            // 濡傛灉鍒犻櫎鍚� sone 鏁扮粍涓虹┖,鍒欏垹闄ゆ暣涓埗绾ч」
-            if (parentItem.sone.length === 0) {
-              const parentIndex = this.yichangList.indexOf(parentItem);
-              if (parentIndex > -1) {
-                this.yichangList.splice(parentIndex, 1);
-              }
-            }
+    submitNewItem() {
+      const data = {
+        tjh: this.tableAll.tjNumber,
+        parentName: this.newItem.parentName,
+        jcxm: this.newItem.jcxm,
+        jcjg: this.newItem.jcjg,
+        ckfw: this.newItem.ckfw,
+        dw: this.newItem.dw,
+        map: this.newItem.map,
+        jyjc: this.newItem.ckfw ? "0" : "1",
+      };
 
-            // 鏇存柊 expends 鏁扮粍
-            this.getExpends();
-
-            this.$message.success("鍒犻櫎鎴愬姛");
+      addOrder1(data)
+        .then((res) => {
+          if (res.code === 200) {
+            this.$message.success("鏂板寮傚父缁撴灉鎴愬姛");
+            this.addNewDialogVisible = false;
+            this.yichangjieguo();
+          } else {
+            this.$message.error("鏂板澶辫触");
           }
-        }
-      });
-    }, */
+        })
+        .catch((error) => {
+          console.error("鏂板寮傚父缁撴灉澶辫触:", error);
+          this.$message.error("鏂板寮傚父缁撴灉澶辫触");
+        });
+    },
+
+    addnew() {
+      this.newItem = {
+        parentName: "",
+        jcxm: "",
+        jcjg: "",
+        ckfw: "",
+        dw: "",
+        map: [{ bt: "", nr: "" }],
+      };
+      this.addNewDialogVisible = true;
+
+      cSWebGetPro(this.tjNumber)
+        .then((res) => {
+          if (res.data && Array.isArray(res.data)) {
+            this.projectCategories = res.data;
+          } else {
+            this.$message.warning("鏈幏鍙栧埌椤圭洰鍒嗙被鏁版嵁");
+            this.projectCategories = [];
+          }
+        })
+        .catch((error) => {
+          console.error("鑾峰彇椤圭洰鍒嗙被澶辫触:", error);
+          this.$message.error("鑾峰彇椤圭洰鍒嗙被澶辫触");
+          this.projectCategories = [];
+        });
+    },
+
+    handleCategoryChange(value) {
+      if (value) {
+        this.newItem.jcxm = value;
+      }
+    },
+
+    change(val) {
+      console.log("閫変腑鐨勫�兼槸锛�", val);
+    },
+
+    addAdvice() {
+      this.newItem.map.push({ bt: "", nr: "" });
+    },
+
+    removeAdvice(index) {
+      if (this.newItem.map.length > 1) {
+        this.newItem.map.splice(index, 1);
+      } else {
+        this.$message.warning("鑷冲皯淇濈暀涓�缁勫缓璁�");
+      }
+    },
+
     shanchu(row) {
       this.isdisabled = true;
 
@@ -2118,62 +2443,6 @@
           this.isdisabled = false;
         });
     },
-    getConfigKey() {
-      getconfigKey("sfkqtwbg").then((res) => {
-        this.msgtuwen = res.msg;
-      });
-      getconfigKey("sfkqjqwz").then((res) => {
-        this.msgjianqian = res.msg;
-      });
-      getconfigKey("kcf").then((res) => {
-        this.msgkcf = res.msg;
-      });
-    },
-    //璁剧疆table涓殑鎵╁睍椤癸紝灞曞紑鐨刬d锛屾澶勬垜闇�瑕佸叏閮ㄥ睍寮�
-    getExpends() {
-      // 閫氳繃flatMap灏嗘瘡涓猻one鏁扮粍涓殑ID鎻愬彇鍑烘潵锛屽苟杩斿洖涓�涓墎骞冲寲鐨処D鏁扮粍
-      this.expends = this.yichangList.flatMap((item) =>
-        item.sone.map((subItem) => subItem.proId)
-      );
-    },
-
-    getRowKeys(row) {
-      return row.proId;
-    },
-    // 椤圭洰鎯呭喌
-    xiangmuqingkuang() {
-      cSWebGetPro(this.tjNumber).then((res) => {
-        this.status1 = 1;
-        this.statusList = res.data;
-
-        if (this.statusList.length == 0) {
-          _this.$message.msgSuccess("鏆傛棤椤圭洰鎯呭喌");
-        }
-      });
-    },
-
-    fuchaxiangmu() {
-      this.loading = true;
-      this.status1 = 2;
-      let data = {
-        tjNum: this.tjNumber,
-        type: 1,
-      };
-      getFcList(data)
-        .then((res) => {
-          this.fcList = res.data;
-          this.fcList.forEach((item, index) => {
-            item.newID = index + 1;
-          });
-        })
-        .catch((error) => {
-          console.error("鑾峰彇澶嶆煡椤圭洰澶辫触:", error);
-          this.$message.error("鑾峰彇澶嶆煡椤圭洰澶辫触");
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
 
     handleQuery() {
       this.xmopen = true;
@@ -2197,29 +2466,11 @@
           },
         ],
       };
-      UpdFcPro(data).then((res) => {
-        if (res.code == 200) {
-          this.xmChange = [];
-          this.fuchaxiangmu();
-        }
-      });
+      UpdFcPro(data).then((res) => {});
     },
 
-    handledeleteClick(row) {
-      let data = {
-        orderId: row.orderId,
-        data: [
-          {
-            proId: row.proId,
-            type: 0,
-          },
-        ],
-      };
-      UpdFcPro(data).then((res) => {
-        if (res.code == 200) {
-          this.fuchaxiangmu();
-        }
-      });
+    handledeleteClick() {
+      UpdFcPro(data).then((res) => {});
     },
 
     handlexmChange(selection) {
@@ -2227,77 +2478,164 @@
       this.xmChange = selection;
       if (selection.length > 1) {
         let del_row = selection.shift();
-        this.$refs.elTable.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+        this.$refs.elTable.toggleRowSelection(del_row, false);
       }
     },
+
     submitFormxm() {
       this.xmopen = false;
     },
+
     cancels() {
       this.xmopen = false;
       this.xmChange = [];
     },
+
+    getExpends() {
+      this.expends = this.yichangList.flatMap((item) =>
+        item.sone.map((soneItem) => soneItem.orderDetailId)
+      );
+    },
+
+    getConfigKey() {
+      getconfigKey("sfkqtwbg").then((res) => {
+        this.msgtuwen = res.msg;
+      });
+      getconfigKey("sfkqjqwz").then((res) => {
+        this.msgjianqian = res.msg;
+      });
+      getconfigKey("kcf").then((res) => {
+        this.msgkcf = res.msg;
+      });
+    },
+
+    getRowKeys(row) {
+      return row.orderDetailId;
+    },
+
+    xiangmuqingkuang() {
+      this.loading = true;
+      cSWebGetPro(this.tjNumber)
+        .then((res) => {
+          this.status1 = 1;
+          this.statusList = res.data;
+          if (this.statusList.length == 0) {
+            this.$message.success("鏆傛棤椤圭洰鎯呭喌");
+          }
+        })
+        .catch((error) => {
+          console.error("鑾峰彇椤圭洰鎯呭喌澶辫触:", error);
+          this.$message.error("鑾峰彇椤圭洰鎯呭喌澶辫触");
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+
     guanbi() {
       this.drawer = false;
     },
+
     yichangjieguo() {
-      this.isLoading = true;
+      this.loading = true;
       this.status1 = 0;
-      let _this = this;
       yichang({
         tjNum: this.tjNumber,
       })
         .then((res) => {
-          this.isLoading = false;
           this.yichangList = res.data;
-
-          // console.log(this.yichangList, 3232);
-          this.getExpends();
-
           this.yichangList.forEach((item) => {
             item.sone.forEach((soneItem) => {
               if (
                 !Array.isArray(soneItem.advices) ||
                 soneItem.advices.length === 0
               ) {
-                // 濡傛灉 advices 鏄┖锛岃缃粯璁ゅ��
-                soneItem.advices = [
-                  {
-                    bt: "",
-                    nr: "",
-                  },
-                ];
+                soneItem.advices = [{ bt: "", nr: "" }];
               }
             });
           });
-
           if (!this.yichangList) {
-            _this.$message({
-              type: "warning ",
-              message: "鏆傛棤寮傚父鎶ュ憡",
-            });
+            this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
           }
         })
         .catch((error) => {
-          this.isLoading = false;
           console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error);
           this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触");
         })
         .finally(() => {
-          this.isLoading = false;
           this.loading = false;
         });
     },
+
+    fuchaxiangmu() {
+      this.loading = true;
+      this.status1 = 2;
+      let data = {
+        tjNum: this.tjNumber,
+        type: 1,
+      };
+      getFcList(data)
+        .then((res) => {
+          this.fcList = res.data;
+        })
+        .catch((error) => {
+          console.error("鑾峰彇澶嶆煡椤圭洰澶辫触:", error);
+          this.$message.error("鑾峰彇澶嶆煡椤圭洰澶辫触");
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+
+    yichanghuifu() {
+      this.loading = true;
+      let tjNum = this.tjNumber;
+      huiFuyichangxiangmu(tjNum).then((res) => {
+        this.status1 = 4;
+        this.ychfList = res.data;
+        if(this.ychfList.length == 0){
+          this.message.success("鏆傛棤寮傚父鎭㈠椤圭洰")
+        }
+      })
+      .catch((error)=>{
+        console.error("鑾峰彇椤圭洰澶辫触锛�",error);
+        
+        this.$message.error("鑾峰彇椤圭洰澶辫触")
+      })
+      .finally(()=>{
+        this.loading = false;
+      })
+    },
+    hfyc(id) {
+      this.$confirm("纭瑕佹仮澶嶈椤瑰悧锛�", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          // 鐢ㄦ埛纭鍚庢墽琛屾帴鍙�
+          hfbt({ id })
+            .then((res) => {
+              this.$message.success("鎭㈠鎴愬姛");
+              this.yichanghuifu(); // 鎭㈠鍚庡埛鏂板垪琛�
+            })
+            .catch((err) => {
+              console.error(err);
+              this.$message.error("鎭㈠澶辫触");
+            });
+        })
+        .catch(() => {
+          // 鐢ㄦ埛鍙栨秷浜嗘搷浣�
+          this.$message.info("宸插彇娑堟仮澶�");
+        });
+    },
+
     getdate() {
       getNewDateList().then((res) => {
-        /* this.startTime = [
-          moment(res.data).format("YYYY-MM-DD 00:00:00"),
-          moment(res.data).format("YYYY-MM-DD 23:59:00"),
-        ]; */
         this.getList();
       });
     },
-    // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
+
     getNowTime() {
       var curDate = new Date().getTime();
       var dayNum = 7 * 24 * 3600 * 1000;
@@ -2306,9 +2644,11 @@
       var end = this.getLocalTime(curDate);
       this.startTime = [sDay, end];
     },
+
     add0(m) {
       return m < 10 ? "0" + m : m;
     },
+
     getLocalTime(nS) {
       var time = new Date(nS);
       var y = time.getFullYear();
@@ -2328,6 +2668,7 @@
         this.add0(mm)
       );
     },
+
     jianqian() {
       this.flags = true;
       this.jianqians = true;
@@ -2347,28 +2688,28 @@
         this.queryParams.endTime = null;
       }
 
-      // 椤甸潰鏁版嵁
       getcheckList(this.queryParams).then((response) => {
         if (response.code == 200) {
-          this.loading = false;
+          // this.loading = false;
           if (response.data) {
             if (response.data.date) {
+              this.loading = false;
               this.checkList = response.data.date;
             } else {
+              this.loading = false;
               this.checkList = response.data.customers;
             }
-
             this.total = response.data.total;
           } else {
             this.checkList = [];
           }
         }
-      }),
-        // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
-        getCompany(this.queryParam).then((response) => {
-          this.CompanyList = response.data;
-          this.loading = false;
-        });
+      });
+
+      getCompany(this.queryParam).then((response) => {
+        this.CompanyList = response.data;
+        // this.loading = false;
+      });
     },
 
     viewReport(row) {
@@ -2388,13 +2729,12 @@
                 loading.close();
               }, 3000);
               this.$message({
-                message: "鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
+                message: "璇锋挙鍥為噸鏂扮敓鎴愭姤鍛�",
                 type: "error",
               });
             } else {
               this.dialogVisible = true;
-
-              this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+              this.url = window.webkitURL.createObjectURL(response);
             }
           });
         } else {
@@ -2410,45 +2750,53 @@
     },
 
     Graphicreport() {
+      this.loading = true;
       let dictType = "dict_ageunit";
-      getDicts(dictType).then((res) => {
-        if (res.code == 200) {
-          res.data.forEach((item) => {
-            if (this.tableAll.age_unit == item.dictValue) {
-              this.tableAll.age_unit = item.dictLabel;
-            }
-          });
-          let dictTypes = "sys_user_sex";
-          getDicts(dictTypes).then((res) => {
-            if (res.code == 200) {
-              res.data.forEach((item) => {
-                if (this.tableAll.cusSex == item.dictValue) {
-                  this.tableAll.cusSex = item.dictLabel;
-                }
-              });
-              let data = {
-                patname: this.tableAll.cusName,
-                sex: this.tableAll.cusSex,
-                patage: this.tableAll.age,
-                patagename: this.tableAll.age_unit,
-                patbirth: this.tableAll.cusBrithday,
-              };
-              // let data = {
-              //   patname: "鑴辫兘濞�",
-              //   sex: "濂�",
-              //   patage: "60",
-              //   patagename: "宀�",
-              //   patbirth: "1963-01-01"
-              // }
-              getTjYxjcList(data).then((res) => {
-                this.baogao = res.data;
-              });
-              this.$refs.bbb.open = true;
-              this.$refs.bbb.title = "鎶ュ憡瀛楀吀";
-            }
-          });
-        }
-      });
+      getDicts(dictType)
+        .then((res) => {
+          if (res.code == 200) {
+            res.data.forEach((item) => {
+              if (this.tableAll.age_unit == item.dictValue) {
+                this.tableAll.age_unit = item.dictLabel;
+              }
+            });
+            let dictTypes = "sys_user_sex";
+            return getDicts(dictTypes);
+          } else {
+            throw new Error("鑾峰彇骞撮緞鍗曚綅瀛楀吀澶辫触");
+          }
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            res.data.forEach((item) => {
+              if (this.tableAll.cusSex == item.dictValue) {
+                this.tableAll.cusSex = item.dictLabel;
+              }
+            });
+            let data = {
+              patname: this.tableAll.cusName,
+              sex: this.tableAll.cusSex,
+              patage: this.tableAll.age,
+              patagename: this.tableAll.age_unit,
+              patbirth: this.tableAll.cusBrithday,
+            };
+            return getTjYxjcList(data);
+          } else {
+            throw new Error("鑾峰彇鎬у埆瀛楀吀澶辫触");
+          }
+        })
+        .then((res) => {
+          this.baogao = res.data;
+          this.$refs.bbb.open = true;
+          this.$refs.bbb.title = "鎶ュ憡瀛楀吀";
+        })
+        .catch((error) => {
+          console.error("鐢熸垚鍥炬枃鎶ュ憡澶辫触:", error);
+          this.$message.error("鐢熸垚鍥炬枃鎶ュ憡澶辫触");
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
 
     historicalreport() {
@@ -2456,58 +2804,63 @@
       let data = {
         cusId: this.tableAll.cusId,
       };
-      reportHistory(data).then((res) => {
-        this.loading = false;
-        if (res.data[0] != null) {
-          this.reportHistorydata = res.data;
-        } else {
-          this.reportHistorydata = [];
-        }
-      });
+      reportHistory(data)
+        .then((res) => {
+          if (res.data[0] != null) {
+            this.reportHistorydata = res.data;
+          } else {
+            this.reportHistorydata = [];
+          }
+        })
+        .catch((error) => {
+          console.error("鑾峰彇鍘嗗彶鎶ュ憡澶辫触:", error);
+          this.$message.error("鑾峰彇鍘嗗彶鎶ュ憡澶辫触");
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
 
     medicalhistory() {
+      this.loading = true;
       this.status1 = 3;
       let tjNumber = this.tableAll.tjNumber;
-      getInfoById(tjNumber).then((response) => {
-        this.formobj = response.data;
-        if (this.formobj.xiyan == null) {
-          this.formobj.xiyan = "1";
-        }
-        if (this.formobj.xiyanpinlv == null) {
-          this.formobj.xiyanpinlv = "0";
-        }
-        if (this.formobj.xiyanyear == null) {
-          this.formobj.xiyanyear = "0";
-        }
-        if (this.formobj.yinjiu == null) {
-          this.formobj.yinjiu = "1";
-        }
-        if (this.formobj.yinjiupinlv == null) {
-          this.formobj.yinjiupinlv = "0";
-        }
-        if (this.formobj.yinjiuyear == null) {
-          this.formobj.yinjiuyear = "0";
-        }
-      });
+      getInfoById(tjNumber)
+        .then((response) => {
+          this.formobj = response.data;
+          if (this.formobj.xiyan == null) {
+            this.formobj.xiyan = "1";
+          }
+          if (this.formobj.xiyanpinlv == null) {
+            this.formobj.xiyanpinlv = "0";
+          }
+          if (this.formobj.xiyanyear == null) {
+            this.formobj.xiyanyear = "0";
+          }
+          if (this.formobj.yinjiu == null) {
+            this.formobj.yinjiu = "1";
+          }
+          if (this.formobj.yinjiupinlv == null) {
+            this.formobj.yinjiupinlv = "0";
+          }
+          if (this.formobj.yinjiuyear == null) {
+            this.formobj.yinjiuyear = "0";
+          }
+        })
+        .catch((error) => {
+          console.error("鑾峰彇鑱屼笟鐥呭彶澶辫触:", error);
+          this.$message.error("鑾峰彇鑱屼笟鐥呭彶澶辫触");
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
-    // viewReport(row) {
-    //   const tjNumber = row.tjNumber;
-    //   const viewNum = "792997692059705344";
-    //   const params = { viewNum, tjNumber };
-    //   hasReportEnd(tjNumber).then((res) => {
-    //     if (res == 1) {
-    //       this.$tab.openPage("浣撴鎶ュ憡", "/report/viewReport", params);
-    //     } else {
-    //       this.$message.error("璇ョ敤鎴蜂綋妫�鏆傛湭瀹屾垚锛屾棤娉曟墦鍗颁綋妫�鎶ュ憡锛�");
-    //     }
-    //   });
-    // },
+
     downLoadFileImg(row) {
       const tjNumber = row.tjNumber;
       const flag = true;
       getPdf(tjNumber, flag).then((response) => {
-        this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+        this.url = window.webkitURL.createObjectURL(response);
       });
     },
 
@@ -2521,7 +2874,6 @@
       this.$refs.Pre.title = "澶勬柟";
     },
 
-    // 鍗曢�夋寜閽�
     radioChange(value) {
       this.loading = true;
       this.queryParams.checkStatus = value;
@@ -2537,26 +2889,27 @@
         this.loading = false;
       });
     },
+
     propoChange() {
       this.cusobj = { sex: this.tableAll.cusSex, isZj: 0 };
       this.$refs.proposal.open = true;
       this.$refs.proposal.title = "寤鸿鏂规";
-      // this.$refs.proposal.getList();
     },
+
     eventchange(data) {
       this.dataText = data;
-      console.log(data, 6655);
-
       if (this.textarea1 == null) {
         this.textarea1 = "";
       }
-      /* data.forEach((item) => {
-        this.textarea1 += item.advice;
-      }); */
       data.forEach((item) => {
-        this.textarea1 += (item.advice || item.jynr || "") + "\n";
+        if (item.advice) {
+          this.textarea1 += item.advice;
+        } else {
+          this.textarea1 += item.jynr;
+        }
       });
     },
+
     proposalChange() {
       if (this.textarea1) {
         this.creatobj = { proParentList: this.textarea1, isZj: 0 };
@@ -2564,16 +2917,16 @@
         this.$refs.createproposal.title = "甯哥敤寤鸿缁存姢";
       } else {
         this.$message({
-          type: "warning ",
+          type: "warning",
           message: "璇峰厛濉啓鎬绘寤鸿",
         });
       }
     },
+
     radiotjprojectChange() {
       if (this.tjproject == "0") {
         getupdateCheckType(this.tjNumber).then((response) => {
           this.changedate = response.data;
-
           this.changedate.forEach((item) => {
             this.textarea1 = item.checkAdvice;
           });
@@ -2581,21 +2934,9 @@
             for (let i = 0; i < this.changedate.length; i++) {
               this.remark = this.changedate[i].remark;
             }
-            this.changedate.forEach((item) => {
-              // this.remark = item.remark;
-              // item.sons.forEach((item3) => {
-              //   if (item3.standard.tjStandardGtValue === null) {
-              //     item3.standard.tjStandardGtValue = "";
-              //   }
-              //   if (item3.standard.tjStandardLtValue === null) {
-              //     item3.standard.tjStandardLtValue = "";
-              //   }
-              // });
-              // item.remark = "";
-            });
           } else {
             this.$message({
-              type: "warning ",
+              type: "warning",
               message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
             });
           }
@@ -2603,9 +2944,7 @@
       } else if (this.tjproject == "1") {
         getupdateCheckTypeHuaYan(this.tjNumber).then((res) => {
           if (res.data) {
-            // this.Testitems = res.data
             this.changedate = res.data;
-
             this.changedate.forEach((item) => {
               this.textarea1 = item.checkAdvice;
             });
@@ -2613,22 +2952,10 @@
               for (let i = 0; i < this.changedate.length; i++) {
                 this.remark = this.changedate[i].remark;
               }
-              this.changedate.forEach((item) => {
-                // this.remark = item.remark;
-                item.sons.forEach((item3) => {
-                  // if (item3.standard.tjStandardGtValue === null) {
-                  //   item3.standard.tjStandardGtValue = "";
-                  // }
-                  // if (item3.standard.tjStandardLtValue === null) {
-                  //   item3.standard.tjStandardLtValue = "";
-                  // }
-                });
-                // item.remark = "";
-              });
             }
           } else {
             this.$message({
-              type: "warning ",
+              type: "warning",
               message: "璇ュ鎴锋病鏈夊寲楠岄」鐩暟鎹�",
             });
           }
@@ -2636,7 +2963,6 @@
       }
     },
 
-    // 浣撴鍏徃鎷奸煶鎼滅储
     getRemoteData(query) {
       if (query) {
         let compName = query;
@@ -2646,12 +2972,10 @@
       }
     },
 
-    // 閫夋鏁版嵁
     searchSelect(val) {
       this.CheckBox = val;
     },
 
-    // 鏃堕棿
     dateChangebirthday1(val) {
       this.startTime = val;
     },
@@ -2662,9 +2986,7 @@
       }
     },
 
-    // 鎼滅储
     submitForm() {
-      console.log(this.tjStatus);
       this.loading = true;
       this.queryParams.compId = this.CheckBox.drugManufacturerId;
       this.queryParams.checkStatus = this.tjStatus;
@@ -2676,7 +2998,6 @@
         this.queryParams.endTime = null;
       }
 
-      // 椤甸潰鏁版嵁
       getcheckList(this.queryParams).then((response) => {
         if (response.code == 200) {
           this.loading = false;
@@ -2685,7 +3006,6 @@
             this.checkList.forEach((item) => {
               this.tjStatus = item.tjStatus.toString();
             });
-
             this.total = response.data.total;
           } else {
             this.checkList = [];
@@ -2693,61 +3013,66 @@
         }
       });
     },
-    // 閲嶇疆
+
     resetQuery() {
       this.startTime = [];
       this.resetForm("tableList");
       this.submitForm();
     },
+
+    huifu(row) {
+      const tjNUm = this.tjNumber;
+      const proId = row.proId;
+      huifu(tjNUm, proId).then((res) => {
+        if (res.code == 200) {
+          this.xiangmuqingkuang();
+        }
+      });
+    },
+
     changRed({ row }) {
       if (row.ycbz != "" && row.ycbz != null) {
-        // 鍙橀鑹茬殑鏉′欢
         return {
-          color: "red", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+          color: "red",
         };
       }
     },
+
     red() {
       return {
         color: "red",
       };
     },
+
     redxiangmu({ row }) {
       if (row.type != 1) {
-        // 鍙橀鑹茬殑鏉′欢
         return {
-          backgroundColor: "#AAD8DF !important", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
-          // color: "#AAD8DF ",
+          backgroundColor: "#AAD8DF !important",
         };
       }
     },
-    /*  changRed(row) {
-      if (row.label === "鈫�") {
-        return {
-          color: "green", // 璁剧疆涓婄澶翠负缁胯壊
-        };
-      } else if (row.label === "鈫�") {
-        return {
-          color: "red", // 璁剧疆涓嬬澶翠负绾㈣壊
-        };
-      }
-      // 榛樿棰滆壊
-      return {
-        color: "black",
-      };
-    }, */
+
     handleCurrentChange(val) {
       if (val != null) {
         this.handleClick(val);
       }
     },
 
-    // 鐐瑰嚮璇︽儏
+    qingkong() {
+      this.tableAll = {};
+      this.changedate = [];
+      this.yichangList = [];
+      this.statusList = [];
+      this.xmChange = [];
+      this.fcList = [];
+      this.formobj = {};
+    },
+
     handleClick(row) {
+      this.qingkong();
       this.$refs.Pre.open = false;
       this.tableAll = row;
       this.tjproject = "0";
-
       this.tjNumber = this.tableAll.tjNumber;
 
       getState(this.tjNumber).then((res) => {
@@ -2774,34 +3099,25 @@
                       this.changedate.forEach((item) => {
                         this.textarea1 = item.checkAdvice || "";
                       });
-
-                      // 杩欓噷璁剧疆鍒濆鍊�
-                      this.initialTotalCheckAdvice = this.textarea1; // 淇濆瓨鎬绘寤鸿
-
-                      // 淇濆瓨鍒濆鐘舵��
+                      this.initialTotalCheckAdvice = this.textarea1;
                       this.initialState = JSON.parse(
                         JSON.stringify(this.changedate)
                       );
-
                       for (let i = 0; i < this.changedate.length; i++) {
                         this.remark = this.changedate[i].remark;
                       }
-                      this.changedate.forEach((item) => {
-                        // this.remark = item.remark;
-                        // item.sons.forEach((item3) => {
-                        //   if (item3.standard.tjStandardGtValue === null) {
-                        //     item3.standard.tjStandardGtValue = "";
-                        //   }
-                        //   if (item3.standard.tjStandardLtValue === null) {
-                        //     item3.standard.tjStandardLtValue = "";
-                        //   }
-                        // });
-                      });
+                      // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
+                      this.zhiyeJl = response.data.zhiyeJl || "";
+                      this.zhiyeJg =
+                        response.data.zhiyeJg || "鏈彂鐜扮洰鏍囨�х柧鐥�";
                     } else {
                       this.$message({
-                        type: "warning ",
+                        type: "warning",
                         message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
                       });
+                      // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
+                      this.zhiyeJl = "";
+                      this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
                     }
                   });
                 });
@@ -2821,7 +3137,6 @@
                 this.yichangjieguo();
                 getInfo().then((response) => {
                   this.userId = response.user.userId;
-
                   if (this.userId) {
                     let data = {
                       userId: this.userId,
@@ -2842,31 +3157,21 @@
                           this.initialState = JSON.parse(
                             JSON.stringify(this.changedate)
                           );
-
                           this.changedate.forEach((item) => {
                             this.textarea1 = item.checkAdvice || "";
-
-                            // this.remark = item.remark;
-                            // item.sons.forEach((item3) => {
-                            //   if (item3.standard.tjStandardGtValue === null) {
-                            //     item3.standard.tjStandardGtValue = "";
-                            //   }
-                            //   if (item3.standard.tjStandardLtValue === null) {
-                            //     item3.standard.tjStandardLtValue = "";
-                            //   }
-                            // });
-                            // item.remark = "";
                           });
-
-                          // 淇濆瓨鎬绘寤鸿
-                          this.totalCheckAdvice = this.changedate.map(
-                            (item) => item.totalCheckAdvice
-                          );
+                          // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
+                          this.zhiyeJl = response.data.zhiyeJl || "";
+                          this.zhiyeJg =
+                            response.data.zhiyeJg || "鏈彂鐜扮洰鏍囨�х柧鐥�";
                         } else {
                           this.$message({
-                            type: "warning ",
+                            type: "warning",
                             message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
                           });
+                          // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
+                          this.zhiyeJl = "";
+                          this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
                         }
                       });
                     });
@@ -2879,336 +3184,52 @@
                   message: "宸插彇娑堣繘鍏�",
                 });
               });
-
-            this.drawer = false;
           }
-        } else {
-          this.drawer = true;
-          this.yichangjieguo();
-          getInfo().then((response) => {
-            this.userId = response.user.userId;
-
-            if (this.userId) {
-              let data = {
-                userId: this.userId,
-                tjNumber: this.tjNumber,
-                state: 0,
-              };
-              getforceIn(data).then((res) => {
-                this.MsgId = res.msg;
-                this.drawer = true;
-                getupdateCheckType(this.tjNumber).then((response) => {
-                  this.changedate = response.data;
-                  if (this.changedate) {
-                    for (let i = 0; i < this.changedate.length; i++) {
-                      this.remark = this.changedate[i].remark;
-                    }
-                    this.initialState = JSON.parse(
-                      JSON.stringify(this.changedate)
-                    );
-
-                    this.changedate.forEach((item) => {
-                      this.textarea1 = item.checkAdvice || "";
-
-                      // this.remark = item.remark;
-                      // item.sons.forEach((item3) => {
-                      //   if (item3.standard.tjStandardGtValue === null) {
-                      //     item3.standard.tjStandardGtValue = "";
-                      //   }
-                      //   if (item3.standard.tjStandardLtValue === null) {
-                      //     item3.standard.tjStandardLtValue = "";
-                      //   }
-                      // });
-                      // item.remark = "";
-                    });
-
-                    // 淇濆瓨鎬绘寤鸿
-                    this.totalCheckAdvice = this.changedate.map(
-                      (item) => item.totalCheckAdvice
-                    );
-                  } else {
-                    this.$message({
-                      type: "warning ",
-                      message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
-                    });
-                  }
-                });
-              });
-            }
-          });
-        }
-      });
-
-      // 鑾峰彇灏忕粨
-      // getDeptAdvice().then((response) => {
-      //   response.data.forEach((item) => {
-      //     this.DeptadviceAll = item;
-      //   });
-      // });
-    },
-    // 鎾ら攢
-    getRevoke(row) {
-      this.loading = true;
-      const tjNumber = row.tjNumber;
-      revoke(tjNumber).then((response) => {
-        this.$modal.msgSuccess("鎾ゅ洖鎴愬姛");
-        if (response.code == 200) {
-          this.loading = false;
-          this.getList();
         }
       });
     },
 
-    
-    addAdvice() {
-      this.newItem.map.push({ bt: '', nr: '' });
-    },
-
-     removeAdvice(index) {
-      if (this.newItem.map.length > 1) {
-        this.newItem.map.splice(index, 1);
-      } else {
-        this.$message.warning('鑷冲皯淇濈暀涓�缁勫缓璁�');
-      }
-    },
-
-    submitNewItem() {
-      const data = {
-        tjh: this.tableAll.tjNumber,
-        parentName: this.newItem.parentName,
-        jcxm: this.newItem.jcxm,
-        jcjg: this.newItem.jcjg,
-        ckfw: this.newItem.ckfw,
-        dw: this.newItem.dw,
-        map: this.newItem.map,
-        jyjc: this.newItem.ckfw ? "0" : "1"
-      };
-
-      addOrder1(data).then((res) => {
-        if (res.code === 200) {
-          this.$message.success('鏂板寮傚父缁撴灉鎴愬姛');
-          this.addNewDialogVisible = false;
-          this.yichangjieguo();
-        } else {
-          this.$message.error('鏂板澶辫触');
-        }
-      }).catch((error) => {
-        console.error('鏂板寮傚父缁撴灉澶辫触:', error);
-        this.$message.error('鏂板寮傚父缁撴灉澶辫触');
-      });
-    },
-
-
-     addnew() {
-      this.newItem = {
-        parentName: '',
-        jcxm: '',
-        jcjg: '',
-        ckfw: '',
-        dw: '',
-        map: [{ bt: '', nr: '' }]
-      };
-      this.addNewDialogVisible = true;
-
-      cSWebGetPro(this.tjNumber).then((res) => {
-        if (res.data && Array.isArray(res.data)) {
-          this.projectCategories = res.data;
-        } else {
-          this.$message.warning('鏈幏鍙栧埌椤圭洰鍒嗙被鏁版嵁');
-          this.projectCategories = [];
-        }
-      }).catch((error) => {
-        console.error('鑾峰彇椤圭洰鍒嗙被澶辫触:', error);
-        this.$message.error('鑾峰彇椤圭洰鍒嗙被澶辫触');
-        this.projectCategories = [];
-      });
-    },
-
-    cancel() {
-      this.propdialog = false;
-    },
-
-    // 鏄惁鍏抽棴寮圭獥
     handleClose(done) {
-      if (this.loading) {
-        return;
-      }
-
-      // 妫�鏌ユ槸鍚︽湁淇敼
-      let isModified =
-        JSON.stringify(this.changedate) !== JSON.stringify(this.initialState) ||
-        (this.textarea1 !== this.initialTotalCheckAdvice &&
-          this.textarea1 !== null);
-      console.log("Initial Total Check Advice:", this.initialTotalCheckAdvice);
-
-      console.log("Current textarea1:", this.textarea1);
-      if (isModified) {
-        // 濡傛灉鏈変慨鏀癸紝寮瑰嚭纭妗�
-        this.$confirm("妫�娴嬪唴瀹规湁淇敼锛岀‘瀹氳鎻愪氦鍚楋紵")
+      if (
+        JSON.stringify(this.initialState) !== JSON.stringify(this.changedate) ||
+        this.initialTotalCheckAdvice !== this.textarea1
+      ) {
+        this.$confirm("鎮ㄦ湁鏈繚瀛樼殑鏇存敼锛岀‘瀹氳鍏抽棴鍚楋紵", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning",
+        })
           .then(() => {
-            this.loading = true;
-            this.timer = setTimeout(() => {
-              done();
-              this.determine();
-              setTimeout(() => {
-                this.loading = false;
-              }, 400);
-            }, 2000);
-          })
-          .catch(() => {
-            // 鐢ㄦ埛鍙栨秷鎿嶄綔
-            this.drawer = false;
             let data = {
               userId: this.userId,
               tjNumber: this.tjNumber,
               state: 1,
-              id: this.MsgId,
             };
-            getfiedState(data).then((res) => {});
-            this.submitForm();
-          });
+            getfiedState(data).then((res) => {
+              this.drawer = false;
+              done();
+            });
+          })
+          .catch(() => {});
       } else {
-        // 濡傛灉娌℃湁淇敼锛岀洿鎺ュ叧闂�
-        done();
+        let data = {
+          userId: this.userId,
+          tjNumber: this.tjNumber,
+          state: 1,
+        };
+        getfiedState(data).then((res) => {
+          this.drawer = false;
+          done();
+        });
       }
     },
-    handleClose1() {
+
+    handleClose1(done) {
       this.jianqians = false;
+      this.flags = false;
+      done();
     },
-    // 鐢熸垚鎶ュ憡
-    // generate(row) {
-    //   const tjNumber = row.tjNumber;
-    //   getGenerate(tjNumber).then((response) => {
-    //     this.$modal.msgSuccess("鐢熸垚鎴愬姛");
-    //   });
-    // },
-    // xiAoJieChange(event) {
-    //   if (event) {
-    //     this.changedate.forEach((item) => {
-    //       item.remark = "";
-    //       item.parentAdvice.forEach((item1) => {
-    //         event.forEach((item2) => {
-    //           if (item2 == item1.id) {
-    //             item.remark = item.remark + item1.advice + "銆�";
-    //           }
-    //         });
-    //       });
-    //     });
-    //   }
-    // },
-    change(vale) {},
 
-    // determine() {
-    //   let tjNumber = this.tableAll.tjNumber;
-    //   let tjh = this.tableAll.tjNumber;
-    //   // let jyjc = this.yichangList.map(item => item.jyjc || null);
-    //   let advice = this.textarea1;
-    //   let data = {
-    //     tjNumber,
-    //     advice,
-    //     checkStatus: 1,
-    //   };
-
-    //   console.log(this.yichangList, 66);
-
-    //   let dataList = this.yichangList
-    //     .map((item) => {
-    //       return item.sone.map((soneItem) => ({
-    //         tjh,
-    //         parentName: item.proName,
-    //         jcxm: soneItem.proName,
-    //         map: soneItem.advices,
-    //         jyjc: item.jyjc, // assuming jyjc belongs to the outer item, not soneItem
-    //         jcjg: soneItem.proResult,
-    //         ckfw: soneItem.stanId,
-    //         dw: soneItem.proAdvice,
-    //       }));
-    //     })
-    //     .flat(); // 浣跨敤 flat() 鏂规硶灏嗗祵濂楁暟缁勫睍骞�
-    //   console.log(dataList, 777);
-
-    //   /*  addOrder(dataList).then((res) => {
-    //     console.log(res, 999);
-    //   }); */
-    //   getTjdetailList(data)
-    //     .then((response) => {
-    //       if (response.code === 200) {
-    //         this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-
-    //         // 鍑嗗鐢熸垚鎶ュ憡鐨勮姹傛暟鎹�
-    //         let reportData = {
-    //           userId: this.userId,
-    //           tjNumber: tjNumber,
-    //           state: 1,
-    //           id: this.MsgId,
-    //         };
-
-    //         // 鐢熸垚鎶ュ憡骞朵繚鎸� loading 鎵撳紑
-    //         const reportPromise = gettoPdf(tjNumber)
-    //           .then((res) => {
-    //             this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�");
-    //           })
-    //           .catch((error) => {
-    //             this.$modal.msgError(
-    //               "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
-    //             );
-    //           });
-
-    //         // 鏇存柊鐘舵�佸苟鎻愪氦淇敼璇锋眰
-    //         const statePromise = getfiedState(reportData).then((res) => {
-    //           this.drawer = false;
-    //         });
-
-    //         // const addOrderPromise = addOrder(dataList).then((res) => {
-    //         //   console.log(res, 999);
-    //         // });
-
-    //         // 澶勭悊鍏朵粬淇敼鎿嶄綔
-    //         const updatePromises = this.changedate.map((item) => {
-    //           this.proIds = item.parentId;
-    //           let remarks = item.remark;
-    //           let updateOrderRemarkVos = [
-    //             {
-    //               tjNumber,
-    //               proId: this.proIds.toString(),
-    //               remarks,
-    //             },
-    //           ];
-    //           return getModified(updateOrderRemarkVos); // 杩斿洖 Promise
-    //         });
-
-    //         // 绛夊緟鎵�鏈夎姹傚畬鎴�
-    //         Promise.all([
-    //           reportPromise,
-    //           statePromise,
-    //           // addOrderPromise,
-    //           ...updatePromises,
-    //         ])
-    //           .then(() => {
-    //             // 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
-    //             this.loading = false;
-    //             // 鏇存柊鍒嗛〉淇℃伅
-    //             this.queryParams.page = 1;
-    //             this.queryParams.pageSize = 10;
-    //             this.submitForm();
-    //             this.$forceUpdate();
-    //           })
-    //           .catch((error) => {
-    //             // 澶勭悊閿欒鎯呭喌
-    //             this.loading = false;
-    //             console.error("鍙戠敓閿欒:", error);
-    //           });
-    //       } else {
-    //         // 鎻愪氦澶辫触锛屽叧闂� loading
-    //         this.loading = false;
-    //       }
-    //     })
-    //     .catch((error) => {
-    //       // 鎻愪氦璇锋眰澶辫触锛屽叧闂� loading
-    //       this.loading = false;
-    //       console.error("鎻愪氦璇锋眰澶辫触:", error);
-    //     });
-    // },
     determine() {
       let tjNumber = this.tableAll.tjNumber;
       let tjh = this.tableAll.tjNumber;
@@ -3217,10 +3238,9 @@
         tjNumber,
         advice,
         checkStatus: 1,
+        zhiyeJl: this.zhiyeJl, // 娣诲姞妫�鏌ョ粨璁�
+        zhiyeJg: this.zhiyeJg, // 娣诲姞浣撴缁撴灉
       };
-
-      console.log(this.yichangList, 6644);
-
       let dataList = this.yichangList
         .map((item) => {
           return item.sone.map((soneItem) => ({
@@ -3234,14 +3254,17 @@
             dw: soneItem.proAdvice,
           }));
         })
-        .flat(); // 浣跨敤 flat() 鏂规硶灏嗗祵濂楁暟缁勫睍骞�
+        .flat();
 
+      this.loading = true;
       getTjdetailList(data)
         .then((response) => {
           if (response.code === 200) {
             this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+            // 娓呯┖瀛楁
+            this.zhiyeJl = "";
+            this.zhiyeJg = "";
 
-            // 鍑嗗鐢熸垚鎶ュ憡鐨勮姹傛暟鎹�
             let reportData = {
               userId: this.userId,
               tjNumber: tjNumber,
@@ -3249,12 +3272,8 @@
               id: this.MsgId,
             };
 
-            // 璋冪敤 addOrderPromise
-            console.log(dataList, 5555);
-
             addOrder(dataList)
               .then((res) => {
-                console.log(res, 999);
                 if (res.code == 200) {
                   gettoPdf(tjNumber)
                     .then((res) => {
@@ -3280,41 +3299,60 @@
                         remarks,
                       },
                     ];
-                    return getModified(updateOrderRemarkVos); // 杩斿洖 Promise
+                    return getModified(updateOrderRemarkVos);
                   });
 
-                  // 绛夊緟鎵�鏈夎姹傚畬鎴�
                   Promise.all([statePromise, ...updatePromises])
                     .then(() => {
-                      // 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
                       this.loading = false;
-                      // 鏇存柊鍒嗛〉淇℃伅
                       this.queryParams.page = 1;
                       this.queryParams.pageSize = 10;
                       this.submitForm();
                       this.$forceUpdate();
                     })
                     .catch((error) => {
-                      // 澶勭悊閿欒鎯呭喌
                       this.loading = false;
                       console.error("鍙戠敓閿欒:", error);
                     });
                 }
               })
               .catch((error) => {
-                // 濡傛灉 addOrderPromise 澶辫触锛屽鐞嗛敊璇�
                 this.loading = false;
                 console.error("addOrderPromise 澶辫触:", error);
               });
           } else {
-            // 鎻愪氦澶辫触锛屽叧闂� loading
             this.loading = false;
+            this.$modal.msgError("鎻愪氦澶辫触");
           }
         })
         .catch((error) => {
-          // 鎻愪氦璇锋眰澶辫触锛屽叧闂� loading
           this.loading = false;
           console.error("鎻愪氦璇锋眰澶辫触:", error);
+          this.$modal.msgError("鎻愪氦璇锋眰澶辫触");
+        });
+    },
+
+    getRevoke(row) {
+      this.$confirm("纭鎾ら攢璇ユ姤鍛婂悧锛�", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          revoke(row.tjNumber).then((response) => {
+            if (response.code === 200) {
+              this.submitForm();
+              this.$message.success("鎾ら攢鎴愬姛");
+            } else {
+              this.$message.error("鎾ら攢澶辫触");
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "宸插彇娑堟挙閿�",
+          });
         });
     },
   },
@@ -3470,10 +3508,40 @@
   width: 100%;
   display: flex;
   justify-content: center;
+  /* 纭繚鍒嗛〉鍣ㄦ暣浣撳眳涓� */
+  align-items: center;
+  /* 鍨傜洿灞呬腑 */
+  margin-top: 15px;
+  /* 涓庤〃鏍肩殑闂磋窛 */
+}
+
+.pag2 {
+  width: auto;
+  /* 绉婚櫎鍥哄畾瀹藉害锛岃鍒嗛〉鍣ㄦ牴鎹唴瀹硅嚜閫傚簲 */
+  min-width: 750px;
+  /* 璁剧疆鏈�灏忓搴︼紝纭繚鍒嗛〉鍣ㄤ笉浼氬お绐� */
+  text-align: center;
+  /* 纭繚鍒嗛〉鍣ㄥ唴閮ㄥ厓绱犲眳涓� */
+}
+
+@media (max-width: 750px) {
+  .pag2 {
+    min-width: 300px;
+    /* 绉诲姩绔渶灏忓搴� */
+    overflow-x: auto;
+    /* 鍏佽妯悜婊氬姩 */
+    padding: 10px;
+    /* 绉诲姩绔唴杈硅窛 */
+  }
 }
 
 .pag1 {
-  width: 30%;
+  width: auto;
+  /* 绉婚櫎鍥哄畾瀹藉害锛岃鍒嗛〉鍣ㄦ牴鎹唴瀹硅嚜閫傚簲 */
+  min-width: 300px;
+  /* 璁剧疆鏈�灏忓搴︼紝纭繚鍒嗛〉鍣ㄤ笉浼氬お绐� */
+  text-align: center;
+  /* 纭繚鍒嗛〉鍣ㄥ唴閮ㄥ厓绱犲眳涓� */
 }
 
 .dialog-footers {
@@ -3504,7 +3572,7 @@
 
 .box {
   display: flex;
-  height: calc(100% - 160px);
+  height: calc(100vh - 200px);
   margin-top: 20px;
   overflow: hidden;
 }
@@ -3649,4 +3717,80 @@
 ::v-deep .el-drawer {
   padding: 0 0 50px;
 }
+
+.custom-dialog {
+  ::v-deep .el-dialog__header {
+    padding: 15px 20px;
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #e8ecef;
+  }
+
+  ::v-deep .el-dialog__title {
+    font-size: 18px;
+    color: #303133;
+    font-weight: 600;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 20px; // 澧炲姞鍐呰竟璺�
+    background-color: #fff;
+  }
+
+  ::v-deep .el-dialog__footer {
+    padding: 10px 20px;
+    border-top: 1px solid #e8ecef;
+    text-align: right;
+  }
+
+  .custom-form {
+    .advice-group {
+      border: 1px solid #e8ecef;
+      border-radius: 4px;
+      padding: 10px;
+      margin-bottom: 15px;
+      background-color: #f9fbfc;
+
+      .el-form-item {
+        margin-bottom: 15px;
+      }
+
+      .el-button {
+        margin-top: 5px;
+      }
+    }
+  }
+}
+
+.section-title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #303133;
+  background-color: #f5f7fa;
+  padding: 10px 15px;
+  border-left: 4px solid #409eff;
+  /* 宸︿晶钃濊壊杈规潯锛屽寮鸿瑙夋晥鏋� */
+  margin-bottom: 15px;
+  margin-top: 15px;
+  border-radius: 4px;
+}
+
+.dialog-pager {
+  display: flex;
+  justify-content: center;
+  /* 姘村钩灞呬腑 */
+  align-items: center;
+  /* 鍨傜洿灞呬腑 */
+  margin-top: 15px;
+  /* 涓庤〃鏍肩殑闂磋窛 */
+  padding: 0 20px;
+  /* 澧炲姞鍐呰竟璺濓紝閬垮厤杩囦簬璐磋竟 */
+  box-sizing: border-box;
+  /* 纭繚鍐呰竟璺濅笉褰卞搷瀹藉害 */
+}
+
+// .dialog-pager-inner {
+//   width: auto; /* 鑷�傚簲瀹藉害 */
+//   min-width: 300px; /* 璁剧疆鏈�灏忓搴︼紝纭繚鍒嗛〉鍣ㄤ笉浼氬お绐� */
+//   text-align: center; /* 纭繚鍒嗛〉鍣ㄥ唴閮ㄥ厓绱犲眳涓� */
+// }
 </style>

--
Gitblit v1.8.0