Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/patientRegister/PatientRegisterEdit.vue

@@ -35,7 +35,7 @@
             </div>
           </div>
         </div>
-        <div>
+        <div style="background-color: #e8e8e8;">
           <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="medium">
             <el-row>
               <el-col :span="5">

src/components/patientRegister/PatientRegisterRecoverList.vue

@@ -107,11 +107,11 @@
       <div class="listBtn">
         <el-button type="primary" class="commonbutton" @click="btnScanRecover">扫码回收</el-button>
       </div>
-      <div class="listBtn">
+      <!-- <div class="listBtn">
         <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
             <el-button type="" style="width:100%">导出excel</el-button>
           </download-excel>
-      </div>
+      </div> -->
     </div>
     <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogVisible" width="400px" :append-to-body="true"
       :close-on-click-modal="false">

src/components/patientRegister/patientRegisterRecoverListQuery.vue

@@ -132,6 +132,11 @@
       <div class="query">
         <el-button class="commonbutton" @click="btnQuery">查询</el-button>
       </div>
+      <div class="query">
+        <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
+            <el-button type="" style="width:100%">导出excel</el-button>
+          </download-excel>
+      </div>
     </div>
     <div :style="'margin-top: 10px;width:' + (window.pageWidth - 15) + 'px;'">
       <el-table :data="tableData" width="100%" border :height="window.pageHeight < 600 ? 405 : window.pageHeight - 165"
@@ -243,8 +248,8 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
-
+import { dddw, objCopy, arrayReduce, arrayExistObj,deepCopy  } from "@/utlis/proFunc";
+import { savePeoplePhoto } from "../../utlis/proApi";
 
 export default {
   components: {
@@ -272,6 +277,40 @@ export default {
       loadOptsInit: {},
       lazyLoading: false,
       dom: null,
+      jsonFields: {
+        回收:"isRecoverGuide",
+        体检进度: "completeFlag",
+        锁住: "isLock",
+        单位: "customerOrgParentName",
+        部门: "customerOrgName",
+        姓名: "patientName",
+        性别: "sexName",
+        年龄: "age",
+        条码号: "patientRegisterNo",
+        档案号: "patientNo",
+        体检次数: "medicalTimes",
+        分组套餐: "groupPack",
+        民族: "nationName",
+        身份证: "idNo",
+        出生日期: "birthDate",
+        邮箱: "email",
+        手机: "mobileTelephone",
+        电话: "telephone",
+        地址: "address",
+        体检卡号: "medicalCardNo",
+        工卡号: "jobCardNo",
+        婚姻状况: "maritalStatusName",
+        体检类别: "medicalTypeName",
+        人员类别: "personnelTypeName",
+        职务: "jobPost",
+        职称: "jobTitle", 
+        介绍人: "salesman",
+        VIP: "isVip",
+        登记人: "creatorName",
+        登记日期: "creationTime",
+        上传: "isUpload"
+      },
+      tableName:""
     };
   },
 
@@ -605,7 +644,22 @@ export default {
         }
       })
     },
-
+    btnExport(elId) {
+      let tableDatas = deepCopy(this.tableData)
+      tableDatas.forEach((e, index) => {
+        if(e.completeFlag) e.completeFlag = this.dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
+        if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
+        if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
+          e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+        } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
+          e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+        }
+        if (e.idNo) e.idNo = e.idNo + '&'
+        if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
+      })
+      this.tableName = '体检表回收' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      return tableDatas;
+    },
   },
 
   //监听事件

src/components/report/deptProgress.vue

@@ -161,7 +161,7 @@ export default {
   //挂载完成
   mounted() {
     let ldate = new Date();
-    this.query.startDate = ldate;
+    this.query.startDate = this.moment(ldate).format("YYYY-MM-DD");
     this.query.endDate = ldate;
 
 
@@ -177,7 +177,6 @@ export default {
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
     dddw, moment,
-
     dictInit() {
       //体检类别
       // getapi("/api/app/medical-type/in-filter").then((res) => {