doctor

src/components/doctorCheck/CheckSumSug.vue

@@ -1,10 +1,10 @@
 <template>
     <div style="display: flex;">
       <div style="width:50%;">
-        <el-table :data="doctorCheck.checkItemList" width="100%" height="350" border
+        <el-table :data="doctorCheck.checkSummaryList" width="100%" height="350" border
             @row-click="rowClick">
-            <el-table-column prop="itemName" label="小结" width="380" />
-            <el-table-column label="排序" width="50">
+            <el-table-column prop="summary" label="小结" width="380" />
+            <el-table-column label="排序" width="80">
               <template>
                 <el-tag class="move" style="cursor: move; margin-left: 15px" draggable="true" >
                   <i class="el-icon-d-caret" style="width: 1rem; height: 1rem"></i>
@@ -14,10 +14,10 @@
         </el-table>
       </div>
       <div style="width:50%;">
-        <el-table :data="doctorCheck.checkItemList" width="100%" height="350" border
+        <el-table :data="doctorCheck.checkSuggestionList" width="100%" height="350" border
             @row-click="rowClick">
-            <el-table-column prop="itemName" label="建议" width="380" />
-            <el-table-column label="排序" width="50">
+            <el-table-column prop="suggestion" label="建议" width="380" />
+            <el-table-column label="排序" width="80">
               <template>
                 <el-tag class="move" style="cursor: move; margin-left: 15px" draggable="true" >
                   <i class="el-icon-d-caret" style="width: 1rem; height: 1rem"></i>

src/components/doctorCheck/PatientRegisterBase.vue

@@ -122,10 +122,10 @@ export default {
   mounted() { },
 
   computed: {
-    ...mapState(["dict", "doctorCheck", "patientRegister", "customerOrg"]),    
+    ...mapState(["dict", "doctorCheck", "sumDoctorCheck"]),    
   },
   methods: {
-    ...mapMutations(['doctorCheckPrBaseInit']),
+    ...mapMutations(['doctorCheckPrBaseInit','sumPREditInit']),
     //按条码号查个人数据
     onQueryByPatientRegisterNo() {
       let val = this.doctorCheck.prBase.patientRegisterNo
@@ -136,6 +136,9 @@ export default {
           this.doctorCheckPrBaseInit()
           this.doctorCheck.prBase.patientRegisterNo = val
           objCopy(res.data,this.doctorCheck.prBase)
+
+          this.sumPREditInit()
+          objCopy(res.data,this.sumDoctorCheck.sumPREdit)
         }
       });
     },

src/components/doctorCheck/RegisterCheckList.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-      <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" height="750" border
-          :row-class-name="tableRowClassName" @row-click="rowClick">
-          <el-table-column prop="asbitemName" label="组合项目" width="180" />    
-      </el-table>
+    <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" height="750" border
+      :row-class-name="tableRowClassName" @row-click="rowClick">
+      <el-table-column prop="asbitemName" label="组合项目" width="180" />    
+    </el-table>
   </div>
 </template>
 <script>
@@ -29,12 +29,14 @@ export default {
 
   methods: {
     tableRowClassName({row, rowIndex}) {
+      //console.log('tableRowClassName',rowIndex,row)
       if (row.completeFlag === '0') {
         return 'warning-row'; //未检
       } else if (row.completeFlag === '2') {
         return 'refuse-row'; //弃检
       }
       return '';
+          
     },
     
     //选择组合项目
@@ -78,13 +80,13 @@ export default {
   }
 };
 </script>
-<style scoped>
+<style>
   .el-table .warning-row {
-    background: rgb(240, 125, 125);
+    background: rgb(240,125,125);
   }
 
   .el-table .refuse-row {
-    background: rgb(192, 192, 192);
+    background: rgb(192,192,192);
   }
 
 </style>

src/components/patientRegister/PatientRegisterItem.vue

@@ -226,8 +226,8 @@ export default {
       //   "price": 0,
       //console.log('this.asbItemChoosed.length',this.asbItemChoosed.length)
       for (let i = 0; i < this.asbItemChoosed.length; i++) {
-        if (this.patientRegisterForm.sexId == '9') break //未选性别时，无需判断组合项目性别限制
-        if (this.asbItemChoosed[i].forSexId == '9') continue
+        if (this.patientRegisterForm.sexId == 'U') break //未选性别时，无需判断组合项目性别限制
+        if (this.asbItemChoosed[i].forSexId == 'A') continue
         if (this.asbItemChoosed[i].forSexId != this.patientRegisterForm.sexId) {
           alert(`所选项目：${this.asbItemChoosed[i].displayName}，不适合当前人员性别`)
           checked = false

src/components/sumDoctorCheck/SumPREdit.vue

@@ -0,0 +1,72 @@
+<template>
+  <div style="display: flex">
+    <div style="display: flex; flex-wrap: wrap; width: 100%">      
+      <div class="query">
+        <span>总检医生</span>
+        <el-input v-model="sumDoctorCheck.sumPREdit.summaryDoctor" size="small" style="width: 110px" />
+      </div>
+      <div class="query">
+        <span>总检日期</span>
+        <el-date-picker v-model="sumDoctorCheck.sumPREdit.summaryDate" type="date" style="width: 130px" size="small" />
+      </div> 
+      <div class="query">
+        <span>审核医生</span>
+        <el-input v-model="sumDoctorCheck.sumPREdit.auditDoctor" size="small"  style="width: 110px" disabled/>
+      </div>
+      <div class="query">
+        <span>审核日期</span> 
+        <el-input :value="sumDoctorCheck.sumPREdit.auditDate ? lmoment(sumDoctorCheck.sumPREdit.auditDate, 'yyyy-MM-DD') :''" style="width: 120px" size="small" disabled></el-input>
+      </div>
+      <div class="query">
+        <span>审核</span>
+        <el-checkbox v-model="sumDoctorCheck.sumPREdit.isAudit" disabled></el-checkbox>        
+      </div>      
+    </div> 
+
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+
+export default {
+  components: {},
+  data() {
+    return {
+      
+      
+    };
+  },
+
+  created() {},
+
+  //挂载完成
+  mounted() {},
+
+  computed: {
+    ...mapState(["dict", "doctorCheck","sumDoctorCheck", ]),
+    lmoment(date, forMat) {
+      return moment(new Date(date)).format(forMat);
+    },
+  },
+  methods: {
+    //查询
+    btnQuery() {
+      this.sumDoctorCheck.sumPREdit.times++;
+      console.log("this.sumDoctorCheck.sumPREdit", this.sumDoctorCheck.sumPREdit);
+    },
+
+    //读身份证
+    readIdCard() {
+      alert("读身份证");
+    },
+  },
+};
+</script>
+<style scoped>
+.query {
+  margin-left: 10px;
+  margin-top: 5px;
+}
+</style>

src/store/index.js

@@ -51,7 +51,7 @@ export default new Vuex.Store({
         medicalPackageId: null, //套餐
         patientName: "", //姓名
         birthDate: "", //字符串 如：2012-01-29
-        sexId: "9", //性别 默认未知U
+        sexId: "U", //性别 默认未知U
         age: null, //年龄
         jobCardNo: "", //工卡号
         medicalCardNo: "", //体检卡号
@@ -121,7 +121,12 @@ export default new Vuex.Store({
       RegisterCheckId:'',         //
       checkItemList:[],           //组合项目包含的明细项目
       checkSummaryList:[],        //小结
-      checkSuggestionList:[],     //建议      
+      checkSuggestionList:[],     //建议 
+    },
+
+    //总检医生
+    sumDoctorCheck:{
+      sumPREdit:{},               //总检医生时间等相关信息
 
     },
 
@@ -149,12 +154,21 @@ export default new Vuex.Store({
         { id: "1", displayName: "已检" },
         { id: "2", displayName: "弃检" },
       ],
+      sumAudit:[
+        //总检审核
+        { id: "Y", displayName: "已审核" },
+        { id: "N", displayName: "未审核" }
+      ],
       payType: [
         //支付方式,比如是0自费、2免费、1单位支付
         { id: "0", displayName: "个人支付" },
         { id: "1", displayName: "单位支付" },
         { id: "2", displayName: "赠送" },
       ],
+      checkTypeFlag:[
+        { id: "0", displayName: "检验" },
+        { id: "1", displayName: "功能检查" },
+      ],
       medicalPackage: [], //所有套餐
       customerOrgGroupAll: [], //所有分组，不限单位，不限次数
       customerOrg: [], //所有单位，非树结构
@@ -205,6 +219,18 @@ export default new Vuex.Store({
         mobileTelephone:'', //手机
       }   //人员体检登记显示基本信息
     },
+
+    sumPREditInit(state){
+      state.sumDoctorCheck.sumPREdit = {
+        id:'', //体检登记ID
+        completeFlag:'',   //完成状态
+        summaryDoctor:'', //总检医生
+        summaryDate:'',   //总检日期
+        isAudit:'',       //审核状态
+        auditDoctor:'', //审核医生
+        auditDate:'',   //审核日期
+      }   //人员体检登记显示基本信息
+    },
   },
 
   actions: {

src/views/doctorCheck/sumDoctorCheck.vue

@@ -9,11 +9,14 @@
                 <ButtonList/>
             </td>
           </tr>
-          <tr>
-            <td width="90%">
+          <tr height="700px">
+            <td width="90%" style="valign:top;">
                 <el-tabs style="margin-left: 10px" v-model="tabChoosed">
                     <el-tab-pane label="综述建议" name="1">
-                        <RegisterCheckList/>
+                      <div>
+                        <CheckSumSug/>
+                        <SumPREdit/>
+                      </div>
                     </el-tab-pane>
                     <el-tab-pane label="明细结果" name="2">
                         
@@ -48,7 +51,7 @@
   import RegisterCheckList from "../../components/doctorCheck/RegisterCheckList.vue";
   import CheckItemList from "../../components/doctorCheck/CheckItemList.vue";
   import CheckSumSug from "../../components/doctorCheck/CheckSumSug.vue";
-  import RegisterCheckEdit from "../../components/doctorCheck/RegisterCheckEdit.vue";
+  import SumPREdit from "../../components/sumDoctorCheck/SumPREdit.vue";
 
   export default {
     components: {
@@ -57,7 +60,7 @@
       ButtonList,
       CheckItemList,
       CheckSumSug,
-      RegisterCheckEdit
+      SumPREdit
     },
     data() {
       return {