bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk

This commit is contained in:
jiask 2025-09-22 12:17:46 +08:00
parent 7d8e93e965
commit 51315da75d
10 changed files with 99 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/healthCenter/index.js
View File

@ -157,6 +157,8 @@ export function delHealthInfoApi(data) {
data: data
})
}
// 模板-列表
export function getModelListApi() {
return request({
@ -190,6 +192,16 @@ export function addReportApi(data) {
data: data
})
}
export function getHealthReportPageApi(data) {
return request({
url: '/smart-canteen/health_person_medical_report/list',
method: 'get',
headers: {
//"merchant-id":"378915229716713472",
},
params:data
})
}
export function getReportApi(data) {
return request({
url: '/smart-canteen/health_person_medical_report/getReportList',

9
src/views/canteen/accountCenter/cardManage/cardList/index.vue
View File

@ -7,6 +7,13 @@
<el-form-item label="用户编号" prop="userId">
<el-input v-model="queryParams.userId" placeholder="请输入用户编号" maxlength="20" clearable style="width: 240px"/>
</el-form-item>
<el-form-item label="卡状态" prop="cardStatus">
<el-select v-model="queryParams.cardStatus" placeholder="请选择卡状态" style="width: 240px;">
<el-option label="正常" :value="1"></el-option>
<el-option label="挂失" :value="4"></el-option>
<el-option label="退卡" :value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -195,7 +202,7 @@
"pageSize": this.queryParams.pageSize,
"serialNum": this.queryParams.serialNum,
"userId": this.queryParams.userId,
"cardStatus":"1"
"cardStatus":this.queryParams.cardStatus
// "accountStatusList": this.queryParams.accountStatusList,
// "deptIdList": this.queryParams.deptIdList,
// "walletType": this.queryParams.walletType,

2
src/views/canteen/dish/dish/index.vue
View File

@ -950,7 +950,7 @@
appendTreeNode(data) {
this.form={
"level": "0",
"parentId": "1",
"parentId": "0",
}
this.resetForm("form");
this.openType = true;

10
src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
View File

@ -60,7 +60,7 @@
<el-input v-model="baseInfo.inspector" placeholder="请输入验货人" maxlength="20" clearable style="width: 240px"/>
</el-form-item> -->
<el-form-item label="验货人" prop="inspector">
<el-select v-model="contractPerson" placeholder="请选择验货人" clearable style="width: 240px">
<el-select v-model="baseInfo.inspector" placeholder="请选择验货人" clearable style="width: 240px">
<el-option
v-for="option in contractPersonOptions"
:key="option.value"
@ -344,9 +344,9 @@ export default {
inspector: [
{ required: true, message: "验货人不能为空", trigger: "blur" }
],
inspectAttachmentList: [
{ required: true, message: "查验附件不能为空", trigger: "change" }
],
// inspectAttachmentList: [
// { required: true, message: "查验附件不能为空", trigger: "change" }
// ],
},
treeAreaOptions:[],
canteenOptions:[],
@ -423,7 +423,7 @@ export default {
if (response.rows) {
// 从接口返回的数据中提取用户选项
this.contractPersonOptions = response.rows.map(user => ({
value: user.userId, // 下拉框绑定的值
value: user.userId+'', // 下拉框绑定的值
label: user.userName, // 下拉框显示的文本
}));
}

2
src/views/foodManage/purchaseManage/purchasePlan/detail.vue
View File

@ -96,7 +96,7 @@
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="预计采购金额(元)" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.purchaseNum*scope.row.unitPrice/100).toFixed(2) }}</span>
<span>{{ (scope.row.purchaseNum*scope.row.unitPrice).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>

11
src/views/foodManage/stockManage/warehouseIn/edit.vue
View File

@ -455,16 +455,15 @@ export default {
},
//添加货品
addMaterial(){
if(this.baseInfo.areaId!=undefined){
if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId!=undefined){
this.openDialog=true
this.resetQuery()
setTimeout(()=>{
this.$refs.multipleTable1.clearSelection()
},300)
}else{
this.$modal.msgError("请先选择区域");
this.$modal.msgError("请先选择区域，仓库");
}
},
/** 搜索按钮操作 */
handleQuery() {
@ -558,7 +557,11 @@ export default {
})
}
if(this.noMaterial){
if(this.baseInfo.relateOrderGoodsId&&this.baseInfo.relateOrderGoodsId!=""){
this.$modal.msgError("当前导入的采购订单无验收无法入库！");
}else{
this.$modal.msgError("表格数据请填写完整！");
}
}else{
this.noMaterial = true;
if(this.materialList.length>0){
@ -655,7 +658,7 @@ export default {
},
//导入
importPurchaseOrder(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId!=undefined){
this.openImportDialog=true
this.resetQuery2()
// setTimeout(()=>{

2
src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
View File

@ -58,7 +58,7 @@
}" @change="handleAreaChange">
</el-cascader> -->
</el-descriptions-item>
<el-descriptions-item label="邀请供应商" prop="supplierId">
<el-descriptions-item label="供应商名称" prop="supplierId">
{{ baseInfo.supplierName }}
<!-- <el-select v-model="baseInfo.supplierId" @change="handleSupplierChange" placeholder="请选择供应商" style="width: 100%;">
<el-option v-for="item in supplierOptions"

24
src/views/foodManage/supplierFunction/supplierQuotation/index.vue
View File

@ -235,7 +235,13 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
const currenttime=this.getNowFormatDate();
if(currenttime<=row.endTime){
this.$router.push({ path: "/foodManage/supplierFunction/supplierQuotationEdit",query: {supplierQuotationData:JSON.stringify(row)} });
}else{
this.$modal.msgError("报价已结束");
}
},
// 取消按钮
cancel() {
@ -277,6 +283,22 @@ export default {
this.end = parseInt(end.getTime() / 1000)
return [start, end]
},
//获取当前时间，格式YYYY-MM-DD
getNowFormatDate() {
var date = new Date();
var seperator1 = "-";
var year = date.getFullYear();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = year + seperator1 + month + seperator1 + strDate;
return currentdate;
},
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD
@ -284,6 +306,8 @@ export default {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
const day = String(date.getDate()).padStart(2, '0');
const ct=year+"-"+month+"-"+day;
console.log(ct);
return `${year}-${month}-${day}`;
},
//日期时间

13
src/views/foodManage/supplierManage/goodsSupplier/index.vue
View File

@ -502,8 +502,13 @@ export default {
}else{
flag=true
}
}else{
if(item.status==1){
flag=false
}else{
flag=true
}
}
return flag;
},
//首选选过的供应商，不能在备选里选
@ -520,6 +525,12 @@ export default {
}else{
flag=true
}
}else{
if(item.status==1){
flag=false
}else{
flag=true
}
}
return flag;
},

14
src/views/system/user/index.vue
View File

@ -218,9 +218,13 @@
prop="userName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="scope">
<span>{{ hidePhone(scope.row.phonenumber) }}</span>
</template>
</el-table-column>
<el-table-column
label="用户编码"
label="员工编号"
align="center"
key="userCode"
prop="userCode"
@ -422,10 +426,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户编码" prop="userCode">
<el-form-item label="员工编号" prop="userCode">
<el-input
v-model="form.userCode"
placeholder="请输入用户编码"
placeholder="请输入员工编号"
maxlength="30" @input="(v)=>(form.userCode=v.replace(/[^\d]/g,''))"
/>
</el-form-item>
@ -890,7 +894,7 @@ export default {
userCode: [
{
required: true,
message: '用户编码不能为空',
message: '员工编号不能为空',
trigger: 'blur',
},
],