doctor

src/components/doctorCheck/CheckItemList.vue

@@ -1,48 +1,23 @@
 <template>
   <div>
-    <el-table
-      :data="doctorCheck.checkItemList"
-      style="width: 100%"
-      :height="
-        window.pageHeight < 600
+    <el-table :data="doctorCheck.checkItemList" style="width: 100%" :height="window.pageHeight < 600
         ? Math.floor(((420 - (isCheckPicture ? 110 : 0)) * 3) / 5)
         : Math.floor(((window.pageHeight - 260 - (isCheckPicture ? 110 : 0)) * 3) / 5)
-      "
-      border highlight-current-row
-      @row-click="rowClick" size="small"
-    >
+      " border highlight-current-row @row-click="rowClick" size="small">
       <el-table-column prop="itemName" label="项目" width="180" />
       <el-table-column prop="result" label="结果" min-width="200">
         <template slot-scope="scope">
-          <el-autocomplete
-            style="width: 100%;"
-            type="textarea" 
-            v-model="scope.row.result"
-            :fetch-suggestions="querySearch"
-            placeholder="请输入结果值"
-            @select="handleSelect"
-            :disabled="scope.row.isCalculationItem == 'Y' ||
+          <el-autocomplete style="width: 100%;" type="textarea" v-model="scope.row.result"
+            :fetch-suggestions="querySearch" placeholder="请输入结果值" @select="handleSelect" :disabled="scope.row.isCalculationItem == 'Y' ||
               doctorCheck.RegisterCheckEdit.completeFlag == '1' ||
               doctorCheck.RegisterCheckEdit.completeFlag == '2'
-            "
-            :autosize="{ minRows: 1, maxRows: 100 }"
-            :data-lineModeFlag="scope.row.lineModeFlag"
-            @input="madeTooltips(scope.$index);computeFun(scope.$index)"
-            v-bind:class="scope.row.class"
-          /> 
+              " :autosize="{ minRows: 1, maxRows: 100 }" :data-lineModeFlag="scope.row.lineModeFlag"
+            @input="madeTooltips(scope.$index); computeFun(scope.$index)" v-bind:class="scope.row.class" />
         </template>
       </el-table-column>
       <el-table-column prop="unit" label="单位" width="80" align="center" />
-      <el-table-column
-        prop="referenceRangeValue"
-        label="参考范围"
-        width="80" align="center"
-      />
-      <el-table-column
-        prop="tooltips"
-        label="提示"
-        width="40" align="center"
-      />
+      <el-table-column prop="referenceRangeValue" label="参考范围" width="80" align="center" />
+      <el-table-column prop="tooltips" label="提示" width="40" align="center" />
     </el-table>
   </div>
 </template>
@@ -281,9 +256,7 @@ export default {
         this.doctorCheck.checkItemList = []
         return
       }
-      console.log(
-        `/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`
-      );
+      console.log(`/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`);
       getapi(
         `/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}&PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`
       )
@@ -416,6 +389,7 @@ export default {
   background-color: v-bind("tipsNormal.backgroundColor") !important;
   color: v-bind("tipsNormal.color") !important;
 }
+
 /*错误*/
 ::v-deep .tipsError .el-textarea__inner {
   background-color: v-bind("tipsError.backgroundColor") !important;
@@ -463,8 +437,6 @@ export default {
   background-color: v-bind("tipsSuperHigh.backgroundColor") !important;
   color: v-bind("tipsSuperHigh.color") !important;
 }
- 
-
 </style>
 
 

src/components/patientRegister/PatientRegisterEditGroupBatch.vue

@@ -2,60 +2,33 @@
   <div style="display: flex">
     <div>
       <div>
-        <div>
-          批量调整分组只针对单位体检有效，个人体检将忽略此操作；不能调整已收费或已检的项目及已总检的体检人员。
-        </div>
+        <div>批量调整分组只针对单位体检有效，个人体检将忽略此操作；不能调整已收费或已检的项目及已总检的体检人员。</div>
         <div>
           <br /><span>分组</span>
-          <el-select
-            v-model="groupBatch.customerOrgGroupId"
-            placeholder="请选择"
-            filterable
-            size="small"
-          >
-            <el-option
-              v-for="item in customerOrgGroup"
-              :key="item.id"
-              :label="item.displayName"
-              :value="item.id"
-            />
+          <el-select v-model="groupBatch.customerOrgGroupId" placeholder="请选择" filterable size="small">
+            <el-option v-for="item in customerOrgGroup" :key="item.id" :label="item.displayName" :value="item.id" />
           </el-select>
         </div>
         <div>
-          <br /><el-radio v-model="groupBatch.payTypeFlag" label="0"
-            >个人支付</el-radio
-          >
-          <br /><el-radio v-model="groupBatch.payTypeFlag" label="1"
-            >单位支付</el-radio
-          >
-          <br /><el-radio v-model="groupBatch.payTypeFlag" label="2"
-            >免费</el-radio
-          >
+          <br /><el-radio v-model="groupBatch.payTypeFlag" label="0">个人支付</el-radio>
+          <br /><el-radio v-model="groupBatch.payTypeFlag" label="1">单位支付</el-radio>
+          <br /><el-radio v-model="groupBatch.payTypeFlag" label="2">免费</el-radio>
         </div>
         <div>
-          <br /><el-checkbox v-model="groupBatch.isReserveAddAsbitem"
-            >保留加做项目（包括不属于原分组的、没有设置分组的）</el-checkbox
-          >
+          <br /><el-checkbox v-model="groupBatch.isReserveAddAsbitem">保留加做项目（包括不属于原分组的、没有设置分组的）</el-checkbox>
         </div>
       </div>
       <div style="display: flex;margin-top: 5px;justify-content:space-between;">
         <div></div>
         <div>
-          <el-button type="primary" @click="groupBatchHandle">确 定</el-button>
-          <el-button @click="dialogWin.PatientRegisterEditGroupBatch = false">取 消</el-button>
+          <el-button class="commonbutton" type="primary" @click="groupBatchHandle">确 定</el-button>
+          <el-button class="commonbutton" @click="dialogWin.PatientRegisterEditGroupBatch = false">取 消</el-button>
         </div>
       </div>
     </div>
     <!-- 通用进度条 -->
-    <el-dialog
-      title="数据处理中……"
-      :visible.sync="elProgress.display"
-      width="600px"
-      height="400"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
+    <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400" :show-close="false"
+      :close-on-click-modal="false" :append-to-body="true">
       <ElProgressOCX />
     </el-dialog>
   </div>
@@ -92,17 +65,17 @@ export default {
         payTypeFlag: "1", //0：个人付费，1：单位付费 2：免费
         isReserveAddAsbitem: true, //是否保留加做项目
       },
-
+      groupBatchInit:{},
     };
   },
 
   created() {
-
+    this.groupBatchInit = deepCopy(this.groupBatch)
   },
 
   //挂载完成
   mounted() {
-    
+    this.getCustomerOrgGroup(this.multipleSelection[0].customerOrgRegisterId)
   },
   computed: {
     ...mapState([
@@ -119,15 +92,18 @@ export default {
     moment, dddw, deepCopy,
     
     //获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf
-    getCustomerOrgGroup(customerOrgId) {
+    getCustomerOrgGroup(customerOrgRegisterId) {
+      this.customerOrgGroup = []
+      this.groupBatch = deepCopy(this.groupBatchInit)
       getapi(
-        `/api/app/customer-org-group/in-customer-org-id/${customerOrgId}`
+        `/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`
       ).then((res) => {
         console.log("getCustomerOrgGroup", res.data);
         if (res.code == 1) {
-          this.customerOrgGroup = res.data;
+          this.customerOrgGroup = res.data.items;
         }
       });
+
     },
 
     //批量更新分组处理(确定)
@@ -170,12 +146,12 @@ export default {
 
   //监听事件
   watch: {
-    "dataTransOpts.refresh.asbitem.M":{
-      immediate: true, // 立即执行
+    "dataTransOpts.plus.PatientRegisterEditGroupBatch": {
+      // immediate: true, // 立即执行
       // deep: true, // 深度监听复杂类型内变化
       handler(newVal, oldVal) {
         console.log(`watch: 刷新单位分组 newVal: ${newVal} oldVal:${oldVal}`)
-        this.getCustomerOrgGroup(this.multipleSelection[0].customerOrgParentId)
+        if (newVal != oldVal) this.getCustomerOrgGroup(this.multipleSelection[0].customerOrgRegisterId)
       }
     },
   },
@@ -199,5 +175,4 @@ export default {
 .btnClass {
   width: 100px;
 }
-
 </style>

src/components/patientRegister/PatientRegisterEditItemBatch.vue

@@ -112,6 +112,7 @@ export default {
         asbitemsTemp: [], //删除或增加项目临时用
         asbitemCurr: {}, //当前选中要删除的项目(批量调整)
       },
+      asbitemBatchInit:{},
 
       asbItemQuick: [], //快速选择未过滤前全部项目
       quickAsb: [], //可供快速选择的组合项目
@@ -121,13 +122,13 @@ export default {
 
   // 组件创建完成
   created() {
-
+    this.asbitemBatchInit = deepCopy(this.asbitemBatch)
   },
 
   //挂载完成
   mounted() {
     // 初始化数据，如：在用组合项目
-    // this.dictInit()
+    this.dictInit()
   },
 
   computed: {
@@ -349,7 +350,7 @@ export default {
 
     // 初始化字典信息
     dictInit() {
-
+      this.asbitemBatch = deepCopy(this.asbitemBatchInit)
       // 获取在用的组合项目
       postapi('/api/app/asbitem/GetBasicList', { isFilterActive: 'Y' }).then(res => {
         if (res.code != -1) {
@@ -363,12 +364,12 @@ export default {
 
   //监听事件
   watch: {
-    "dataTransOpts.refresh.asbitem.M": {
-      immediate: true, // 立即执行
+    "dataTransOpts.plus.PatientRegisterEditItemBatch": {
+      // immediate: true, // 立即执行
       // deep: true, // 深度监听复杂类型内变化
       handler(newVal, oldVal) {
         console.log(`watch: 刷新在用组合项目 newVal: ${newVal} oldVal:${oldVal}`)
-        this.dictInit()
+        if(newVal != oldVal) this.dictInit()
       }
     },
   },

src/components/patientRegister/PatientRegisterList.vue

@@ -981,8 +981,8 @@ export default {
         this.$message.info("请选择要操作的记录！");
         return;
       }      
-
       this.dialogWin.PatientRegisterEditGroupBatch = true;
+      this.dataTransOpts.plus.PatientRegisterEditGroupBatch++
 
     },
 
@@ -1006,6 +1006,7 @@ export default {
       }
 
       this.dialogWin.PatientRegisterEditItemBatch = true;
+      this.dataTransOpts.plus.PatientRegisterEditItemBatch++
       
     },
 

src/components/sumDoctorCheck/SumAsbItemStatus.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="display: flex;height:90px;    background-color: #fff;margin-top: 10px;border-radius: 8px;padding: 10px;">
+  <div style="display: flex;background-color: #fff;margin-top: 10px;border-radius: 8px;padding: 10px;">
     <div class="asbitemListClass">
       <div style="font-size:9px;color: #F56C6C;">未检组合项目：</div>
       <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">

src/components/sumDoctorCheck/SumDiagnosis.vue

@@ -73,7 +73,7 @@ export default {
     ...mapState(["window", "dict","dataTransOpts", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck", "report"]),
     sumHeight(){
       let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight
-      return tempHeight - 352
+      return tempHeight - 367
     },
   },
   methods: {
@@ -85,7 +85,6 @@ export default {
           this.diagnosisesAll = res.data
           //过滤已选的诊断
           this.filterDiagnosises()
-
         }
       })
 

src/components/sumDoctorCheck/SumSug.vue

@@ -118,7 +118,7 @@ export default {
 
     sumHeight(){
       let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight
-      return tempHeight - 320
+      return tempHeight - 335
     },
   },
 

src/store/index.js

@@ -358,6 +358,7 @@ export default new Vuex.Store({
             },
             plus: {
                 clearPatientRegisterQuery: 0,   //清空人员登记界面查询条件
+                PatientRegisterEditGroupBatch: 0,  //刷新批量调整分组窗口
                 PatientRegisterEditItemBatch: 0,  //刷新批量调整项目窗口
             }
 

src/views/doctorCheck/sumDoctorCheck.vue

@@ -9,17 +9,16 @@
           <div>
             <PatientRegisterBase />
           </div>
-          <div :style="'height:' +
-            (window.pageHeight < 600 ? 435 : window.pageHeight - 165) +
-            'px;'
-            ">
+          <div :style="`height: ${window.pageHeight < 600 ? 436 : window.pageHeight - 164}px;`">
             <el-tabs v-model="tabChoosed">
               <el-tab-pane label="综述建议" name="1">
                 <div style="display: flex;">
                   <!-- 综述建议 -->
                   <div :style="'width:' + (window.pageWidth - 110 - 15 - 200) + 'px;'">
-                    <SumSug :patientRegisterId="sumDoctorCheck.sumPREdit.id" :curGetFocusSuggestionId="curGetFocusSuggestionId"/>
+                    <SumSug :patientRegisterId="sumDoctorCheck.sumPREdit.id"
+                      :curGetFocusSuggestionId="curGetFocusSuggestionId" />
                   </div>
+                  <!-- 诊断 -->
                   <div style="width:200px;">
                     <SumDiagnosis :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
                   </div>
@@ -28,8 +27,10 @@
                   <!-- 总检状态 -->
                   <SumPREdit />
                   <!-- 检查情况 -->
+                  <div style="margin-top: -6px;">
                     <SumAsbItemStatus :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
                   </div>                  
+                </div>
               </el-tab-pane>
               <el-tab-pane label="明细结果" name="2">
                 <CheckDetails :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
@@ -230,5 +231,4 @@ export default {
 @import '../../assets/css/global_input.css';
 @import '../../assets/css/global_table.css';
 @import '../../assets/css/global.css';
-
 </style>