|
@@ -912,6 +912,7 @@
|
|
|
<el-select v-model="specialPersonnelReportForm.userId"
|
|
<el-select v-model="specialPersonnelReportForm.userId"
|
|
|
placeholder="请选择人员"
|
|
placeholder="请选择人员"
|
|
|
filterable
|
|
filterable
|
|
|
|
|
+ v-if="user.userNameNeedTranslate != '1'"
|
|
|
style="width: 100%;">
|
|
style="width: 100%;">
|
|
|
<el-option v-for="item in allUsersList"
|
|
<el-option v-for="item in allUsersList"
|
|
|
:key="item.id"
|
|
:key="item.id"
|
|
@@ -921,6 +922,7 @@
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
|
|
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
|
|
|
</el-option>
|
|
</el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
+ <selectCat :subject="allUsersList" :subjectId="specialPersonnelReportForm.userId" :filterable="true" :clearable="true" @selectCal="selectCal" v-if="user.userNameNeedTranslate == '1'"></selectCat>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -974,12 +976,15 @@
|
|
|
</template>
|
|
</template>
|
|
|
<script>
|
|
<script>
|
|
|
import util from "../../common/js/util";
|
|
import util from "../../common/js/util";
|
|
|
|
|
+ // 引入自定义组件
|
|
|
|
|
+ import selectCat from "@/components/select.vue"
|
|
|
// 引入自定义级联组件
|
|
// 引入自定义级联组件
|
|
|
import vueCascader from "@/components/cascader.vue"
|
|
import vueCascader from "@/components/cascader.vue"
|
|
|
import { getThemeColor } from '@/utils/commonMethod.js'
|
|
import { getThemeColor } from '@/utils/commonMethod.js'
|
|
|
export default {
|
|
export default {
|
|
|
components: {
|
|
components: {
|
|
|
- vueCascader
|
|
|
|
|
|
|
+ vueCascader,
|
|
|
|
|
+ selectCat
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -1223,6 +1228,9 @@
|
|
|
this.getAllUsersList()
|
|
this.getAllUsersList()
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ selectCal(obj) {
|
|
|
|
|
+ this.specialPersonnelReportForm.userId = obj.id
|
|
|
|
|
+ },
|
|
|
startSynchronizing() {
|
|
startSynchronizing() {
|
|
|
this.attendanceSynchronizationLoading = true;
|
|
this.attendanceSynchronizationLoading = true;
|
|
|
var url = '/user-with-beisen/syncAttendanceFromBeisen';
|
|
var url = '/user-with-beisen/syncAttendanceFromBeisen';
|