config

public/sysConfig.js

@@ -0,0 +1,3 @@
+export default{
+    apiurl:'http://140.143.162.39:9529',
+}

src/api/api.js

@@ -1,5 +1,5 @@
 import request from "@/api/request";
-import mm from "@/utlis/mm";
+import sysConfig from "../../public/sysConfig"
 import { Loading } from 'element-ui';
 
 export async function getapi(url, params = {}, config) {
@@ -12,7 +12,7 @@ export async function getapi(url, params = {}, config) {
             customClass: "boxStyle"
         });
         request
-            .get(`${mm.apiurl}${url}`, {
+            .get(`${sysConfig.apiurl}${url}`, {
                 params: params,
                 ...config,
             })
@@ -39,7 +39,7 @@ export async function postapi(url, paramsdata = {}, config) {
             customClass: "boxStyle"
         });
         request
-            .post(`${mm.apiurl}${url}`, paramsdata, config)
+            .post(`${sysConfig.apiurl}${url}`, paramsdata, config)
             .then((res) => {
                 resolve(res);
             })
@@ -62,7 +62,7 @@ export async function deletapi(url, params = {}, config) {
             customClass: "boxStyle"
         });
         request
-            .delete(`${mm.apiurl}${url}`, {
+            .delete(`${sysConfig.apiurl}${url}`, {
                 params: params,
                 ...config,
             })
@@ -88,7 +88,7 @@ export async function putapi(url, params = {}, config) {
             customClass: "boxStyle"
         });
         request
-            .put(`${mm.apiurl}${url}`, params, config)
+            .put(`${sysConfig.apiurl}${url}`, params, config)
             .then((res) => {
                 resolve(res);
             })

src/components/sumDoctorCheck/ButtonList.vue

@@ -281,7 +281,7 @@ export default {
             let pojo = {
                 id,
                 patientRegisterId: this.sumDoctorCheck.sumPREdit.id,
-                diagnosisId: null,
+                diagnosisId: [],
                 details: [
                     {
                         sumSuggestionHeaderId: id,

src/components/sumDoctorCheck/SumDiagnosis.vue

@@ -80,7 +80,7 @@ export default {
     checkPagePriv, 
     dictInit() {
       postapi('/api/app/diagnosis/getlistinsuggestion', {}).then(res => {
-        if (res.code != -1) {
+        if (res.code > -1) {
           this.diagnosisesCur = res.data
           this.diagnosisesAll = res.data
           //过滤已选的诊断

src/components/sumDoctorCheck/SumSug.vue

@@ -41,41 +41,82 @@
               <div style="display: flex;">
                 <el-input v-model="scope.row.suggestionTitle" placeholder="请输入建议标题" :ref="scope.row.id" :id="scope.row.id"
                   :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'">
-                </el-input>
-
-                <el-button v-show="checkPagePriv(pagePriv.privs, '新增建议明细')" type="success" icon="el-icon-plus"
-                  style="min-width:23px;height:23px;padding:2px;" @click="addSug(scope.$index)"
-                  :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
+                </el-input>                
                 <el-button v-show="checkPagePriv(pagePriv.privs, '删除建议')" type="danger" icon="el-icon-delete"
-                  style="margin-left: 2px;min-width:23px;height:23px;padding:2px;" @click="delSugHead(scope.$index)"
+                  style="margin-left: 2px;min-width:21px;height:21px;padding:2px;" @click="delSugHead(scope.$index)"
+                  :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
+              </div>
+              <div style="display: flex;">
+                <div style="width:60px;">诊断：</div>
+                <el-select v-model="scope.row.diagnosisId" multiple placeholder="请选择" style="width: 100%;height: 34px;">
+                  <el-option v-for="item in diagnosises" :key="item.id" :value="item.id" :label="item.displayName" />
+                </el-select>
+                <el-button v-show="checkPagePriv(pagePriv.privs, '新增解释')" type="success" icon="el-icon-plus"
+                  style="min-width:21px;height:21px;padding:2px;" @click="addSug(scope.$index)"
+                  :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
+                <el-button v-show="checkPagePriv(pagePriv.privs, '新增指导')" type="danger" icon="el-icon-plus"
+                  style="margin-left: 2px;min-width:21px;height:21px;padding:2px;" @click="addSug(scope.$index)"
                   :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
               </div>
+              <div style="display: flex;">
+                <div style="width:60px;">解释：</div>
+                <el-table :id="'0_sug' + scope.row.id" row-key="displayOrder" style="margin-left: 10px;"
+                  :data="scope.row.terms" border @row-click="rowClickSug(0)" :show-header="false">
+                  <el-table-column width="30">
+                    <template slot-scope="scope2">
+                      <div>{{ scope2.$index + 1 }}).</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="suggestionContent" label="建议" min-width="200">
+                    <template slot-scope="scope2">
+                      <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入建议内容"
+                        :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
+                        :autosize="{ minRows: 1, maxRows: 10 }">
+                      </el-input>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="35">
+                    <template slot-scope="scope2">
+                      <el-button v-show="checkPagePriv(pagePriv.privs, '删除医学解释')" type="danger"
+                        style="min-width:23px;height:23px;padding:2px;" icon="el-icon-delete"
+                        @click="delSug(scope.row.details, scope2.$index)"
+                        :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
+                        size="small"></el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+              <div style="display: flex;">
+                <div style="width:60px;">指导：</div>
+                <el-table :id="'1_sug' + scope.row.id" row-key="displayOrder" style="margin-left: 10px;"
+                  :data="scope.row.guides" border @row-click="rowClickSug(1)" :show-header="false">
+                  <el-table-column width="30">
+                    <template slot-scope="scope2">
+                      <div>{{ scope2.$index + 1 }}).</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="suggestionContent" label="建议" min-width="200">
+                    <template slot-scope="scope2">
+                      <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入健康指导"
+                        :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
+                        :autosize="{ minRows: 1, maxRows: 10 }">
+                      </el-input>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="35">
+                    <template slot-scope="scope2">
+                      <el-button v-show="checkPagePriv(pagePriv.privs, '删除健康指导')" type="danger"
+                        style="min-width:23px;height:23px;padding:2px;" icon="el-icon-delete"
+                        @click="delSug(scope.row.details, scope2.$index)"
+                        :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
+                        size="small"></el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+
+
 
-              <el-table :id="'sug' + scope.row.id" row-key="displayOrder" style="margin-left: 10px;"
-                :data="scope.row.details" border @row-click="rowClickSug" :show-header="false">
-                <el-table-column width="30">
-                  <template slot-scope="scope2">
-                    <div>{{ scope2.$index + 1 }}).</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="suggestionContent" label="建议" min-width="200">
-                  <template slot-scope="scope2">
-                    <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入建议内容"
-                      :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
-                      :autosize="{ minRows: 1, maxRows: 10 }">
-                    </el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="suggestionContent" label="操作" width="35">
-                  <template slot-scope="scope2">
-                    <el-button v-show="checkPagePriv(pagePriv.privs, '删除建议明细')" type="danger"
-                      style="min-width:23px;height:23px;padding:2px;" icon="el-icon-delete"
-                      @click="delSug(scope.row.details, scope2.$index)"
-                      :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
-                      size="small"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
             </div>
           </template>
         </el-table-column>
@@ -113,6 +154,7 @@ export default {
     this.rowDrop();
     this.rowDropSuggestion();
 
+    this.dictInit()
     // document.addEventListener('DOMContentLoaded', function () {
     //   const textarea = document.querySelector('textarea');
     //   textarea.addEventListener('input', function () {
@@ -146,7 +188,14 @@ export default {
     //   });      
     // },
 
-
+    // 获取诊断数据
+    dictInit() {
+      postapi('/api/app/diagnosis/getlistinsuggestion', {}).then(res => {
+        if (res.code > -1) {
+          this.diagnosises = res.data
+        }
+      })
+    },
 
     //获取综述
     summaryList(RegisterId) {
@@ -323,20 +372,20 @@ export default {
       return el
     },
 
-    rowClickSug(row) {
-      console.log('rowClick row', row)
+    rowClickSug(row,contentType) {
+      console.log('rowClick row', row,contentType)
       let lfind = arrayExistObj(this.sumDoctorCheck.suggestionList, 'id', row.sumSuggestionHeaderId)
       if (lfind > -1) {
         this.sugDetails = this.sumDoctorCheck.suggestionList[lfind].details
-        this.rowDropSugDetail(row.sumSuggestionHeaderId)
+        this.rowDropSugDetail(contentType,row.sumSuggestionHeaderId)
       }
       console.log('this.sumDetails', this.sugDetails)
     },
 
     //建议明细拖拽
-    rowDropSugDetail(id) {
+    rowDropSugDetail(contentType,id) {
       this.$nextTick(() => {
-        const fEl = document.getElementById('sug' + id)  // document.querySelector(`#${id} tbody`) querySelector为静态方法不支持动态传参;
+        const fEl = document.getElementById(`${contentType}_sug${id}`)  // document.querySelector(`#${id} tbody`) querySelector为静态方法不支持动态传参;
         console.log('rowDropSumDetail tbody', fEl, fEl.children) //el.childNodes,el.children
         const el = this.findEl(fEl, 'TBODY')
         console.log('rowDropSumDetail tbody', el) //el.childNodes,el.children

src/views/doctorCheck/sumDoctorCheck.vue

@@ -14,12 +14,12 @@
               <el-tab-pane label="综述建议" name="1">
                 <div style="display: flex;">
                   <!-- 综述建议 -->
-                  <div :style="'width:' + (window.pageWidth - 110 - 15 - 200) + 'px;'">
+                  <div :style="'width:' + (window.pageWidth - 110 - 15) + 'px;'">
                     <SumSug :patientRegisterId="sumDoctorCheck.sumPREdit.id"
                       :curGetFocusSuggestionId="curGetFocusSuggestionId" />
                   </div>
-                  <!-- 诊断 -->
-                  <div style="width:200px;">
+                  <!-- 诊断 width:200px; -->
+                  <div v-show="false" style="width:200px;">
                     <SumDiagnosis :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
                   </div>
                 </div>