From 767efec7a91d117c792e035f35736215c8b173ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E5=8B=87?= <995058772@qq.com>
Date: Thu, 2 Jan 2025 15:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                          |  2 +-
 src/utils/request.js                  |  3 +--
 src/views/person/form.vue             |  5 +++++
 src/views/xy-modules/person/form.vue  | 12 ++++++++++++
 src/views/xy-modules/person/index.vue |  6 ++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

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 @@
             <el-input v-model="form.xxEntryTime"  />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="入职时间">
+            <el-input v-model="form.xxEndDate"  />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="离职时间">
             <el-input v-model="form.xxLeaveDate"  />
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 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同到期时间" >
+            <el-date-picker
+              v-model="form.xxEndDate"
+              type="date"
+              placeholder="选择离职时间"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
             <el-form-item label="税前或税后" >
               <el-select v-model="form.xxIsBefoAfter" placeholder="请选择">
@@ -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 @@
           <span>{{ parseDate(scope.row.xxEndProTime) }}</span>
         </template>
       </af-table-column>
+      <af-table-column align="center" prop="xxEndDate" label="合同到期日期" width='90'>
+         <template slot-scope="scope">
+          <span>{{ parseDate(scope.row.xxEndDate) }}</span>
+        </template>
+      </af-table-column>
       <af-table-column align="center" prop="xxRemark" label="备注" width='250'/>
       <af-table-column align="center" prop="xxAppendix" label="附件" width='250'/>
       <af-table-column align="center" prop="xxNumber" label="身份证号码" width='150'/>
@@ -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,//银行名称