From 1d9c769dbe1ad106289c98fd19b3fbc018ccdd9c Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 25 十二月 2023 13:54:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue | 20 ++------------------
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue | 10 +++++-----
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue | 6 ++++--
3 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
index 5048120..b0ebf88 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
@@ -72,22 +72,6 @@
</el-form-item>
</el-col>
-<!-- <el-col :span="6">
- <el-form-item class="item-style">
- <el-row :gutter="10">
-
- <el-col :span="6" :offset="6">
- <el-button type="primary" @click="onSubmit">淇濆瓨</el-button>
- </el-col>
- <el-col :span="6" :offset="6">
- <el-button>杩斿洖璁㈠崟鏌ヨ</el-button>
- </el-col>
-
-
- </el-row>
-
- </el-form-item>
- </el-col>-->
<el-col :span="6"></el-col>
</el-row>
@@ -225,12 +209,12 @@
'name': '閫�璐�',
status:'primary',
'code':'Return'
- },
+ }/*,
{
'name': '杩斿洖鏌ヨ',
'code':'GoSelect'
- }],
+ }*/],
import: false,
export: true,
print: true,
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue
index 3addbe5..470db4c 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue
@@ -6,15 +6,15 @@
<!-- <el-breadcrumb-item>閲囪喘涓庣墿璧�</el-breadcrumb-item>
<el-breadcrumb-item>閲囪喘璁㈠崟
</el-breadcrumb-item>-->
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/SelectPurchaseOrder'}">鏌ヨ璁㈠崟
+ <el-breadcrumb-item :to="{path:'/main/purchaseOrder/SelectPurchaseOrder'}">鏌ヨ閲囪喘璁㈠崟
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/CreatePurchaseOrder'}">鍒涘缓璁㈠崟
+ <el-breadcrumb-item :to="{path:'/main/purchaseOrder/CreatePurchaseOrder'}">鍒涘缓閲囪喘璁㈠崟
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/StoragePurchaseOrder'}">璁㈠崟鍏ュ簱
+ <el-breadcrumb-item :to="{path:'/main/purchaseOrder/StoragePurchaseOrder'}">閲囪喘鍏ュ簱
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/ReturnPurchaseOrder'}">璁㈠崟閫�璐�
+ <el-breadcrumb-item :to="{path:'/main/purchaseOrder/ReturnPurchaseOrder'}">閲囪喘閫�璐�
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/PaymentPurchaseOrder'}">搴斾粯璁㈠崟
+ <el-breadcrumb-item :to="{path:'/main/purchaseOrder/PaymentPurchaseOrder'}">搴斾粯閲囪喘璁㈠崟
</el-breadcrumb-item>
<el-breadcrumb-item style="display: none"></el-breadcrumb-item>
</el-breadcrumb>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue
index 37d938a..11161c1 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue
@@ -269,7 +269,8 @@
{field: '6', width: '10%',title: '澶囨敞', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true}
],//琛ㄥご鍙傛暟
toolbarConfig: {
- buttons: [{type:'text'},{
+ buttons: [/*{type:'text'},
+ {
'name': '鍒涘缓璁㈠崟',
'code':'Add',
@@ -279,7 +280,8 @@
'name': '鏃犲崟鏂板',
'code':'AddNo'
- }],
+ }*/
+ ],
import: false,
export: true,
print: true,
--
Gitblit v1.8.0