From fd3e3b19aaf23c4f68d8b98d514499510b152e39 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 15:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/basicData/supplierManage/index.vue |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/views/basicData/supplierManage/index.vue b/src/views/basicData/supplierManage/index.vue
index 63a179c..e2a71ee 100644
--- a/src/views/basicData/supplierManage/index.vue
+++ b/src/views/basicData/supplierManage/index.vue
@@ -28,14 +28,14 @@
     </div>
     <div class="table_list">
       <PIMTable
+        rowKey="id"
         :column="tableColumn"
         :tableData="tableData"
         :page="page"
         :isSelection="true"
-        :handleSelectionChange="handleSelectionChange"
+        @selection-change="handleSelectionChange"
         :tableLoading="tableLoading"
-        @pagination="pagination"
-        :total="total"
+				@pagination="pagination"
       ></PIMTable>
     </div>
     <el-dialog
@@ -200,13 +200,13 @@
         <template #tip>
           <div class="el-upload__tip text-center">
             <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
-            <el-link
+            <!-- <el-link
               type="primary"
               :underline="false"
               style="font-size: 12px; vertical-align: baseline"
               @click="importTemplate"
               >涓嬭浇妯℃澘</el-link
-            >
+            > -->
           </div>
         </template>
       </el-upload>
@@ -251,14 +251,17 @@
   {
     label: "鑱旂郴鏂瑰紡",
     prop: "companyPhone",
+    width:150
   },
   {
     label: "寮�鎴疯",
     prop: "bankAccountName",
+    width: 220,
   },
   {
     label: "璐﹀彿",
     prop: "bankAccountNum",
+    width: 220,
   },
   {
     label: "鑱旂郴浜�",
@@ -267,6 +270,7 @@
   {
     label: "鑱旂郴鐢佃瘽",
     prop: "contactUserPhone",
+    width: 150,
   },
   {
     label: "缁存姢浜�",
@@ -276,6 +280,7 @@
   {
     label: "缁存姢鏃堕棿",
     prop: "maintainTime",
+    width:100
   },
   {
     dataType: "action",
@@ -298,9 +303,9 @@
 const tableLoading = ref(false);
 const page = reactive({
   current: 1,
-  size: 10,
+  size: 100,
+  total: 0,
 });
-const total = ref(0);
 
 // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
 const operationType = ref("");
@@ -351,6 +356,7 @@
 };
 /** 鎻愪氦涓婁紶鏂囦欢 */
 function submitFileForm() {
+  console.log(upload.url + '?updateSupport=' + upload.updateSupport)
   proxy.$refs["uploadRef"].submit();
 }
 const getList = () => {
@@ -358,7 +364,7 @@
   listSupplier({ ...searchForm.value, ...page }).then((res) => {
     tableLoading.value = false;
     tableData.value = res.data.records;
-    total.value = res.data.total;
+    page.total = res.data.total;
   });
 };
 const upload = reactive({
@@ -368,6 +374,8 @@
   title: "",
   // 鏄惁绂佺敤涓婁紶
   isUploading: false,
+  // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+  updateSupport: 1,
   // 璁剧疆涓婁紶鐨勮姹傚ご閮�
   headers: { Authorization: "Bearer " + getToken() },
   // 涓婁紶鐨勫湴鍧�
@@ -378,6 +386,19 @@
   upload.title = "渚涘簲鍟嗗鍏�";
   upload.open = true;
 }
+
+/**鏂囦欢涓婁紶涓鐞� */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+
+/** 鏂囦欢涓婁紶鎴愬姛澶勭悊 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false;
+  upload.isUploading = false;
+  proxy.$refs["uploadRef"].handleRemove(file);
+  getList();
+};
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
   selectedRows.value = selection;

--
Gitblit v1.9.3