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/FinishedProductOut.vue | 457 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 273 insertions(+), 184 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index 15d4193..f192b1d 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -1,200 +1,289 @@
-<!--鎴愬搧鍑哄簱-->
+<script setup>
-<script lang="ts" setup>
-import {ref} from "vue";
-import {Search} from "@element-plus/icons-vue";
-import {defineComponent} from "vue";
+import {reactive} 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
+ }
+ }
+}
+//瀛愮粍浠舵帴鏀跺弬鏁�
-let tableData = ref([
- {
- "閫佽揣鍗曞彿":'JG23121112',
- "閿�鍞崟鍙�":'NG23120610',
- "瀹㈡埛鍚嶇О":'涓北甯傛í鏍忛晣鐜収鐏グ鍘�',
- "椤圭洰鍚嶇О":'閽㈠寲闀�',
- "涓氬姟鍛�":'鐜嬭壇',
- "璁㈠簭":'1',
- "妤煎眰缂栧彿":'813404',
- "璁㈠崟鏁�":'346',
- "闀�":'813.00',
- "瀹�":'404.00',
- "鍘氬害":'4.00',
- "鎬绘暟閲�":'176.00',
- "鎬婚潰绉�":'58.0800',
- "绠卞彿":'',
- "鎶ヨ〃鏃ユ湡":'2023-23-13',
- "鎴愬搧缂栧彿":'0601000622',
- "鎴愬搧鍚嶇О":'4mm鏂瑰舰閽㈠寲闀�',
- "鏁伴噺":'176',
- "鐘舵��":'宸插嚭搴�',
- "澶囨敞":'',
- }, {
- "閫佽揣鍗曞彿":'JG23121112',
- "閿�鍞崟鍙�":'NG23120610',
- "瀹㈡埛鍚嶇О":'涓北甯傛í鏍忛晣鐜収鐏グ鍘�',
- "椤圭洰鍚嶇О":'閽㈠寲闀�',
- "涓氬姟鍛�":'鐜嬭壇',
- "璁㈠簭":'1',
- "妤煎眰缂栧彿":'813404',
- "璁㈠崟鏁�":'346',
- "闀�":'813.00',
- "瀹�":'404.00',
- "鍘氬害":'4.00',
- "鎬绘暟閲�":'176.00',
- "鎬婚潰绉�":'58.0800',
- "绠卞彿":'',
- "鎶ヨ〃鏃ユ湡":'2023-23-13',
- "鎴愬搧缂栧彿":'0601000622',
- "鎴愬搧鍚嶇О":'4mm鏂瑰舰閽㈠寲闀�',
- "鏁伴噺":'176',
- "鐘舵��":'宸插嚭搴�',
- "澶囨敞":'',
- }, {
- "閫佽揣鍗曞彿":'JG23121112',
- "閿�鍞崟鍙�":'NG23120610',
- "瀹㈡埛鍚嶇О":'涓北甯傛í鏍忛晣鐜収鐏グ鍘�',
- "椤圭洰鍚嶇О":'閽㈠寲闀�',
- "涓氬姟鍛�":'鐜嬭壇',
- "璁㈠簭":'1',
- "妤煎眰缂栧彿":'813404',
- "璁㈠崟鏁�":'346',
- "闀�":'813.00',
- "瀹�":'404.00',
- "鍘氬害":'4.00',
- "鎬绘暟閲�":'176.00',
- "鎬婚潰绉�":'58.0800',
- "绠卞彿":'',
- "鎶ヨ〃鏃ユ湡":'2023-23-13',
- "鎴愬搧缂栧彿":'0601000622',
- "鎴愬搧鍚嶇О":'4mm鏂瑰舰閽㈠寲闀�',
- "鏁伴噺":'176',
- "鐘舵��":'宸插嚭搴�',
- "澶囨敞":'',
- }, {
- "閫佽揣鍗曞彿":'JG23121112',
- "閿�鍞崟鍙�":'NG23120610',
- "瀹㈡埛鍚嶇О":'涓北甯傛í鏍忛晣鐜収鐏グ鍘�',
- "椤圭洰鍚嶇О":'閽㈠寲闀�',
- "涓氬姟鍛�":'鐜嬭壇',
- "璁㈠簭":'1',
- "妤煎眰缂栧彿":'813404',
- "璁㈠崟鏁�":'346',
- "闀�":'813.00',
- "瀹�":'404.00',
- "鍘氬害":'4.00',
- "鎬绘暟閲�":'176.00',
- "鎬婚潰绉�":'58.0800',
- "绠卞彿":'',
- "鎶ヨ〃鏃ユ湡":'2023-23-13',
- "鎴愬搧缂栧彿":'0601000622',
- "鎴愬搧鍚嶇О":'4mm鏂瑰舰閽㈠寲闀�',
- "鏁伴噺":'176',
- "鐘舵��":'宸插嚭搴�',
- "澶囨敞":'',
- }, {
- "閫佽揣鍗曞彿":'JG23121112',
- "閿�鍞崟鍙�":'NG23120610',
- "瀹㈡埛鍚嶇О":'涓北甯傛í鏍忛晣鐜収鐏グ鍘�',
- "椤圭洰鍚嶇О":'閽㈠寲闀�',
- "涓氬姟鍛�":'鐜嬭壇',
- "璁㈠簭":'1',
- "妤煎眰缂栧彿":'813404',
- "璁㈠崟鏁�":'346',
- "闀�":'813.00',
- "瀹�":'404.00',
- "鍘氬害":'4.00',
- "鎬绘暟閲�":'176.00',
- "鎬婚潰绉�":'58.0800',
- "绠卞彿":'',
- "鎶ヨ〃鏃ユ湡":'2023-23-13',
- "鎴愬搧缂栧彿":'0601000622',
- "鎴愬搧鍚嶇О":'4mm鏂瑰舰閽㈠寲闀�',
- "鏁伴噺":'176',
- "鐘舵��":'宸插嚭搴�',
- "澶囨敞":'',
- }, {
- "閫佽揣鍗曞彿":'JG23121112',
- "閿�鍞崟鍙�":'NG23120610',
- "瀹㈡埛鍚嶇О":'涓北甯傛í鏍忛晣鐜収鐏グ鍘�',
- "椤圭洰鍚嶇О":'閽㈠寲闀�',
- "涓氬姟鍛�":'鐜嬭壇',
- "璁㈠簭":'1',
- "妤煎眰缂栧彿":'813404',
- "璁㈠崟鏁�":'346',
- "闀�":'813.00',
- "瀹�":'404.00',
- "鍘氬害":'4.00',
- "鎬绘暟閲�":'176.00',
- "鎬婚潰绉�":'58.0800',
- "绠卞彿":'',
- "鎶ヨ〃鏃ユ湡":'2023-23-13',
- "鎴愬搧缂栧彿":'0601000622',
- "鎴愬搧鍚嶇О":'4mm鏂瑰舰閽㈠寲闀�',
- "鏁伴噺":'176',
- "鐘舵��":'宸插嚭搴�',
- "澶囨敞":'',
+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: '80', slots: { default: 'button_slot' },fixed:"left"},
+ {field: 'DeliveryOrderNumber', 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: 'ProductName', width: '100',title: '鎴愬搧鍚嶇О', sortable: true},
+ {field: 'ProductNumber',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: 'TotalQuantity',width: '140', title: '鎬绘暟閲�', sortable: true},
+ {field: 'TotalArea',width: '100', title: '鎬婚潰绉�', sortable: true},
+ {field: 'FloorNumber',width: '100', title: '妤煎眰缂栧彿', sortable: true},
+ {field: 'OrderNumber',width: '100', title: '璁㈠簭', sortable: true},
+ {field: 'Salesman',width: '100', title: '涓氬姟鍛�', sortable: true},
+ {field: 'BoxNumber',width: '100', title: '绠卞彿', sortable: true},
+ {field: 'Quantity',width: '100', title: '鏁伴噺', sortable: true},
+ {field: 'ReportingDate',width: '140', title: '鎶ヨ〃鏃ユ湡', sortable: true},
+ {field: 'OrderQuantity',width: '100', title: '璁㈠崟鏁�', sortable: true},
+ {field: 'Status',width: '100', title: '鐘舵��', sortable: true},
+ {field: 'remark',width: '80', title: '澶囨敞', sortable: true},
+ ],//琛ㄥご鎸夐挳
+ toolbarConfig: {
+ buttons: [{
+ 'name': '纭鍑哄簱',
+ status: 'primary'
+ }],
+ import: false,
+ export: true,
+ print: true,
+ zoom: true,
+ custom: true
+ },
+ data: [
+ {
+ "DeliveryOrderNumber": "1",
+ "SalesOrderNumber": "NG23072003",
+ "ProjectName": "閽㈠寲鐜荤拑",
+ "CustomerName": "鏉庝簩鐗�",
+ "Salesman": "灏忓渤",
+ "OrderNumber": '7',
+ "FloorNumber": "06040000022",
+ "OrderQuantity": "7",
+ "Length": "1230.00",
+ "Width": "1075.00",
+ "Thickness": "6銆�700",
+ "TotalQuantity": "100.00",
+ "TotalArea": "360.80",
+ "BoxNumber": "06",
+ "ReportingDate": "2023-12-22",
+ "ProductNumber": "NG2312220001",
+ "ProductName": "瓒呯骇鐜荤拑",
+ "Quantity": "360",
+ "Status": "宸茶皟鏋�",
+ "remark": "娴嬭瘯",
+ }, {
+ "DeliveryOrderNumber": "1",
+ "SalesOrderNumber": "NG23072003",
+ "ProjectName": "閽㈠寲鐜荤拑",
+ "CustomerName": "鏉庝簩鐗�",
+ "Salesman": "灏忓渤",
+ "OrderNumber": '7',
+ "FloorNumber": "06040000022",
+ "OrderQuantity": "7",
+ "Length": "1230.00",
+ "Width": "1075.00",
+ "Thickness": "6銆�700",
+ "TotalQuantity": "100.00",
+ "TotalArea": "360.80",
+ "BoxNumber": "06",
+ "ReportingDate": "2023-12-22",
+ "ProductNumber": "NG2312220001",
+ "ProductName": "瓒呯骇鐜荤拑",
+ "Quantity": "360",
+ "Status": "宸茶皟鏋�",
+ "remark": "娴嬭瘯",
+ }, {
+ "DeliveryOrderNumber": "1",
+ "SalesOrderNumber": "NG23072003",
+ "ProjectName": "閽㈠寲鐜荤拑",
+ "CustomerName": "鏉庝簩鐗�",
+ "Salesman": "灏忓渤",
+ "OrderNumber": '7',
+ "FloorNumber": "06040000022",
+ "OrderQuantity": "7",
+ "Length": "1230.00",
+ "Width": "1075.00",
+ "Thickness": "6銆�700",
+ "TotalQuantity": "100.00",
+ "TotalArea": "360.80",
+ "BoxNumber": "06",
+ "ReportingDate": "2023-12-22",
+ "ProductNumber": "NG2312220001",
+ "ProductName": "瓒呯骇鐜荤拑",
+ "Quantity": "360",
+ "Status": "宸茶皟鏋�",
+ "remark": "娴嬭瘯",
+ }, {
+ "DeliveryOrderNumber": "1",
+ "SalesOrderNumber": "NG23072003",
+ "ProjectName": "閽㈠寲鐜荤拑",
+ "CustomerName": "鏉庝簩鐗�",
+ "Salesman": "灏忓渤",
+ "OrderNumber": '7',
+ "FloorNumber": "06040000022",
+ "OrderQuantity": "7",
+ "Length": "1230.00",
+ "Width": "1075.00",
+ "Thickness": "6銆�700",
+ "TotalQuantity": "100.00",
+ "TotalArea": "360.80",
+ "BoxNumber": "06",
+ "ReportingDate": "2023-12-22",
+ "ProductNumber": "NG2312220001",
+ "ProductName": "瓒呯骇鐜荤拑",
+ "Quantity": "360",
+ "Status": "宸茶皟鏋�",
+ "remark": "娴嬭瘯",
+ }, {
+ "DeliveryOrderNumber": "1",
+ "SalesOrderNumber": "NG23072003",
+ "ProjectName": "閽㈠寲鐜荤拑",
+ "CustomerName": "鏉庝簩鐗�",
+ "Salesman": "灏忓渤",
+ "OrderNumber": '7',
+ "FloorNumber": "06040000022",
+ "OrderQuantity": "7",
+ "Length": "1230.00",
+ "Width": "1075.00",
+ "Thickness": "6銆�700",
+ "TotalQuantity": "100.00",
+ "TotalArea": "360.80",
+ "BoxNumber": "06",
+ "ReportingDate": "2023-12-22",
+ "ProductNumber": "NG2312220001",
+ "ProductName": "瓒呯骇鐜荤拑",
+ "Quantity": "360",
+ "Status": "宸茶皟鏋�",
+ "remark": "娴嬭瘯",
+ }, {
+ "DeliveryOrderNumber": "1",
+ "SalesOrderNumber": "NG23072003",
+ "ProjectName": "閽㈠寲鐜荤拑",
+ "CustomerName": "鏉庝簩鐗�",
+ "Salesman": "灏忓渤",
+ "OrderNumber": '7',
+ "FloorNumber": "06040000022",
+ "OrderQuantity": "7",
+ "Length": "1230.00",
+ "Width": "1075.00",
+ "Thickness": "6銆�700",
+ "TotalQuantity": "100.00",
+ "TotalArea": "360.80",
+ "BoxNumber": "06",
+ "ReportingDate": "2023-12-22",
+ "ProductNumber": "NG2312220001",
+ "ProductName": "瓒呯骇鐜荤拑",
+ "Quantity": "360",
+ "Status": "宸茶皟鏋�",
+ "remark": "娴嬭瘯",
+ },
-]);
+ ],//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 ''
+ })
+ ]
+ }
+
+})
+
+
</script>
+
<template>
- <div>
- <div>
- <el-form size="medium" >
+ <div class="main-div-customer">
+ <vxe-grid
+ max-height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
- <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="2">-->
-<!-- <el-button id="searchButton" type="primary" :icon="Search" style="width: 100px; height: 25px">瀵煎嚭</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="4">-->
-<!-- <el-button id="searchButton" type="primary" :icon="Search" style="width: 100px; height: 25px">鏌ヨ</el-button>-->
-<!-- </el-col>-->
- <el-col :span="4">
- <el-button id="searchButton" type="primary" :icon="Search" style="width: 100px; height: 25px">纭畾</el-button>
- </el-col>
- </el-row>
+ >
+ <!-- @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>
- </el-form>
- <div>
- <el-table :data="tableData" border style="width: 100%">
- <el-table-column prop="閫佽揣鍗曞彿" label="閫佽揣鍗曞彿" width="100" />
- <el-table-column prop="閿�鍞崟鍙�" label="閿�鍞崟鍙�" width="120" />
- <el-table-column prop="瀹㈡埛鍚嶇О" label="瀹㈡埛鍚嶇О" width="180"/>
- <el-table-column prop="椤圭洰鍚嶇О" label="椤圭洰鍚嶇О" width="100"/>
- <el-table-column prop="涓氬姟鍛�" label="涓氬姟鍛�" width="80"/>
- <el-table-column prop="璁㈠簭" label="璁㈠簭" width="80"/>
- <el-table-column prop="妤煎眰缂栧彿" label="妤煎眰缂栧彿" width="100"/>
- <el-table-column prop="璁㈠崟鏁�" label="璁㈠崟鏁�" width="100"/>
- <el-table-column prop="闀�" label="闀�" width="180"/>
- <el-table-column prop="瀹�" label="瀹�" width="80"/>
- <el-table-column prop="鍘氬害" label="鍘氬害" width="100"/>
- <el-table-column prop="鎬绘暟閲�" label="鎬绘暟閲�" width="80"/>
- <el-table-column prop="绠卞彿" label="绠卞彿" width="80"/>
- <el-table-column prop="鎬婚潰绉�" label="鎬婚潰绉�" width="80"/>
- <el-table-column prop="鎶ヨ〃鏃ユ湡" label="鎶ヨ〃鏃ユ湡" width="100"/>
- <el-table-column prop="鎴愬搧缂栧彿" label="鎴愬搧缂栧彿" width="120"/>
- <el-table-column prop="鎴愬搧鍚嶇О" label="鎴愬搧鍚嶇О" width="130"/>
- <el-table-column prop="鏁伴噺" label="鏁伴噺" width="80"/>
- <el-table-column prop="鐘舵��" label="鐘舵��" width="80"/>
- <el-table-column prop="澶囨敞" label="澶囨敞" width="80"/>
- <el-table-column prop="閫夋嫨" label="閫夋嫨" type="selection" width="80"/>
- </el-table>
- </div>
- </div>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')" 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>
+
+
+ </vxe-grid>
</div>
</template>
-<style>
+<style scoped>
+.main-div-customer{
+ width: 99%;
+ height: 100%;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0