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

测试问题修改

This commit is contained in:
zzyuan 2025-07-09 16:38:56 +08:00
parent 46192df626
commit 5e529ed911
21 changed files with 122 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/canteen/accountCenter/account/accountManager/index.vue
View File

@ -187,11 +187,11 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="个人钱包" prop="walletLimitBalance">
<el-input v-model="form.walletLimitBalance" placeholder="请输入允许最低余额" maxlength="8" clearable style="width: 300px;"
@input="(v)=>(form.walletLimitBalance=v.replace(/[^\d.]/g,''))"/>
@input="(v)=>(form.walletLimitBalance=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</el-form-item>
<el-form-item label="补贴钱包" prop="subLimitBalance">
<el-input v-model="form.subLimitBalance" placeholder="请输入允许最低余额" maxlength="8" clearable style="width: 300px;"
@input="(v)=>(form.subLimitBalance=v.replace(/[^\d.]/g,''))"/>
@input="(v)=>(form.subLimitBalance=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</el-form-item>
<el-form-item label="有账户有效期" prop="accEndDate">
<el-date-picker
@ -278,7 +278,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="补贴金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入补贴金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(form.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(form.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -349,7 +349,7 @@
<el-form ref="batchForm" :model="batchForm" :rules="batchRules" label-width="100px">
<el-form-item label="补贴金额" prop="amount">
<el-input v-model="batchForm.amount" placeholder="请输入补贴金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(batchForm.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(batchForm.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -460,7 +460,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="充值金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入充值金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(form.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(form.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -529,7 +529,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="提现金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入提现金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(form.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(form.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -714,7 +714,7 @@
accountStatus:row.accountStatus,
userId:row.userId
}
this.$modal.confirm('确认要"' + text + '吗？').then(function() {
this.$modal.confirm('确认要' + text + '吗？').then(function() {
return updateAccStateApi(param)
}).then(() => {
this.$modal.msgSuccess(text + '成功')
@ -888,6 +888,11 @@
}
accInfoPageApi(param).then(response => {
this.dialogTableData = response.rows;
this.dialogTableData.forEach(item=>{
if(item.phoneNumber&&item.phoneNumber!=""){
this.$set(item,"phoneNumber",decryptWithSM4(item.phoneNumber))
}
})
this.dialogTotal = Number(response.total);
});
},

4
src/views/canteen/accountCenter/account/wallet/index.vue
View File

@ -171,7 +171,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="充值金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入充值金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(form.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(form.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -241,7 +241,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="提现金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入提现金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(form.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(form.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>

13
src/views/canteen/accountCenter/butie/butie/index.vue
View File

@ -179,7 +179,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="补贴金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入补贴金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(form.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(form.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -263,7 +263,7 @@
<el-form ref="batchForm" :model="batchForm" :rules="batchRules" label-width="100px">
<el-form-item label="补贴金额" prop="amount">
<el-input v-model="batchForm.amount" placeholder="请输入补贴金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(batchForm.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(batchForm.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -406,7 +406,7 @@
</el-form-item>
<el-form-item label="操作金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入操作金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(form.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(form.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -482,7 +482,7 @@
</el-form-item>
<el-form-item label="操作金额" prop="amount">
<el-input v-model="batchForm.amount" placeholder="请输入操作金额" maxlength="9" clearable style="width: 300px;"
@input="(v)=>(batchForm.amount=v.replace(/[^\d.]/g,''))">
@input="(v)=>(batchForm.amount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -802,6 +802,11 @@
}
accInfoPageApi(param).then(response => {
this.dialogTableData = response.rows;
this.dialogTableData.forEach(item=>{
if(item.phoneNumber&&item.phoneNumber!=""){
this.$set(item,"phoneNumber",decryptWithSM4(item.phoneNumber))
}
})
this.dialogTotal = Number(response.total);
});
},

35
src/views/canteen/base/canteenStall/area/index.vue
View File

@ -104,7 +104,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="typeList" border height="800">
<el-table v-loading="loading" :data="tableListData" border height="800">
<el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@ -225,7 +225,7 @@
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { systemAreaTreeApi,getAreaListApi,addAreaApi,updateAreaApi,removeAreaApi } from "@/api/base/area";
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
export default {
name: "ToolsType",
components: { Treeselect },
@ -260,7 +260,7 @@
// 总条数
total: 0,
//列表数据
typeList: undefined,
tableListData: undefined,
// 是否显示弹出层
open: false,
// 弹出层标题
@ -352,8 +352,13 @@
"pagenation":true
}
getAreaListApi(params).then((response) => {
this.typeList = response.rows;
this.tableListData = response.rows;
this.total = Number(response.total);
this.tableListData.forEach(item=>{
if(item.contactTel&&item.contactTel!=""){
this.$set(item,"contactTel",decryptWithSM4(item.contactTel))
}
})
this.loading = false;
});
},
@ -427,15 +432,21 @@
console.log(this.form, "提交参数---");
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.areaId != undefined) {
updateAreaApi(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.getTreeData();
});
let param = {
...this.form
}
if(param.contactTel&&param.contactTel!=""){
param.contactTel = encryptWithSM4(this.baseForm.contactTel)
}
if (param.areaId != undefined) {
updateAreaApi(param).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.getTreeData();
});
}else {
addAreaApi(this.form).then((response) => {
addAreaApi(param).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();

21
src/views/canteen/base/canteenStall/canteen/index.vue
View File

@ -211,7 +211,8 @@
<script>
import { systemAreaTreeApi } from "@/api/base/area";
import { getPageCanteenApi, addCanteenApi, getCanteenInfoModifyApi, updateCanteenApi, removeCanteenApi } from "@/api/base/canteen";
import { imgUpLoadTwo } from '@/api/system/upload'
import { imgUpLoadTwo } from '@/api/system/upload';
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
export default {
name: "",
dicts: ['stall_tag'],
@ -329,6 +330,11 @@
getPageCanteenApi(param).then(response => {
this.tableListData = response.rows;
this.total = Number(response.total);
this.tableListData.forEach(item=>{
if(item.contactTel&&item.contactTel!=""){
this.$set(item,"contactTel",decryptWithSM4(item.contactTel))
}
})
this.loading = false;
});
},
@ -365,6 +371,9 @@
console.log(response)
this.canteenId = response.data.canteenId;
this.baseForm = response.data;
if(this.baseForm.contactTel&&this.baseForm.contactTel!=""){
this.$set(this.baseForm,"contactTel",decryptWithSM4(this.baseForm.contactTel))
}
if(response.data.imgUrl){
this.fileList=[{url:response.data.imgUrl}]
this.checkUrlList=[response.data.imgUrl]
@ -398,14 +407,20 @@
this.baseForm.bizStartTime=""
this.baseForm.bizEndTime=""
}
let param = {
...this.baseForm
}
if(param.contactTel&&param.contactTel!=""){
param.contactTel = encryptWithSM4(this.baseForm.contactTel)
}
if (this.canteenId != "") {
updateCanteenApi(this.baseForm).then(response => {
updateCanteenApi(param).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addCanteenApi(this.baseForm).then(response => {
addCanteenApi(param).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();

20
src/views/canteen/base/canteenStall/stall/index.vue
View File

@ -328,6 +328,7 @@
<script>
import { systemAreaTreeApi,getCanteenByAreaApi, getPageStallApi, addStallApi, getStallInfoModifyApi, updateStallApi, removeStallApi } from "@/api/base/stall";
import { imgUpLoadTwo } from '@/api/system/upload'
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
// import C from "highlight.js/lib/languages/1c";
export default {
name: "",
@ -515,6 +516,11 @@ export default {
getPageStallApi(param).then(response => {
this.tableListData = response.rows;
this.total = Number(response.total);
this.tableListData.forEach(item=>{
if(item.contactTel&&item.contactTel!=""){
this.$set(item,"contactTel",decryptWithSM4(item.contactTel))
}
})
this.loading = false;
});
},
@ -592,7 +598,10 @@ export default {
this.activeName="baseSetting"
getStallInfoModifyApi(row.stallId).then(response => {
this.stallId = response.data.stallId;
this.baseForm = response.data;
this.baseForm = response.data;
if(this.baseForm.contactTel&&this.baseForm.contactTel!=""){
this.$set(this.baseForm,"contactTel",decryptWithSM4(this.baseForm.contactTel))
}
if(response.data.imgUrl){
this.fileList=[{url:response.data.imgUrl}]
this.checkUrlList=[response.data.imgUrl]
@ -641,8 +650,13 @@ export default {
this.baseForm.bizStartTime=""
this.baseForm.bizEndTime=""
}
this.baseForm.basicStallMealtimeList = this.mealtimeList
let param = this.baseForm
this.baseForm.basicStallMealtimeList = this.mealtimeList
let param = {
...this.baseForm
}
if(param.contactTel&&param.contactTel!=""){
param.contactTel = encryptWithSM4(this.baseForm.contactTel)
}
if (this.stallId != "") {
param.stallId = this.stallId
updateStallApi(param).then(response => {

4
src/views/canteen/dish/menu/detail.vue
View File

@ -182,12 +182,12 @@
</el-table-column>
<el-table-column label="当餐售价" align="center" prop="price">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.price=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.price" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.price=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="当餐优惠价" align="center" prop="salePrice">
<template slot-scope="scope">
<el-input v-model="scope.row.salePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.salePrice=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.salePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.salePrice=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="最大供应量" align="center" prop="supplyNum">

4
src/views/canteen/dish/menu/edit.vue
View File

@ -182,12 +182,12 @@
</el-table-column>
<el-table-column label="当餐售价" align="center" prop="price">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.price=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.price" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.price=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="当餐优惠价" align="center" prop="salePrice">
<template slot-scope="scope">
<el-input v-model="scope.row.salePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.salePrice=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.salePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.salePrice=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="最大供应量" align="center" prop="supplyNum">

2
src/views/canteen/order/offlineManagement/index.vue
View File

@ -464,7 +464,7 @@
<span>{{ (rowData.refundAmount/100).toFixed(2) }}</span>
</el-form-item>
<el-form-item label="本次退款金额：" prop="refundMoney">
<el-input v-model="rowData.refundMoney" placeholder="请输入本次退款金额" maxlength="20" clearable @input="(v)=>(rowData.refundMoney=v.replace(/[^\d.]/g,''))" style="width: 200px;"/>
<el-input v-model="rowData.refundMoney" placeholder="请输入本次退款金额" maxlength="20" clearable @input="(v)=>(rowData.refundMoney=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))" style="width: 200px;"/>
</el-form-item>
</el-form>
</div>

2
src/views/canteen/order/reserveManagement/index.vue
View File

@ -434,7 +434,7 @@
<span>{{ (rowData.refundAmount/100).toFixed(2) }}</span>
</el-form-item>
<el-form-item label="本次退款金额：" prop="refundMoney">
<el-input v-model="rowData.refundMoney" placeholder="请输入本次退款金额" maxlength="20" clearable @input="(v)=>(rowData.refundMoney=v.replace(/[^\d.]/g,''))" style="width: 200px;"/>
<el-input v-model="rowData.refundMoney" placeholder="请输入本次退款金额" maxlength="20" clearable @input="(v)=>(rowData.refundMoney=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))" style="width: 200px;"/>
</el-form-item>
</el-form>
</div>

2
src/views/foodManage/purchaseManage/contractList/edit.vue
View File

@ -134,7 +134,7 @@
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true">

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

@ -90,7 +90,7 @@
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="订货数量" align="center" prop="orderNum" :show-overflow-tooltip="true">

2
src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
View File

@ -121,7 +121,7 @@
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true">

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

@ -82,7 +82,7 @@
</el-table-column>
<el-table-column label="参考价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true">

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

@ -100,7 +100,7 @@
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g,''))"/>
<el-input v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</template>
</el-table-column>
<el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true">

14
src/views/foodManage/stockManage/warehouseOut/detail.vue
View File

@ -68,14 +68,14 @@
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<el-table-column label="金额(元)" align="center" prop="" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
</template> -->
<el-table-column label="金额(元)" align="center" prop="totalPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.totalPrice/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="入库时间" align="center" prop="" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="保质期" align="center" prop="" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="入库时间" align="center" prop="intoDate" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="保质期" align="center" prop="expireTime" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="库存数量" align="center" prop="inventoryNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">

4
src/views/foodManage/supplierManage/supplierList/index.vue
View File

@ -325,13 +325,13 @@
<el-col :span="12">
<el-form-item label="去年度营业收入" prop="lastYearOperatingIncome">
<el-input v-model="form.lastYearOperatingIncome" placeholder="请输入去年度营业收入" maxlength="30" clearable
@input="(v)=>(form.lastYearOperatingIncome=v.replace(/[^\d.]/g,''))"/>
@input="(v)=>(form.lastYearOperatingIncome=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="前年度营业收入" prop="beforeYearOperatingIncome">
<el-input v-model="form.beforeYearOperatingIncome" placeholder="请输入前年度营业收入" maxlength="30" clearable
@input="(v)=>(form.beforeYearOperatingIncome=v.replace(/[^\d.]/g,''))"/>
@input="(v)=>(form.beforeYearOperatingIncome=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</el-form-item>
</el-col>
<el-col :span="24">

11
src/views/kitchen/baseSetting/baseSettings.vue
View File

@ -9,7 +9,7 @@
<span class="item-label">健康证临期提醒设置:</span>
<el-input
v-model.number="staff_health_cert_left_day_reminder" style="width: 200px;margin-left: 50px;"
auto-complete="off" placeholder="30" maxlength="9" @input="(v)=>(staff_health_cert_left_day_reminder=v.replace(/[^\d]/g,''))"
auto-complete="off" placeholder="30" maxlength="3" @input="(v)=>(staff_health_cert_left_day_reminder=v.replace(/[^\d]/g,''))"
></el-input>
<span class="item-unit">天</span>
</div>
@ -29,7 +29,7 @@
<span class="item-label">晨检视频存储时长设置:</span>
<el-input
v-model.number="staff_morning_check_video_save_day" style="width: 200px;margin-left: 50px;"
auto-complete="off" maxlength="9" placeholder="30" @input="(v)=>(staff_morning_check_video_save_day=v.replace(/[^\d]/g,''))"
auto-complete="off" maxlength="3" placeholder="30" @input="(v)=>(staff_morning_check_video_save_day=v.replace(/[^\d]/g,''))"
></el-input>
<span class="item-unit">天</span>
</div>
@ -40,11 +40,12 @@
<div>
<div>
<span class="item-label">人员违规环境报警记录保存时长:</span>
<el-input
<el-input-number v-model="staff_illegal_warning_record_save_day" controls-position="right" maxlength="3" :min="0" :max="365"></el-input-number>
<!-- <el-input
v-model.number="staff_illegal_warning_record_save_day" style="width: 200px;margin-left: 50px;"
auto-complete="off" maxlength="9" @input="(v)=>(staff_illegal_warning_record_save_day=v.replace(/[^\d]/g,''))"
auto-complete="off" maxlength="3" max="365" @input="(v)=>(staff_illegal_warning_record_save_day=v.replace(/[^\d]/g,''))"
placeholder="365"
></el-input>
></el-input> -->
<span class="item-unit">天</span>
</div>
<div style="color: #999;font-size: 14px;margin-top: 10px">默认365天，人员违规和环境报警抓拍记录最多保留365天。</div>

3
src/views/kitchen/staffManage/violation/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键字" prop="searchValue">
<el-input v-model="queryParams.searchValue" placeholder="请输入员工姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
<el-input v-model="queryParams.searchValue" placeholder="请输入员工姓名，编号" maxlength="20" clearable style="width: 240px"/>
</el-form-item>
<el-form-item label="违规内容" prop="alarmType">
<el-select v-model="queryParams.alarmType" style="width: 240px" clearable>
@ -36,6 +36,7 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="员工编号" align="center" prop="staffNo" :show-overflow-tooltip="true"/>
<el-table-column label="违规人员" align="center" prop="staffName" :show-overflow-tooltip="true"/>
<el-table-column label="违规内容" align="center" prop="recordDesc" :show-overflow-tooltip="true"/>
<el-table-column label="违规图片" align="center" prop="imgUrl" :show-overflow-tooltip="true">

10
src/views/kitchen/wasteManage/wasteGarbage/index.vue
View File

@ -187,16 +187,16 @@
<el-col :span="12">
<el-form-item label="处置方式:" prop="dealType">
<el-select v-model="form.dealType" style="width: 100%;" clearable placeholder="请选择处置方式">
<el-option label="丢弃" value="1"></el-option>
<el-option label="下一餐使用" value="2"></el-option>
<el-option label="集中售卖" value="3"></el-option>
<el-option label="丢弃" :value="1"></el-option>
<el-option label="下一餐使用" :value="2"></el-option>
<el-option label="集中售卖" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="售卖金额(元):" prop="saleAmount">
<el-form-item label="售卖金额(元):" prop="saleAmount" v-if="form.dealType==3">
<el-input v-model="form.saleAmount" placeholder="请输入售卖金额" maxlength="10"
@input="(v)=>(form.saleAmount=v.replace(/[^\d.]/g,''))"/>
@input="(v)=>(form.saleAmount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
</el-form-item>
</el-col>
<el-col :span="24">

17
src/views/system/notice/index.vue
View File

@ -76,30 +76,30 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="公告ID" align="center" prop="noticeId" width="120" /> -->
<el-table-column label="公告ID" align="center" prop="noticeId"/>
<el-table-column
label="公告标题"
align="center"
prop="noticeTitle"
:show-overflow-tooltip="true"
/>
<el-table-column label="公告类型" align="center" prop="noticeType" width="120">
<el-table-column label="公告类型" align="center" prop="noticeType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" width="120">
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建者" align="center" prop="createBy" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<el-table-column label="创建者" align="center" prop="createBy" width="150" />
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
<template slot-scope="scope">
<el-button
size="mini"
@ -303,10 +303,9 @@ export default {
});
},
/** 删除按钮操作 */
handleDelete(row,index) {
console.log(index)
handleDelete(row) {
const noticeIds = row.noticeId || this.ids
this.$modal.confirm('是否确认删除公告序号为"' + (index+1) + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除公告ID为"' + (noticeIds) + '"的数据项？').then(function() {
return delNotice(noticeIds);
}).then(() => {
this.getList();