From d5868d38cd7d46c52da971d7d0388d229495d729 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 一月 2024 14:08:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/BOM/BenchmarkBOM.vue | 130 +++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/BOM/BenchmarkBOM.vue b/north-glass-erp/northglass-erp/src/views/pp/BOM/BenchmarkBOM.vue
index c5b5258..486fff8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/BOM/BenchmarkBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/BOM/BenchmarkBOM.vue
@@ -63,27 +63,19 @@
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'materialCode', title: '鐗╂枡缂栫爜',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'materialName', title: '鐗╂枡鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'number',title: '鏁伴噺', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'materialRequisitionProcess', title: '棰嗘枡宸ュ簭',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'mainUnit',title: '涓诲崟浣�', sortable: true,showOverflow:"ellipsis"},
- {field: 'conversionRate', title: '鎹㈢畻鐜�', sortable: true},
- {field: 'deputyUnit', title: '鍓崟浣�', sortable: true},
- {field: 'producer', title: '浜у湴', sortable: true,showOverflow:"ellipsis"},
+ {field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '鏁伴噺',title: '鏁伴噺', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '棰嗘枡宸ュ簭', title: '棰嗘枡宸ュ簭',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '涓诲崟浣�',title: '涓诲崟浣�', sortable: true,showOverflow:"ellipsis"},
+ {field: '鎹㈢畻鐜�', title: '鎹㈢畻鐜�', sortable: true},
+ {field: '鍓崟浣�', title: '鍓崟浣�', sortable: true},
+ {field: '浜у湴', title: '浜у湴', sortable: true,showOverflow:"ellipsis"},
],//琛ㄥご鎸夐挳
toolbarConfig: {
+ //琛ㄦ牸涓婃柟鍔熻兘鎸夐挳
buttons: [
-
- // {
- // name:'浜у搧绉嶇被',
- // dropdowns: [
- // { code: 'other1', name: '绉嶇被涓�', type: 'text', },
- // { code: 'other2', name: '绉嶇被浜�', type: 'text', },
- // { code: 'other2', name: '绉嶇被涓�', type: 'text', },
- // ]
- // },
{code: 'print_lck', name: '娣诲姞涓�琛�' },
{code: 'print_lck', name: '鍑忓皯涓�琛�' },
{code: 'print_lck', name: '淇濆瓨',status:'primary' ,icon:'vxe-icon-save'},
@@ -96,50 +88,81 @@
},
data: [
{
- materialCode: '70020000000000000000000004',
- materialName: '棰勬礂鍓�7600TRO-DS',
- number: '4',
- materialRequisitionProcess: '鍒堕暅',
- mainUnit:'L',
- conversionRate:'0.001000',
- deputyUnit:'ml',
- producer:'鍥涘窛',
+ //鐗╂枡缂栫爜
+ 鐗╂枡缂栫爜: '70020000000000000000000004',
+ //鐗╂枡鍚嶇О
+ 鐗╂枡鍚嶇О: '棰勬礂鍓�7600TRO-DS',
+ //鏁伴噺
+ 鏁伴噺: '4',
+ //棰嗘枡宸ュ簭
+ 棰嗘枡宸ュ簭: '鍒堕暅',
+ //涓诲崟浣�
+ 涓诲崟浣�:'L',
+ //鎹㈢畻鐜�
+ 鎹㈢畻鐜�:'0.001000',
+ //鍓崟浣�
+ 鍓崟浣�:'ml',
+ //浜у湴
+ 浜у湴:'鍥涘窛',
},
{
- materialCode: '70020000000000000000000004',
- materialName: '棰勬礂鍓�7600TRO-DS',
- number: '4',
- materialRequisitionProcess: '鍒堕暅',
- mainUnit:'L',
- conversionRate:'0.001000',
- deputyUnit:'ml',
- producer:'鍥涘窛',
- },
-
- {
- materialCode: '70020000000000000000000004',
- materialName: '棰勬礂鍓�7600TRO-DS',
- number: '4',
- materialRequisitionProcess: '鍒堕暅',
- mainUnit:'L',
- conversionRate:'0.001000',
- deputyUnit:'ml',
- producer:'鍥涘窛',
+ //鐗╂枡缂栫爜
+ 鐗╂枡缂栫爜: '70020000000000000000000004',
+ //鐗╂枡鍚嶇О
+ 鐗╂枡鍚嶇О: '棰勬礂鍓�7600TRO-DS',
+ //鏁伴噺
+ 鏁伴噺: '4',
+ //棰嗘枡宸ュ簭
+ 棰嗘枡宸ュ簭: '鍒堕暅',
+ //涓诲崟浣�
+ 涓诲崟浣�:'L',
+ //鎹㈢畻鐜�
+ 鎹㈢畻鐜�:'0.001000',
+ //鍓崟浣�
+ 鍓崟浣�:'ml',
+ //浜у湴
+ 浜у湴:'鍥涘窛',
},
{
- materialCode: '70020000000000000000000004',
- materialName: '棰勬礂鍓�7600TRO-DS',
- number: '4',
- materialRequisitionProcess: '鍒堕暅',
- mainUnit:'L',
- conversionRate:'0.001000',
- deputyUnit:'ml',
- producer:'鍥涘窛',
+ //鐗╂枡缂栫爜
+ 鐗╂枡缂栫爜: '70020000000000000000000004',
+ //鐗╂枡鍚嶇О
+ 鐗╂枡鍚嶇О: '棰勬礂鍓�7600TRO-DS',
+ //鏁伴噺
+ 鏁伴噺: '4',
+ //棰嗘枡宸ュ簭
+ 棰嗘枡宸ュ簭: '鍒堕暅',
+ //涓诲崟浣�
+ 涓诲崟浣�:'L',
+ //鎹㈢畻鐜�
+ 鎹㈢畻鐜�:'0.001000',
+ //鍓崟浣�
+ 鍓崟浣�:'ml',
+ //浜у湴
+ 浜у湴:'鍥涘窛',
+ },
+ {
+ //鐗╂枡缂栫爜
+ 鐗╂枡缂栫爜: '70020000000000000000000004',
+ //鐗╂枡鍚嶇О
+ 鐗╂枡鍚嶇О: '棰勬礂鍓�7600TRO-DS',
+ //鏁伴噺
+ 鏁伴噺: '4',
+ //棰嗘枡宸ュ簭
+ 棰嗘枡宸ュ簭: '鍒堕暅',
+ //涓诲崟浣�
+ 涓诲崟浣�:'L',
+ //鎹㈢畻鐜�
+ 鎹㈢畻鐜�:'0.001000',
+ //鍓崟浣�
+ 鍓崟浣�:'ml',
+ //浜у湴
+ 浜у湴:'鍥涘窛',
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['number']
+ let footList=['鏁伴噺']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
@@ -155,6 +178,7 @@
})
+//浜у搧绉嶇被涓嬫媺妗�
const value = ref('')
const options = [
{
--
Gitblit v1.8.0