From fcd7ece15a86fc0cb526ee801ff8262b0db22dee Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期一, 25 十二月 2023 11:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue | 278 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 221 insertions(+), 57 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
index 1815244..6fa3f41 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
@@ -1,23 +1,171 @@
-<script lang="ts" setup>
-import {reactive, ref} from 'vue'
+<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/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
+ break
+ }
+ case 'delete':{
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+ break
+ }
+ case 'setType':{
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
+ break
+ }
+ }
+}
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+//瀛愮粍浠舵帴鏀跺弬鏁�
-const defaultTime = ref<[Date, Date]>([
- new Date(2000, 1, 1, 0, 0, 0),
- new Date(2000, 2, 1, 23, 59, 59),
-])
-// do not use same name with ref
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+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: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ {field: '1', width: 120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '2',width: 120, title: '瀹㈡埛缂栫爜', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '3', width: 130,title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '4',width: 120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '5', width: 100,title: '璁㈠崟鏁伴噺', sortable: true,showOverflow:"ellipsis"},
+ {field: '6', width: 100,title: '棰嗘枡宸ュ簭', sortable: true},
+ {field: '7',width: 100, title: '鐗╂枡缂栫爜', sortable: true},
+ {field: '8',width: 120, title: '鐗╂枡鍚嶇О', sortable: true,showOverflow:"ellipsis"},
+ {field: '9', width: 120,title: '鍗曚綅', sortable: true},
+ {field: '10', width: 120,title: '浜у湴', sortable: true},
+ {field: '11',width: 120, title: '鐗╂枡鏁伴噺', sortable: true},
+ {field: '12',width: 120, title: '閲囪喘鏁伴噺', sortable: true},
+ {field: '13',width: 120, title: '鏄惁瀹℃牳', sortable: true},
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ // buttons: [{
+ //
+ // }],
+ import: false,
+ export: true,
+ print: true,
+ zoom: true,
+ custom: true
+ },
+ data: [
+ {
+ 1:'NG230101',
+ 2:'24',
+ 3:'06045001',
+ 4:'3mm鐧藉潯/PE绮楃（/鍒囪9*9mm/TG/鎸夊浘[KD10059406-7-20002] 1011* 374(鍖呰 : 320鐗�/绠憋紝鐢ㄧ儹闅擣SC绾�)',
+ 5:'1300',
+ 6:'涓�绾胯绠�',
+ 7:'70030201000010400410000002',
+ 8:'FSC鏃犲皹绾�',
+ 9:'寮�',
+ 10:'涓滆帪甯傞敠鑽ｇ焊涓�',
+ 11:'1304.00',
+ 12:'1000.0000',
+ 13:'宸插鏍�',
+ },
+ {
+ 1:'NG230101',
+ 2:'24',
+ 3:'06045001',
+ 4:'3mm鐧藉潯/PE绮楃（/鍒囪9*9mm/TG/鎸夊浘[KD10059406-7-20002] 1011* 374(鍖呰 : 320鐗�/绠憋紝鐢ㄧ儹闅擣SC绾�)',
+ 5:'1300',
+ 6:'涓�绾胯绠�',
+ 7:'70030201000010400410000002',
+ 8:'FSC鏃犲皹绾�',
+ 9:'寮�',
+ 10:'涓滆帪甯傞敠鑽ｇ焊涓�',
+ 11:'1304.00',
+ 12:'1000.0000',
+ 13:'宸插鏍�',
+ },
+ {
+ 1:'NG230101',
+ 2:'24',
+ 3:'06045001',
+ 4:'3mm鐧藉潯/PE绮楃（/鍒囪9*9mm/TG/鎸夊浘[KD10059406-7-20002] 1011* 374(鍖呰 : 320鐗�/绠憋紝鐢ㄧ儹闅擣SC绾�)',
+ 5:'1300',
+ 6:'涓�绾胯绠�',
+ 7:'70030201000010400410000002',
+ 8:'FSC鏃犲皹绾�',
+ 9:'寮�',
+ 10:'涓滆帪甯傞敠鑽ｇ焊涓�',
+ 11:'1304.00',
+ 12:'1000.0000',
+ 13:'宸插鏍�',
+ },
+ {
+ 1:'NG230101',
+ 2:'24',
+ 3:'06045001',
+ 4:'3mm鐧藉潯/PE绮楃（/鍒囪9*9mm/TG/鎸夊浘[KD10059406-7-20002] 1011* 374(鍖呰 : 320鐗�/绠憋紝鐢ㄧ儹闅擣SC绾�)',
+ 5:'1300',
+ 6:'涓�绾胯绠�',
+ 7:'70030201000010400410000002',
+ 8:'FSC鏃犲皹绾�',
+ 9:'寮�',
+ 10:'涓滆帪甯傞敠鑽ｇ焊涓�',
+ 11:'1304.00',
+ 12:'1000.0000',
+ 13:'宸插鏍�',
+ },
+ ],//table body瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['5','11','12']
+ return[
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return '鍚堣:'
+ }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
})
const value = ref('')
@@ -35,37 +183,35 @@
label: 'Option3',
},
]
-const tableData = [
- {
- 1:'NG230101',
- 2:'24',
- 3:'06045001',
- 4:'3mm鐧藉潯/PE绮楃（/鍒囪9*9mm/TG/鎸夊浘[KD10059406-7-20002] 1011* 374(鍖呰 : 320鐗�/绠憋紝鐢ㄧ儹闅擣SC绾�)',
- 5:'1300',
- 6:'涓�绾胯绠�',
- 7:'70030201000010400410000002',
- 8:'FSC鏃犲皹绾�',
- 9:'寮�',
- 10:'涓滆帪甯傞敠鑽ｇ焊涓�',
- 11:'1304.00',
- 12:'1000.0000',
- 13:'宸插鏍�',
- },
-]
+
+const form = reactive({
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ desc: '',
+
+})
+
</script>
-<!--BOM鎶ヨ〃-->
+
<template>
- <div class="div-main">
+ <div class="main-div-customer">
<div id="selectForm">
<el-row :gutter="0">
-<!-- <el-input placeholder="璁惧鍚嶇О" v-model="form.name" style="width: 200px"/>-->
-<!-- -->
+ <!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
+ <!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
+
<el-date-picker
v-model="form.date1"
type="daterange"
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
:default-time="defaultTime"
+ style="width: 100px"
/>
<el-select v-model="value" class="m-2" placeholder="鏌ヨ绫诲瀷">
@@ -80,34 +226,52 @@
</el-row>
</div>
- <div>
- <el-table :data="tableData" border style="width: 100%" height="100%">
- <el-table-column prop="1" label="閿�鍞崟鍙�" />
- <el-table-column prop="2" label="瀹㈡埛缂栫爜" :show-overflow-tooltip='true'/>
- <el-table-column prop="3" label="浜у搧缂栧彿" :show-overflow-tooltip='true' />
- <el-table-column prop="4" label="浜у搧鍚嶇О" :show-overflow-tooltip='true'/>
- <el-table-column prop="5" label="璁㈠崟鏁伴噺" :show-overflow-tooltip='true' />
- <el-table-column prop="6" label="棰嗘枡宸ュ簭" />
- <el-table-column prop="7" label="鐗╂枡缂栫爜" :show-overflow-tooltip='true'/>
- <el-table-column prop="8" label="鐗╂枡鍚嶇О" :show-overflow-tooltip='true'/>
- <el-table-column prop="9" label="鍗曚綅"/>
- <el-table-column prop="10" label="浜у湴" :show-overflow-tooltip='true'/>
- <el-table-column prop="11" label="鐗╂枡鏁伴噺"/>
- <el-table-column prop="12" label="閲囪喘鏁伴噺"/>
- <el-table-column prop="13" label="鏄惁瀹℃牳"/>
- </el-table><!-- <h1>{{msg}}</h1> -->
- </div>
+ <vxe-grid
+ max-height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ >
+ <!-- @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,'setType')" link type="primary" size="small">鍙嶅</el-button>
+ <el-button @click="getTableRow(row,'delete')" 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 scoped>
-.div-main{
- width: 100%;
+.main-div-customer{
+ width: 99%;
height: 100%;
}
#selectForm {
- width: 70%;
+ width: 60%;
text-align: center;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0