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

线上问题优化zzy

This commit is contained in:
zzyuan 2025-11-19 13:15:22 +08:00
parent 6889f80321
commit e2dc0cb89d
95 changed files with 1199 additions and 928 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/monitor/iframe.html
View File

@ -17,7 +17,7 @@ html, body {
}
.plugin {
width: 1300px;
height: 680px;
height: 650px;
}
.vpopmenu{
position: absolute;

BIN
src/assets/images/camera.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/assets/images/grad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 B

BIN
src/assets/images/grad16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 745 B

BIN
src/assets/images/grad4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 295 B

BIN
src/assets/images/grad9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 605 B

BIN
src/assets/images/playVideo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/images/switchWindow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 602 B

16
src/components/TopNav/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-menu
:default-active="activeMenu"
mode="horizontal"
mode="horizontal"
@select="handleSelect" style="background: transparent;border-bottom: 0;"
>
<template v-for="(item, index) in topMenus">
@ -123,10 +123,10 @@ export default {
this.visibleNumber = parseInt(width / 85);
},
// 菜单选择事件
handleSelect(key, keyPath) {
handleSelect(key, keyPath) {
this.currentIndex = key;
const route = this.routers.find(item => item.path === key);
if (this.ishttp(key)) {
if (this.ishttp(key)) {
// http(s):// 路径新窗口打开
window.open(key, "_blank");
} else if (!route || !route.children) {
@ -143,6 +143,16 @@ export default {
// 显示左侧联动菜单
this.activeRoutes(key);
this.$store.dispatch('app/toggleSideBarHide', false);
console.log(key)
if(key=='/canteen'){
this.$router.push({ path: '/canteen/index' });
}else if(key=='/kitchen'){
this.$router.push({ path: '/kitchen/kitchenIndex' });
}else if(key=='/foodManage'){
this.$router.push({ path: '/foodManage/foodIndex' });
}else if(key=='/energySaving'){
this.$router.push({ path: '/energySaving/energyIndex' });
}
}
},
// 当前激活的路由

2
src/main.js
View File

@ -25,6 +25,7 @@ import {
selectDictLabel,
selectDictLabels,
handleTree,
hidePhone
} from '@/utils/bonus'
// 分页组件
import Pagination from '@/components/Pagination'
@ -56,6 +57,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.hidePhone = hidePhone
// 全局组件挂载
Vue.component('DictTag', DictTag)

7
src/utils/bonus.js
View File

@ -232,3 +232,10 @@ export function tansParams(params) {
export function blobValidate(data) {
return data.type !== 'application/json'
}
/* 手机号码脱敏 */
export function hidePhone(phone) {
if (!phone) return ''
return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
}

26
src/views/canteen/accountCenter/account/accountManager/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="accountStatusList">
<el-select v-model="queryParams.accountStatusList" style="width: 240px" clearable>
@ -56,7 +56,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -330,7 +334,11 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -366,7 +374,11 @@
<el-table :data="resultData.errVOList" max-height="250">
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -384,7 +396,11 @@
<el-table :data="resultData.successVoList" max-height="250">
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">

6
src/views/canteen/accountCenter/account/tradeRecords/index.vue
View File

@ -79,7 +79,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column label="操作员事件" align="center" prop="operationType" :show-overflow-tooltip="true">

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

@ -34,7 +34,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -67,11 +71,11 @@
<span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true">
<!-- <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column label="个人钱包允许最低金额" align="center" prop="minWalletBalLimit" :show-overflow-tooltip="true" width="160">
<template slot-scope="scope">
<span>{{ (scope.row.minWalletBalLimit/100).toFixed(2) }}</span>
@ -162,10 +166,10 @@
<template slot="label">补贴钱包余额</template>
{{ (form.subsidyBal/100).toFixed(2) }}
</el-descriptions-item>
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">冻结金额</template>
{{ (form.accFreezeBalTotal/100).toFixed(2) }}
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
<div style="margin: 20px 0;font-weight: bold;font-size: 16px;color: #000;"></div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
@ -232,10 +236,10 @@
<template slot="label">补贴钱包余额</template>
{{ (form.subsidyBal/100).toFixed(2) }}
</el-descriptions-item>
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">冻结金额</template>
{{ (form.accFreezeBalTotal/100).toFixed(2) }}
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
<div style="margin: 20px 0;font-weight: bold;font-size: 16px;color: #000;"></div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
@ -302,10 +306,10 @@
<template slot="label">补贴钱包余额</template>
{{ (form.subsidyBal/100).toFixed(2) }}
</el-descriptions-item>
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">冻结金额</template>
{{ (form.accFreezeBalTotal/100).toFixed(2) }}
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
</div>
<div slot="footer" class="dialog-footer">

6
src/views/canteen/accountCenter/account/wallet/outRecord.vue
View File

@ -53,7 +53,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">

6
src/views/canteen/accountCenter/account/wallet/rechargeRecord.vue
View File

@ -62,7 +62,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120" >
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">

12
src/views/canteen/accountCenter/account/wallet/record.vue
View File

@ -64,7 +64,11 @@
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
@ -162,7 +166,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">

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

@ -45,7 +45,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -83,11 +87,11 @@
<span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
</template>
</el-table-column> -->
<el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true">
<!-- <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column label="账户有效期" align="center" prop="endDate" :show-overflow-tooltip="true" width="150"/> -->
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
@ -170,10 +174,10 @@
<template slot="label">红包余额</template>
{{ (form.redEnvelope/100).toFixed(2) }}
</el-descriptions-item> -->
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">冻结金额</template>
{{ (form.accFreezeBalTotal/100).toFixed(2) }}
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
<div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;"></div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
@ -244,7 +248,11 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -296,7 +304,11 @@
<el-table :data="resultData.errVOList" max-height="250">
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -314,7 +326,11 @@
<el-table :data="resultData.successVoList" max-height="250">
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -391,10 +407,10 @@
<template slot="label">红包余额</template>
{{ (form.redEnvelope/100).toFixed(2) }}
</el-descriptions-item> -->
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">冻结金额</template>
{{ (form.accFreezeBalTotal/100).toFixed(2) }}
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
<!-- <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;"></div> -->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@ -457,7 +473,11 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -501,7 +521,11 @@
<el-table :data="resultData2.errVOList" max-height="250">
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -519,7 +543,11 @@
<el-table :data="resultData2.successVoList" max-height="250">
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">

12
src/views/canteen/accountCenter/butie/butieRecordsTab/index.vue
View File

@ -64,7 +64,11 @@
<el-table-column label="补贴时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
@ -163,7 +167,11 @@
<el-table-column label="补贴清空时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">

6
src/views/canteen/base/mobile/complaint/index.vue
View File

@ -42,7 +42,11 @@
</template>
</el-table-column>
<el-table-column label="投诉人账号" align="center" prop="createBy" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="contactTel" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="contactTel" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.contactTel) }}</span>
</template>
</el-table-column>
<el-table-column label="投诉日期" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/> -->
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>

3
src/views/canteen/dish/menu/index.vue
View File

@ -403,7 +403,8 @@
// this.menuTypeList.push(item)
// }
// })
this.menuTypeList = [{bindType: 7,id: 2,name: "智慧餐台/消费机"},{bindType: 2,id: 7,name: "移动端预订餐"},{bindType: 3,id: 8,name: "移动端一周菜谱"}]
//{bindType: 2,id: 7,name: "移动端预订餐"},
this.menuTypeList = [{bindType: 7,id: 2,name: "智慧餐台/消费机"},{bindType: 3,id: 8,name: "移动端一周菜谱"}]
this.bindType = this.menuTypeList[0].bindType
// });
},

6
src/views/canteen/healthCenter/examinationReport/index.vue
View File

@ -26,7 +26,11 @@
<el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable">
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" >
</el-table-column>
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.mobile) }}</span>
</template>
</el-table-column>
<el-table-column label="位置信息" align="center" prop="placeFullName" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="饮食医嘱" align="center" prop="doctorAdvice" :show-overflow-tooltip="true">
<template slot-scope="scope">

6
src/views/canteen/healthCenter/healthRecords/indexOld.vue
View File

@ -55,7 +55,11 @@
<el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable">
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" >
</el-table-column>
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.mobile) }}</span>
</template>
</el-table-column>
<el-table-column label="位置信息" align="center" prop="placeFullName" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="饮食医嘱" align="center" prop="doctorAdvice" :show-overflow-tooltip="true">
<template slot-scope="scope">

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

@ -168,7 +168,11 @@
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="80"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>

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

@ -223,7 +223,11 @@
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="80"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>

26
src/views/canteen/reportCenter/accountSum/index.vue
View File

@ -31,48 +31,52 @@
<span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="100" fixed="left"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template>
</el-table-column>
<el-table-column label="卡物理号" align="center" prop="serialNum" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true" width="120">
<el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accBalTotal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="可用总余额" align="center" prop="accAvailableBal" :show-overflow-tooltip="true" width="120">
<el-table-column label="可用总余额" align="center" prop="accAvailableBal" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span>{{ (scope.row.accAvailableBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="个人钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true" width="120">
<el-table-column label="个人钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span>{{ (scope.row.walletBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="补贴钱包余额" align="center" prop="subsidyBal" :show-overflow-tooltip="true" width="120">
<el-table-column label="补贴钱包余额" align="center" prop="subsidyBal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
<!-- <el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="账户状态" align="center" prop="accountStatus" :show-overflow-tooltip="true" width="120">
</el-table-column> -->
<el-table-column label="账户状态" align="center" prop="accountStatus" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.accountStatus==0">正常</span>
<span v-if="scope.row.accountStatus==1">停用</span>
</template>
</el-table-column>
<el-table-column label="账户有效期" align="center" prop="endDate" :show-overflow-tooltip="true" width="160"/>
<!-- <el-table-column label="账户有效期" align="center" prop="endDate" :show-overflow-tooltip="true" width="160"/> -->
<!--
<el-table-column label="个人钱包允许最低金额" align="center" prop="minWalletBalLimit" :show-overflow-tooltip="true" width="160">

6
src/views/canteen/reportCenter/inComeSum/psnPaymentSum/index.vue
View File

@ -50,7 +50,11 @@
<el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phonenumber) }}</span>
</template>
</el-table-column>
<el-table-column label="上期余额" align="center" prop="lastWalletBal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.lastWalletBal/100).toFixed(2) }}</span>

6
src/views/canteen/reportCenter/rechargeSumByAcc/index.vue
View File

@ -55,7 +55,11 @@
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">

10
src/views/canteen/reportCenter/tradeSumByCanteen/index.vue
View File

@ -62,9 +62,9 @@
<span>{{ (scope.row.lunchConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="下午茶次数" align="center" prop="afternoonTeaOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="下午茶人数" align="center" prop="afternoonTeaUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="下午茶金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true" width="120">
<el-table-column label="外卖预定次数" align="center" prop="afternoonTeaOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="外卖预定人数" align="center" prop="afternoonTeaUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="外卖预定金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.afternoonTeaConsumeCount/100).toFixed(2) }}</span>
</template>
@ -76,13 +76,13 @@
<span>{{ (scope.row.dinnerConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="夜宵次数" align="center" prop="midnightSnackOrderCount" :show-overflow-tooltip="true" width="120"/>
<!-- <el-table-column label="夜宵次数" align="center" prop="midnightSnackOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="夜宵人数" align="center" prop="midnightSnackUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="夜宵金额" align="center" prop="midnightSnackConsumeCount" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.midnightSnackConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination

8
src/views/canteen/reportCenter/tradeSumByDishes/index.vue
View File

@ -65,8 +65,8 @@
<span>{{ (scope.row.lunchConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="下午茶数量" align="center" prop="afternoonTeaQuantityCount" :show-overflow-tooltip="true" />
<el-table-column label="下午茶金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true" >
<el-table-column label="外卖预定数量" align="center" prop="afternoonTeaQuantityCount" :show-overflow-tooltip="true" />
<el-table-column label="外卖预定金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span>{{ (scope.row.afternoonTeaConsumeCount/100).toFixed(2) }}</span>
</template>
@ -77,12 +77,12 @@
<span>{{ (scope.row.dinnerConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="夜宵数量" align="center" prop="midnightSnackQuantityCount" :show-overflow-tooltip="true" />
<!-- <el-table-column label="夜宵数量" align="center" prop="midnightSnackQuantityCount" :show-overflow-tooltip="true" />
<el-table-column label="夜宵金额" align="center" prop="midnightSnackConsumeCount" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span>{{ (scope.row.midnightSnackConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination

30
src/views/canteen/reportCenter/tradeSumByMachine/index.vue
View File

@ -47,43 +47,43 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="设备编号" align="center" prop="deviceNum" :show-overflow-tooltip="true" width="150" fixed="left"/>
<el-table-column label="设备SN" align="center" prop="deviceSn" :show-overflow-tooltip="true" width="180" fixed="left"/>
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="150" fixed="left"/>
<el-table-column label="早餐次数" align="center" prop="breakfastOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="早餐人数" align="center" prop="breakfastUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="早餐金额" align="center" prop="breakfastConsumeCount" :show-overflow-tooltip="true" width="120">
<el-table-column label="早餐次数" align="center" prop="breakfastOrderCount" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="早餐人数" align="center" prop="breakfastUserCount" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="早餐金额" align="center" prop="breakfastConsumeCount" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span>{{ (scope.row.breakfastConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="午餐次数" align="center" prop="lunchOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="午餐人数" align="center" prop="lunchUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="午餐金额" align="center" prop="lunchConsumeCount" :show-overflow-tooltip="true" width="120">
<el-table-column label="午餐次数" align="center" prop="lunchOrderCount" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="午餐人数" align="center" prop="lunchUserCount" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="午餐金额" align="center" prop="lunchConsumeCount" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span>{{ (scope.row.lunchConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="下午茶次数" align="center" prop="afternoonTeaOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="下午茶人数" align="center" prop="afternoonTeaUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="下午茶金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true" width="120">
<el-table-column label="外卖预定" align="center" prop="afternoonTeaOrderCount" :show-overflow-tooltip="true"/>
<el-table-column label="外卖预定人数" align="center" prop="afternoonTeaUserCount" :show-overflow-tooltip="true"/>
<el-table-column label="外卖预定金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.afternoonTeaConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="晚餐次数" align="center" prop="dinnerOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="晚餐人数" align="center" prop="dinnerUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="晚餐金额" align="center" prop="dinnerConsumeCount" :show-overflow-tooltip="true" width="120">
<el-table-column label="晚餐次数" align="center" prop="dinnerOrderCount" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="晚餐人数" align="center" prop="dinnerUserCount" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="晚餐金额" align="center" prop="dinnerConsumeCount" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span>{{ (scope.row.dinnerConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="夜宵次数" align="center" prop="midnightSnackOrderCount" :show-overflow-tooltip="true" width="120"/>
<!-- <el-table-column label="夜宵次数" align="center" prop="midnightSnackOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="夜宵人数" align="center" prop="midnightSnackUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="夜宵金额" align="center" prop="midnightSnackConsumeCount" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.midnightSnackConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination

10
src/views/canteen/reportCenter/tradeSumByPersonal/index.vue
View File

@ -64,9 +64,9 @@
<span>{{ (scope.row.lunchConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="下午茶次数" align="center" prop="afternoonTeaOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="下午茶人数" align="center" prop="afternoonTeaUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="下午茶金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true" width="120">
<el-table-column label="外卖预定次数" align="center" prop="afternoonTeaOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="外卖预定人数" align="center" prop="afternoonTeaUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="外卖预定金额" align="center" prop="afternoonTeaConsumeCount" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.afternoonTeaConsumeCount/100).toFixed(2) }}</span>
</template>
@ -78,13 +78,13 @@
<span>{{ (scope.row.dinnerConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="夜宵次数" align="center" prop="midnightSnackOrderCount" :show-overflow-tooltip="true" width="120"/>
<!-- <el-table-column label="夜宵次数" align="center" prop="midnightSnackOrderCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="夜宵人数" align="center" prop="midnightSnackUserCount" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="夜宵金额" align="center" prop="midnightSnackConsumeCount" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.midnightSnackConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination

11
src/views/canteen/reportCenter/tradedDetail/index.vue
View File

@ -49,7 +49,11 @@
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ scope.row.phonenumber }}</span>
</template>
</el-table-column>
<el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -92,7 +96,7 @@
<span v-if="scope.row.payType==6">红包支付</span>
</template>
</el-table-column>
<el-table-column label="设备编号" align="center" prop="machineSn" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="设备SN" align="center" prop="machineSn" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/>
</el-table>
@ -234,7 +238,7 @@
this.tableListData = response.rows;
this.tableListData.forEach(item=>{
if(item.phonenumber&&item.phonenumber!=""){
// this.$set(item,"phonenumber",decryptWithSM4(item.phonenumber))
// this.$set(item,"phonenumber",decryptWithSM4(item.phonenumber))
this.$set(item, "phonenumber", this.maskPhoneNumber(item.phonenumber));
}
})
@ -252,7 +256,6 @@
maskPhoneNumber(phoneNumber) {
// 解密电话号码
const decryptedPhone = decryptWithSM4(phoneNumber);
console.log(decryptedPhone)
// 这里使用正则表达式将中间四位数字替换为 ***
return decryptedPhone.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2");
},

6
src/views/canteen/superstore/orderShenhe/index.vue
View File

@ -91,7 +91,11 @@
<el-table-column label="退库存数量" align="center" prop="" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.mobile) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">

12
src/views/canteen/superstore/superOrder/index.vue
View File

@ -141,7 +141,11 @@
<!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="80"/> -->
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.phoneNumber) }}</span>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="订单号" align="center" prop="orderId" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true" width="180"/>
@ -159,14 +163,14 @@
>详情</el-button>
<el-button
size="mini" style="color: red;"
type="text" v-if="scope.row.orderState==1||scope.row.orderState==4"
type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==4"
@click="handleRefund(scope.row)"
>退单</el-button>
<el-button
<!-- <el-button
size="mini"
type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==5"
@click="handleRefundPart(scope.row)"
>部分退款</el-button>
>部分退款</el-button> -->
<!--
<el-button
size="mini"

963
src/views/energySaving/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -432,7 +432,7 @@ export default {
{
type: "category",
inverse: true,
offset: 90,
offset: 80,
axisLabel: {
show: true,
align: "left",
@ -537,7 +537,7 @@ export default {
{
type: "category",
inverse: true,
offset: -30,
offset: -10,
axisTick: "none",
axisLine: "none",
show: true,

12
src/views/foodManage/pickManage/materialPicking/detail.vue
View File

@ -34,13 +34,13 @@
<template slot="label">领料仓库</template>
{{ baseInfo.warehouseName }}
</el-descriptions-item>
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">审批状态</template>
<span v-if="baseInfo.approveStatus==1">待审批</span>
<span v-if="baseInfo.approveStatus==2">审批中</span>
<span v-if="baseInfo.approveStatus==3">审批同意</span>
<span v-if="baseInfo.approveStatus==4">审批拒绝</span>
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
</div>
@ -59,7 +59,13 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
<el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true"/>
<el-table-column label="货品数量" align="center" prop="fetchNum" :show-overflow-tooltip="true"></el-table-column>

13
src/views/foodManage/pickManage/materialPicking/edit.vue
View File

@ -79,7 +79,13 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
<el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true"/>
<el-table-column label="货品数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
@ -140,10 +146,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />
</el-table>

5
src/views/foodManage/purchaseManage/contractList/detail.vue
View File

@ -91,10 +91,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">

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

@ -141,11 +141,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</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="7" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
@ -214,11 +215,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
@ -621,7 +623,7 @@ export default {
this.noMaterial = false;
if(this.contractMaterialList.length>0){
this.contractMaterialList.forEach(item=>{
if(item.singlePrice==0 || item.orderNum==0){
if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)

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

@ -364,7 +364,7 @@ export default {
},
defaultDateRange() {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
end.setTime(end.getTime() + 7 * 24 * 60 * 60 * 1000 -1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000);
this.start = parseInt(start.getTime() / 1000)

7
src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
View File

@ -103,7 +103,12 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">

17
src/views/foodManage/purchaseManage/goodsInquiry/detail.vue
View File

@ -33,11 +33,7 @@
<el-descriptions-item>
<template slot="label">联系电话</template>
{{ baseInfo.phone }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">收货地址</template>
{{ baseInfo.address }}
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">所属区域</template>
{{ baseInfo.area }}
@ -46,6 +42,10 @@
<template slot="label">询价供应商</template>
{{ baseInfo.supplierNames }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">收货地址</template>
{{ baseInfo.address }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">备注</template>
{{ baseInfo.inquiryNotes }}
@ -69,11 +69,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true" />
<el-table-column label="报价数量" align="center" prop="quoteNum" :show-overflow-tooltip="true" />
<el-table-column label="中选单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">

43
src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
View File

@ -54,12 +54,12 @@
<el-input v-model="baseInfo.linkMan" placeholder="请输入联系人" maxlength="20" clearable style="width: 240px"/>
</el-form-item> -->
<el-form-item label="联系人" prop="linkMan">
<el-select v-model="baseInfo.linkMan" placeholder="请输入联系人" clearable style="width: 240px">
<el-select v-model="baseInfo.linkMan" placeholder="请输入联系人" clearable style="width: 240px" @change="changeLinkMan">
<el-option
v-for="option in contractPersonOptions"
:key="option.value"
:label="option.label"
:value="option.value"
:key="option.id"
:label="option.name"
:value="option.id"
/>
</el-select>
</el-form-item>
@ -95,7 +95,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
</el-table-column>
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<!-- <el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model.number="scope.row.purNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.purNum=v.replace(/[^\d]/g,''))"/>
@ -166,11 +171,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
@ -265,6 +271,7 @@ import { systemAreaTreeApi } from "@/api/base/stall";
import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/stockManage";
import { getGoodsInquiryInfoApi,addGoodsInquiryApi,editGoodsInquiryApi } from "@/api/foodManage/purchaseManage";
import { purchasePlanPageApi,getPurchasePlanInfoApi } from "@/api/foodManage/purchaseManage";
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
export default {
name: "GoodsInquiryEdit",
dicts: [],
@ -408,15 +415,21 @@ export default {
roleId: 3
}
fetchUsersApi(param).then((response) => {
if (response.rows) {
// 从接口返回的数据中提取用户选项
this.contractPersonOptions = response.rows.map(user => ({
value: user.id, // 下拉框绑定的值
label: user.name, // 下拉框显示的文本
}));
}
if (response.rows) {
// 从接口返回的数据中提取用户选项
this.contractPersonOptions = response.rows
}
});
},
changeLinkMan(e){
console.log(e)
this.contractPersonOptions.forEach(item=>{
if(item.id==e){
console.log(item)
this.$set(this.baseInfo,"phone",decryptWithSM4(item.phone))
}
})
},
limitDecimalInput(value, row, key) {
// 只允许数字和小数点
let val = value.replace(/[^\d.]/g, '');

8
src/views/foodManage/purchaseManage/goodsInquiry/index.vue
View File

@ -103,7 +103,11 @@
<span v-if="scope.row.status!=2">未中选</span>
</template>
</el-table-column> -->
<el-table-column label="中选供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
<el-table-column label="中选供应商" align="center" prop="supplierName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.supplierName||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="中选金额(元)" align="center" prop="bidTotalPrice" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.bidTotalPrice/100).toFixed(2) }}</span>
@ -380,7 +384,7 @@ export default {
},
defaultDateRange() {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
end.setTime(end.getTime() + 7 * 24 * 60 * 60 * 1000 -1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000);
this.start = parseInt(start.getTime() / 1000)

12
src/views/foodManage/purchaseManage/materialBidPrice/index.vue
View File

@ -49,7 +49,13 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="货品类别" align="center" prop="categoryName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="计量单位" align="center" prop="" :show-overflow-tooltip="true" width="120" />
<el-table-column label="货品规格" align="center" prop="" :show-overflow-tooltip="true" width="120" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="最近一次采购" align="center">
<el-table-column label="价格" align="center" prop="" width="100" :show-overflow-tooltip="true" >
@ -57,8 +63,8 @@
<span>{{ (scope.row.lastOrderGoodsPrice/100).toFixed(2) }}</span>
</template> -->
</el-table-column>
<el-table-column label="时间" align="center" prop="" width="120" :show-overflow-tooltip="true" />
<el-table-column label="供应商" align="center" prop="" width="100" :show-overflow-tooltip="true" />
<el-table-column label="时间" align="center" prop="" width="120" :show-overflow-tooltip="true" />
<el-table-column label="供应商" align="center" prop="" width="100" :show-overflow-tooltip="true" />
</el-table-column>
<el-table-column label="市场价格" align="center">
<el-table-column label="录入/抓取时间" align="center" prop="" width="120" :show-overflow-tooltip="true" />

5
src/views/foodManage/purchaseManage/productionPlan/index.vue
View File

@ -169,10 +169,11 @@
<el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
<el-table-column label="原料名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="可食用部分(%)" align="center" prop="edible" :show-overflow-tooltip="true" width="120">

9
src/views/foodManage/purchaseManage/purchaseInspection/detail.vue
View File

@ -67,11 +67,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice).toFixed(2) }}</span>
@ -80,7 +81,7 @@
<el-table-column label="订货数量" align="center" prop="orderNum" :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.orderNum*scope.row.unitPrice/100).toFixed(2) }}</span>
<span>{{ (scope.row.orderNum*scope.row.unitPrice).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="送货数量" align="center" prop="deliveryNum" :show-overflow-tooltip="true"></el-table-column>

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

@ -113,11 +113,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
@ -207,11 +208,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>

12
src/views/foodManage/purchaseManage/purchaseInspection/index.vue
View File

@ -66,8 +66,16 @@
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="送货单号" align="center" prop="relateDeliveryGoodsId" :show-overflow-tooltip="true"/> -->
<el-table-column label="送货供应商" align="center" prop="deliverySupplierName" :show-overflow-tooltip="true"/>
<el-table-column label="送货人" align="center" prop="deliveryMan" :show-overflow-tooltip="true"/>
<el-table-column label="送货人电话" align="center" prop="deliveryPhone" :show-overflow-tooltip="true"/>
<el-table-column label="送货人" align="center" prop="deliveryMan" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.deliveryMan||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="送货人电话" align="center" prop="deliveryPhone" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.deliveryPhone||'/' }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="送货仓库" align="center" prop="deliveryWarehouseId" :show-overflow-tooltip="true"/> -->
<el-table-column label="验货日期" align="center" prop="inspectDate" :show-overflow-tooltip="true"/>
<el-table-column label="送货总数量" align="center" prop="deliveryTotalNum" :show-overflow-tooltip="true"/>

9
src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
View File

@ -38,13 +38,13 @@
<template slot="label">送货地址</template>
{{ baseInfo.supplyAddress }}
</el-descriptions-item>
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">审批状态</template>
<span v-if="baseInfo.approveStatus==1">待审批</span>
<span v-if="baseInfo.approveStatus==2">审批中</span>
<span v-if="baseInfo.approveStatus==3">审批同意</span>
<span v-if="baseInfo.approveStatus==4">审批拒绝</span>
</el-descriptions-item>
</el-descriptions-item> -->
<el-descriptions-item>
<template slot="label">确认状态</template>
<span v-if="baseInfo.supplierConfirmStatus==1">待确认</span>
@ -94,10 +94,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">

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

@ -127,11 +127,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</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, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
@ -144,7 +145,8 @@
</el-table-column>
<el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.singlePrice>=0">{{ PrecisionHandler.multiply(scope.row.orderNum,scope.row.singlePrice) }}</span>
<span>{{ (scope.row.orderNum*scope.row.singlePrice).toFixed(2) }}</span>
<!-- <span v-if="scope.row.singlePrice>=0">{{ PrecisionHandler.multiply(scope.row.orderNum,scope.row.singlePrice) }}</span> -->
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true">
@ -200,11 +202,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
@ -628,7 +631,7 @@ export default {
"materialName": this.queryParams.materialName,
"materialCode": this.queryParams.materialCode,
"materialTypeIds": this.queryParams.materialTypeIds,
"supplierId": this.baseInfo.supplierId,
// "supplierId": this.baseInfo.supplierId,
}
getMaterialListApi(param).then(response => {
this.tableListData = response.rows;
@ -686,7 +689,7 @@ export default {
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
if(item.singlePrice==0 || item.orderNum==0){
if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)
@ -699,7 +702,7 @@ export default {
})
}
if(this.noMaterial){
this.$modal.msgError("请输入单价和数量！");
this.$modal.msgError("请输入正确的单价和数量！");
}else{
this.noMaterial = true;
if(this.materialList.length>0){
@ -749,7 +752,7 @@ export default {
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
if(item.singlePrice==0 || item.orderNum==0){
if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)

16
src/views/foodManage/purchaseManage/purchaseOrder/index.vue
View File

@ -105,19 +105,29 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="180">
<template slot-scope="scope">
<span>{{ scope.row.contractCode||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="生产计划单号" align="center" prop="productPlanCodeList" :show-overflow-tooltip="true" width="180">
<template slot-scope="scope">
<div v-if="scope.row.productPlanCodeList">
<div v-if="scope.row.productPlanCodeList&&scope.row.productPlanCodeList.length>0">
<div v-for="(item,index) in scope.row.productPlanCodeList" :key="index">{{ item }}</div>
</div>
<div v-else>
/
</div>
</template>
</el-table-column>
<el-table-column label="采购计划单号" align="center" prop="purchasePlanCodeList" :show-overflow-tooltip="true" width="180">
<template slot-scope="scope">
<div v-if="scope.row.purchasePlanCodeList">
<div v-if="scope.row.purchasePlanCodeList&&scope.row.purchasePlanCodeList.length>0">
<div v-for="(item,index) in scope.row.purchasePlanCodeList" :key="index">{{ item }}</div>
</div>
<div v-else>
/
</div>
</template>
</el-table-column>
<el-table-column label="采购订单号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" width="180"/>

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

@ -15,21 +15,21 @@
<template slot="label">提交人</template>
{{ baseInfo.createBy }}
</el-descriptions-item>
<el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">审批状态</template>
<span v-if="baseInfo.approveStatus==1">待审批</span>
<span v-if="baseInfo.approveStatus==2">审批中</span>
<span v-if="baseInfo.approveStatus==3">审批同意</span>
<span v-if="baseInfo.approveStatus==4">审批拒绝</span>
</el-descriptions-item>
<el-descriptions-item>
</el-descriptions-item> -->
<!-- <el-descriptions-item>
<template slot="label">审批时间</template>
{{ baseInfo.approveTime }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">审批人</template>
{{ baseInfo.approveBy }}
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
<el-descriptions style="margin-bottom: 20px;" title="基本信息" :column="4" size="medium" border>
<el-descriptions-item>
@ -83,10 +83,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="参考价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">

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

@ -77,10 +77,11 @@
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="库存数量" align="center" prop="materialTotalNum" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="参考价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
@ -150,10 +151,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="materialTotalNum" :show-overflow-tooltip="true" />
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
@ -459,7 +461,7 @@ export default {
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
if(item.unitPrice==0 || item.purchaseNum==0){
if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)
@ -522,7 +524,7 @@ export default {
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
if(item.unitPrice==0 || item.purchaseNum==0){
if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)

6
src/views/foodManage/purchaseManage/purchasePlan/index.vue
View File

@ -95,7 +95,11 @@
<span v-if="scope.row.ifBreakDown">是</span>
</template>
</el-table-column>
<el-table-column label="生产计划单号" align="center" prop="productionPlanId" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="生产计划单号" align="center" prop="productionPlanId" :show-overflow-tooltip="true" width="200">
<template slot-scope="scope">
<span>{{ scope.row.productionPlanId||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="采购计划单号" align="center" prop="planCode" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="采购计划时间" align="center" prop="purchaseDate" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>

24
src/views/foodManage/purchaseReport/correlationReport/index.vue
View File

@ -83,7 +83,11 @@
<span v-if="scope.row.ifBreakDown">是</span>
</template>
</el-table-column>
<el-table-column label="生产计划单号" align="center" prop="productionPlanId" :show-overflow-tooltip="true" />
<el-table-column label="生产计划单号" align="center" prop="productionPlanId" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.productionPlanId||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="采购计划单号" align="center" prop="planCode" :show-overflow-tooltip="true" />
<el-table-column label="采购计划时间" align="center" prop="purchaseDate" :show-overflow-tooltip="true" />
<el-table-column label="计划采购货品总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" />
@ -111,19 +115,29 @@
<span>{{(queryParams3.pageNum - 1) * queryParams3.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="180">
<template slot-scope="scope">
<span>{{ scope.row.contractCode||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="生产计划单号" align="center" prop="productPlanCodeList" :show-overflow-tooltip="true" width="180">
<template slot-scope="scope">
<div v-if="scope.row.productPlanCodeList">
<div v-if="scope.row.productPlanCodeList&&scope.row.productPlanCodeList.length>0">
<div v-for="(item,index) in scope.row.productPlanCodeList" :key="index">{{ item }}</div>
</div>
<div v-else>
/
</div>
</template>
</el-table-column>
<el-table-column label="采购计划单号" align="center" prop="purchasePlanCodeList" :show-overflow-tooltip="true" width="180">
<template slot-scope="scope">
<div v-if="scope.row.purchasePlanCodeList">
<div v-if="scope.row.purchasePlanCodeList&&scope.row.purchasePlanCodeList.length>0">
<div v-for="(item,index) in scope.row.purchasePlanCodeList" :key="index">{{ item }}</div>
</div>
</div>
<div v-else>
/
</div>
</template>
</el-table-column>
<el-table-column label="采购订单号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" width="180"/>

17
src/views/foodManage/purchaseReport/procurePlanReport/index.vue
View File

@ -39,19 +39,20 @@
</el-table-column>
<el-table-column label="采购计划单号" align="center" prop="planCode" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="140"/>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="140"/>
<el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="140"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
<el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true"/>
<el-table-column label="计划采购数量" align="center" prop="materialCount" :show-overflow-tooltip="true" width="140"/>
<el-table-column label="计划采购日期" align="center" prop="purchaseDate" :show-overflow-tooltip="true" width="140"/>
<el-table-column label="计划采购日期" align="center" prop="purchaseDate" :show-overflow-tooltip="true"/>
</el-table>
<pagination

5
src/views/foodManage/returnManage/materialReturn/detail.vue
View File

@ -46,10 +46,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
</el-table-column>

5
src/views/foodManage/returnManage/materialReturn/edit.vue
View File

@ -66,10 +66,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="批次号" align="center" prop="intoCode" :show-overflow-tooltip="true" />
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">

27
src/views/foodManage/stockManage/depotManage/index.vue
View File

@ -61,20 +61,35 @@
<el-table-column label="仓库名称" align="center" prop="warehouseName" :show-overflow-tooltip="true" />
<el-table-column label="仓库类别" align="center" prop="categoryId" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse_category" :value="scope.row.categoryId"/>
<dict-tag v-if="scope.row.categoryId" :options="dict.type.warehouse_category" :value="scope.row.categoryId"/>
<span v-else>/</span>
</template>
</el-table-column>
<el-table-column label="仓库类型" align="center" prop="warehouseType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.warehouseType==1">原料</span>
<span v-if="scope.row.warehouseType==2">商品</span>
<span v-if="scope.row.warehouseType==1">原料</span>
<span v-if="scope.row.warehouseType==2">商品</span>
<span v-if="!scope.row.warehouseType">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" ></el-table-column>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" ></el-table-column>
<el-table-column label="仓库地址" align="center" prop="address" :show-overflow-tooltip="true" ></el-table-column>
<el-table-column label="负责人" align="center" prop="managerName" :show-overflow-tooltip="true" ></el-table-column>
<el-table-column label="手机号" align="center" prop="managerPhone" :show-overflow-tooltip="true" ></el-table-column>
<el-table-column label="仓库地址" align="center" prop="address" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.address||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="负责人" align="center" prop="managerName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.managerName||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="手机号" align="center" prop="managerPhone" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ hidePhone(scope.row.managerPhone)||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button

8
src/views/foodManage/stockManage/depotManage/materialStock.vue
View File

@ -68,7 +68,13 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="当前库存数" align="center" prop="materialNum" :show-overflow-tooltip="true" width="120"/>

7
src/views/foodManage/stockManage/goodsTransfer/detail.vue
View File

@ -56,11 +56,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</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="orderNum" :show-overflow-tooltip="true"></el-table-column>
</el-table>

14
src/views/foodManage/stockManage/totalStock/index.vue
View File

@ -67,10 +67,16 @@
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true"/>
<el-table-column label="当前库存数" align="center" prop="materialNum" :show-overflow-tooltip="true" width="120"/>
<!-- <el-table-column label="库存金额" align="center" prop="totalPrice" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">

5
src/views/foodManage/stockManage/warehouseIn/detail.vue
View File

@ -52,10 +52,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
<el-table-column label="生产日期" align="center" prop="productDate" :show-overflow-tooltip="true" />

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

@ -65,8 +65,13 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="供应商" align="center" prop="supplierId" :show-overflow-tooltip="true" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.supplierId" placeholder="请选择供应商" style="width: 100%;">
@ -169,10 +174,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
@ -692,7 +698,7 @@ export default {
"pageSize": this.queryParams2.pageSize,
"pageNum": this.queryParams2.pageNum,
"orderGoodsCode": this.queryParams2.orderGoodsCode,
"orderStatus":2,
"orderStatus":3,
"isInspect":0,
"ifAllInto":2,
"areaId": this.baseInfo.areaId,

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

@ -63,10 +63,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="金额(元)" align="center" prop="totalPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">

12
src/views/foodManage/stockManage/warehouseOut/edit.vue
View File

@ -67,7 +67,12 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<!-- <el-table-column label="金额(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
@ -130,10 +135,11 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<!-- <el-table-column label="单价" align="center" prop="unitPrice" :show-overflow-tooltip="true" >
<template slot-scope="scope">

8
src/views/foodManage/stockReport/expiredWarning/index.vue
View File

@ -52,7 +52,13 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>

28
src/views/foodManage/stockReport/inoutDetails/index.vue
View File

@ -42,7 +42,13 @@
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" />
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" />
<el-table-column label="发生时间" align="center" prop="outDate" :show-overflow-tooltip="true" />
@ -123,7 +129,13 @@
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" />
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" />
<el-table-column label="当前库存数量" align="center" prop="balanceCount" :show-overflow-tooltip="true" />
@ -132,13 +144,21 @@
<span>{{ (scope.row.balanceAmount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="总入库数量" align="center" prop="intoNum" :show-overflow-tooltip="true" />
<el-table-column label="总入库数量" align="center" prop="intoNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.intoNum||'0' }}</span>
</template>
</el-table-column>
<el-table-column label="入库总额" align="center" prop="intoAmount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.intoAmount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="总出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
<el-table-column label="总出库数量" align="center" prop="outNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.outNum||'0' }}</span>
</template>
</el-table-column>
<el-table-column label="出库总额" align="center" prop="outAmount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.outAmount/100).toFixed(2) }}</span>

8
src/views/foodManage/stockReport/stockWarning/index.vue
View File

@ -42,7 +42,13 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" />
<el-table-column label="当前库存数" align="center" prop="materialNum" :show-overflow-tooltip="true" />

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

@ -61,23 +61,24 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true" />
<el-table-column label="报价数量" align="center" prop="quoteNum" :show-overflow-tooltip="true">
<!-- <el-table-column label="报价数量" align="center" prop="quoteNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ Number(scope.row.quoteNum).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="中选单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
</el-table-column> -->
<el-table-column label="报价单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="中选总价（元）" align="center" prop="totalPrice" :show-overflow-tooltip="true">
<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>
@ -190,6 +191,15 @@ export default {
//查询
getGoodsInquiryDetailInfoApi(param).then((response) => {
this.baseInfo = this.supplierQuotationData;
//是否在报价时间段判断
let start = new Date(this.supplierQuotationData.startTime).getTime()
let end = new Date(this.supplierQuotationData.endTime).getTime()
let now = new Date().getTime()
if(now>start&&now<end){
this.supplierQuotationData.isInTime = true
}else{
this.supplierQuotationData.isInTime = false
}
this.baseInfo.arrivalTime=response.data[0].arrivalTime;
console.log("this.baseInfo",this.baseInfo)
// this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])

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

@ -85,11 +85,17 @@
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<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="6" clearable @change="sumAmount" @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
</template>
@ -147,11 +153,12 @@
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</el-table-column>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>

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

@ -57,9 +57,15 @@
<el-button
size="mini"
type="text"
icon="el-icon-edit" v-if="scope.row.bidStatus==2"
icon="el-icon-edit" v-if="scope.row.bidStatus==2&&scope.row.isInTime"
@click="handleUpdate(scope.row)"
>报价</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit" v-if="scope.row.bidStatus==2&&!scope.row.isInTime"
@click="handleView(scope.row)"
>查看</el-button>
<el-button
size="mini"
type="text"
@ -201,6 +207,10 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
}
this.dateRange = this.defaultDateRange()
this.resetForm("queryForm");
this.handleQuery();
@ -212,9 +222,9 @@ export default {
"pageNum": this.queryParams.pageNum,
"pageSize": this.queryParams.pageSize,
"orderStatus": 2,
"bidStatus": this.queryParams.bidStatus,
"inquiryCode": this.queryParams.inquiryCode,
"title": this.queryParams.title,
"inquiryState": this.queryParams.inquiryState,
"title": this.queryParams.title,
}
if(this.dateRange&&this.dateRange.length>0){
param.startDateTime=this.formatDateTime(this.dateRange[0])
@ -226,6 +236,16 @@ export default {
console.log("param",param)
goodsInquiryQuotePageApi(param).then(response => {
this.tableListData = response.rows;
this.tableListData.forEach(item=>{
let start = new Date(item.startTime).getTime()
let end = new Date(item.endTime).getTime()
let now = new Date().getTime()
if(now>start&&now<end){
item.isInTime = true
}else{
item.isInTime = false
}
})
this.total = Number(response.total);
this.loading = false;
});

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

@ -51,8 +51,26 @@
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" />
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" />
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span>
<span v-if="scope.row.salesMode==2">称重</span>
<span v-if="!scope.row.salesMode">/</span>
</template>
</el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.areaName||'/' }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="是否供应" align="center" prop="ifSupply" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<el-select v-model="scope.row.ifSupply" placeholder="是否供应" style="width: 100%;">
@ -87,6 +105,9 @@
</el-table-column> -->
<el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
<el-table-column label="最近一次供货时间" align="center" prop="purchaseGoodsTime" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.purchaseGoodsTime||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="价格" align="center" prop="singlePrice" width="120" :show-overflow-tooltip="true" >
<template slot-scope="scope">

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

@ -75,14 +75,26 @@
<el-table-column label="供应商编号" align="center" prop="supplierCode" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ scope.row.supplierScore||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="主要联系人" align="center" prop="linkman" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="联系人手机号" align="center" prop="linkmanPhone" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="联系人手机号" align="center" prop="linkmanPhone" :show-overflow-tooltip="true" width="120">
<template scope="scope">
<span>{{ hidePhone(scope.row.linkmanPhone) }}</span>
</template>
</el-table-column>
<el-table-column label="绑定供应商用户" align="center" prop="supplierUserName" :show-overflow-tooltip="true" width="140"/>
<!-- <el-table-column label="营业执照编号" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="食品经营许可证编号" align="center" prop="" :show-overflow-tooltip="true" width="180"/> -->
<el-table-column label="供应类别" align="center" prop="categoryModelStr" :show-overflow-tooltip="true"/>
<el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true"/>
<el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.address||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2"
@ -797,7 +809,7 @@ export default {
fetchUsersApi(param).then((response) => {
if (response.rows) {
// 从接口返回的数据中提取用户选项
this.supplierUserList = response.rows
this.supplierUserList = response.rows;
}
});
},
@ -910,7 +922,7 @@ export default {
arr.push(item.categoryId)
})
this.$set(this.form,"categoryIdList",arr)
this.$set(this.form,"supplierUserId",Number(row.supplierUserId))
this.$set(this.form,"supplierUserId",row.supplierUserId)
this.open = true;
this.title = "修改";

6
src/views/foodManage/supplierManage/supplierQualification/index.vue
View File

@ -58,7 +58,11 @@
<el-table-column label="资质编号" align="center" prop="qualificationCode" :show-overflow-tooltip="true" />
<el-table-column label="资质名称" align="center" prop="qualificationName" :show-overflow-tooltip="true"/>
<el-table-column label="联系人" align="center" prop="linkman" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" prop="linkmanPhone" :show-overflow-tooltip="true"/>
<el-table-column label="手机号码" align="center" prop="linkmanPhone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.linkmanPhone) }}</span>
</template>
</el-table-column>
<el-table-column label="到期时间" align="center" prop="expirationDate" :show-overflow-tooltip="true" />
<el-table-column label="临期天数" align="center" prop="expireDays" :show-overflow-tooltip="true"/>
</el-table>

14
src/views/foodManage/supplierManage/supplyStatistics/index.vue
View File

@ -52,9 +52,17 @@
<span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="采购订单数量" align="center" prop="orderNum" :show-overflow-tooltip="true" />
<el-table-column label="最近一次采购中标日期" align="center" prop="lastBidDate" :show-overflow-tooltip="true"/>
<el-table-column label="最近一次采购中标金额" align="center" prop="lastBidAmount" :show-overflow-tooltip="true"/>
<el-table-column label="采购货品数量" align="center" prop="orderNum" :show-overflow-tooltip="true" />
<el-table-column label="最近一次采购中标日期" align="center" prop="lastBidDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.lastBidDate||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="最近一次采购中标金额" align="center" prop="lastBidAmount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.lastBidAmount/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table>
<pagination

10
src/views/ims/person_setting/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>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -30,7 +30,11 @@
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="name" :show-overflow-tooltip="true"/>
<el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true"/>
<el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="性别" align="center" prop="sex" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.sex==0">男</span>
@ -258,6 +262,8 @@ export default {
getList() {
this.loading = true;
let param = {
"pageNum":this.queryParams.pageNum,
"pageSize":this.queryParams.pageSize,
"searchValue":this.queryParams.searchValue,
"type":this.queryParams.type,
}

8
src/views/ims/supplier_person/index.vue
View File

@ -30,7 +30,11 @@
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="name" :show-overflow-tooltip="true"/>
<el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true"/>
<el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phone) }}</span>
</template>
</el-table-column>
<el-table-column label="性别" align="center" prop="sex" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.sex==0">男</span>
@ -243,6 +247,8 @@ export default {
getList() {
this.loading = true;
let param = {
"pageNum":this.queryParams.pageNum,
"pageSize":this.queryParams.pageSize,
"searchValue":this.queryParams.searchValue,
"type":this.queryParams.type,
}

20
src/views/kitchen/devicesManage/deviesRecord/index.vue
View File

@ -40,10 +40,22 @@
<span v-if="scope.row.workState==2">离线</span>
</template>
</el-table-column>
<el-table-column label="开始使用时间" align="center" prop="startUseTime" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="结束使用时间" align="center" prop="endUseTime" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="使用时长(h)" align="center" prop="useTime" :show-overflow-tooltip="true" />
<el-table-column label="离线时长(h)" align="center" prop="" :show-overflow-tooltip="true" />
<el-table-column label="开始使用时间" align="center" prop="startUseTime" :show-overflow-tooltip="true" width="160">
<template slot-scope="scope">
<span>{{ scope.row.startUseTime||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="结束使用时间" align="center" prop="endUseTime" :show-overflow-tooltip="true" width="160">
<template slot-scope="scope">
<span>{{ scope.row.endUseTime||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="使用时长(h)" align="center" prop="useTime" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.useTime||'/' }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="离线时长(h)" align="center" prop="" :show-overflow-tooltip="true"/> -->
</el-table>
<pagination
v-show="total>0"

33
src/views/kitchen/environment/videoMonitoring/history.vue
View File

@ -3,13 +3,24 @@
<div style="width: 100%;">
<div class="header"><span>历史视频</span></div>
<div style="width: 100%;display: flex;justify-content: space-between;">
<div style="width: 20%;">
<el-tree style="height: 700px; overflow: scroll"
<div style="width: 18%;margin: 10px auto;">
<div style="padding-left: 20px;">经研院食堂监控历史</div>
<el-tree style="height: 660px; overflow: scroll;padding-top: 10px;"
:data="devicesOptions" :props="defaultProps"
:default-expand-all="true"
:expand-on-click-node="false" @node-click="handleNodeClick2"
:expand-on-click-node="false" @node-click="handleNodeClick"
ref="typeTree" node-key="deviceId" highlight-current
></el-tree>
>
<span style="width: 95%;" slot-scope="{ node, data }">
<div style="width: 95%;display: flex;justify-content: space-between;align-items: center;">
<div style="display: flex;align-items: center;">
<img src="@/assets/images/camera.png" style="width: 14px;height: 14px;">
<span style="margin-left: 6px;">{{ node.label }}</span>
</div>
<img src="@/assets/images/playVideo.png" style="width: 16px;height: 16px;">
</div>
</span>
</el-tree>
</div>
<div class="contant">
<div style="display: flex;width: 100%;height: 50px;align-items: center;">
@ -27,8 +38,8 @@
:picker-options="pickerOptions" >
</el-date-picker>
</div>
<div style="width: 100%;height: 630px;margin-bottom: 10px; overflow: hidden;position: relative;margin-right: 10px;">
<iframe src="monitor/iframe.html" ref="videoIframe2" frameborder="0" style="width: 1300px;height: 630px;"></iframe>
<div style="width: 100%;height: 650px;margin-bottom: 10px; overflow: hidden;position: relative;margin-right: 10px;">
<iframe src="monitor/iframe.html" ref="videoIframe2" frameborder="0" style="width: 1300px;height: 650px;"></iframe>
</div>
</div>
</div>
@ -95,14 +106,14 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no
iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
var that = this;
if(domId=='2'){
var oWebVideoCtrl2 = this.$refs.videoIframe2.contentWindow.WebVideoCtrl;
oWebVideoCtrl2.I_InitPlugin(1300,700, {
oWebVideoCtrl2.I_InitPlugin(1300,650, {
bWndFull: true,//<EFBFBD>Ƿ<EFBFBD>֧<EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˫<EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD> true:֧<EFBFBD><EFBFBD> false:<EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD>
iWndowType: 1,
cbInitPluginComplete: function () {
@ -134,7 +145,7 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no
iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
@ -166,7 +177,7 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no
iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
@ -221,7 +232,7 @@ methods:{
color: #000;
margin-top: 10px;
span{
margin-left: 40px;
margin-left: 10px;
font-size: 20px;
font-weight: bold;
}

67
src/views/kitchen/environment/videoMonitoring/index.vue
View File

@ -3,18 +3,49 @@
<div style="width: 100%;">
<div class="header"><span>视频监控</span></div>
<div style="width: 100%;display: flex;justify-content: space-between;">
<div style="width: 20%;">
<el-tree style="height: 700px; overflow: scroll"
<div style="width: 18%;margin: 10px auto;">
<div style="width: 100%;padding-left: 20px;display: flex;justify-content: space-between;align-items: center;">
<span>经研院食堂视频监控</span>
</div>
<el-tree style="height: 670px; overflow: scroll;padding-top: 10px;"
:data="devicesOptions" :props="defaultProps"
:default-expand-all="true"
:expand-on-click-node="false" @node-click="handleNodeClick"
ref="typeTree" node-key="deviceId" highlight-current
></el-tree>
>
<span style="width: 95%;" slot-scope="{ node, data }">
<div style="width: 95%;display: flex;justify-content: space-between;align-items: center;">
<div style="display: flex;align-items: center;">
<img src="@/assets/images/camera.png" style="width: 14px;height: 14px;">
<span style="margin-left: 6px;">{{ node.label }}</span>
</div>
<img src="@/assets/images/playVideo.png" style="width: 16px;height: 16px;">
</div>
</span>
</el-tree>
</div>
<div class="contant">
<div style="width: 100%;height: 700px;margin-bottom: 10px; overflow: hidden;position: relative;margin-right: 10px;">
<div style="width: 96%;height: 42px;display: flex;align-items: center;margin: 4px auto;font-weight: 600;">
<el-button size="small" @click="changeWindow(1)">
<img src="@/assets/images/grad.png" style="width: 12px;height: 12px;">
<span style="margin-left: 5px;font-size: 14px;">单宫格</span>
</el-button>
<el-button size="small" @click="changeWindow(2)">
<img src="@/assets/images/grad4.png" style="width: 12px;height: 12px;">
<span style="margin-left: 5px;font-size: 14px;">四宫格</span>
</el-button>
<el-button size="small" @click="changeWindow(3)">
<img src="@/assets/images/grad9.png" style="width: 12px;height: 12px;">
<span style="margin-left: 5px;font-size: 14px;">九宫格</span>
</el-button>
<el-button size="small" @click="changeWindow(4)">
<img src="@/assets/images/grad16.png" style="width: 12px;height: 12px;">
<span style="margin-left: 5px;font-size: 14px;">十六宫格</span>
</el-button>
</div>
<div style="width: 100%;height: 650px;margin-bottom: 10px; overflow: hidden;position: relative;margin-right: 10px;">
<!-- <div style="width: 100%;height: 100%;position: fixed;"></div> -->
<iframe src="monitor/iframe.html" ref="videoIframe1" frameborder="0" style="width: 100%;height:700px;"></iframe>
<iframe src="monitor/iframe.html" ref="videoIframe1" frameborder="0" style="width: 100%;height:650px;"></iframe>
</div>
</div>
</div>
@ -73,13 +104,13 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no
iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
var that = this;
var oWebVideoCtrl1 = this.$refs.videoIframe1.contentWindow.WebVideoCtrl;
oWebVideoCtrl1.I_InitPlugin(1300,700, {
oWebVideoCtrl1.I_InitPlugin(1300,645, {
bWndFull: true,//<EFBFBD>Ƿ<EFBFBD>֧<EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˫<EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD> true:֧<EFBFBD><EFBFBD> false:<EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD>
iWndowType: 2,
cbInitPluginComplete: function () {
@ -91,7 +122,7 @@ methods:{
iRtspPort: oLiveView.szPort,
iWndIndex:0,
iStreamType: oLiveView.iStreamType,
iChannelID: 1,
iChannelID: 5,
bZeroChannel: oLiveView.bZeroChannel
});
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
@ -105,14 +136,14 @@ methods:{
iRtspPort: oLiveView.szPort,
iWndIndex:2,
iStreamType: oLiveView.iStreamType,
iChannelID: 1,
iChannelID: 3,
bZeroChannel: oLiveView.bZeroChannel
});
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
iRtspPort: oLiveView.szPort,
iWndIndex:3,
iStreamType: oLiveView.iStreamType,
iChannelID: 2,
iChannelID: 4,
bZeroChannel: oLiveView.bZeroChannel
});
}
@ -141,8 +172,8 @@ methods:{
szPort: "80", // protocol port
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 1, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
@ -175,7 +206,7 @@ methods:{
szUsername:"admin", // device username
szPassword:"JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no
iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP;
@ -191,6 +222,14 @@ methods:{
});
}, 1000);
},
async changeWindow(type){
var oWebVideoCtrl1 = this.$refs.videoIframe1.contentWindow.WebVideoCtrl;
setTimeout(function () {
oWebVideoCtrl1.I_ChangeWndNum(type);
}, 1000);
}
// I_ChangeWndNum(iWndType)
}
}
</script>
@ -205,7 +244,7 @@ methods:{
color: #000;
margin-top: 10px;
span{
margin-left: 40px;
margin-left: 10px;
font-size: 20px;
font-weight: bold;
}

12
src/views/kitchen/foodSafety/sampleManage/index.vue
View File

@ -89,8 +89,16 @@
<span v-else>无</span>
</template>
</el-table-column>
<el-table-column label="入柜时间" align="center" prop="enterCabinetTime" :show-overflow-tooltip="true" />
<el-table-column label="离柜时间" align="center" prop="leaveCabinetTime" :show-overflow-tooltip="true" />
<el-table-column label="入柜时间" align="center" prop="enterCabinetTime" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.enterCabinetTime||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="离柜时间" align="center" prop="leaveCabinetTime" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.leaveCabinetTime||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="存放状态" align="center" prop="saveStatusName" :show-overflow-tooltip="true" />
<el-table-column label="违规状态" align="center" prop="illegalStatusName" :show-overflow-tooltip="true" width="200"/>
</el-table>

28
src/views/kitchen/foodSafety/sampleRecord/index.vue
View File

@ -9,8 +9,8 @@
</el-form-item>
<el-form-item label="操作事项" prop="actionType">
<el-select v-model="queryParams.actionType" style="width: 240px" clearable>
<el-option label="留样" value="1"></el-option>
<el-option label="取样" value="2"></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>
@ -32,11 +32,27 @@
</el-table-column>
<el-table-column label="设备信息" align="center" prop="deviceName" :show-overflow-tooltip="true"/>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
<el-table-column label="开柜温度（°C）" align="center" prop="openCabinetTemp" :show-overflow-tooltip="true"/>
<el-table-column label="关柜温度（°C）" align="center" prop="closeCabinetTemp" :show-overflow-tooltip="true"/>
<el-table-column label="开柜温度（°C）" align="center" prop="openCabinetTemp" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.openCabinetTemp||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="关柜温度（°C）" align="center" prop="closeCabinetTemp" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.closeCabinetTemp||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="使用人" align="center" prop="staffName" :show-overflow-tooltip="true"/>
<el-table-column label="开柜时间" align="center" prop="openCabinetTime" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="关柜时间" align="center" prop="closeCabinetTime" :show-overflow-tooltip="true" width="160"/>
<el-table-column label="开柜时间" align="center" prop="openCabinetTime" :show-overflow-tooltip="true" width="160">
<template slot-scope="scope">
<span>{{ scope.row.openCabinetTime||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="关柜时间" align="center" prop="closeCabinetTime" :show-overflow-tooltip="true" width="160">
<template slot-scope="scope">
<span>{{ scope.row.closeCabinetTime||'/' }}</span>
</template>
</el-table-column>
<el-table-column label="操作事项" align="center" prop="actionTypeName" :show-overflow-tooltip="true"/>
</el-table>
<pagination

2
src/views/kitchen/index.vue
View File

@ -1180,7 +1180,7 @@ export default {
// });
},
goList(){
this.$router.push({ path: "/kitchen/staffManage/violation"});
this.$router.push({ path: "/kitchen/violation/cameraRecord"});
},
goList2(){
this.$router.push({ path: "/kitchen/environment/alarmRecord",query: {activeName:5}});

18
src/views/kitchen/staffManage/intoRecords/index.vue
View File

@ -70,7 +70,10 @@
<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="mobile" :show-overflow-tooltip="true">
</el-table-column>
<template scope="scope">
<span>{{ hidePhone(scope.row.mobile) }}</span>
</template>
</el-table-column>
<el-table-column label="职位" align="center" prop="postName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="区域" align="center" prop="areaName" :show-overflow-tooltip="true">
@ -241,12 +244,17 @@ export default {
"pageNum":this.queryParams.pageNum,
"pageSize":this.queryParams.pageSize,
"articleTitle":this.queryParams.articleTitle,
"deptIds":this.queryParams.deptIdList.join(",")||"",
"startDate":this.formatDate(this.dateRange[0]),
"deptIds":this.queryParams.deptIdList.join(",")||"",
"areaId":this.queryParams.areaId,
"canteenId":this.queryParams.canteenId,
"subPlaceId":this.queryParams.subPlaceId,
"endDate":this.formatDate(this.dateRange[1])
"subPlaceId":this.queryParams.subPlaceId,
}
if(this.dateRange&&this.dateRange.length>0){
param.startDate=this.formatDate(this.dateRange[0])
param.endDate=this.formatDate(this.dateRange[1])
}else{
param.startDate=undefined;
param.endDate=undefined;
}
console.log("param",param);
getIntoRecordsListApi(param).then(response => {

10
src/views/kitchen/staffManage/morningCheck/index.vue
View File

@ -31,14 +31,18 @@
</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="mobile" :show-overflow-tooltip="true" />
<el-table-column label="手机号" align="center" prop="mobile" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.mobile) }}</span>
</template>
</el-table-column>
<el-table-column label="岗位名称" align="center" prop="postName" :show-overflow-tooltip="true" />
<el-table-column label="晨检视频" align="center" prop="checkVideoUrl" :show-overflow-tooltip="true">
<!-- <el-table-column label="晨检视频" align="center" prop="checkVideoUrl" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.checkVideoUrl" style="" @click="openVideo(scope.row)">查看</span>
<span v-else>无</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="体温" align="center" prop="temperatureValue" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.temperatureValue }} ℃

6
src/views/kitchen/staffManage/staff/index.vue
View File

@ -56,7 +56,11 @@
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
<el-table-column label="员工名称" align="center" prop="staffName" :show-overflow-tooltip="true" />
<el-table-column label="手机号" align="center" prop="mobile" :show-overflow-tooltip="true"/>
<el-table-column label="手机号" align="center" prop="mobile" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.mobile) }}</span>
</template>
</el-table-column>
<el-table-column label="性别" align="center" prop="sex" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.sex==0">男</span>

4
src/views/login1.vue
View File

@ -97,7 +97,7 @@
</el-input>
</el-form-item>
</template>
<div class="login-form-center">
<!-- <div class="login-form-center">
<el-link v-if="config.loginConfig.emailCode ||config.loginConfig.phoneCode " @click="toggleLoginMethod">
{{ loginMethod === 'password' ? '短信登录' : '密码登录' }}
</el-link>
@ -105,7 +105,7 @@
<el-link>注册账号</el-link>
</router-link>
<el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
</div>
</div> -->
<el-form-item style="width: 100%;">
<el-button v-if="!isAdmin"
:loading="loading"

6
src/views/system/role/authUser.vue
View File

@ -64,7 +64,11 @@
<el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phonenumber) }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>

6
src/views/system/role/selectUser.vue
View File

@ -29,7 +29,11 @@
<el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true">
<template scope="scope">
<span>{{ hidePhone(scope.row.phonenumber) }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>

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

@ -55,7 +55,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-form-item label="用户姓名" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入用户姓名"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="请输入手机号码"
@ -63,7 +72,7 @@
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
@ -220,7 +229,8 @@
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span>{{ hidePhone(scope.row.phonenumber) }}</span>
<span v-if="scope.row.userName.length==11">{{ hidePhone(scope.row.userName) }}</span>
<span v-else>{{ scope.row.userName }}</span>
</template>
</el-table-column>
<el-table-column
@ -853,6 +863,7 @@ export default {
pageNum: 1,
pageSize: 10,
userName: undefined,
nickName: undefined,
phonenumber: undefined,
status: undefined,
isPermanent: undefined,

3
vue.config.js
View File

@ -36,7 +36,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.2.75:48380`,//旭
target: `http://192.168.20.241:48380`,//测试
target: `http://192.168.20.234:48390`,//测试
// target: `http://192.168.20.242:48380`,//测试
// target: `http://192.168.2.108:48380`,//测试
// target: `http://192.168.0.34:48380`,//测试
// target: `http://192.168.0.176:48380`,//