Skip to content

M
mingPayPc
Commit 9eb47e07 by liang ce
Options

修改es报错

parents 7796486c 3cacfdf4
Showing with 171 additions and 48 deletions
.env.test 0 → 100644
NODE_ENV = 'test'
VUE_APP_API_URL = 'https://gateway-beta.mingwork.com'
\ No newline at end of file
.gitignore
.DS_Store
node_modules
dist
<<<<<<< HEAD
=======
>>>>>>> ISV
# local env files
.env.local
.env.*.local
......
package.json
......@@ -7,12 +7,14 @@
"devserve": "vue-cli-service serve --model development",
"build": "vue-cli-service build",
"probuild": "vue-cli-service build --mode production",
"test": "vue-cli-service build --mode test",
"lint": "vue-cli-service lint"
},
"dependencies": {
"ant-design-vue": "^1.3.8",
"core-js": "^2.6.5",
"dingtalk-jsapi": "^2.6.44",
"echarts": "^4.5.0",
"vue": "^2.6.10",
"vue-router": "^3.0.3",
"vuex": "^3.0.1"
......
src/api/axios.js
......@@ -14,7 +14,7 @@ axios.interceptors.request.use((config) => {
} else {
return new Promise((resolve, reject) => {
refreshToken().then((res) => {
console.log('res', res);
console.log('res', res)
}).catch((err) => {
console.log(err)
})
......
src/api/config.js
......@@ -54,7 +54,7 @@ const config = {
let isRefreshToken = new Date().getTime() - localStorage.getItem(`start_time_${localStorage.getItem('orgId')}`) < localStorage.getItem(`expires_in_${localStorage.getItem('orgId')}`) - 5 * 60 * 1000
if (localStorage.getItem(`access_token_${localStorage.getItem('orgId')}`) && isRefreshToken) {
resolve('ok')
} else if (localStorage.getItem('refresh_token')) {
} else if (localStorage.getItem(`refresh_token_${localStorage.getItem('orgId')}`)) {
refreshToken().then((res) => {
if (res === 'ok') {
resolve('ok')
......
src/api/generateOrRefreshToken.js
......@@ -18,6 +18,8 @@ instance.interceptors.response.use(res => {
router.push({
path: '/noPermission'
})
} else {
resolve('ok')
}
})
}
......@@ -106,11 +108,11 @@ function getToken () {
}
// 刷新token接口
function refreshToken () {
let loginData = qs.stringify({
refresh_token: localStorage.getItem(`refresh_token_${localStorage.getItem('orgId')}`),
grant_type: 'refresh_token'
})
return new Promise((resolve, reject) => {
let loginData = qs.stringify({
refresh_token: localStorage.getItem(`refresh_token_${localStorage.getItem('orgId')}`),
grant_type: 'refresh_token'
})
instance.post(`${BASE_URL}/auth/oauth/token`, loginData, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
......@@ -122,9 +124,8 @@ function refreshToken () {
localStorage.setItem(`expires_in_${localStorage.getItem('orgId')}`, response.data.expires_in * 1000)
localStorage.setItem(`start_time_${localStorage.getItem('orgId')}`, new Date().getTime())
resolve('ok')
}).catch((err) => {
console.log('refreshToken', err)
resolve(err)
}).catch(() => {
resolve('ok')
})
})
}
......
src/components/pages/VisitorManagement/HistoricalVisitors.vue
......@@ -21,18 +21,86 @@
:open="endOpen"
@openChange="handleEndOpenChange"
/>
<a-button type="primary" @click="getStatisticalProductPage">查询</a-button>
<a-button type="primary" @click="queryRecordList">查询</a-button>
</div>
<!-- <a-table :columns="columns" :dataSource="dataSource" rowKey="productId" :pagination="pagination" @change="handleTableChange">
<span slot="productIcon" slot-scope="productIcon">
<img style="width: 100px" :src="productIcon" alt="" />
<a-table :columns="columns" :dataSource="dataSource" style="margin-top: 20px;" rowKey="recordId" :pagination="pagination" @change="handleTableChange">
<span slot="visitorList" slot-scope="visitorList">
<span v-for="(item, index) in visitorList" :key="item.visitorId">
{{ index === visitorList.length - 1 ? item.name : `${item.name}，`}}
</span>
</span>
<span slot="productName"></span>
<span slot="productPrice" slot-scope="productPrice">
{{ productPrice.toFixed(2) }}
<span slot="companyName"></span>
<span slot="purpose"></span>
<span slot="byVisitorName"></span>
<span slot="startTime" slot-scope="startTime, record">
{{ startTime }} - {{ record.endTime }}
</span>
<span slot="productStatisticalQuantity"></span>
</a-table> -->
<span slot="processStatus" slot-scope="processStatus">
{{processStatus === 'invite' ? '已邀请' : processStatus === 'reach' ? '已接待' : '已取消'}}
</span>
<span slot="byVisitorName"></span>
<span slot="action" slot-scope="text, record">
<a @click="showModal(record)">查看详情</a>
</span>
</a-table>
<a-modal v-model="visible" title="访客详情" :footer="null">
<div class="recordDetails">
<div>
<label>到访情况</label>
<div>{{showModalData.processStatus === 'invite' ? '已邀请' : showModalData.processStatus === 'reach' ? '已接待' : '已取消'}}</div>
</div>
<div>
<label>主访客</label>
<div>{{showModalData.visitorName}} {{showModalData.mobile}}</div>
</div>
<div>
<label>随行访客</label>
<div v-if="showModalData.visitorList1 && showModalData.visitorList1.length !== 1">
<p v-for="item in showModalData.visitorList1" :key="item.visitorId" v-show="item.mobile !== showModalData.mobile">{{item.name}} {{item.mobile}}</p>
</div>
<div v-else>
暂无
</div>
</div>
<div>
<label>访客公司</label>
<div>{{showModalData.companyName ? showModalData.companyName : '暂无'}}</div>
</div>
<div>
<label>被约时间</label>
<div>{{showModalData.inviteTime}}</div>
</div>
<div>
<label>被访人</label>
<div>{{showModalData.byVisitorName}}</div>
</div>
<div>
<label>开始时间</label>
<div>{{showModalData.startTime}}</div>
</div>
<div>
<label>结束时间</label>
<div>{{showModalData.endTime}}</div>
</div>
<div>
<label>来访目的</label>
<div>{{showModalData.purpose}}</div>
</div>
<div>
<label>到访地址</label>
<div>{{showModalData.visitAddress}}</div>
</div>
<div>
<label>周知人员</label>
<div v-if="showModalData.participatorUserList && showModalData.participatorUserList.length === 0">暂无</div>
<div v-else><span v-for="item in showModalData.participatorUserList" :key="item.ddUserId" style="margin-right: 10px;">{{item.username}}</span></div>
</div>
<div>
<label>备注</label>
<div>{{showModalData.remark}}</div>
</div>
</div>
</a-modal>
</div>
</template>
......@@ -58,31 +126,51 @@ export default {
total: 0
},
columns: [{
title: '产品图',
dataIndex: 'productIcon',
scopedSlots: { customRender: 'productIcon' }
title: '访客姓名',
dataIndex: 'visitorList',
scopedSlots: { customRender: 'visitorList' },
width: '90px'
}, {
title: '访客单位',
dataIndex: 'companyName'
}, {
title: '来访目的',
dataIndex: 'purpose'
}, {
title: '被访人',
dataIndex: 'byVisitorName'
}, {
title: '菜名',
dataIndex: 'productName'
title: '被约时间',
dataIndex: 'startTime',
scopedSlots: { customRender: 'startTime' }
}, {
title: '售出(份数)',
dataIndex: 'productStatisticalQuantity'
title: '状态',
dataIndex: 'processStatus',
scopedSlots: { customRender: 'processStatus' }
}, {
title: '操作',
dataIndex: 'action',
scopedSlots: { customRender: 'action' }
}],
dataSource: []
dataSource: [],
showModalData: {},
visible: false
}
},
created () {
let date = new Date()
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = (new Date(year, month, 0).getDate().toString()).length > 1 ? new Date(year, month, 0).getDate() : '0' + new Date(year, month, 0).getDate()
this.startTime = `${year}-${month.toString().length > 1 ? month : '0' + month}-01`
this.endTime = `${year}-${month.toString().length > 1 ? month : '0' + month}-${day}`
this.startValue = this.moment(`${year}-${month.toString().length > 1 ? month : '0' + month}-01`, 'YYYY-MM-DD')
this.endValue = this.moment(`${year}-${month.toString().length > 1 ? month : '0' + month}-${day}`, 'YYYY-MM-DD')
this.queryRecordList()
},
methods: {
showModal (record) {
this.showModalData = record
this.visible = true
},
// handleOk (e) {
// this.visible = false
// },
// handleCancel (e) {
// this.visible = false
// },
moment,
disabledStartDate (startValue) {
const endValue = this.endValue
......@@ -114,14 +202,16 @@ export default {
},
queryRecordList () {
let RecordListData = {
startTime: `${this.startTime} 00:00:00`,
endTime: `${this.endTime} 23:59:59`,
visitorName: this.visitorName,
byVisitorName: this.byVisitorName,
startTime: this.startTime ? `${this.startTime} 00:00:00` : '',
endTime: this.endTime ? `${this.endTime} 23:59:59` : '',
pageNumber: 10,
currentPage: this.pagination.current
}
$http.post(`/admin/visitor/queryRecordList`, RecordListData).then((res) => {
if (res.data.resultCode === 0) {
this.dataSource = res.data.data.list
$http.post(`/admin/visitor/getRecordList`, RecordListData).then((res) => {
if (res.data.code === 0) {
this.dataSource = res.data.data.records
this.pagination.total = res.data.data.total
} else {
this.$message.error(res.data.message)
......@@ -149,4 +239,15 @@ export default {
.searchBox input{
margin-right: 20px;
}
.recordDetails>div{
width: 100%;
display: flex;
margin: 10px;
}
.recordDetails>div label {
width: 120px;
font-weight: bolder;
margin-right: 10px;
text-align: right;
}
</style>
src/components/pages/VisitorManagement/VisitorSetting.vue
......@@ -2,7 +2,7 @@
<div class="visitorSetting">
<div class="title">新增到访目的</div>
<div class="purposeList">
<a-input placeholder="请输入来访目的" v-model="addtags" style="width: 320px;margin-right:20px"/>
<a-input placeholder="请输入来访目的" maxlength="20" v-model="addtags" style="width: 320px;margin-right:20px"/>
<a-button type="primary" @click="savePurpose">保存</a-button>
<div class="purposeListContent">
<template v-for="item in tagsData">
......@@ -22,7 +22,7 @@
<a-input
v-decorator="[
'address',
{ rules: [{ required: true, message: '请填写省/市/街道' }] },
{ rules: [{ required: true, message: '请填写省/市/街道' }, { max: 120, message: '最大长度为120字符' } ]},
]"
placeholder="请填写省/市/街道"
/>
......@@ -35,7 +35,7 @@
<a-textarea
v-decorator="[
'addressDetail',
{ rules: [{ required: true, message: '请输入详细地址信息，如道路、楼栋号、单位、门牌号等' }] },
{ rules: [{ required: true, message: '请输入详细地址信息，如道路、楼栋号、单位、门牌号等' }, { max: 120, message: '最大长度为120字符' } ]},
]"
placeholder="请输入详细地址信息，如道路、楼栋号、单位、门牌号等"
/>
......@@ -197,12 +197,21 @@ export default {
})
},
deleteAddress (id) {
let removeData = {
addressId: id
}
$http.delete(`/admin/address/remove`, removeData).then((res) => {
if (res.data.code === 0) {
this.queryAddressList()
let that = this
this.$confirm({
title: '删除到访地址',
content: '确认删除该删除到访地址么？',
okText: '确定',
cancelText: '取消',
onOk () {
let removeData = {
addressId: id
}
$http.delete(`/admin/address/remove`, removeData).then((res) => {
if (res.data.code === 0) {
that.queryAddressList()
}
})
}
})
},
......@@ -224,6 +233,7 @@ export default {
$http.post(`/admin/address/save`, saveData).then((res) => {
if (res.data.code === 0) {
this.checkNick = false
this.form.resetFields()
this.queryAddressList()
}
})
......
src/main.js
......@@ -6,6 +6,7 @@ import { Upload, Menu, Layout, Checkbox, Breadcrumb, Popover, Icon, Button, Date
import 'ant-design-vue/dist/antd.css'
import { config } from './api/config'
import './assets/css/global.css'
import echarts from 'echarts'
Vue.use(Layout)
Vue.use(Upload)
......@@ -32,8 +33,10 @@ Vue.use(Input.TextArea)
Vue.use(message)
Vue.use(Pagination)
Vue.config.productionTip = false
Vue.prototype.$confirm = Modal.confirm
Vue.prototype.$message = message
Vue.prototype.$echarts = echarts
router.beforeEach(function (to, from, next) {
// 项目初始化进行鉴权
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment