lis

src/components/doctorCheck/PatientRegisterList.vue

@@ -10,8 +10,7 @@
         </el-tooltip>
       </div>
       <div class="query" style="display: flex;padding-top: 2px;">
-        <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:238px;" size="small"
-          disabled>
+        <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:238px;" size="small" disabled>
         </el-input>
         <el-button icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
           style="font-size: 20px;height:30px;min-width:30px; padding: 5px 5px;" size="small"></el-button>
@@ -19,24 +18,22 @@
 
       <div class="query">
         <span>姓名：</span>
-        <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
-          style="width: 100px" />
+        <el-input placeholder="姓名" v-model="local.query.patientName" size="small" clearable style="width: 100px" />
       </div>
       <div class="query">
         <span>性别：</span>
-        <el-select v-model="patientRegister.query.sex" placeholder="请选择" clearable style="width: 80px" size="small">
+        <el-select v-model="local.query.sex" placeholder="请选择" clearable style="width: 80px" size="small">
           <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
       </div>
       <div class="query">
         <span>检查状态：</span>
-        <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
-          size="small">
+        <el-select v-model="local.query.completeFlag" placeholder="请选择" clearable style="width: 80px" size="small">
           <el-option v-for="item in local.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
-        <el-select v-model="patientRegister.query.isAudit" placeholder="请选择" clearable style="width: 75px;margin: 0 2px;"
+        <el-select v-model="local.query.isAudit" placeholder="请选择" clearable style="width: 75px;margin: 0 2px;"
           size="small">
           <el-option label="未审核" value="N" />
           <el-option label="已审核" value="Y" />
@@ -167,7 +164,7 @@
 
     <!--通用选单位、体检次数、分组的控件-->
     <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" :append-to-body="true"
-      width="800px" height="600px">
+      width="800px" height="600px" >
       <CusOrgOCX :useCustomerOrg="false" :initDateType="'medicalStartDate'" />
     </el-dialog>
 
@@ -196,6 +193,20 @@ export default {
 
       local: {
         query: {
+          dateType: 'creationTime', //登记日期
+          dateRange: null, //日期范围
+          startDate: null,
+          endDate: null,
+          containRefuse: true, //包含弃检项目        
+          times: 0, //触发查询次数
+          customerOrgId: "", //体检单位ID
+          CustomerOrgParentId: "", //单位父级ID
+          customerOrgFlag: true, //单位作为查询条件
+          customerOrgRegister: { id: '' }, //单位体检次数 
+          checkAsbs: null,
+          patientName: '', //姓名
+          sex: '', //性别
+          idCardNo: '', //身份证号
           haveImage: false,
           checkAsb: '', //检查项目          
         },
@@ -217,7 +228,7 @@ export default {
   //挂载完成
   mounted() { },
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck", "report"]),
+    ...mapState(["window", "dataTransOpts", "dict", "customerOrg","patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
   },
   methods: {
     ...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
@@ -252,6 +263,7 @@ export default {
       this.local.completeFlag.splice(0, 1) //预记选项去掉
     },
 
+    
     //快速选择组合项目时，调整可按拼间简码及简称查找
     filterMethod(keyWords) {
       //console.log('filterMethod',this.asbItemQuick)  
@@ -305,7 +317,7 @@ export default {
       }
 
       setTimeout(() => { //300ms内没有第二次点击，执行单击事件
-        if(this.oneClick == 1 && this.DbClick == 0) this.rowClickRetrieve(row)
+        if (this.oneClick == 1 && this.DbClick == 0) this.rowClickRetrieve(row)
       }, 300)
 
     },
@@ -361,10 +373,10 @@ export default {
       }
 
       body.customerOrgs = customerOrgs
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
-      if (this.patientRegister.query.isAudit) body.isAudit = this.patientRegister.query.isAudit
-      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+      if (this.local.query.patientName) body.patientName = this.local.query.patientName
+      if (this.local.query.sex) body.sexId = this.local.query.sex
+      if (this.local.query.isAudit) body.isAudit = this.local.query.isAudit
+      if (this.local.query.completeFlag) body.completeFlag = this.local.query.completeFlag
       if (this.local.query.checkAsb) body.asbitems = [this.local.query.checkAsb]
       if (this.local.query.haveImage) body.isPicture = 'Y'
 

src/components/patientRegister/PatientLis.vue

@@ -7,8 +7,7 @@
           <el-table @body-scrolling="load" :data="tableData" border
             :height="window.pageHeight < 600 ? 248 : Math.floor(((window.pageHeight - 250) * 2) / 3)"
             highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" size="small" row-key="id"
-            @selection-change="handleSelectionChange" ref="info" id="info"
-            :row-class-name="handleRowClassName">
+            @selection-change="handleSelectionChange" ref="info" id="info" :row-class-name="handleRowClassName">
             <!-- 取消勾选，改为选中
           <el-table-column type="selection" width="40" show-overflow-tooltip/>
           :height="window.pageHeight < 600 ? 202 : Math.floor(((window.pageHeight - 302) * 2) / 3)"
@@ -110,7 +109,14 @@
         <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
           <!-- 给合项目 -->
           <el-tab-pane label="预览" name="1">
-            <PatientRegisterAsbItem />
+            <div style="overflow: scroll; width: 100%;height: 240px;">
+              <el-image  :src="lisLabel">
+                <div slot="placeholder" class="image-slot">
+                  加载中<span class="dot">...</span>
+                </div>
+              </el-image>
+            </div>
+
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -133,6 +139,13 @@
         <div v-show="checkPagePriv(pagePriv.privs, '撤消申请')" class="listBtn">
           <el-button type="" class="commonbutton" @click="btnUndoLis">撤消申请</el-button>
         </div>
+        <div style="margin-top: 5px;">
+          <el-image style="width: 110px; height: 115px;" :src="peoplePhoto">
+            <div slot="placeholder" class="image-slot">
+              加载中<span class="dot">...</span>
+            </div>
+          </el-image>
+        </div>
       </div>
     </div>
     <!--组件弹窗-->
@@ -149,6 +162,7 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { photoParse } from "../../utlis/proFunc"
 import Sortable from "sortablejs";
 import FileSaver from 'file-saver';
 import html2canvas from 'html2canvas';
@@ -246,6 +260,8 @@ export default {
 
       oneClick: 0,  // 1 表示行单击一次
       DbClick: 0,  // 1 表示行有单击第二次
+
+      lisLabel:'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg',
     };
   },
 
@@ -278,6 +294,10 @@ export default {
       "patientRegister",
       "customerOrg",
     ]),
+
+    peoplePhoto() {
+      return photoParse(this.tableDataCurrentRow.photo)
+    }
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
@@ -296,11 +316,22 @@ export default {
     },
 
     // 全选 取消全选
-    btnChooseAll(type){
-      if(type == 1){
+    btnChooseAll(type) {
+      if (type == 1) {
         // 全选
-      }else{
+        this.tableData.forEach(e => {
+          e.choosed = true;
+          e.highLightBg = "selected";
+        });
 
+        this.multipleSelection = deepCopy(this.tableData)
+      } else {
+        this.tableData.forEach(e => {
+          e.choosed = false;
+          e.highLightBg = "";
+        });
+        this.multipleSelection = []
+        this.$refs['info'].setCurrentRow();
       }
     },
 
@@ -333,7 +364,7 @@ export default {
       this.multipleSelection = JSON.parse(JSON.stringify(rows));
     },
 
-      //点击体检次数行
+    //点击体检次数行
     rowClick(row) {
       if (this.oneClick == 0) {
         this.oneClick = 1;
@@ -565,22 +596,22 @@ export default {
     },
 
     // 预览设置
-    btnPrintPre(){
+    btnPrintPre() {
 
     },
 
     // 打印
-    btnPrint(){
+    btnPrint() {
 
     },
 
     // 发送检验申请
-    btnSendLis(){
+    btnSendLis() {
       console.log('btnSendLis')
     },
 
     // 撤消检验申请
-    btnUndoLis(){
+    btnUndoLis() {
       console.log('btnUndoLis')
     },
 
@@ -651,7 +682,7 @@ export default {
           { Name: "printer", Value: user },
           { Name: "hisLog", Value: "pic/hisLog.jpg" },
         ],
-        BusinessCode:prId
+        BusinessCode: prId
       };
 
       if (isPreview) {
@@ -722,7 +753,7 @@ export default {
           .then(res => {
             if (JSON.parse(res).code < 0) {
               this.$message.warning({ showClose: true, message: JSON.parse(res).message });
-            }else{
+            } else {
               return postapi("/api/app/lisrequest/updatelisrequestisprint", {
                 operateType: 1,
                 patientRegisterId: prId,
@@ -730,7 +761,7 @@ export default {
             }
           })
           .then(res => {
-            if(res && res.code < 0){
+            if (res && res.code < 0) {
               this.$message.error({ showClose: true, message: `${res.message}` });
             }
           })
@@ -757,7 +788,7 @@ export default {
           { Name: "printer", Value: user },
           { Name: "hisLog", Value: "pic/hisLog.jpg" },
         ],
-        BusinessCode:prId
+        BusinessCode: prId
       };
 
       if (isPreview) {
@@ -826,7 +857,7 @@ export default {
           .then(res => {
             if (JSON.parse(res).code < 0) {
               this.$message.warning({ showClose: true, message: JSON.parse(res).message });
-            }else{
+            } else {
               return postapi("/api/app/lisrequest/updatelisrequestisprint", {
                 operateType: 1,
                 patientRegisterId: prId,
@@ -834,7 +865,7 @@ export default {
             }
           })
           .then(res => {
-            if(res && res.code < 0){
+            if (res && res.code < 0) {
               this.$message.error({ showClose: true, message: `${res.message}` });
             }
           })

src/views/doctorCheck/doctorCheck.vue

@@ -103,7 +103,8 @@ export default {
       // this.$message.info("此功能，需要在壳客户端才可运行！");
       // console.log('this.$peisAPI',this.$peisAPI)
       this.$peisAPI.getIsCheckPicture().then(res => {
-        if (res) this.isCheckPicture = res
+        console.log("this.$peisAPI.getIsCheckPicture()",res)
+        if (res) this.isCheckPicture = res.toUpperCase() == 'Y' ? true:false
       })
     }