elink-star
/
epmet-work-pc-chengyang
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_contract' into dev

feature
wanggongfeng 3 years ago
parent
afd2bec621 8a2cba4b3a
commit
13deadb5c3
4 changed files with 73 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/views/modules/plugins/change/changedeath.vue
  2. 35
      src/views/modules/plugins/change/changerelocation.vue
  3. 23
      src/views/modules/plugins/change/changewelfare.vue
  4. 2
      src/views/modules/plugins/change/resichange.vue

35
src/views/modules/plugins/change/changedeath.vue
View File

@ -31,12 +31,6 @@
</el-input>
</el-form-item>
<br/>
<el-form-item label="享受福利" prop="isWelfare">
<el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
<el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="死亡时间"
prop="startTime">
<el-date-picker v-model="timeRange"
@ -49,15 +43,18 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="享受福利" prop="isWelfare">
<el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
<el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
<!--<el-form-item>-->
<!--<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
<!--</el-form-item>-->
@ -67,6 +64,9 @@
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
</div>
<el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column label="序号"
@ -295,4 +295,21 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
}
.resi-row-btn {
display: flex;
margin-bottom: 13px;
.el-button {
margin-left: 10px;
border: 0;
}
// .el-button--success {
// background: rgba(34, 193, 195, 1);
// }
// .el-button--warning {
// background: rgba(254, 179, 73, 1);
// }
// .el-button--danger {
// background: rgba(254, 98, 82, 1);
// }
}
</style>

35
src/views/modules/plugins/change/changerelocation.vue
View File

@ -128,12 +128,6 @@
</el-input>
</el-form-item>
<br/>
<el-form-item label="享受福利" prop="isWelfare">
<el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
<el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="迁出时间"
prop="startTime">
<el-date-picker v-model="timeRange"
@ -146,15 +140,18 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="享受福利" prop="isWelfare">
<el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
<el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
<!--<el-form-item>-->
<!--<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
<!--</el-form-item>-->
@ -164,6 +161,9 @@
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
</div>
<el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column label="序号"
@ -524,4 +524,21 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
}
.resi-row-btn {
display: flex;
margin-bottom: 13px;
.el-button {
margin-left: 10px;
border: 0;
}
// .el-button--success {
// background: rgba(34, 193, 195, 1);
// }
// .el-button--warning {
// background: rgba(254, 179, 73, 1);
// }
// .el-button--danger {
// background: rgba(254, 98, 82, 1);
// }
}
</style>

23
src/views/modules/plugins/change/changewelfare.vue
View File

@ -45,9 +45,6 @@
<el-form-item>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
</el-form-item>
@ -57,6 +54,9 @@
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button type="warning" size="small" class="diy-button--add" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</div>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column label="序号"
@ -305,4 +305,21 @@ export default {
padding: 8px;
box-sizing: border-box;
}
.resi-row-btn {
display: flex;
margin-bottom: 13px;
.el-button {
margin-left: 10px;
border: 0;
}
// .el-button--success {
// background: rgba(34, 193, 195, 1);
// }
// .el-button--warning {
// background: rgba(254, 179, 73, 1);
// }
// .el-button--danger {
// background: rgba(254, 98, 82, 1);
// }
}
</style>

2
src/views/modules/plugins/change/resichange.vue
View File

@ -242,7 +242,7 @@
<el-dialog :visible.sync="tranferShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'人员变动'"
:title="'迁出管理'"
width="950px"
top="5vh"
class="dialog-h"

Write Preview
Loading…
Cancel
Save