pengqiang
/
xiangan_pc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

360view
bianyaqi 2 years ago
parent
4b746ff678 bd4633f30c
commit
331024a9ea
5 changed files with 62 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 112
      src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
  2. 3
      src/page-subspecialty/views/modules/scientificManagement/subjectMgt/log/index.vue
  3. 2
      src/page-subspecialty/views/modules/scientificManagement/sys/project-add-or-update.vue
  4. 2
      src/page-subspecialty/views/modules/scientificManagement/sys/project-review.vue
  5. 13
      src/page-subspecialty/views/modules/scientificManagement/sys/project.vue

112
src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
View File

@ -16,7 +16,7 @@
</el-form-item>
</el-form>
<el-table :data="doctorList">
<el-table-column prop="userName" label="用户名" header-align="center" align="center" />
<el-table-column prop="employeeId" label="用户名" header-align="center" align="center" />
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center" />
<el-table-column prop="gender" label="性别" header-align="center" align="center">
<template slot-scope="scope">
@ -26,8 +26,8 @@
<el-table-column prop="mobile" label="手机号" header-align="center" align="center" />
<el-table-column prop="roleNameList" label="角色" header-align="center" align="center">
<template slot-scope="scope">
<div v-if="scope.row.roleNameList && scope.row.roleNameList.length>0">
<p v-for="(item,index) in scope.row.roleNameList" :key="index" style="margin:0">{{ item }}
<div v-if="scope.row.roleList && scope.row.roleList.length>0">
<p v-for="(item,index) in scope.row.roleList" :key="index" style="margin:0">{{ item.name }}
</p>
</div>
</template>
@ -42,19 +42,24 @@
<!-- </el-table-column>-->
<el-table-column prop="operation" label="操作" header-align="center" align="center">
<template slot-scope="scope">
<span v-if="opPermission(scope.row)">
<!-- <el-dropdown trigger="click" @command="handleRoleCommand(scope.row,$event)">-->
<!-- <span class="el-dropdown-link" style="padding-right:8px;cursor: pointer;">更改角色</span>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item v-for="item in roleList" :key="item.roleId" :command="item.id">{{ item.name }}</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<span
style="color:#FF4D4F"
class="operation-delete"
@click="deleteClick(scope.row)"
>移出</span>
</span>
<span
style="color:#FF4D4F"
class="operation-delete"
@click="deleteClick(scope.row)"
>移出</span>
<!-- <span v-if="opPermission(scope.row)">-->
<!-- <el-dropdown trigger="click" @command="handleRoleCommand(scope.row,$event)">-->
<!-- <span class="el-dropdown-link" style="padding-right:8px;cursor: pointer;">更改角色</span>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item v-for="item in roleList" :key="item.roleId" :command="item.id">{{ item.name }}</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- <span-->
<!-- style="color:#FF4D4F"-->
<!-- class="operation-delete"-->
<!-- @click="deleteClick(scope.row)"-->
<!-- >移出</span>-->
<!-- </span>-->
</template>
</el-table-column>
</el-table>
@ -74,7 +79,7 @@
:render-content="renderFunc"
:format="{noChecked: '${total}',hasChecked: '${checked}/${total}'}"
:titles="['未加入', '已加入课题']"
:props="{key: 'doctorId', label: 'doctorName'}"
:props="{key: 'userId', label: 'realName'}"
:data="AllJoinedPeopleList"
@change="handleChange"
/>
@ -106,7 +111,7 @@ export default {
inputSearchValue: '',
transferData: generateData(),
renderFunc(h, option) {
return <span>{option.doctorName}</span>
return <span>{option.realName}</span>
},
dialogFormVisible: false,
projectId: '',
@ -124,11 +129,10 @@ export default {
}
},
created() {
// this.projectId = window.SITE_CONFIG['projectId']
this.projectId = this.$route.query.projectId
this.getDoctorList()
this.getProjectUser()
this.getRoleList()
// this.getRoleList()
},
methods: {
reload() {
@ -144,39 +148,32 @@ export default {
assignPeopleClick() {
this.dialogFormVisible = true
},
// 获取医生列表
async getProjectUser() {
const { data: res } = await this.$http.get('/dp/getDoctorList')
if (res.code === 0) {
this.AllJoinedPeopleList = res.data
}
},
// 获取人员列表
// getProjectUser() {
// this.$http.get(`/projectUser/getUserList/${this.projectId}`)
// .then(({ data: res }) => {
// this.JoinedPeopleList = res.data.joinedList
// this.notJoinedPeopleList = res.data.notJoined
// // 已加入
// if (res.data.joinedList.length > 0) {
// res.data.joinedList.forEach(item => {
// this.rightValue.push(item.userId)
// if (item.isAdmin === 1) {
// item.disabled = true
// }
// })
// }
// // 未加入
// if (res.data.notJoined.length > 0) {
// res.data.notJoined.forEach(item => {
// if (item.isAdmin === 1) {
// item.disabled = true
// }
// })
// }
// this.AllJoinedPeopleList = [...res.data.joinedList, ...res.data.notJoined]
// })
// },
getProjectUser() {
this.$http.get(`/projectUser/getUserList/${this.projectId}`)
.then(({ data: res }) => {
this.JoinedPeopleList = res.data.joinedList
this.notJoinedPeopleList = res.data.notJoined
// 已加入
if (res.data.joinedList.length > 0) {
res.data.joinedList.forEach(item => {
this.rightValue.push(item.userId)
if (item.isAdmin === 1) {
item.disabled = true
}
})
}
// 未加入
if (res.data.notJoined.length > 0) {
res.data.notJoined.forEach(item => {
if (item.isAdmin === 1) {
item.disabled = true
}
})
}
this.AllJoinedPeopleList = [...res.data.joinedList, ...res.data.notJoined]
})
},
// 分配人员变化时
handleChange(value) {
this.joinedListUserId = value
@ -189,7 +186,7 @@ export default {
userIdList: this.joinedListUserId
}).then(({ data: res }) => {
this.$message.success('分配成功')
this.refresh()
this.getDoctorList()
})
},
// 获取角色列表
@ -210,11 +207,11 @@ export default {
userId: scopeRow.userId
}).then(({ data: res }) => {
this.$message.success('更改角色成功!')
this.refresh()
this.getDoctorList()
})
},
// 获取医生列表
getDoctorList(e) {
getDoctorList() {
this.$http.get('/projectUser/page', {
params: {
limit: this.limit,
@ -223,7 +220,7 @@ export default {
realName: ''
}
}).then(({ data: res }) => {
this.doctorList = res.data.list
this.doctorList = res.data.list || []
this.total = res.data.total
})
},
@ -241,7 +238,7 @@ export default {
data: [scopeRow.id]
}).then(({ data: res }) => {
this.$message.success('删除成功!')
this.refresh()
this.getDoctorList()
})
})
}
@ -249,7 +246,6 @@ export default {
}
</script>
<style lang='scss' scoped>
.state-circle {
display: inline-block;
width: 6px;

3
src/page-subspecialty/views/modules/scientificManagement/subjectMgt/log/index.vue
View File

@ -2,7 +2,6 @@
<el-card shadow="never" class="aui-card--fill">
<div class="filter-wrapper">
<el-form :inline="true" :model="dataForm" @submit.native.prevent @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="input" placeholder="关键词" class="input-with-select" clearable>
<el-select slot="prepend" v-model="select" placeholder="请选择">
@ -14,9 +13,7 @@
<el-button slot="append" icon="el-icon-search" @click="getDataList()">{{ $t('query') }}</el-button>
</el-input>
</el-form-item>
</el-form>
<el-table
v-loading="dataListLoading"
:data="dataList"

2
src/page-subspecialty/views/modules/scientificManagement/sys/project-add-or-update.vue
View File

@ -125,7 +125,7 @@ export default {
dateRange1: [],
uploadUrl: window.SITE_CONFIG['apiURL'] + '/upload/uploadFiles',
headers: {
token: Cookies.get('token')
token: window.sessionStorage.getItem('xa-token') || ''
},
uploadData: {
path: '课题附件'

2
src/page-subspecialty/views/modules/scientificManagement/sys/project-review.vue
View File

@ -259,7 +259,7 @@ export default {
this.approvalComment = ''
this.approvalId = ''
this.$message({ type: 'success', message: '审批完成' })
this.query()
this.getDataList()
})
})
},

13
src/page-subspecialty/views/modules/scientificManagement/sys/project.vue
View File

@ -160,34 +160,32 @@
:label="$t('handle')"
header-align="center"
align="center"
width="120"
width="180"
>
<template slot-scope="scope">
<span v-if="opPermission(scope.row.projectAdminUserId)">
<span>
<el-button
v-if="$hasPermission('') && scope.row.approvalStatus==3 "
type="text"
size="small"
@click="assignPeopleHandle(scope.row)"
>人员
</el-button>
<el-button
v-if="$hasPermission('') && scope.row.approvalStatus==3"
style="margin-right: 12px"
type="text"
size="small"
@click="addOrUpdateHandle(scope.row.id)"
>{{ $t("update") }}
</el-button>
<el-button
v-if="$hasPermission('')&& scope.row.approvalStatus!=3"
type="text"
size="small"
style="color: red"
style="color: red;margin-right: 12px"
@click="deleteHandle(scope.row.id)"
>{{ $t("delete") }}
</el-button>
</span>
<span v-else>
<span>
<el-button
type="text"
size="small"
@ -314,6 +312,7 @@ export default {
},
methods: {
windowOpen_project(projectId, deptId) {
console.log(arguments)
// window.open(`project/home?id=${projectId}`)
// const { href } = this.$router.resolve({
// name: 'subject'

Write Preview
Loading…
Cancel
Save