From 2e77330d87341624c88301562fd137b58f9a101a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 25 十二月 2025 10:57:35 +0800
Subject: [PATCH] 1.海川开心-录入日期都默认当天,封装公用组件和方法

---
 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue |   42 ++++++++++++++++++++----------------------
 1 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index ad7b1d1..abbd056 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -16,19 +16,20 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="鐢宠閮ㄩ棬锛�" prop="approveDeptId">
-							<el-select
-								disabled
-								v-model="form.approveDeptId"
-								placeholder="閫夋嫨閮ㄩ棬"
-							>
-								<el-option
-									v-for="user in productOptions"
-									:key="user.deptId"
-									:label="user.deptName"
-									:value="user.deptId"
-								/>
-							</el-select>
+            <el-form-item label="鐢宠閮ㄩ棬锛�" prop="approveDeptName">
+              <el-input v-model="form.approveDeptName" placeholder="璇疯緭鍏�" clearable/>
+<!--							<el-select-->
+<!--								disabled-->
+<!--								v-model="form.approveDeptId"-->
+<!--								placeholder="閫夋嫨閮ㄩ棬"-->
+<!--							>-->
+<!--								<el-option-->
+<!--									v-for="user in productOptions"-->
+<!--									:key="user.deptId"-->
+<!--									:label="user.deptName"-->
+<!--									:value="user.deptId"-->
+<!--								/>-->
+<!--							</el-select>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -145,6 +146,9 @@
 							<el-select
 								v-model="form.approveUser"
 								placeholder="閫夋嫨浜哄憳"
+                filterable
+                default-first-option
+                :reserve-keyword="false"
 							>
 								<el-option
 									v-for="user in userList"
@@ -209,6 +213,7 @@
 } from "@/api/salesManagement/salesLedger.js";
 import {userListNoPageByTenantId} from "@/api/system/user.js";
 import { getToken } from "@/utils/auth";
+import { getCurrentDate } from "@/utils/index.js";
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['close'])
 import useUserStore from "@/store/modules/user";
@@ -229,6 +234,7 @@
     approveId: "",
     approveUser: "",
 		approveDeptId: "",
+    approveDeptName: "",
     approveReason: "",
     checkResult: "",
     tempFileIds: [],
@@ -242,7 +248,7 @@
     approveTime: [{ required: false, message: "璇疯緭鍏�", trigger: "change" },],
     approveId: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
     approveUser: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
-		approveDeptId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    approveDeptName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     approveReason: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
     startDate: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
@@ -395,14 +401,6 @@
   dialogFormVisible.value = false;
   emit('close')
 };
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-function getCurrentDate() {
-  const today = new Date();
-  const year = today.getFullYear();
-  const month = String(today.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮�
-  const day = String(today.getDate()).padStart(2, "0");
-  return `${year}-${month}-${day}`;
-}
 
 // 涓婁紶鍓嶆牎妫�
 function handleBeforeUpload(file) {

--
Gitblit v1.9.3