From 8be0a3efd0d15cf241c4e3c5910cd0d6f2f1f150 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 04 二月 2021 20:43:26 +0800
Subject: [PATCH] feat(信息录入): 实现了公用的取消功能
---
.eslintrc.js | 22 +++++++++++-----------
src/views/user/Informationinput.vue | 13 +++++++++----
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index c977505..6ec8516 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,24 +7,24 @@
env: {
browser: true,
node: true,
- es6: true,
+ es6: true
},
extends: ['plugin:vue/recommended', 'eslint:recommended'],
// add your custom rules here
//it is base on https://github.com/vuejs/eslint-config-vue
rules: {
- "vue/max-attributes-per-line": [2, {
- "singleline": 10,
- "multiline": {
- "max": 1,
- "allowFirstLine": false
+ 'vue/max-attributes-per-line': [2, {
+ 'singleline': 10,
+ 'multiline': {
+ 'max': 1,
+ 'allowFirstLine': false
}
}],
- "vue/singleline-html-element-content-newline": "off",
- "vue/multiline-html-element-content-newline":"off",
- "vue/name-property-casing": ["error", "PascalCase"],
- "vue/no-v-html": "off",
+ 'vue/singleline-html-element-content-newline': 'off',
+ 'vue/multiline-html-element-content-newline': 'off',
+ 'vue/name-property-casing': ['error', 'PascalCase'],
+ 'vue/no-v-html': 'off',
'accessor-pairs': 2,
'arrow-spacing': [2, {
'before': true,
@@ -47,7 +47,7 @@
'curly': [2, 'multi-line'],
'dot-location': [2, 'property'],
'eol-last': 2,
- 'eqeqeq': ["error", "always", {"null": "ignore"}],
+ 'eqeqeq': ['error', 'always', { 'null': 'ignore' }],
'generator-star-spacing': [2, {
'before': true,
'after': true
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 1ffeff4..3e05c13 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -422,9 +422,8 @@
</el-table>
<el-col :span="24">
<div style="margin: 0px auto; width: 250px;margin-top: 20px;">
- <el-button class="nomalBtn">取消</el-button>
- <el-button class="nomalBtn">暂存</el-button>
- <el-button class="commonBtn">提交</el-button>
+ <el-button class="nomalBtn" @click="deleteFrom()">取消</el-button>
+ <el-button class="commonBtn" @click="submitTo()">提交</el-button>
</div>
</el-col>
</el-main>
@@ -2085,6 +2084,7 @@
}
],
isAdd: false,
+ queryParams: {},
depts: [],
deptTree: [],
physicalExamData: [],
@@ -2788,8 +2788,13 @@
break
}
},
+ deleteFrom() {
+ this.butDelete()
+ },
selectEmpBase() {
- this.$get('hr/empBaseInfo/list')
+ this.queryParams.delFlag = '2'
+ // eslint-disable-next-line no-undef
+ this.$get('hr/empBaseInfo/list', this.queryParams)
.then((r) => {
this.basicInformationData = r.data.data.rows
})
--
Gitblit v1.8.0