From 97c3f97a11524d8bacc6d36cf2ec4e3b93b5c277 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期三, 27 十二月 2023 10:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue |  563 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 284 insertions(+), 279 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
index 24d9c59..4e88112 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
@@ -1,287 +1,292 @@
-<!-- 鎴愬搧搴撳瓨 -->
-<script  lang="ts" setup>
-import { ref } from 'vue'
-import router from "@/router";
-let tableData = ref([
-  {
-    "鑷簭":'30',
-    "璁㈠崟搴忓彿":'1',
-    "閿�鍞崟鍙�":'NG23072003',
-    "椤圭洰鍚嶇О":'閽㈠寲鐜荤拑',
-    "璁㈠崟绫诲瀷":'鏅�氳鍗�',
-    "娴佺▼鍗″彿":'NG23072003A01',
-    "浜у搧鍚嶇О":'',
-    "浜у搧缂栧彿":'06040000022',
-    "瀹㈡埛缂栧彿":'KD0071',
-    "瀹㈡埛鍚嶇О":'',
-    "闀垮害":'1075.00',
-    "瀹藉害":'440.00',
-    "鍘氬害":'3.00',
-    "搴撳瓨鏁�":'360',
-    "瀹為檯鍗曠墖闈㈢Н":'0.473000',
-    "闈㈢Н":'170.28',
-    "缁撶畻鍗曠墖闈㈢Н":'0.47',
-    "缁撶畻鎬婚潰绉�":'170.28',
-    "鍙敤鏁伴噺":'360',
-    "妤煎眰缂栧彿":'10927769',
-    "閫佽揣鍦板潃":'閽㈠寲鐜荤拑',
-    "鎵规":'',
-    "涓氬姟鍛�":'闄堝畻鍑�',
-    "骞冲嚒姣背":'1915.6500',
-    "閲嶉噺":'1.91565',
-    "鏈�鍚庡叆搴撴棩鏈�":'2023-09-22 08:31:17',
-    "搴撲綅缂栧彿":'鎴愬搧搴�',
-    "搴撳尯":'搴撳尯',
-    "搴撲綅":'0',
-    "鍗曟嵁鐘舵��":'1',
-    "澶囨敞":'',
-  }, {
-    "鑷簭":'31',
-    "璁㈠崟搴忓彿":'1',
-    "閿�鍞崟鍙�":'NG23072003',
-    "椤圭洰鍚嶇О":'閽㈠寲鐜荤拑',
-    "璁㈠崟绫诲瀷":'鏅�氳鍗�',
-    "娴佺▼鍗″彿":'NG23072003A02',
-    "浜у搧鍚嶇О":'',
-    "浜у搧缂栧彿":'06040000022',
-    "瀹㈡埛缂栧彿":'KD0071',
-    "瀹㈡埛鍚嶇О":'',
-    "闀垮害":'1075.00',
-    "瀹藉害":'440.00',
-    "鍘氬害":'3.00',
-    "搴撳瓨鏁�":'360',
-    "瀹為檯鍗曠墖闈㈢Н":'0.473000',
-    "闈㈢Н":'170.28',
-    "缁撶畻鍗曠墖闈㈢Н":'0.47',
-    "缁撶畻鎬婚潰绉�":'170.28',
-    "鍙敤鏁伴噺":'360',
-    "妤煎眰缂栧彿":'10927769',
-    "閫佽揣鍦板潃":'閽㈠寲鐜荤拑',
-    "鎵规":'',
-    "涓氬姟鍛�":'闄堝畻鍑�',
-    "骞冲嚒姣背":'1915.6500',
-    "閲嶉噺":'1.91565',
-    "鏈�鍚庡叆搴撴棩鏈�":'2023-09-22 08:31:17',
-    "搴撲綅缂栧彿":'鎴愬搧搴�',
-    "搴撳尯":'搴撳尯',
-    "搴撲綅":'0',
-    "鍗曟嵁鐘舵��":'1',
-    "澶囨敞":'',
-  }, {
-    "鑷簭":'32',
-    "璁㈠崟搴忓彿":'1',
-    "閿�鍞崟鍙�":'NG23072003',
-    "椤圭洰鍚嶇О":'閽㈠寲鐜荤拑',
-    "璁㈠崟绫诲瀷":'鏅�氳鍗�',
-    "娴佺▼鍗″彿":'NG23072003A01',
-    "浜у搧鍚嶇О":'',
-    "浜у搧缂栧彿":'06040000022',
-    "瀹㈡埛缂栧彿":'KD0071',
-    "瀹㈡埛鍚嶇О":'',
-    "闀垮害":'1075.00',
-    "瀹藉害":'440.00',
-    "鍘氬害":'3.00',
-    "搴撳瓨鏁�":'360',
-    "瀹為檯鍗曠墖闈㈢Н":'0.473000',
-    "闈㈢Н":'170.28',
-    "缁撶畻鍗曠墖闈㈢Н":'0.47',
-    "缁撶畻鎬婚潰绉�":'170.28',
-    "鍙敤鏁伴噺":'360',
-    "妤煎眰缂栧彿":'10927769',
-    "閫佽揣鍦板潃":'閽㈠寲鐜荤拑',
-    "鎵规":'',
-    "涓氬姟鍛�":'闄堝畻鍑�',
-    "骞冲嚒姣背":'1915.6500',
-    "閲嶉噺":'1.91565',
-    "鏈�鍚庡叆搴撴棩鏈�":'2023-09-22 08:31:17',
-    "搴撲綅缂栧彿":'鎴愬搧搴�',
-    "搴撳尯":'搴撳尯',
-    "搴撲綅":'0',
-    "鍗曟嵁鐘舵��":'1',
-    "澶囨敞":'',
-  }, {
-    "鑷簭":'33',
-    "璁㈠崟搴忓彿":'1',
-    "閿�鍞崟鍙�":'NG23072003',
-    "椤圭洰鍚嶇О":'閽㈠寲鐜荤拑',
-    "璁㈠崟绫诲瀷":'鏅�氳鍗�',
-    "娴佺▼鍗″彿":'NG23072003A01',
-    "浜у搧鍚嶇О":'',
-    "浜у搧缂栧彿":'06040000022',
-    "瀹㈡埛缂栧彿":'KD0071',
-    "瀹㈡埛鍚嶇О":'',
-    "闀垮害":'1075.00',
-    "瀹藉害":'440.00',
-    "鍘氬害":'3.00',
-    "搴撳瓨鏁�":'360',
-    "瀹為檯鍗曠墖闈㈢Н":'0.473000',
-    "闈㈢Н":'170.28',
-    "缁撶畻鍗曠墖闈㈢Н":'0.47',
-    "缁撶畻鎬婚潰绉�":'170.28',
-    "鍙敤鏁伴噺":'360',
-    "妤煎眰缂栧彿":'10927769',
-    "閫佽揣鍦板潃":'閽㈠寲鐜荤拑',
-    "鎵规":'',
-    "涓氬姟鍛�":'闄堝畻鍑�',
-    "骞冲嚒姣背":'1915.6500',
-    "閲嶉噺":'1.91565',
-    "鏈�鍚庡叆搴撴棩鏈�":'2023-09-22 08:31:17',
-    "搴撲綅缂栧彿":'鎴愬搧搴�',
-    "搴撳尯":'搴撳尯',
-    "搴撲綅":'0',
-    "鍗曟嵁鐘舵��":'1',
-    "澶囨敞":'',
-  }, {
-    "鑷簭":'34',
-    "璁㈠崟搴忓彿":'1',
-    "閿�鍞崟鍙�":'NG23072003',
-    "椤圭洰鍚嶇О":'閽㈠寲鐜荤拑',
-    "璁㈠崟绫诲瀷":'鏅�氳鍗�',
-    "娴佺▼鍗″彿":'NG23072003A01',
-    "浜у搧鍚嶇О":'',
-    "浜у搧缂栧彿":'06040000022',
-    "瀹㈡埛缂栧彿":'KD0071',
-    "瀹㈡埛鍚嶇О":'',
-    "闀垮害":'1075.00',
-    "瀹藉害":'440.00',
-    "鍘氬害":'3.00',
-    "搴撳瓨鏁�":'360',
-    "瀹為檯鍗曠墖闈㈢Н":'0.473000',
-    "闈㈢Н":'170.28',
-    "缁撶畻鍗曠墖闈㈢Н":'0.47',
-    "缁撶畻鎬婚潰绉�":'170.28',
-    "鍙敤鏁伴噺":'360',
-    "妤煎眰缂栧彿":'10927769',
-    "閫佽揣鍦板潃":'閽㈠寲鐜荤拑',
-    "鎵规":'',
-    "涓氬姟鍛�":'闄堝畻鍑�',
-    "骞冲嚒姣背":'1915.6500',
-    "閲嶉噺":'1.91565',
-    "鏈�鍚庡叆搴撴棩鏈�":'2023-09-22 08:31:17',
-    "搴撲綅缂栧彿":'鎴愬搧搴�',
-    "搴撳尯":'搴撳尯',
-    "搴撲綅":'0',
-    "鍗曟嵁鐘舵��":'1',
-    "澶囨敞":'',
-  }, {
-    "鑷簭":'35',
-    "璁㈠崟搴忓彿":'1',
-    "閿�鍞崟鍙�":'NG23072003',
-    "椤圭洰鍚嶇О":'閽㈠寲鐜荤拑',
-    "璁㈠崟绫诲瀷":'鏅�氳鍗�',
-    "娴佺▼鍗″彿":'NG23072003A01',
-    "浜у搧鍚嶇О":'',
-    "浜у搧缂栧彿":'06040000022',
-    "瀹㈡埛缂栧彿":'KD0071',
-    "瀹㈡埛鍚嶇О":'',
-    "闀垮害":'1075.00',
-    "瀹藉害":'440.00',
-    "鍘氬害":'3.00',
-    "搴撳瓨鏁�":'360',
-    "瀹為檯鍗曠墖闈㈢Н":'0.473000',
-    "闈㈢Н":'170.28',
-    "缁撶畻鍗曠墖闈㈢Н":'0.47',
-    "缁撶畻鎬婚潰绉�":'170.28',
-    "鍙敤鏁伴噺":'360',
-    "妤煎眰缂栧彿":'10927769',
-    "閫佽揣鍦板潃":'閽㈠寲鐜荤拑',
-    "鎵规":'',
-    "涓氬姟鍛�":'闄堝畻鍑�',
-    "骞冲嚒姣背":'1915.6500',
-    "閲嶉噺":'1.91565',
-    "鏈�鍚庡叆搴撴棩鏈�":'2023-09-22 08:31:17',
-    "搴撲綅缂栧彿":'鎴愬搧搴�',
-    "搴撳尯":'搴撳尯',
-    "搴撲綅":'0',
-    "鍗曟嵁鐘舵��":'1',
-    "澶囨敞":'',
+<script setup>
+
+import {reactive, ref} from "vue";
+import {useRouter} from  'vue-router'
+let router=useRouter()
+const getTableRow = (row,type) =>{
+  switch (type) {
+    case 'edit' :{
+      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+      router.push({path: '/main/productStock/OrderAllocation', query: { id: row.id }})
+      break
+    }
+    case 'back':{
+      router.push({path: '/main/productStock/FinishedProductRework', query: { id: row.id }})
+      break
+    }
+    case 'out' :{
+      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+      router.push({path: '/main/productStock/FinishedGoodsIssue', query: { id: row.id }})
+      break
+    }
   }
-])
-const name = ref('')
-const productName = ref('')
-const salId = ref('')
+}
+
+
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+
+const gridOptions = reactive({
+  border:  "full",//琛ㄦ牸鍔犺竟妗�
+  keepSource: true,//淇濇寔婧愭暟鎹�
+  align: 'center',//鏂囧瓧灞呬腑
+  stripe:true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'CustomerList',
+  showFooter: true,//鏄剧ず鑴�
+  printConfig: {},
+  importConfig: {},
+  exportConfig: {},
+  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+  showOverflow:true,
+  columnConfig: {
+    resizable: true,
+    useKey: true
+  },
+  filterConfig: {   //绛涢�夐厤缃」
+    remote: true
+  },
+  customConfig: {
+    storage: true
+  },
+  editConfig: {
+    trigger: 'click',
+    mode: 'row',
+    showStatus: true
+  },//琛ㄥご鍙傛暟
+  columns:[
+    {type:'expand',fixed:"left",slots: { content:'content' },width: '50'},
+    // { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
+    { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
+    // {title: '鎿嶄綔', width: '220', slots: { default: 'button_slot' },fixed:"left"},
+    {field: 'OrderNumber', width:'150', title: '璁㈠崟搴忓彿', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
+    {field: 'SalesOrderNumber', width: '150',title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'ProjectName', width: '120',title: '椤圭洰鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'OrderType', width: '100',title: '璁㈠崟绫诲瀷', sortable: true},
+    {field: 'ProcessCardNumber',width: '100', title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis"},
+    {field: 'ProductName', width: '100',title: '浜у搧鍚嶇О', sortable: true},
+    {field: 'ProductNumber',width: '100', title: '浜у搧缂栧彿', sortable: true},
+    {field: 'CustomerNumber', width: '100',title: '瀹㈡埛缂栧彿', sortable: true},
+    {field: 'CustomerName',width: '100', title: '瀹㈡埛鍚嶇О', sortable: true},
+    {field: 'Length', width: '100',title: '闀垮害', sortable: true},
+    {field: 'Width',width: '100', title: '瀹藉害', sortable: true},
+    {field: 'Thickness', width: '100',title: '鍘氬害', sortable: true},
+    {field: 'InventoryCount',width: '140', title: '搴撳瓨鏁�', sortable: true},
+    {field: 'ActualSingleArea',width: '140', title: '瀹為檯鍗曠墖闈㈢Н', sortable: true},
+    {field: 'Area',width: '100', title: '闈㈢Н', sortable: true},
+    {field: 'SettlementSingleArea',width: '140', title: '缁撶畻鍗曠墖闈㈢Н', sortable: true},
+    {field: 'SettlementTotalArea',width: '140', title: '缁撶畻鎬婚潰绉�', sortable: true},
+    {field: 'AvailableQuantity',width: '100', title: '鍙敤鏁伴噺', sortable: true},
+    {field: 'FloorNumber',width: '100', title: '妤煎眰缂栧彿', sortable: true},
+    {field: 'DeliveryAddress',width: '100', title: '閫佽揣鍦板潃', sortable: true},
+    {field: 'Batch',width: '100', title: '鎵规', sortable: true},
+    {field: 'Salesman',width: '100', title: '涓氬姟鍛�', sortable: true},
+    {field: 'OrdinaryMillimeter',width: '100', title: '骞冲嚒姣背', sortable: true},
+    {field: 'Weight',width: '100', title: '閲嶉噺', sortable: true},
+    {field: 'LastWarehousingDate',width: '140', title: '鏈�鍚庡叆搴撴棩鏈�', sortable: true},
+    {field: 'LocationNumber',width: '100', title: '搴撲綅缂栧彿', sortable: true},
+    {field: 'StorageArea',width: '100', title: '瀛樺偍鍖哄煙', sortable: true},
+    {field: 'Location',width: '100', title: '搴撲綅', sortable: true},
+    {field: 'DocumentStatus',width: '100', title: '鍗曟嵁鐘舵��', sortable: true},
+    {field: 'remark',width: '80', title: '澶囨敞', sortable: true},
+  ],//琛ㄥご鎸夐挳
+  toolbarConfig: {
+    buttons: [
+      { 'code' :'issue','name':'璁㈠崟璋冩嫧',status: 'primary'},
+      { 'code' :'out','name':'鎴愬搧棰嗗嚭',status: 'primary'},
+      { 'code' :'rework','name':'鎴愬搧杩斿伐',status: 'primary'},
+
+    ],
+    import: false,
+    export: true,
+    print: true,
+    zoom: true,
+    custom: true
+  },
+  data:  [
+    {
+      "OrderNumber": "1",
+      "SalesOrderNumber": "NG23072003",
+      "ProjectName": "閽㈠寲鐜荤拑",
+      "OrderType": "鏅�氳鍗�",
+      "ProcessCardNumber": "NG23072003A01",
+      "ProductName": '',
+      "ProductNumber": "06040000022",
+      "CustomerNumber": "KD0071",
+      "CustomerName": "浠�",
+      "Length": "1075.00",
+      "Width": "440.00",
+      "Thickness": "3.00",
+      "InventoryCount": "360",
+      "ActualSingleArea": "0.473000",
+      "Area": "170.28",
+      "SettlementSingleArea": "0.47",
+      "SettlementTotalArea": "170.28",
+      "AvailableQuantity": "360",
+      "FloorNumber": "10927769",
+      "DeliveryAddress": "涓婃捣",
+      "Batch": "娴嬭瘯",
+      "OrdinaryMillimeter": "闄堝畻鍑�",
+      "Weight": "1915.6500",
+      "LastWarehousingDate": "2023-09-22 08:31:17",
+      "LocationNumber": "鎴愬搧搴�",
+      "StorageArea": "娴嬭瘯",
+      "Location": "2",
+      "DocumentStatus": "1",
+      "Remarks": "娴嬭瘯",
+    },
+    {
+      "OrderNumber": "1",
+      "SalesOrderNumber": "NG23072003",
+      "ProjectName": "閽㈠寲鐜荤拑",
+      "OrderType": "鏅�氳鍗�",
+      "ProcessCardNumber": "NG23072003A01",
+      "ProductName": '',
+      "ProductNumber": "06040000022",
+      "CustomerNumber": "KD0071",
+      "CustomerName": "浠�",
+      "Length": "1075.00",
+      "Width": "440.00",
+      "Thickness": "3.00",
+      "InventoryCount": "360",
+      "ActualSingleArea": "0.473000",
+      "Area": "170.28",
+      "SettlementSingleArea": "0.47",
+      "SettlementTotalArea": "170.28",
+      "AvailableQuantity": "360",
+      "FloorNumber": "10927769",
+      "DeliveryAddress": "涓婃捣",
+      "Batch": "娴嬭瘯",
+      "OrdinaryMillimeter": "闄堝畻鍑�",
+      "Weight": "1915.6500",
+      "LastWarehousingDate": "2023-09-22 08:31:17",
+      "LocationNumber": "鎴愬搧搴�",
+      "StorageArea": "娴嬭瘯",
+      "Location": "2",
+      "DocumentStatus": "1",
+      "Remarks": "娴嬭瘯",
+    },{
+      "OrderNumber": "1",
+      "SalesOrderNumber": "NG23072003",
+      "ProjectName": "閽㈠寲鐜荤拑",
+      "OrderType": "鏅�氳鍗�",
+      "ProcessCardNumber": "NG23072003A01",
+      "ProductName": '',
+      "ProductNumber": "06040000022",
+      "CustomerNumber": "KD0071",
+      "CustomerName": "浠�",
+      "Length": "1075.00",
+      "Width": "440.00",
+      "Thickness": "3.00",
+      "InventoryCount": "360",
+      "ActualSingleArea": "0.473000",
+      "Area": "170.28",
+      "SettlementSingleArea": "0.47",
+      "SettlementTotalArea": "170.28",
+      "AvailableQuantity": "360",
+      "FloorNumber": "10927769",
+      "DeliveryAddress": "涓婃捣",
+      "Batch": "娴嬭瘯",
+      "OrdinaryMillimeter": "闄堝畻鍑�",
+      "Weight": "1915.6500",
+      "LastWarehousingDate": "2023-09-22 08:31:17",
+      "LocationNumber": "鎴愬搧搴�",
+      "StorageArea": "娴嬭瘯",
+      "Location": "2",
+      "DocumentStatus": "1",
+      "Remarks": "娴嬭瘯",
+    },
+  ],//table body瀹為檯鏁版嵁
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        // if (props.tableProp.footList.includes(column.field)) {
+        //   return sumNum(data, column.field)
+        // }
+        return ''
+      })
+    ]
+  }
+
+})
+const  xGrid = ref();
+const gridEvents = {
+  toolbarButtonClick({ code }) {
+    const $grid = xGrid.value
+    if($grid){
+      switch (code){
+        case 'issue':{
+          /*VXETable.modal.confirm('鐐瑰嚮浜嗗簱瀛樿皟鎷�');*/
+          router.push({path: '/main/productStock/OrderAllocation'});
+          return;
+          break
+        }
+        case 'out':{
+          router.push({path: '/main/productStock/FinishedGoodsIssue'});
+          return;
+          break;
+        }
+        case 'rework':{
+          router.push({path: '/main/productStock/FinishedProductRework'});
+          return;
+          break;
+        }
+      }
+    }
+  }
+}
+
 
 </script>
+
 <template>
-  <div>
-    <!-- 琛ㄥ崟寮�濮� -->
-    <div>
-      <el-form  size="medium" >
-    
-       <el-row gutter="7">
-<!--  <el-col :span="4">-->
-<!--    <el-input v-model="name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="width: 200px; height: 30px;" />-->
-<!--  </el-col>-->
-<!--  <el-col :span="4">-->
-<!--    <el-input v-model="productName" placeholder="璇疯緭鍏ラ」鐩悕绉�" style="width: 200px; height: 30px;" />-->
-<!--  </el-col>-->
-<!--  <el-col :span="4">-->
-<!--    <el-input v-model="salId" placeholder="璇疯緭鍏ラ攢鍞崟鍙�" style="width: 200px; height: 30px;" />-->
-<!--  </el-col>-->
-  <el-col :span="6.5">
-    <el-date-picker
-    type="daterange"
-    start-placeholder="寮�濮嬫椂闂�"
-    end-placeholder="缁撴潫鏃堕棿"
-   />
-  </el-col>
-  <el-col :span="4">
-           <el-button id="searchButton" type="primary" :icon="Search" style="width: 100px;">鏌ヨ</el-button>
-         </el-col>
-</el-row>
+  <div class="main-div-customer">
+    <vxe-grid
+        max-height="100%"
+        @filter-change="filterChanged"
+        class="mytable-scrollbar"
+        ref="xGrid"
+        v-bind="gridOptions"
+        v-on="gridEvents"
+
+    >
+      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
+      <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+      <template #content="{ row}">
+        <ul class="expand-wrapper">
+          <li  v-for="(item,key,index) in row">
+            <span style="font-weight: bold">{{key+':  '}}</span>
+            <span>{{ item }}</span>
+          </li>
+        </ul>
+      </template>
+
+      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+      <template #button_slot="{ row }">
+<!--        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">璁㈠崟璋冩嫧</el-button>-->
+<!--        <el-button @click="getTableRow(row,'out')" link type="primary" size="small">鎴愬搧棰嗗嚭</el-button>-->
+<!--        <el-button @click="getTableRow(row,'back')" link type="primary" size="small">鎴愬搧杩斿伐</el-button>-->
+      </template>
+
+      <template #num1_filter="{ column, $panel }">
+        <div>
+          <div v-for="(option, index) in column.filters" :key="index">
+            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+          </div>
+        </div>
+      </template>
 
 
-        <!-- <el-form-item size="large">
-          <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
-          <el-button @click="resetForm">閲嶇疆</el-button>
-        </el-form-item>-->
-      </el-form> 
-    </div>
-    <!-- 琛ㄥ崟缁撴潫 -->
-
-    <!-- 琛ㄦ牸寮�濮� -->
-    <div>
-  <el-table :data="tableData" border style="width: 100%">
-    <el-table-column prop="鑷簭" label="鑷簭" width="180" />
-    <el-table-column prop="璁㈠崟搴忓彿" label="璁㈠崟搴忓彿" width="180" />
-    <el-table-column prop="閿�鍞崟鍙�" label="閿�鍞崟鍙�" width="180"/>
-    <el-table-column prop="椤圭洰鍚嶇О" label="椤圭洰鍚嶇О" width="180"/>
-    <el-table-column prop="璁㈠崟绫诲瀷" label="璁㈠崟绫诲瀷" width="180"/>
-    <el-table-column prop="娴佺▼鍗″彿" label="娴佺▼鍗″彿" width="180"/>
-    <el-table-column prop="浜у搧鍚嶇О" label="浜у搧鍚嶇О" width="180"/>
-    <el-table-column prop="浜у搧缂栧彿" label="浜у搧缂栧彿" width="180"/>
-    <el-table-column prop="瀹㈡埛缂栧彿" label="瀹㈡埛缂栧彿" width="180"/>
-    <el-table-column prop="瀹㈡埛鍚嶇О" label="瀹㈡埛鍚嶇О" width="180"/>
-    <el-table-column prop="闀垮害" label="闀垮害" width="180"/>
-    <el-table-column prop="瀹藉害" label="瀹藉害" width="180"/>
-    <el-table-column prop="鍘氬害" label="鍘氬害" width="180"/>
-    <el-table-column prop="搴撳瓨鏁�" label="搴撳瓨鏁�" width="180"/>
-    <el-table-column prop="瀹為檯鍗曠墖闈㈢Н" label="瀹為檯鍗曠墖闈㈢Н" width="180"/>
-    <el-table-column prop="闈㈢Н" label="闈㈢Н" width="180"/>
-    <el-table-column prop="缁撶畻鍗曠墖闈㈢Н" label="缁撶畻鍗曠墖闈㈢Н" width="180"/>
-    <el-table-column prop="缁撶畻鎬婚潰绉�" label="缁撶畻鎬婚潰绉�" width="180"/>
-    <el-table-column prop="鍙敤鏁伴噺" label="鍙敤鏁伴噺" width="180"/>
-    <el-table-column prop="妤煎眰缂栧彿" label="妤煎眰缂栧彿" width="180"/>
-    <el-table-column prop="閫佽揣鍦板潃" label="閫佽揣鍦板潃" width="180"/>
-    <el-table-column prop="鎵规" label="鎵规" width="180"/>
-    <el-table-column prop="涓氬姟鍛�" label="涓氬姟鍛�" width="180"/>
-    <el-table-column prop="骞虫柟姣背" label="骞虫柟姣背" width="180"/>
-    <el-table-column prop="閲嶉噺" label="閲嶉噺" width="180"/>
-    <el-table-column prop="鏈�鍚庡叆搴撴棩鏈�" label="鏈�鍚庡叆搴撴棩鏈�" width="180"/>
-    <el-table-column prop="搴撲綅缂栧彿" label="搴撲綅缂栧彿" width="180"/>
-    <el-table-column prop="搴撳尯" label="搴撳尯" width="180"/>
-    <el-table-column prop="搴撲綅" label="搴撲綅" width="180"/>
-    <el-table-column prop="鍗曟嵁鐘舵��" label="鍗曟嵁鐘舵��" width="180"/>
-    <el-table-column prop="澶囨敞" label="澶囨敞" width="180"/>
-
-  </el-table>
-    </div>
-    <!-- 琛ㄦ牸缁撴潫 -->
+    </vxe-grid>
   </div>
-    
-  </template>
+</template>
 
-  <style scoped>
-  
-  </style>
-  
\ No newline at end of file
+<style scoped>
+.main-div-customer{
+  width: 99%;
+  height: 100%;
+}
+</style>
\ No newline at end of file

--
Gitblit v1.8.0