From 7ec0b6ddb14897fa47769b14cc4cb36049bb5ebb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 22 六月 2026 09:11:53 +0800
Subject: [PATCH] 1、报价系统中,需将付款方式改为选择项(现金、电汇、微信、支付宝等),不能做成手工输入;4、退货单未明确退货规则;5、客户往来信息过于简单,只做总结性信息,无多维度明细信息;

---
 src/views/collaborativeApproval/enterpriseBook/index.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/collaborativeApproval/enterpriseBook/index.vue b/src/views/collaborativeApproval/enterpriseBook/index.vue
index 0b33a32..8239811 100644
--- a/src/views/collaborativeApproval/enterpriseBook/index.vue
+++ b/src/views/collaborativeApproval/enterpriseBook/index.vue
@@ -275,8 +275,8 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button @click="showAddContactDialog = false">鍙栨秷</el-button>
         <el-button type="primary" @click="addContact">纭畾</el-button>
+        <el-button @click="showAddContactDialog = false">鍙栨秷</el-button>
       </template>
     </el-dialog>
   </div>
@@ -295,7 +295,6 @@
   getEmployeeDetail
 } from '@/api/collaborativeApproval/enterpriseBook.js'
 import { getUserProfile } from '@/api/system/user.js'
-import {staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
 import {
   changeUserStatus,
   listUser,
@@ -306,6 +305,7 @@
   addUser,
   deptTreeSelect,
 } from "@/api/system/user";
+import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
 
 // 鏍囩椤电姸鎬�
 const activeTab = ref('personal')
@@ -395,7 +395,7 @@
 }
   //鑾峰彇鍛樺伐鍒楄〃
 const getEmployeeList = async () => {
-  staffJoinListPage(publicSearch.value).then(res => {
+  staffOnJobListPage(Object.assign({current: -1, size: -1},publicSearch.value)).then(res => {
     console.log(res.data.records)
       EmployeeList.value = res.data.records
     }).catch(err => {})
@@ -403,7 +403,7 @@
 // 鑾峰彇鍗曚綅閫氳褰曞垪琛�
 const getCompanyContactsList = async () => {
   loading.value = true
-    staffJoinListPage(companySearch.value).then(res => {
+  staffOnJobListPage(Object.assign({current: -1, size: -1},companySearch.value)).then(res => {
     // console.log(res.data.records)
       companyContacts.value = res.data.records
     }).catch(err => {})

--
Gitblit v1.9.3