From 9ca14d8c895e7301b127ccd61b39ee821fef8981 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 02 二月 2021 15:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/Informationinput.vue | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 21f87cb..9461425 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -89,13 +89,6 @@
<el-table-column prop="guardNumb" label="保安员证号" width="180" />
<el-table-column prop="archivesNumber" label="档案编号" width="180" />
<el-table-column prop="archivesStatus" label="档案情况" width="180" />
- <!-- <el-row>-->
- <!-- <el-col :span="24" class="button-from">-->
- <!-- <el-button type="info">提交</el-button>-->
- <!-- <el-button type="warning">暂存</el-button>-->
- <!-- <el-button type="danger">取消</el-button>-->
- <!-- </el-col>-->
- <!-- </el-row>-->
</el-table>
<el-table
v-show="showArr[1].show"
@@ -317,13 +310,6 @@
<el-table-column prop="sbumitBy" label="递交人" width="180" />
<el-table-column prop="expensesFee" label="医疗总费用" width="180" />
<el-table-column prop="compensated" label="已赔付医药费用" width="180" />
- <!-- <el-row>-->
- <!-- <el-col :span="24" class="button-from">-->
- <!-- <el-button type="info">提交</el-button>-->
- <!-- <el-button type="warning">暂存</el-button>-->
- <!-- <el-button type="danger">取消</el-button>-->
- <!-- </el-col>-->
- <!-- </el-row>-->
</el-table>
<el-table v-show="showArr[11].show" ref="occupationalTable" :data="laborTroubleData" style="width: 100%;height: 70%;">
<el-table-column type="selection" width="55" />
@@ -372,7 +358,6 @@
<el-table-column prop="reporter" label="汇报人" width="180" />
<el-table-column prop="remark" label="备注" width="180" />
</el-table>
-
<el-table v-show="showArr[13].show" ref="remarkInfoTable" :data="remarkInfoData" style="width: 100%;height: 70%;">
<el-table-column type="selection" width="55" />
<el-table-column fixed="left" label="操作" width="100">
@@ -479,7 +464,6 @@
<el-option label="外国民族" value="98" />
</el-select>
</el-form-item>
-
<el-form-item label="婚姻状态" prop="region">
<el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态">
<el-option label="未婚" value="1" />
@@ -493,7 +477,6 @@
<el-form-item label="身高(cm)">
<el-input v-model="empBaseInfoForm.stature" />
</el-form-item>
-
<el-form-item label="政治面貌" prop="region">
<el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌">
<el-option label="中共党员" value="01" />
@@ -589,8 +572,18 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="护卫点">
- <el-input v-model="empBaseInfoForm.deptName" />
+ <!-- <el-form-item label="护卫点">-->
+ <!-- <el-input v-model="empBaseInfoForm.deptName" />-->
+ <!-- </el-form-item>-->
+ <el-form-item label="护卫点" prop="deptId">
+ <treeselect
+ v-model="empBaseInfoForm.deptId"
+ :multiple="false"
+ :options="depts"
+ :clear-value-text="$t('common.clear')"
+ placeholder=" "
+ style="width:100%"
+ />
</el-form-item>
<el-form-item label="姓名">
<el-input v-model="empBaseInfoForm.empName" />
@@ -1069,7 +1062,6 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="辞职申请" :visible.sync="dialogshowArr[6].show" width="50%">
<el-form :model="resignForm" label-position="right" label-width="120px">
<el-row>
@@ -1125,12 +1117,11 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="失业金领取" :visible.sync="dialogshowArr[7].show" width="50%">
<el-form :model="unemploymentForm" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
- <el-form-item label="员工编号">
+ <el-form-item label="员工编号🔍" @click.native="showXzyg">
<el-input v-model="unemploymentForm.empNumb" />
</el-form-item>
<el-form-item label="性别" prop="region">
@@ -1181,7 +1172,6 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="社保申请" :visible.sync="dialogshowArr[8].show" width="50%">
<el-form :model="insuranceForm" label-position="right" label-width="120px">
<el-row>
@@ -1208,7 +1198,7 @@
<el-input v-model="insuranceForm.insuranceGaers" />
</el-form-item>
<el-form-item label="状态" prop="region">
- <el-select v-model="contractData.applayStatus" placeholder="请选择状态">
+ <el-select v-model="insuranceForm.applayStatus" placeholder="请选择状态">
<el-option label="未申请" value="1" />
<el-option label="已申请" value="2" />
</el-select>
@@ -1224,7 +1214,7 @@
<el-input v-model="insuranceForm.proposer" />
</el-form-item>
<el-form-item label="是否已经报告" prop="region">
- <el-select v-model="contractData.reportStatus" placeholder="是否已经报告">
+ <el-select v-model="insuranceForm.reportStatus" placeholder="是否已经报告">
<el-option label="未报告" value="1" />
<el-option label="已报告" value="2" />
</el-select>
@@ -1248,7 +1238,6 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="意外险案件" :visible.sync="dialogshowArr[9].show" width="50%">
<el-form :model="accidentCasesForm" label-position="right" label-width="120px">
<el-row>
@@ -1376,7 +1365,6 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="工伤案件" :visible.sync="dialogshowArr[10].show" width="50%">
<el-form :model="occupationalForm" label-position="right" label-width="140px">
<el-row>
@@ -1527,7 +1515,7 @@
<el-input v-model="occupationalForm.companyCompensation" />
</el-form-item>
<el-form-item label="是否结案" prop="region">
- <el-select v-model="contractData.settleStatus" placeholder="">
+ <el-select v-model="occupationalForm.settleStatus" placeholder="">
<el-option label="已结案" value="1" />
<el-option label="未结案" value="0" />
</el-select>
@@ -1549,7 +1537,6 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="劳资案件" :visible.sync="dialogshowArr[11].show" width="50%">
<el-form :model="laborTroubleForm" label-position="right" label-width="140px">
<el-row>
@@ -1625,7 +1612,6 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="不良记录" :visible.sync="dialogshowArr[12].show" width="50%">
<el-form :model="badRecordForm" label-position="right" label-width="140px">
<el-row>
@@ -1681,7 +1667,6 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
-
<el-dialog title="备注信息" :visible.sync="dialogshowArr[13].show" width="50%">
<el-form :model="remarkInfoForm" label-position="right" label-width="140px">
<el-row>
@@ -1728,14 +1713,21 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
+ <el-dialog title="选择员工" :visible.sync="dialogShowXzyg" width="90%">
+ <Selectuser @selectedUser="selectedUser" @cancleChooseUser="cancleChooseUser" />
+ </el-dialog>
</div>
</template>
<script>
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
+ components: { Treeselect },
data() {
return {
formLabelWidth: '120px',
thisShowIndex: 0,
+ dialogShowXzyg: false,
dialogshowArr: [
{
show: false
@@ -1826,10 +1818,12 @@
}
],
isAdd: false,
+ depts: [],
+ deptTree: [],
physicalExamData: [],
workExperienceData: [],
basicInformationData: [],
- contractData: [],
+ contractInfoData: [],
attendanceData: [],
leaveInfoData: [],
resignData: [],
@@ -2237,6 +2231,7 @@
}
},
mounted() {
+ this.initDept()
this.selectBadRecord()
this.selectEmpBase()
this.selectWorkExperience()
@@ -2267,6 +2262,21 @@
this.showArr[this.thisShowIndex].show = false
}
this.thisShowIndex = index
+ },
+ initDept() {
+ this.$get('system/dept').then((r) => {
+ this.depts = r.data.data.rows
+ this.deptTree = this.depts
+ }).catch((error) => {
+ console.error(error)
+ this.$message({
+ message: this.$t('tips.getDataFail'),
+ type: 'error'
+ })
+ })
+ },
+ resetDeptTree() {
+ this.$refs.deptTree.setCheckedKeys([])
},
butDelete() {
switch (this.thisShowIndex) {
@@ -3997,6 +4007,20 @@
this.remarkInfoForm.version = row.version
this.dialogshowArr[13].show = true
+ },
+ showXzyg() {
+ this.dialogShowXzyg = true
+ },
+ cancleChooseUser() {
+ this.dialogShowXzyg = false
+ },
+ selectedUser(users) {
+ for (var i = 0; i < users.length; i++) {
+ var data = users[i]
+ this.unemploymentForm.empNumb = data.username
+ this.unemploymentForm.sex = data.sex
+ }
+ this.dialogShowXzyg = false
}
}
}
--
Gitblit v1.8.0