Commit 6f6f1ab4 authored by 张伯涛's avatar 张伯涛

修改

parent 61d77214
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''" @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)" @contextmenu.prevent.native="openMenu(tag,$event)"
> >
{{ tag.title }} {{ setName(tag) }}
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link> </router-link>
</scroll-pane> </scroll-pane>
...@@ -71,6 +71,20 @@ export default { ...@@ -71,6 +71,20 @@ export default {
this.addTags() this.addTags()
}, },
methods: { methods: {
setName(route) {
console.log('路由', route)
if (route.path === '/contract/manage1/add') {
if (route.query.type === 'add') {
return '新增' + route.title
} else if (route.query.type === 'update') {
return '修改' + route.title
} else if (route.query.type === 'checkDetails') {
return '查看' + route.title
}
} else {
return route.title
}
},
isActive(route) { isActive(route) {
return route.path === this.$route.path return route.path === this.$route.path
}, },
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<!-- <i class="el-icon-message-solid" />--> <!-- <i class="el-icon-message-solid" />-->
<!-- </el-badge>--> <!-- </el-badge>-->
<span class="username-text"> <span class="username-text">
[您好,{{ userName }}] [您好,{{ userName }}&nbsp;&nbsp; {{name}}]
</span> </span>
<el-dropdown class="avatar-container" trigger="click"> <el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper"> <div class="avatar-wrapper">
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,7 @@ export default {
return { return {
appList: [], appList: [],
userName: '', userName: '',
name: '',
avatar: '', avatar: '',
specialTag: this.$store.state.user.specialTag specialTag: this.$store.state.user.specialTag
} }
...@@ -82,6 +83,7 @@ export default { ...@@ -82,6 +83,7 @@ export default {
try { try {
const user = JSON.parse(Store.get(storeKey.user)) const user = JSON.parse(Store.get(storeKey.user))
this.userName = user.userName this.userName = user.userName
this.name = user.name
this.avatar = user.avatar this.avatar = user.avatar
} catch (e) { } catch (e) {
......
...@@ -62,7 +62,7 @@ export const constantRoutes = [ ...@@ -62,7 +62,7 @@ export const constantRoutes = [
path: '/contract/manage1/add', path: '/contract/manage1/add',
name: 'contractManage'.toLocaleUpperCase(), name: 'contractManage'.toLocaleUpperCase(),
component: () => import('@/views/list/add'), component: () => import('@/views/list/add'),
meta: { title: '新增合同信息' } meta: { title: '合同信息' }
} }
] ]
}, },
......
This diff is collapsed.
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
<el-table :row-style="tableRowStyle" :data="data" border> <el-table :row-style="tableRowStyle" :data="data" border>
<el-table-column label="序号" type="index" width="55" /> <el-table-column label="序号" type="index" width="55" />
<el-table-column label="原合同ID" prop="FROMID" :show-overflow-tooltip="true" /> <el-table-column label="原合同ID" prop="FROMID" :show-overflow-tooltip="true" />
<el-table-column label="合同中文名称" prop="CONNAMECN" :show-overflow-tooltip="true" /> <el-table-column label="合同中文名称" prop="CONNAMECN" :show-overflow-tooltip="true">
<template slot-scope="{ row }">
<el-link type="primary" @click.stop="checkDetail(row)">{{row.CONNAMECN}}</el-link>
</template>
</el-table-column>
<el-table-column label="合同编码" prop="CONCODE" :show-overflow-tooltip="true" /> <el-table-column label="合同编码" prop="CONCODE" :show-overflow-tooltip="true" />
<el-table-column label="项目编码" prop="PROJNUMBER" :show-overflow-tooltip="true" /> <el-table-column label="项目编码" prop="PROJNUMBER" :show-overflow-tooltip="true" />
<el-table-column label="项目名称" prop="PROJNAME" :show-overflow-tooltip="true" /> <el-table-column label="项目名称" prop="PROJNAME" :show-overflow-tooltip="true" />
...@@ -77,6 +81,7 @@ ...@@ -77,6 +81,7 @@
<el-table-column width="135px" label="操作"> <el-table-column width="135px" label="操作">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link> <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
<!-- <el-link :underline="false" type="warning" style="margin-left: 10px " @click.stop="checkDetail(row)">查看</el-link>-->
<el-link v-if="jurisdiction === '2016012550'" :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link> <el-link v-if="jurisdiction === '2016012550'" :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
<el-link :underline="false" type="danger" style="margin-left: 10px " @click.stop="del(row)">删除</el-link> <el-link :underline="false" type="danger" style="margin-left: 10px " @click.stop="del(row)">删除</el-link>
</template> </template>
...@@ -84,7 +89,7 @@ ...@@ -84,7 +89,7 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="部门列表" name="second"> <el-tab-pane label="部门列表" name="second">
<div class="title">合同列表啊啊啊</div> <div class="title">合同列表</div>
<el-table :row-style="tableRowStyle" :data="deptData" border> <el-table :row-style="tableRowStyle" :data="deptData" border>
<el-table-column label="序号" type="index" width="55" /> <el-table-column label="序号" type="index" width="55" />
<el-table-column label="原合同ID" prop="FROMID" :show-overflow-tooltip="true" /> <el-table-column label="原合同ID" prop="FROMID" :show-overflow-tooltip="true" />
...@@ -125,6 +130,7 @@ ...@@ -125,6 +130,7 @@
<el-table-column width="135px" label="操作"> <el-table-column width="135px" label="操作">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link> <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
<!-- <el-link :underline="false" type="warning" style="margin-left: 10px " @click.stop="checkDetail(row)">查看</el-link>-->
<el-link v-if="jurisdiction === '2016012550'" :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link> <el-link v-if="jurisdiction === '2016012550'" :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
<el-link :underline="false" type="danger" style="margin-left: 10px " @click.stop="del(row)">删除</el-link> <el-link :underline="false" type="danger" style="margin-left: 10px " @click.stop="del(row)">删除</el-link>
</template> </template>
...@@ -173,6 +179,7 @@ ...@@ -173,6 +179,7 @@
<el-table-column width="135px" label="操作"> <el-table-column width="135px" label="操作">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link> <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
<!-- <el-link :underline="false" type="warning" style="margin-left: 10px " @click.stop="checkDetail(row)">查看</el-link>-->
<el-link v-if="jurisdiction === '2016012550'" :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link> <el-link v-if="jurisdiction === '2016012550'" :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
<el-link :underline="false" type="danger" style="margin-left: 10px " @click.stop="del(row)">删除</el-link> <el-link :underline="false" type="danger" style="margin-left: 10px " @click.stop="del(row)">删除</el-link>
</template> </template>
...@@ -499,6 +506,20 @@ obj=this.typeform*/ ...@@ -499,6 +506,20 @@ obj=this.typeform*/
} }
}) })
}, },
checkDetail(row) {
const number = this.updateOptions.find(item => item.label.split(' ')[0] === row.BUSINESSTYPE).type
const businessTypeName = this.updateOptions.find(item => item.label.split(' ')[0] === row.BUSINESSTYPE).value
console.log('aaaaaaa', number)
this.$router.push({
path: '/contract/manage1/add',
query: {
row: row,
type: 'checkDetails',
number: number,
businessTypeName: businessTypeName
}
})
},
query() { query() {
this.queryLoading = true this.queryLoading = true
api.query().then(res => { api.query().then(res => {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
Login({ username, password }).then((res) => { Login({ username, password }).then((res) => {
this.loading = false this.loading = false
Store.set(storeKey.token, `${Math.random()}_${new Date().getTime()}`) Store.set(storeKey.token, `${Math.random()}_${new Date().getTime()}`)
Store.set(storeKey.user, JSON.stringify({ userName: username, userId: res.userId, deptId: res.deptId, avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif' })) Store.set(storeKey.user, JSON.stringify({ userName: username, userId: res.userId, deptId: res.deptId, name: res.name, avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif' }))
if (rememberMe) { if (rememberMe) {
Store.set('username', username) Store.set('username', username)
Store.set('password', encrypt(password)) Store.set('password', encrypt(password))
......
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