Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen
This commit is contained in:
commit
e2f591e499
|
|
@ -153,13 +153,10 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<div>用户姓名:<b>测试操作员</b></div>
|
||||
<div>用户姓名:<b>{{personData.nickName}}</b></div>
|
||||
</td>
|
||||
<td>
|
||||
<div>性别:<b>男</b></div>
|
||||
</td>
|
||||
<td>
|
||||
<div>年龄:<b>未知</b></div>
|
||||
<div>性别:<b>{{personData.sex==2?'未知':(personData.sex==0?'男':'女')}}</b></div>
|
||||
</td>
|
||||
<td>
|
||||
<div><span>检验机构:</span></div>
|
||||
|
|
@ -322,7 +319,7 @@
|
|||
import { dictHealthChronicApi,getHealthSciencePageApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi
|
||||
,getModelListApi,getHealthInfoDetailApi,getModelByIdApi,addReportApi,getReportApi,delReportListApi,getReportByIdApi } from "@/api/healthCenter/index";
|
||||
import { imgUpLoadTwo } from '@/api/system/upload'
|
||||
|
||||
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
|
||||
export default {
|
||||
name: "",
|
||||
dicts: [],
|
||||
|
|
@ -489,6 +486,9 @@ export default {
|
|||
// }
|
||||
getHealthInfoPageApi(param).then(response => {
|
||||
this.tableListData = response.rows;
|
||||
this.tableListData.forEach(item=>{
|
||||
this.$set(item,"mobile",decryptWithSM4(item.mobile))
|
||||
});
|
||||
this.total = Number(response.total);
|
||||
this.loading = false;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
|
||||
<!-- 对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
|
||||
<el-form ref="form" :model="form" label-width="90px">
|
||||
<el-row justify="center">
|
||||
<table align="center" width="80%" cellspacing="0">
|
||||
<tr >
|
||||
|
|
@ -314,6 +314,7 @@
|
|||
import { deptTreeSelect } from '@/api/system/user'
|
||||
import { dictHealthChronicApi,getHealthSciencePageApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi,getHealthInfoDetailApi,editHealthInfoApi,delHealthInfoApi } from "@/api/healthCenter/index";
|
||||
import { imgUpLoadTwo } from '@/api/system/upload'
|
||||
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
|
||||
|
||||
export default {
|
||||
name: "",
|
||||
|
|
@ -485,6 +486,9 @@ export default {
|
|||
getHealthInfoPageApi(param).then(response => {
|
||||
this.tableListData = response.rows;
|
||||
console.log("this.tableListData",this.tableListData);
|
||||
this.tableListData.forEach(item=>{
|
||||
this.$set(item,"mobile",decryptWithSM4(item.mobile))
|
||||
})
|
||||
this.total = Number(response.total);
|
||||
this.loading = false;
|
||||
});
|
||||
|
|
@ -607,7 +611,13 @@ export default {
|
|||
const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
|
||||
const day = String(date.getDate()).padStart(2, '0');
|
||||
return `${year}-${month}-${day}`;
|
||||
}
|
||||
},
|
||||
getDecryptWithSM4(obj){
|
||||
return decryptWithSM4(obj);
|
||||
},
|
||||
getEncryptWithSM4(obj){
|
||||
return encryptWithSM4(obj);
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ export default {
|
|||
},
|
||||
// 图片上传
|
||||
imgUpLoad(param, name, index) {
|
||||
// console.log(param,'image')
|
||||
console.log(param,'image')
|
||||
param.type = 'canteen'
|
||||
imgUpLoadTwo(param).then((res) => {
|
||||
if (res.code == 200) {
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
|
||||
|
||||
<el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable">
|
||||
<el-table-column label="日期时间" align="center" prop="enterTime" :show-overflow-tooltip="true" ></el-table-column>
|
||||
<el-table-column label="日期时间" align="center" prop="enterTime" :show-overflow-tooltip="true" width="280"></el-table-column>
|
||||
<el-table-column label="员工编号" align="center" prop="staffNo" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="员工姓名" align="center" prop="staffName" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="体温" align="center" prop="temp" :show-overflow-tooltip="true">
|
||||
|
|
@ -310,7 +310,7 @@
|
|||
import { deptTreeSelect } from '@/api/system/user'
|
||||
import { getIntoRecordsListApi } from "@/api/kitchen/intoRecords";
|
||||
import { imgUpLoadTwo } from '@/api/system/upload'
|
||||
|
||||
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
|
||||
export default {
|
||||
name: "",
|
||||
dicts: [],
|
||||
|
|
@ -436,10 +436,21 @@ export default {
|
|||
getIntoRecordsListApi(param).then(response => {
|
||||
this.tableListData = response.rows;
|
||||
console.log("this.tableListData",this.tableListData);
|
||||
this.tableListData.forEach(item=>{
|
||||
this.$set(item,"mobile",this.getDecryptWithSM4(item.mobile))
|
||||
});
|
||||
this.total = Number(response.total);
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
getDecryptWithSM4(obj){
|
||||
const str=decryptWithSM4(obj);
|
||||
if(str==""||str==''){
|
||||
return obj;
|
||||
}else{
|
||||
return str;
|
||||
}
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
|
|
|
|||
Loading…
Reference in New Issue