From b30685a3eb902c51cac51d3faabd3b1eb0858098 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 22 Apr 2024 11:23:14 +0800
Subject: [PATCH] SUM

---
 src/components/doctorCheck/CheckSumSug.vue   | 144 ++++++++++---------
 src/components/sumDoctorCheck/ButtonList.vue |  12 +-
 src/components/sumDoctorCheck/SumSug.vue     |  14 +-
 src/views/doctorCheck/doctorCheck.vue        |   1 +
 4 files changed, 94 insertions(+), 77 deletions(-)

diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 6357534..09766c2 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -1,78 +1,83 @@
 <template>
-  <div style="display: flex;">
-    <div :style="`width:${sumWidth}px;`">
-      <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" size="samll" :height="sumHeight"
-        width="100%" border>
-        <el-table-column type="index" width="25" align="center" />
-        <el-table-column prop="summary" label="小结">
-          <template slot="header">
-            <div style="display: flex;justify-content:space-between;">
-              <div>小结</div>
+  <div>
+    <div style="display: flex;">
+      <div :style="`width:${sumWidth}px;`">
+        <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" size="samll" :height="sumHeight"
+          width="100%" border>
+          <el-table-column type="index" width="25" align="center" />
+          <el-table-column prop="summary" label="小结">
+            <template slot="header">
+              <div style="display: flex;justify-content:space-between;">
+                <div>小结</div>
+                <div></div>                
+              </div>
+            </template>
+            <template slot-scope="scope">
               <div style="display: flex;">
-                <div v-show="checkPagePriv(pagePriv.privs, '生成小结')">
-                  <el-button type="primary" class="btnClass" @click="btnMakeDiagnosis" :disabled="doctorBtnDisabled('btnMakeDiagnosis')">生成小结</el-button>
-                </div>
-                <div v-show="checkPagePriv(pagePriv.privs, '新增小结')">
-                  <el-button type="primary" class="btnClass" @click="addSummary" :disabled="doctorBtnDisabled('addSummary')">新增小结</el-button>
-                </div>
-                <div v-show="checkPagePriv(pagePriv.privs, '保存结果')">
-                  <el-button type="primary" class="btnClass" @click="save" :disabled="doctorBtnDisabled('save')">保存结果</el-button>
-                </div>
-                <div v-show="checkPagePriv(pagePriv.privs, '审核')">
-                  <el-button type="primary" class="btnClass" style="min-width: 40px;" @click="audit" :disabled="doctorBtnDisabled('audit')">审核</el-button>
+                <el-input type="textarea" v-model="scope.row.summary" :autosize="{ minRows: 1, maxRows: 100 }"
+                  :disabled="doctorBtnDisabled('delSum')" placeholder="请输入小结">
+                </el-input>
+                <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete"
+                  @click="delSum(scope.$index)" :disabled="doctorBtnDisabled('delSum')" size="small"></el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>        
+      </div>
+      <div style="display: flex; position:absolute; top:0px;right:0px;z-index: 300;">
+                  <div v-show="checkPagePriv(pagePriv.privs, '生成小结')">
+                    <el-button type="primary" class="btnClass" @click="btnMakeDiagnosis"
+                      :disabled="doctorBtnDisabled('btnMakeDiagnosis')">生成小结</el-button>
+                  </div>
+                  <div v-show="checkPagePriv(pagePriv.privs, '新增小结')">
+                    <el-button type="primary" class="btnClass" @click="addSummary"
+                      :disabled="doctorBtnDisabled('addSummary')">新增小结</el-button>
+                  </div>
+                  <div v-show="checkPagePriv(pagePriv.privs, '保存结果')">
+                    <el-button type="primary" class="btnClass" @click="save"
+                      :disabled="doctorBtnDisabled('save')">保存结果</el-button>
+                  </div>
+                  <div v-show="checkPagePriv(pagePriv.privs, '审核')">
+                    <el-button type="primary" class="btnClass" style="min-width: 40px;" @click="audit"
+                      :disabled="doctorBtnDisabled('audit')">审核</el-button>
+                  </div>
+                  <div v-show="checkPagePriv(pagePriv.privs, '排队')">
+                    <el-button type="primary" class="btnClass" style="min-width: 40px;" @click="btnLineUp"
+                      :disabled="doctorBtnDisabled('btnLineUp')">排队</el-button>
+                  </div>
                 </div>
-                <div v-show="checkPagePriv(pagePriv.privs, '排队')">
-                  <el-button type="primary" class="btnClass" style="min-width: 40px;" @click="btnLineUp" :disabled="doctorBtnDisabled('btnLineUp')">排队</el-button>
+
+      <div :style="`margin-left:2px;width:${sumWidth}px;`">
+        <el-table id="tableSuggestion" row-key="id" :data="doctorCheck.checkSuggestionList" size="samll"
+          :height="sumHeight" width="100%" border>
+          <el-table-column type="index" width="25" align="center" />
+          <el-table-column prop="suggestion" label="建议">
+            <template slot="header">
+              <div style="display: flex;justify-content:space-between;">
+                <div>建议</div>
+                <div style="display: flex;">
+                  <div v-show="checkPagePriv(pagePriv.privs, '新增建议')">
+                    <el-button type="primary" class="btnClass" @click="addSuggestion"
+                      :disabled="doctorBtnDisabled('addSuggestion')">新增建议</el-button>
+                  </div>
                 </div>
               </div>
-            </div>
-          </template>
-          <template slot-scope="scope">
-            <div style="display: flex;">
-              <el-input type="textarea" v-model="scope.row.summary" :autosize="{ minRows: 1, maxRows: 100 }"
-                :disabled="doctorBtnDisabled('delSum')"
-                placeholder="请输入小结">
-              </el-input>
-              <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete"
-                @click="delSum(scope.$index)"
-                :disabled="doctorBtnDisabled('delSum')"
-                size="small"></el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div :style="`margin-left:2px;width:${sumWidth}px;`">
-      <el-table id="tableSuggestion" row-key="id" :data="doctorCheck.checkSuggestionList" size="samll" :height="sumHeight"
-        width="100%" border>
-        <el-table-column type="index" width="25" align="center" />
-        <el-table-column prop="suggestion" label="建议">
-          <template slot="header">
-            <div style="display: flex;justify-content:space-between;">
-              <div>建议</div>
+            </template>
+            <template slot-scope="scope">
               <div style="display: flex;">
-                <div v-show="checkPagePriv(pagePriv.privs, '新增建议')">
-                  <el-button type="primary" class="btnClass" @click="addSuggestion"
-                    :disabled="doctorBtnDisabled('addSuggestion')">新增建议</el-button>
-                </div>
+                <el-input type="textarea" v-model="scope.row.suggestion" :autosize="{ minRows: 1, maxRows: 100 }"
+                  :disabled="doctorBtnDisabled('delSug')" placeholder="请输入建议">
+                </el-input>
+                <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete"
+                  @click="delSug(scope.$index)" :disabled="doctorBtnDisabled('delSug')" size="small"></el-button>
               </div>
-            </div>
-          </template>
-          <template slot-scope="scope">
-            <div style="display: flex;">
-              <el-input type="textarea" v-model="scope.row.suggestion" :autosize="{ minRows: 1, maxRows: 100 }"
-                :disabled="doctorBtnDisabled('delSug')"
-                placeholder="请输入建议">
-              </el-input>
-              <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete"
-                @click="delSug(scope.$index)"
-                :disabled="doctorBtnDisabled('delSug')"
-                size="small"></el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
     </div>
+
   </div>
 </template>
 <script>
@@ -82,7 +87,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { getPagePriv, checkPagePriv, deepCopy } from "../../utlis/proFunc";
 export default {
   components: {},
-  props: ["registerCheckId", "isCheckPicture", "optGrant", "addSummary", "btnMakeDiagnosis", "save", "audit", "unAudit", "btnLineUp","doctorBtnDisabled"],
+  props: ["registerCheckId", "isCheckPicture", "optGrant", "addSummary", "btnMakeDiagnosis", "save", "audit", "unAudit", "btnLineUp", "doctorBtnDisabled"],
   data() {
     return {
       pagePriv: {
@@ -275,5 +280,6 @@ export default {
   height: 23px;
   line-height: 1.25;
   padding: 1px 15px 1px 2px;
-}</style>
+}
+</style>
   
\ No newline at end of file
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index e7600e0..cb854ac 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -170,7 +170,7 @@ export default {
             // this.saveSuggestion();
             let body = {
                 patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
-                summaryDoctorId: this.dataTransOpts.tableS.patient_register.summaryDoctorId,
+                summaryDoctorId: this.dataTransOpts.tableS.patient_register.summaryDoctorId||null,
                 summaryDate: this.dataTransOpts.tableS.patient_register.summaryDate,
                 sumSummarys: this.sumDoctorCheck.summaryList,
                 sumSuggestions: this.sumDoctorCheck.suggestionList
@@ -180,7 +180,8 @@ export default {
             postapi(`/api/app/patientregister/UpdatePatientRegisterSummarySuggestion`, body)
                 .then((res) => {
                     if (res.code > -1) {
-                        this.dataTransOpts.tableS.patient_register.completeFlag = '3';
+                        // this.dataTransOpts.tableS.patient_register.completeFlag = '3';
+                        this.dataTransOpts.refresh.patient_register.S++
                     }
                 })
         },
@@ -231,6 +232,7 @@ export default {
                 .then((res) => {
                     if (res.code > -1) {
                         this.dataTransOpts.tableS.patient_register.completeFlag = '2';
+                        // this.dataTransOpts.refresh.patient_register.S++
                     }
                 })
         },
@@ -249,9 +251,9 @@ export default {
             postapi(`/api/app/patientregister/updatepatientregisterauditordoctor`, body)
                 .then((res) => {
                     console.log("audit", res.data);
-                    if (res.code != -1) {
+                    if (res.code > -1) {
                         this.dataTransOpts.tableS.patient_register.isAudit = 'Y';
-                        this.$message({ type: "success", message: `总检审核成功` });
+                        // this.$message({ type: "success", message: `总检审核成功` });
                     }
                 })
                 .catch((err) => {
@@ -275,7 +277,7 @@ export default {
                     console.log("unAudit", res.data);
                     if (res.code != -1) {
                         this.dataTransOpts.tableS.patient_register.isAudit = 'N';
-                        this.$message({ type: "success", message: `取消总检审核成功` });
+                        // this.$message({ type: "success", message: `取消总检审核成功` });
                     }
                 })
                 .catch((err) => {
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 0d23214..9a92432 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -32,7 +32,7 @@
     </div>
     <div style="position: absolute; top: 0px; right: 2px; display: flex;z-index: 3;">
       <div style="margin-right: 5px;">
-        <el-button style="height: 28px;" class="commonbutton" @click="btnCollapseAll" :disabled="sumBtnDisabled()">{{
+        <el-button style="height: 28px;" class="commonbutton" @click="btnCollapseAll" :disabled="sumBtnDisabled('collapse')">{{
           collapse ?
           '展开' : '折叠' }}全部建议</el-button>
       </div>
@@ -61,7 +61,7 @@
                 </el-input>
                 <el-button type="danger" :icon="scope.row.collapse ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
                   style="min-width:21px;height:21px;padding:2px;" @click="btnCollapse(sumDoctorCheck.suggestionList,scope.$index,scope.row)"
-                  :disabled="sumBtnDisabled()"></el-button>
+                  :disabled="sumBtnDisabled('collapse')"></el-button>
                 <el-button v-show="checkPagePriv(pagePriv.privs, '删除建议')" type="danger" icon="el-icon-delete"
                   style="margin-left: 2px;min-width:21px;height:21px;padding:2px;" @click="delSugHead(scope.$index)"
                   :disabled="sumBtnDisabled()"></el-button>
@@ -439,7 +439,7 @@ export default {
     },
 
     // 按钮可用
-    sumBtnDisabled() {
+    sumBtnDisabled(btnType) {
       let patientRegister = this.dataTransOpts.tableS.patient_register
       let ret = true
 
@@ -448,6 +448,8 @@ export default {
       // '人员已锁定，不可执行此操作'
       if (patientRegister.isLock && patientRegister.isLock == 'Y') return ret
 
+      if(btnType && btnType == 'collapse') ret = false
+
       if (patientRegister.completeFlag && patientRegister.completeFlag != '3') ret = false
 
       return ret
@@ -538,6 +540,9 @@ export default {
         }
       });
       this.sumDoctorCheck.suggestionList[this.suggestionCurRow]['suggestionTitle'] = `${suggestionTitle}`
+      this.$nextTick(() => {
+        this.$refs['tableSuggestion'].doLayout()
+      })
     },
 
     //增加建议明细
@@ -561,6 +566,9 @@ export default {
         suggestionContent: '',
         displayOrder: Math.random(),
       })
+      this.$nextTick(() => {
+        this.$refs['tableSuggestion'].doLayout()
+      })
       console.log('this.sumDoctorCheck.suggestionList', index, this.sumDoctorCheck.suggestionList)
     },
 
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 9455e14..11654d3 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -308,6 +308,7 @@ export default {
         case 'btnExpPic':   // 导图（图片上传）
         case 'btnSavePic':   // 图片保存
         case 'btnDelImage':   // 图片删除
+          console.log('btnFlagName RegisterCheckEdit',btnFlagName,RegisterCheckEdit.completeFlag)
           if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0') ret = false
           break;
         case 'audit':