|
@@ -1198,12 +1198,28 @@
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
<el-form-item label="工作类别" prop="work">
|
|
<el-form-item label="工作类别" prop="work">
|
|
- <el-input
|
|
|
|
|
|
+ <!-- <el-input
|
|
ref="duration"
|
|
ref="duration"
|
|
v-model="createTemp.work"
|
|
v-model="createTemp.work"
|
|
placeholder="工作类别"
|
|
placeholder="工作类别"
|
|
:disabled="dialogStatus == 'update' && isEditWork"
|
|
:disabled="dialogStatus == 'update' && isEditWork"
|
|
- />
|
|
|
|
|
|
+ /> -->
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="createTemp.work"
|
|
|
|
+ clearable
|
|
|
|
+ placeholder="工作类别"
|
|
|
|
+ class="filter-item"
|
|
|
|
+ style="width: 120px"
|
|
|
|
+ :disabled="dialogStatus == 'update' && isEditWork"
|
|
|
|
+ >
|
|
|
|
+ <!-- TODO: -->
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="(item,index) in workList"
|
|
|
|
+ :key="index"
|
|
|
|
+ :label="item"
|
|
|
|
+ :value="item"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -1681,6 +1697,7 @@
|
|
placeholder="工作类别"
|
|
placeholder="工作类别"
|
|
disabled
|
|
disabled
|
|
/>
|
|
/>
|
|
|
|
+
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -2801,7 +2818,8 @@ import {
|
|
ExecDataByConfig,
|
|
ExecDataByConfig,
|
|
failproccess,
|
|
failproccess,
|
|
GetAccount,
|
|
GetAccount,
|
|
- GetReportform
|
|
|
|
|
|
+ GetReportform,
|
|
|
|
+ getWorkList
|
|
} from '@/api/common'
|
|
} from '@/api/common'
|
|
import waves from '@/directive/waves'
|
|
import waves from '@/directive/waves'
|
|
import { parseTime, sortChange, json2excel } from '@/utils/index.js'
|
|
import { parseTime, sortChange, json2excel } from '@/utils/index.js'
|
|
@@ -2817,6 +2835,7 @@ export default {
|
|
directives: { waves },
|
|
directives: { waves },
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ workList: [], // 工作类别
|
|
isEditWork: true,
|
|
isEditWork: true,
|
|
isBasicsAdd: [],
|
|
isBasicsAdd: [],
|
|
isBasicsCard: [],
|
|
isBasicsCard: [],
|
|
@@ -3528,6 +3547,12 @@ export default {
|
|
console.log(this.isSupRole(), 'hss')
|
|
console.log(this.isSupRole(), 'hss')
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 获取工作类别的数据
|
|
|
|
+ async getWorks() {
|
|
|
|
+ const data = await getWorkList()
|
|
|
|
+ this.workList = data.data
|
|
|
|
+ console.log(data, '工作列表')
|
|
|
|
+ },
|
|
// 判断当前是否是超级管理员 "id":44,"name":"超级管理员
|
|
// 判断当前是否是超级管理员 "id":44,"name":"超级管理员
|
|
isSupRole() {
|
|
isSupRole() {
|
|
const roles = JSON.parse(sessionStorage.getItem('roles'))
|
|
const roles = JSON.parse(sessionStorage.getItem('roles'))
|
|
@@ -4693,7 +4718,8 @@ export default {
|
|
this.$forceUpdate()
|
|
this.$forceUpdate()
|
|
},
|
|
},
|
|
form_see(row) {
|
|
form_see(row) {
|
|
- console.log(row)
|
|
|
|
|
|
+ console.log(row, 'hss')
|
|
|
|
+ this.getWorks()
|
|
this.seeTemp = Object.assign({}, row) // copy obj
|
|
this.seeTemp = Object.assign({}, row) // copy obj
|
|
this.activeName = 'first'
|
|
this.activeName = 'first'
|
|
this.dialogStatus = 'card'
|
|
this.dialogStatus = 'card'
|