From bc0b37e98ba17b8a4c97d853c87e2b12e447b012 Mon Sep 17 00:00:00 2001 From: zuozhengqing <a13193816592@163.com> Date: 星期五, 29 三月 2024 18:10:34 +0800 Subject: [PATCH] 合并分支 --- src/views/purchaseManage/purchase/index.vue | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue index 89747e6..d606fe8 100644 --- a/src/views/purchaseManage/purchase/index.vue +++ b/src/views/purchaseManage/purchase/index.vue @@ -9,7 +9,7 @@ :show-download="false" :amount-view="false" :show-action-btn="false" - :placeholder="'璇疯緭鍏ヤ緵搴斿晢鍚嶇О/鐗╂枡鍚嶇О/閲囪喘鍗曞悕绉�/閿�鍞槑缁嗗崟绛�'" + :placeholder="'璇疯緭鍏ヤ緵搴斿晢鍚嶇О/鐗╂枡鍚嶇О/閲囪喘鍗曞悕绉�/閲囪喘鍗曞彿绛�..'" @searchClick="onFilterSearch" /> </div> @@ -246,7 +246,7 @@ tableColumn: [ { label: "鍗曟嵁绫诲瀷", prop: "orderType", min: 130 }, { label: "閲囪喘鍗曞彿", prop: "number", min: 150, isCommonClick: true, default: true }, - { label: "閿�鍞槑缁嗗崟", prop: "salesDetailsNumber" }, + { label: "閿�鍞槑缁嗗崟", prop: "sourceOrder", min: 130 }, { label: "閲囪喘鍗曞悕绉�", prop: "name", min: 130, isCommonClick: true }, { label: "渚涘簲鍟嗗悕绉�", prop: "supplierName", min: 130 }, { label: "閲囪喘鏁伴噺", prop: "quantity", min: 130 }, @@ -254,17 +254,7 @@ { label: "缁忓姙浜�", prop: "handledBy", min: 130 }, { label: "鍒跺崟浜�", prop: "creator", min: 130 } ], - showCol: [ - "閲囪喘鍗曞彿", - "閿�鍞槑缁嗗崟", - "閲囪喘鍗曞悕绉�", - "鍗曟嵁绫诲瀷", - "渚涘簲鍟嗗悕绉�", - "閲囪喘鏁伴噺", - "鏀惰揣浠撳簱", - "缁忓姙浜�", - "鍒跺崟浜�" - ], + showCol: ["閲囪喘鍗曞彿","閿�鍞槑缁嗗崟", "閲囪喘鍗曞悕绉�", "鍗曟嵁绫诲瀷", "渚涘簲鍟嗗悕绉�", "閲囪喘鏁伴噺", "鏀惰揣浠撳簱", "缁忓姙浜�", "鍒跺崟浜�"], tableBottomColumn: [], showBottomCol: [], TabsIndex: 0, -- Gitblit v1.8.0