Browse Source

peter

360view
newPeter7 2 years ago
parent
commit
6ca25ecc7c
  1. 3
      src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
  2. 93
      src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
  3. 8
      src/page-subspecialty/views/modules/scientificManagement/sys/project.vue

3
src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue

@ -153,7 +153,6 @@ export default {
}
},
created() {
},
methods: {
//
@ -194,7 +193,6 @@ export default {
},
//
selectOptionColorHandle(item) {
console.log(item)
this.dataForm.colour = item.colour
},
//
@ -205,7 +203,6 @@ export default {
}
})
this.brandCOlorList = res.data
console.log(res.data)
if (title !== '编辑') {
this.dataForm.colourId = this.dataForm.eyeType === 'OD' ? res.data.odDefault.id : res.data.osDefault.id
}

93
src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue

@ -15,7 +15,6 @@
</el-button>
</el-form-item>
</el-form>
<el-table :data="doctorList">
<el-table-column prop="userName" label="用户名" header-align="center" align="center" />
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center" />
@ -33,23 +32,23 @@
</div>
</template>
</el-table-column>
<el-table-column prop="status" label="状态" header-align="center" align="center">
<template slot-scope="scope">
<span
:class="scope.row.status=='1' ? 'state-circle state-circle-green' :'state-circle state-circle-red'"
/>
<span>{{ scope.row.status == '1' ? '正常':'停用' }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="status" label="状态" header-align="center" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span-->
<!-- :class="scope.row.status=='1' ? 'state-circle state-circle-green' :'state-circle state-circle-red'"-->
<!-- />-->
<!-- <span>{{ scope.row.status == '1' ? '正常':'停用' }}</span>-->
<!-- </template>-->
<!-- </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>
<!-- <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"
@ -75,7 +74,7 @@
:render-content="renderFunc"
:format="{noChecked: '${total}',hasChecked: '${checked}/${total}'}"
:titles="['未加入', '已加入课题']"
:props="{key: 'userId', label: 'realName'}"
:props="{key: 'doctorId', label: 'doctorName'}"
:data="AllJoinedPeopleList"
@change="handleChange"
/>
@ -107,7 +106,7 @@ export default {
inputSearchValue: '',
transferData: generateData(),
renderFunc(h, option) {
return <span>{option.realName}</span>
return <span>{option.doctorName}</span>
},
dialogFormVisible: false,
projectId: '',
@ -125,7 +124,8 @@ export default {
}
},
created() {
this.projectId = window.SITE_CONFIG['projectId']
// this.projectId = window.SITE_CONFIG['projectId']
this.projectId = this.$route.query.projectId
this.getDoctorList()
this.getProjectUser()
this.getRoleList()
@ -144,32 +144,39 @@ export default {
assignPeopleClick() {
this.dialogFormVisible = true
},
//
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]
})
//
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]
// })
// },
//
handleChange(value) {
this.joinedListUserId = value

8
src/page-subspecialty/views/modules/scientificManagement/sys/project.vue

@ -288,8 +288,8 @@ export default {
data() {
return {
mixinViewModuleOptions: {
// getDataListURL: '/project/approvalPage',
getDataListURL: '/project/page',
getDataListURL: '/project/approvalPage',
// getDataListURL: '/project/page',
getDataListIsPage: true,
deleteURL: '/project',
deleteIsBatch: false
@ -319,7 +319,9 @@ export default {
// name: 'subject'
// })
// window.open(href, '_blank')
// this.$router.push('subjectMgt')
this.$router.push({ path: 'subjectMgt', query: {
projectId: projectId
}})
},
handleChange(value) {
this.joinedListUserId = value

Loading…
Cancel
Save