recoverCore

src/components/patientRegister/PatientRegisterList.vue

@@ -271,12 +271,18 @@
           </download-excel>
           <!-- <el-button type="" class="commonbutton" @click="btnExport('info')">人员信息导出</el-button> -->
         </div>
+        <!-- 弃用
         <div class="listBtn">
           <el-button type="" class="commonbutton" @click="btnDragColDesign">设计列排序</el-button>
         </div>
+        -->
         <div v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')" class="listBtn">
           <el-button type="" class="commonbutton" @click="printPromise2()" style="font-size: 12px">人员+检查条码</el-button>
         </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '体检表回收')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="btnScanRecover">体检表回收</el-button>
+        </div>
+
         <!-- elProgress.display  dialogWin.LocalConfig
         <div class="listBtn"> 
           <el-button type="" class="commonbutton" @click="dialogWin.LocalConfig = true">本地设置</el-button>
@@ -426,6 +432,18 @@
         <img width="100%" :src="qrCode.url">
         <div style="font-size: 16px;">{{ qrCode.barcodeNo + ' ' + qrCode.patientName }}</div>
       </el-dialog>
+
+      <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogRecover" width="400" :append-to-body="true"
+        :close-on-click-modal="false">
+        <div class="query">
+          <span class="spanClass">条码号</span>
+          <el-input ref="tmh" v-model="patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>
+          <el-button @click="dialogRecover = false" class="commonbutton">关闭</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -658,7 +676,11 @@ export default {
         url: 'https://ccjktj.cn:5081/', //二维码 地址
         barcodeNo: '条码号',
         patientName: '姓 名'
-      }
+      },
+
+      // 体检表回收
+      dialogRecover:false,
+      patientRegisterNo:''
     };
   },
 
@@ -1881,7 +1903,7 @@ export default {
         });
       if (subMenuPrint.length > 0)
         items.push({ label: "打印条码", children: subMenuPrint });
-      
+
       //  导入结果合集 ============ start 
       let subMenuImp = [];
       if (
@@ -1914,13 +1936,13 @@ export default {
             this.importResult("diAn", row);
           },
         });
-      if (subMenuImp.length > 0){
+      if (subMenuImp.length > 0) {
         items.push({ label: "导入结果", children: subMenuImp });
       }
       //  导入结果合集 ============ end   
-      
+
       //  批量操作合集 ============ start
-      let batchMenus = []  
+      let batchMenus = []
       if (
         checkPagePriv(this.pagePriv.privs, "批量更新组合项目明细") &&
         this.multipleSelection.length > 0
@@ -1985,7 +2007,7 @@ export default {
           },
         });
       }
-      if (batchMenus.length > 0){
+      if (batchMenus.length > 0) {
         items.push({ label: "批量操作", children: batchMenus });
       }
       //  批量操作合集 ============ end  
@@ -2442,6 +2464,44 @@ export default {
       // })
     },
 
+    // 点击扫码回收体检表按钮
+    btnScanRecover() {
+      this.patientRegisterNo = ''
+      this.dialogRecover = true
+      this.$nextTick(() => {
+        this.$refs['tmh'].focus(); //打开光标定位到条码栏里 
+      });
+    },
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let patientRegisterNo = this.patientRegisterNo
+      let body = {
+        sType: 1,
+        patientRegisterNo
+      }
+      //console.log(`/api/app/patientregister/getpatientregisterorpatient`, body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient', body)
+        .then((res) => {
+          if (res.code != -1) {
+            if (res.data) {
+              this.recoverCore([res.data.id])
+              this.patientRegisterNo = ''
+            }
+          }
+        });
+    },
+
+    // 回收表提交
+    recoverCore(body) {
+      postapi(`/api/app/patientregister/updaterecoverguidemany`, body)
+        .then((res) => {
+          if (res.code > -1) {
+            this.$message.success({ showClose: true, message: "操作成功！"});                  
+          }
+        })
+    },
+
     btnDragColDesign() {
       this.dragColDesign = deepCopy(this.dragCol);
       this.dialogColSort = true;

src/components/patientRegister/PatientRegisterRecoverList.vue

@@ -1,18 +1,14 @@
 <template>
   <div style="display: flex;">
-
-    <div :style="'padding: 15px;background-color: #fff;border-radius: 8px;width:' + (window.pageWidth - 200 - 110 - 65) + 'px;'">
-      <el-table :data="dataList"  width="100%" 
-        :height="window.pageHeight < 600 ? 350:window.pageHeight-245" 
-        row-key="id" size="small"
-        highlight-current-row ref="dataList"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="40"/>
+    <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'">
+      <el-table :data="dataList" width="100%" :height="window.pageHeight < 600 ? 350 : window.pageHeight - 220" row-key="id"
+        size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange" @row-click="rowClick">
+        <el-table-column type="selection" width="40" align="center" />
         <el-table-column prop="isRecoverGuide" label="回收" width="50">
           <template slot-scope="scope">
             <el-checkbox :value="scope.row.isRecoverGuide == 'Y'" />
           </template>
-        </el-table-column>        
+        </el-table-column>
         <el-table-column prop="completeFlag" label="体检进度">
           <template slot-scope="scope">
             <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
@@ -25,7 +21,8 @@
         </el-table-column>
         <el-table-column prop="customerOrgParentName" label="单位" width="180">
           <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="customerOrgName" label="部门" width="180">
@@ -119,30 +116,30 @@
     </div>
     <div style="margin-left: 10px;">
       <div class="listBtn">
-        <el-button type="success" class="commonbutton" @click="recover">回收表单</el-button>
+        <el-button type="success" class="commonbutton" @click="btnRecover">回收表单</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="scanRecover">扫码回收</el-button>
-      </div>        
+        <el-button type="primary" class="commonbutton" @click="btnScanRecover">扫码回收</el-button>
+      </div>
     </div>
-    <el-dialog title="扫/输入条码签到" :visible.sync="dialogVisible">
-      <el-form :model="form">
-        <el-form-item label="条码" label-width="100px">
-          <el-input v-model="form.patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
-        </el-form-item>        
-      </el-form>
+    <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogVisible" width="400" :append-to-body="true"
+      :close-on-click-modal="false">
+      <div class="query">
+        <span class="spanClass">条码号</span>
+        <el-input ref="tmh" v-model="patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
+      </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" class="commonbutton">关闭</el-button>
         <el-button type="primary" @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>
+        <el-button @click="dialogVisible = false" class="commonbutton">关闭</el-button>        
       </div>
-    </el-dialog>   
+    </el-dialog>
   </div>
 </template>
 <script>
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+import { dddw, objCopy, arrayReduce,arrayExistObj } from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
@@ -156,10 +153,11 @@ export default {
     return {
       dataList: [], //列表数据
       multipleSelection: [], //选中的数据列表
-      dialogVisible: false, 
-      form:{
-        patientRegisterNo:''
-      }   
+      selectedRow:{},  // 单行选中的行
+      dialogVisible: false,
+
+      patientRegisterNo: ''
+
     };
   },
 
@@ -168,7 +166,7 @@ export default {
   //挂载完成
   mounted() { },
   computed: {
-    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
@@ -177,54 +175,79 @@ export default {
       this.multipleSelection = val;
     },
 
-    recoverCore(body){      
+    rowClick(row){
+      this.selectedRow = row
+    },
+
+    // 回收表提交
+    recoverCore(body) {
       postapi(`/api/app/patientregister/updaterecoverguidemany`, body)
         .then((res) => {
-          if (res.code != -1){
-            console.log("操作成功");             
-          }                   
+          if (res.code > -1) {
+            this.$message.success({ showClose: true, message: "操作成功！"}); 
+            // 刷新页面回收状态
+            if(this.multipleSelection.length > 0){
+              this.multipleSelection.forEach(e => {
+                e.isRecoverGuide = 'Y'
+              });
+            }else{
+              let lfind = arrayExistObj(this.dataList,'id',body[0].id)
+              if(lfind > -1){
+                this.dataList[lfind].isRecoverGuide = 'Y'
+              }
+            }          
+          }
         })
-        .catch((err) => {
-          this.$message.error({ showClose: true, message:  "操作失败，原因：" + err});
-        });   
     },
 
-    //选中人员签到 
-    recover() {
-      if (!this.multipleSelection || this.multipleSelection.length < 1 ) {
-        this.$message.error({ showClose: true, message:  "请选择体检人员，再进行此操作"});
+    //选中人员记录回收
+    btnRecover() {
+      // 有勾选，则操作勾选的，无勾选则按选中的记录
+      let  selectedRds = []
+      selectedRds = selectedRds.concat(this.multipleSelection)
+      if(selectedRds.length == 0){
+        if(this.selectedRow.id) selectedRds.push(this.selectedRow)
+      }
+      if (selectedRds.length == 0) {
+        this.$message.warning({ showClose: true, message: "请勾选择或选中体检人员，再进行此操作" });
         return;
       }
+
       let body = []
-      this.multipleSelection.forEach(e =>{
+      selectedRds.forEach(e => {
         body.push(e.id)
       });
-      
+
       this.recoverCore(body)
-        
+
     },
 
-    scanRecover(){
+    // 点击扫码回收体检表按钮
+    btnScanRecover() {
+      this.patientRegisterNo = ''
       this.dialogVisible = true
+      this.$nextTick(() => {
+        this.$refs['tmh'].focus(); //打开光标定位到条码栏里 
+      });
     },
 
     //按条码号查个人数据
     signByPatientRegisterNo() {
-      let patientRegisterNo = this.form.patientRegisterNo
+      let patientRegisterNo = this.patientRegisterNo
       let body = {
-        sType:1,
+        sType: 1,
         patientRegisterNo
-      }      
-      console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
-      postapi('/api/app/patientregister/getpatientregisterorpatient',body)   
-      .then((res) => {
-        if (res.code != -1) {
-          if(res.data){
-            this.recoverCore([res.data.id])
-            this.form.patientRegisterNo = ''
-          }          
-        }
-      });
+      }
+      //console.log(`/api/app/patientregister/getpatientregisterorpatient`, body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient', body)
+        .then((res) => {
+          if (res.code != -1) {
+            if (res.data) {
+              this.recoverCore([res.data.id])
+              this.patientRegisterNo = ''
+            }
+          }
+        });
     },
 
     ldddw(arrayData, key, value, display) {
@@ -238,14 +261,14 @@ export default {
     //查询
     query() {
       let body = {}
-      
+
       console.log(`this.patientRegister.query`, this.patientRegister.query)
       if (this.patientRegister.query.customerOrgFlag) {
         if (this.patientRegister.query.CustomerOrgParentId) {
           body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
-        } else{
+        } else {
           if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
-        } 
+        }
       }
 
       if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
@@ -258,8 +281,8 @@ export default {
       if (this.patientRegister.query.startDate && this.patientRegister.query.endDate) {
         body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
         body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
-        if(body.startDate > body.endDate){
-          this.$message.warning({ showClose: true, message: "起始日期不能大于截止日期，数据校验不通过！"})
+        if (body.startDate > body.endDate) {
+          this.$message.warning({ showClose: true, message: "起始日期不能大于截止日期，数据校验不通过！" })
           return
         }
       }
@@ -272,23 +295,14 @@ export default {
       if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
 
 
-      console.log('/api/app/patientregister/getlistinfilter', body)
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      });
+      //console.log('/api/app/patientregister/getlistinfilter', body)
+
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
-          if(res.code != - 1){
+          if (res.code != - 1) {
             this.dataList = res.data.items;
           }
-          loading.close();
         })
-        .catch((err) => {
-          loading.close();
-        });
     },
   },
 
@@ -301,7 +315,7 @@ export default {
         this.query();
       }
     },
-   
+
   },
 };
 </script>
@@ -310,7 +324,18 @@ export default {
   margin-top: 10px;
 }
 
-.btnClass{
-  width:100px;
+.btnClass {
+  width: 100px;
+}
+.query {
+  margin-right: 10px;
+  font-size: 14px;
+  color: #232748;
+  font-weight: 400;
+  font-family: "NotoSansSC-Regular";
+}
+.spanClass {
+  font-size: 14px;
+  padding: 0 2px 0 0;
 }
 </style>

src/views/customerOrg/patientRegister.vue

@@ -6,7 +6,7 @@
       </div>  
       <div style="display: flex;">
         <!-- 单位树组件 -->
-        <div :style="'margin-right:5px;background-color: #fff;border-radius: 8px;width:208px; height:' +
+        <div :style="'margin-right:10px;background-color: #fff;border-radius: 8px;width:208px; height:' +
           (window.pageHeight < 600 ? 450 : window.pageHeight - 100) +
           'px;'
           ">    

src/views/customerOrg/patientRegisterRecover.vue

@@ -1,26 +1,21 @@
 <template>
   <div>
-    <div>
-      <div class="middlebox">
-        <div class="contenttitle">
-          体检登记 /
-          <span class="contenttitleBold"
-            >体检表回收</span
-          >
-        </div>
+    <div>      
+      <div class="contenttitle">
+        体检登记 /<span class="contenttitleBold">体检表回收</span>
       </div>
-      <div style="display: flex;margin-top: 7px;">
+      <div style="display: flex;">
         <!-- 单位树组件 -->
-        <div :style="'margin-right:15px;background-color: #fff;border-radius: 8px;width:208px; height:' +
-          (window.pageHeight < 600 ? 450 : window.pageHeight - 100) +
+        <div :style="'margin-right:10px;background-color: #fff;border-radius: 8px;width:208px; height:' +
+          (window.pageHeight < 600 ? 450 : window.pageHeight - 98) +
           'px;'
           ">
-          <CustomerOrgTreeAll />
+          <!----> 
+          <CustomerOrgTreeAll />    
+               
         </div>
         <div :style="'display:block;width:' +
           (window.pageWidth - 200 - 35) +
-          'px;height:' +
-          (window.pageHeight < 600 ? 450 : window.pageHeight - 150) +
           'px;'">
           <!-- 查询条件  -->
           <PatientRegisterQuery />
@@ -210,6 +205,20 @@ export default {
 };
 </script>
 <style scoped>
-@import '../../assets/css/global_card.css';
-
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+.box {
+  display: flex;
+}
+
+.listBtn {
+  margin-top: 5px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 100px;
+}
 </style>