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:
zzyuan 2025-06-05 13:41:10 +08:00
commit ee270bd8c7
2 changed files with 37 additions and 49 deletions

View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 分页查询 营养科普-列表
export function getHealthSciencePageApi(data) {
return request({
url: '/smart-canteen/health_popular_science/list',
url: '/smart-canteen/health_popular_article/list',
method: 'get',
headers: {
"merchant-id":"378915229716713472",
@ -15,7 +15,7 @@ export function getHealthSciencePageApi(data) {
// 营养科普-新增
export function addHealthScienceApi(data) {
return request({
url: '/smart-canteen/health_popular_science',
url: '/smart-canteen/health_popular_article',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -27,7 +27,7 @@ export function addHealthScienceApi(data) {
// 营养科普-编辑
export function editHealthScienceApi(data) {
return request({
url: '/smart-canteen/health_popular_science/edit',
url: '/smart-canteen/health_popular_article/edit',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -39,7 +39,7 @@ export function editHealthScienceApi(data) {
// 营养科普-删除
export function delHealthScienceApi(Id) {
return request({
url: '/smart-canteen/health_popular_science/del/'+Id,
url: '/smart-canteen/health_popular_article/del/'+Id,
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -51,7 +51,7 @@ export function delHealthScienceApi(Id) {
// 获取慢性病字典-下拉
export function dictHealthChronicApi(data) {
return request({
url: '/smart-canteen/health/chronic/dict-health-chronic',
url: '/smart-canteen/health_chronic/dict-health-chronic',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -106,7 +106,7 @@ export function delChronicApi(Id) {
// 分页查询 健康档案-列表
export function getHealthInfoPageApi(data) {
return request({
url: '/smart-canteen/health/info/list',
url: '/smart-canteen/health_person_info/list',
method: 'get',
headers: {
"merchant-id":"378915229716713472",
@ -117,7 +117,7 @@ export function getHealthInfoPageApi(data) {
// 查询 健康档案-详情
export function getHealthInfoDetailApi(data) {
return request({
url: '/smart-canteen/health/info/detail-health-info',
url: '/smart-canteen/health_person_info/detail-health-info',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -128,7 +128,7 @@ export function getHealthInfoDetailApi(data) {
// 健康档案-编辑
export function editHealthInfoApi(data) {
return request({
url: '/smart-canteen/health/info/edit-health-info',
url: '/smart-canteen/health_person_info/edit-health-info',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@ -140,7 +140,7 @@ export function editHealthInfoApi(data) {
// 健康档案-删除
export function delHealthInfoApi(data) {
return request({
url: '/smart-canteen/health/info/del-health-info',
url: '/smart-canteen/health_person_info/del-health-info',
method: 'post',
headers: {
"merchant-id":"378915229716713472",

View File

@ -339,39 +339,39 @@ export default {
open: false,
dateRange:[new Date(),new Date()],
chronicOptions:[],
doctorAdviceOptions:[{"doctorAdvice":1,"doctorAdviceName":"禁食"},
{"doctorAdvice":2,"doctorAdviceName":"流食"},
{"doctorAdvice":3,"doctorAdviceName":"半流食"},
{"doctorAdvice":4,"doctorAdviceName":"治疗饮食"},
doctorAdviceOptions:[{"doctorAdvice":"1","doctorAdviceName":"禁食"},
{"doctorAdvice":"2","doctorAdviceName":"流食"},
{"doctorAdvice":"3","doctorAdviceName":"半流食"},
{"doctorAdvice":"4","doctorAdviceName":"治疗饮食"},
],
bloodTypeOptions:[
{"bloodType":1,"bloodTypeName":"A型"},
{"bloodType":2,"bloodTypeName":"B型"},
{"bloodType":3,"bloodTypeName":"AB型"},
{"bloodType":4,"bloodTypeName":"O型"},
{"bloodType":5,"bloodTypeName":"Rh阳型"},
{"bloodType":6,"bloodTypeName":"Rh阴型"}
{"bloodType":"1","bloodTypeName":"A型"},
{"bloodType":"2","bloodTypeName":"B型"},
{"bloodType":"3","bloodTypeName":"AB型"},
{"bloodType":"4","bloodTypeName":"O型"},
{"bloodType":"5","bloodTypeName":"Rh阳型"},
{"bloodType":"6","bloodTypeName":"Rh阴型"}
],//
weightControlOptions:[
{"weightControl":1,"weightControlName":"减重"},
{"weightControl":2,"weightControlName":"增重"}
{"weightControl":"1","weightControlName":"减重"},
{"weightControl":"2","weightControlName":"增重"}
],//
ifHospitalizedOptions:[
{"ifHospitalized":1,"ifHospitalizedName":"是"},
{"ifHospitalized":2,"ifHospitalizedName":"否"}
{"ifHospitalized":"1","ifHospitalizedName":"是"},
{"ifHospitalized":"2","ifHospitalizedName":"否"}
],//
pregnantOptions:[
{"pregnantStatus":0,"pregnantStatusName":"保密"},
{"pregnantStatus":1,"pregnantStatusName":"未怀孕"},
{"pregnantStatus":2,"pregnantStatusName":"孕妇(早期)"},
{"pregnantStatus":3,"pregnantStatusName":"孕妇(中期)"},
{"pregnantStatus":4,"pregnantStatusName":"孕妇(晚期)"},
{"pregnantStatus":5,"pregnantStatusName":"乳母"}
{"pregnantStatus":"0","pregnantStatusName":"保密"},
{"pregnantStatus":"1","pregnantStatusName":"未怀孕"},
{"pregnantStatus":"2","pregnantStatusName":"孕妇(早期)"},
{"pregnantStatus":"3","pregnantStatusName":"孕妇(中期)"},
{"pregnantStatus":"4","pregnantStatusName":"孕妇(晚期)"},
{"pregnantStatus":"5","pregnantStatusName":"乳母"}
],//怀
labourIntensityOptions:[
{"labourIntensity":1,"labourIntensityName":"轻劳动"},
{"labourIntensity":2,"labourIntensityName":"中等强度劳动"},
{"labourIntensity":3,"labourIntensityName":"重强度劳动"}
{"labourIntensity":"1","labourIntensityName":"轻劳动"},
{"labourIntensity":"2","labourIntensityName":"中等强度劳动"},
{"labourIntensity":"3","labourIntensityName":"重强度劳动"}
],//
//
queryParams: {
@ -381,6 +381,7 @@ export default {
deptIdList:[],//
chronicList:[], //
placeIdList:[], //
doctorAdvice:[],//
articleType:null //
},
form: {
@ -406,19 +407,6 @@ export default {
doctorAdvice:null,
weightControl:null,
},//
rules: {
articleTitle: [
{ required: true, message: "文章标题不能为空", trigger: "blur" }
],
articleContent: [
{ required: true, message: "文章内容不能为空", trigger: "blur" }
]
},
fileList: [],//
checkUrlList: [],//
checkUrlNameList: [],//
dialogVisible:false,//
dialogImageUrl:"",//
};
},
created() {
@ -469,6 +457,7 @@ export default {
pageSize: 10,
articleTitle: undefined,//
chronicList:[], //
doctorAdvice:[],
articleType:null //
}
this.resetForm("queryForm");
@ -481,10 +470,8 @@ export default {
"pageNum":this.queryParams.pageNum,
"pageSize":this.queryParams.pageSize,
"articleTitle":this.queryParams.articleTitle,
"articleType":this.queryParams.articleType,
"chronicIds":this.queryParams.chronicList.join(",")||"",
"startDate":this.formatDate(this.dateRange[0]),
"endDate":this.formatDate(this.dateRange[1])
"doctorAdvices":this.queryParams.doctorAdvice.join(",")||"",
"chronicIds":this.queryParams.chronicList.join(",")||""
}
// if(this.queryParams.chronicList.length>0){
// this.queryParams.chronicIds = this.queryParams.chronicList.join(",")
@ -493,6 +480,7 @@ export default {
// }
getHealthInfoPageApi(param).then(response => {
this.tableListData = response.rows;
console.log("this.tableListData",this.tableListData);
this.total = Number(response.total);
this.loading = false;
});