This commit is contained in:
2022-03-04 10:44:28 +08:00
parent 878c9b22f7
commit 33a27dd810
16 changed files with 280 additions and 162 deletions

View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: gtz
* @LastEditTime: 2021-04-17 16:33:37
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 10:06:01
* @Description:
-->
<template>
@@ -62,23 +62,8 @@
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item :label="$t('module.basicData.staff.Profession')" prop="majorId">
<el-select
v-model="staffData.majorId"
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.staff.Profession')])"
multiple
filterable
clearable
:style="{width: '100%'}"
>
<el-option
v-for="(item, index) in majorArr"
:key="index"
:label="item.name"
:value="item.id"
:disabled="item.disabled"
/>
</el-select>
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
<el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
@@ -122,11 +107,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
<el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
@@ -140,7 +120,6 @@
<script>
import { staffDetail, staffUpdate, staffAdd, staffCode } from '@/api/basicData/GroupModule/staff'
import { majorList } from '@/api/basicData/GroupModule/major'
export default {
props: {
@@ -152,7 +131,6 @@ export default {
data() {
return {
visible: false,
majorArr: [],
staffData: {
name: undefined,
sex: '',
@@ -211,13 +189,6 @@ export default {
staffCode().then(res => {
this.staffData.code = res.data
})
majorList({
current: 1,
size: 999,
name: ''
}).then(response => {
this.majorArr = response.data.records
})
this.staffData.id = id || ''
this.visible = true
this.$nextTick(() => {

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2021-07-06 11:26:28
* @LastEditTime: 2022-03-03 16:49:10
* @Description:
-->
<template>
@@ -83,7 +83,7 @@ export default {
dataDictionaryDataList({
current: 1,
size: 999,
dictTypeId: '1412216979622785026'
dictTypeId: '2'
}).then(response => {
if (response.data.records) {
this.scrapsArr = response.data.records