diff --git a/package.json b/package.json
index 8bf6120..f0ffefd 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
"html-webpack-plugin": "^3.0.0",
"mini-css-extract-plugin": "0.4.1",
"node-notifier": "5.2.1",
- "node-sass": "^9.0.0",
+ "node-sass": "^4.14.1",
"optimize-css-assets-webpack-plugin": "5.0.0",
"ora": "3.0.0",
"portfinder": "1.0.16",
diff --git a/src/utils/request.js b/src/utils/request.js
index 27f2699..2b10a91 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -53,10 +53,9 @@ service.interceptors.response.use(
}
},
error => {
- alert('0')
let code = 0
try {
- code = error.response.data.status
+ code = error.response.data.code
} catch (e) {
debugger
if (error.toString().indexOf('Error: timeout') !== -1) {
diff --git a/src/views/person/form.vue b/src/views/person/form.vue
index c6a6269..968a411 100644
--- a/src/views/person/form.vue
+++ b/src/views/person/form.vue
@@ -44,6 +44,11 @@
+
+
+
+
+
diff --git a/src/views/xy-modules/person/form.vue b/src/views/xy-modules/person/form.vue
index 5f8e6a0..7cc0c62 100644
--- a/src/views/xy-modules/person/form.vue
+++ b/src/views/xy-modules/person/form.vue
@@ -154,6 +154,16 @@
+
+
+
+
+
+
@@ -279,6 +289,7 @@ export default {
xxProWage: '',//试用期工资
xxEntryTime: '',//入职时间
xxLeaveDate: '',//离职时间
+ xxEndDate: '',
xxIsBefoAfter: '',//税前或税后
xxGradTime: '',//毕业时间
xxEnducation: '',//学历
@@ -372,6 +383,7 @@ export default {
xxProWage: '',
xxEntryTime: '',
xxLeaveDate: '',
+ xxEndDate: '',
xxIsBefoAfter: '',
xxProTime: '',
xxEndProTime: '',
diff --git a/src/views/xy-modules/person/index.vue b/src/views/xy-modules/person/index.vue
index 55cfc4c..39aec36 100644
--- a/src/views/xy-modules/person/index.vue
+++ b/src/views/xy-modules/person/index.vue
@@ -71,6 +71,11 @@
{{ parseDate(scope.row.xxEndProTime) }}
+
+
+ {{ parseDate(scope.row.xxEndDate) }}
+
+
@@ -245,6 +250,7 @@ export default {
xxIsBefoAfter: data.xxIsBefoAfter,//税前或税后
xxGradTime: data.xxGradTime,//毕业时间
xxEnducation: data.xxEnducation,//学历
+ xxEndDate: data.xxEndDate,//学历
xxIsTrue: data.xxIsTrue,//学信网是否可查
xxRemark: data.xxRemark,//备注
xxBankName:data.xxBankName,//银行名称