Merge remote-tracking branch 'origin/master'

src/api/onboardmanage/onboardmanage.js

@@ -42,3 +42,27 @@ export function delOnBoardManage(id) {
         method: 'delete'
     })
 }
+// 查询入职草稿箱
+export function listOnBoardManageDraft(query) {
+    return request({
+        url: '/staffmanage/onboardmanage/listDraft',
+        method: 'get',
+        params: query
+    })
+}
+// 新增入职草稿
+export function addOnBoardManageDraft(data) {
+    return request({
+        url: '/staffmanage/onboardmanage/addDraft',
+        method: 'post',
+        data: data
+    })
+}
+// 修改入职草稿箱（草稿箱提交 状态修改）
+export function updateOnBoardManageDraft(data) {
+    return request({
+        url: '/staffmanage/onboardmanage/updateDraft',
+        method: 'put',
+        data: data
+    })
+}

src/views/staffmanage/confirmationmanage/apply.vue

@@ -56,19 +56,20 @@
           <el-input
               v-model="form.achievementDescription"
               type="textarea"
-              autosize
+              :autosize="{ minRows: 2, maxRows: 4 }"
           placeholder="试用期工作成果描述（不能超过255个字符）"
           maxlength="255"
-              class="applyInput"
+          class="applyInput custom-textarea"
           />
         </el-form-item>
+
         <el-form-item label="自我评价" prop="selfEvaluation" class="selfEvaluationInput">
           <el-input
               v-model="form.selfEvaluation"
               type="textarea"
-              autosize
+              :autosize="{ minRows: 2, maxRows: 4 }"
           placeholder="试用期综合自我评价（不能超过255个字符）"
-              class="applyInput"
+          class="applyInput custom-textarea"
           maxlength="255"
           />
         </el-form-item>
@@ -592,4 +593,19 @@ onMounted(() => {
   width: 400px !important;
   height: 40px !important;
 }
+/* 添加固定高度和滚动条 */
+.fixed-textarea textarea {
+  max-height: 200px !important;
+  overflow-y: auto !important;
+}
+
+/* 增加表单项间距 */
+.el-form-item {
+  margin-bottom: 20px;
+}
+
+/* 上传区域增加顶部间距 */
+.textForInput[prop="confirmationMaterials"] {
+  margin-top: 20px;
+}
 </style>

src/views/staffmanage/onboardmanage/add.vue

@@ -234,7 +234,7 @@
       </el-row>
       <el-form-item class="bottom-button">
         <el-button @click="cancel" class="cancel-button">取 消</el-button>
-        <el-button  class="savecConfirm-button">保存</el-button>
+        <el-button  class="savecConfirm-button" @click="saveOnDraft">保存</el-button>
         <el-button class="savecConfirm-button" @click="submitForm">确 定</el-button>
       </el-form-item>
     </el-form>
@@ -245,7 +245,7 @@
 
 <script setup>
 import { reactive } from 'vue'
-import { listOnBoardManage, getOnBoardManage, delOnBoardManage, addOnBoardManage, updateOnBoardManage } from "@/api/onboardmanage/onboardmanage";
+import { listOnBoardManage, getOnBoardManage, delOnBoardManage, addOnBoardManage, updateOnBoardManage,addOnBoardManageDraft} from "@/api/onboardmanage/onboardmanage";
 import { pcaTextArr} from "element-china-area-data";
 import { useRouter } from 'vue-router';
 const pcaTextArrRef = pcaTextArr;
@@ -517,6 +517,17 @@ function submitForm() {
     }
   });
 }
+function saveOnDraft(){
+  proxy.$refs["onboardmanageRef"].validate(valid => {
+    if (valid) {
+        addOnBoardManageDraft(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          router.push('/staffManage/draftonboardmanage');
+          getList();
+        });
+    }
+  });
+}
 
 /** 删除按钮操作 */
 function handleDelete(row) {

src/views/staffmanage/onboardmanage/edit.vue

@@ -224,7 +224,6 @@
           </el-row>
           <el-form-item class="bottom-button">
             <el-button @click="goBack" class="cancel-button">取 消</el-button>
-            <el-button  class="savecConfirm-button">保存</el-button>
             <el-button class="savecConfirm-button" @click="submitForm">确 定</el-button>
           </el-form-item>
         </el-form>

src/views/staffmanage/onboardmanage/index.vue

@@ -107,7 +107,7 @@
         >新增入职</el-button>
         <div class="main-container">
         <el-tooltip effect="dark" content="草稿箱" placement="top" class="img-container">
-          <el-button link type="primary">
+          <el-button link type="primary" @click="handleDrafts">
             <img src="@/assets/icons/common/rightone.png">
           </el-button>
         </el-tooltip>
@@ -426,7 +426,9 @@ function handleImport() {
   upload.title = "数据导入";
   upload.open = true;
 };
-
+function handleDrafts(){
+  router.push({ path: '/staffmanage/draftonboardmanage' });
+}
 /** 下载模板操作 */
 function importTemplate() {
   proxy.download("staffmanage/onboardmanage/importTemplate", {