Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/personHealthLedger.js

@@ -73,11 +73,14 @@ function exportXlsTWYC(formData) {
 function exportXlsZZYC(formData) {
   return request.post(constant.serverUrl + "/base/personHealthLedger/exportXlsZZYC", formData);
 }
+function healthLedgerDateCompanyNumExportXls() {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/healthLedgerDateCompanyNumExportXls");
+}
 
 function pageListNew(formData) {
   return request.post(constant.serverUrl + "/base/personHealthLedger/pageListNew", formData);
 }
 
 export default {
-  pageList, create, edit, add, update, remove, batchRemove, exportXls, pageListAll,exportXlsAll,gpsHistoryList,exportXlsWC,exportXlsTWYC,exportXlsZZYC,healthLedgerDateExportXls,pageListNew
+  pageList, create, edit, add, update, remove, batchRemove, exportXls, pageListAll,exportXlsAll,gpsHistoryList,exportXlsWC,exportXlsTWYC,exportXlsZZYC,healthLedgerDateExportXls,pageListNew,healthLedgerDateCompanyNumExportXls
 }

src/views/base/personHealthLedger-list.vue

@@ -114,6 +114,14 @@
       <el-button type="warning" size="small" plain icon="el-icon-download" :loading="downloadLoading" @click="exportXlsWC">导出外出信息台账</el-button>
       <el-button type="danger" size="small" plain icon="el-icon-download" :loading="downloadLoading" @click="exportXlsTWYC">导出体温异常信息台账</el-button>
       <el-button type="danger" size="small" plain icon="el-icon-download" :loading="downloadLoading" @click="exportXlsZZYC">导出症状异常信息台账</el-button>
+      <el-button
+        type="success"
+        size="small"
+        plain
+        icon="el-icon-download"
+        :loading="downloadLoading"
+        @click="exportXlsQYMXB"
+      >导出春节期间企业人员情况明细表</el-button>
     </el-row>
     <el-table
       ref="formTable"
@@ -639,6 +647,36 @@ export default {
           });
         }
       });
+    },
+    exportXlsQYMXB(){
+      var self = this;
+      //导出
+
+      self.downloadLoading = true;
+      self.loading = true;
+
+      personHealthLedgerApi.healthLedgerDateCompanyNumExportXls().then(function(response) {
+        var jsonData = response.data;
+
+        self.downloadLoading = false;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.$message({
+            type: "success",
+            showClose: true,
+            message: `报表已生成，<a href="${jsonData.data}">请点击链接下载</a>`,
+            dangerouslyUseHTMLString: true,
+            duration: 30000
+          });
+        } else {
+          self.$message({
+            type: "warning",
+            message: jsonData.message
+          });
+        }
+      });
+
     }
   },
   mounted: function() {

src/views/base/returnInfo-list.vue

@@ -33,6 +33,16 @@
             v-model="queryModel.phone"
             ></el-input>
         </el-form-item>
+        <el-form-item label="是否能修改" prop="enableUpdate">
+            <el-select size="mini" v-model="queryModel.enableUpdate">
+                <el-option
+                v-for="enableUpdates in enableUpdateList"
+                :key="enableUpdates.id"
+                :label="enableUpdates.name"
+                :value="enableUpdates.id"
+                ></el-option>
+            </el-select>
+        </el-form-item>
         <el-form-item>
             <el-button
             type="primary"
@@ -112,6 +122,12 @@
                 label="返乡类型"
                 width="180"
             ></el-table-column>
+            <el-table-column prop="enableUpdate" label="是否能修改" width="180">
+                <template slot-scope="{row}">
+                    <span v-if="row.enableUpdate">是</span>
+                    <span v-else>否</span>
+                </template>
+            </el-table-column>
             <el-table-column prop="checkImageUrl" label="核酸检测报告" width="180">
                 <template slot-scope="{ row }">
                     <a :href="row.checkImageUrl" target="_blank">
@@ -183,7 +199,8 @@ export default {
         queryModel: {
             name:"",
             idCard:"",
-            phone:""
+            phone:"",
+            enableUpdate:"",
         },
         loading: false,
         tableData: [],
@@ -198,6 +215,14 @@ export default {
         showModal: false,
         modalTitle: "",
         businessKey: "",
+        enableUpdateList:[{
+            name:"是",
+            id:true
+        },
+        {
+            name:"否",
+            id:false
+        }]
         };
     },
     methods: {
@@ -215,6 +240,7 @@ export default {
             formData.append("name", self.queryModel.name);
             formData.append("idCard", self.queryModel.idCard);
             formData.append("phone", self.queryModel.phone);
+            formData.append("enableUpdate", self.queryModel.enableUpdate);
 
             returnInfoApi
                 .pageList(formData)