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/mainTrader/SelectTrader.vue | 371 +++++++++++++++++++++++++++++------------------------
1 files changed, 203 insertions(+), 168 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
index b9db151..02261a1 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
@@ -1,184 +1,219 @@
-<!-- 渚涘簲鍟嗙鐞� -->
-<script lang="ts" setup>
-import { ref } from "vue";
-const name = ref('')
-const productName = ref('')
-const salId = ref('')
-let tableData = ref([
- {
- "渚涘簲鍟嗙紪鐮�":'221',
- "渚涘簲鍟嗗悕绉�":'鎴愰兘姝ｅ崕鐢靛瓙浠櫒鏈夐檺鍏徃',
- "浠ｇ悊浜у搧":'杈呮枡',
- "缁撶畻鏂瑰紡":'璐у埌浠樻',
- "鑱旂郴浜�":'',
- "鑱旂郴鐢佃瘽":'',
- "绋庣巼":'13.00',
- "鍏徃鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鏀惰揣鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鎵�灞為泦鍥�":'',
- "绛夌骇":'',
- "鍗曟嵁鐘舵��":'鏈鏍�',
- "瀹℃牳鍛�":'0.0000',
- "瀹℃牳鏃ユ湡":'2023-11-19',
- "鎹㈢畻鍗曚綅":'0',
- "澶囨敞":'0',
+<script setup>
+
+import {reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import {VXETable} from "vxe-table";
+let router=useRouter()
+const getTableRow = (row,type) =>{
+ switch (type) {
+ case 'edit' :{
+ //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ router.push({path: '/main/trader/CreateTrader', query: { id: row.id }})
+ break
+ }
+ case 'delete':{
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+ break
+ }
+
+ }
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+
+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
},
- {
- "渚涘簲鍟嗙紪鐮�":'220',
- "渚涘簲鍟嗗悕绉�":'骞垮窞鍚堢敵鏈虹數绉戞妧鏈夐檺鍏徃',
- "浠ｇ悊浜у搧":'杈呮枡',
- "缁撶畻鏂瑰紡":'璐у埌浠樻',
- "鑱旂郴浜�":'',
- "鑱旂郴鐢佃瘽":'',
- "绋庣巼":'13.00',
- "鍏徃鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鏀惰揣鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鎵�灞為泦鍥�":'',
- "绛夌骇":'',
- "鍗曟嵁鐘舵��":'鏈鏍�',
- "瀹℃牳鍛�":'0.0000',
- "瀹℃牳鏃ユ湡":'2023-11-19',
- "鎹㈢畻鍗曚綅":'0',
- "澶囨敞":'0',
+ filterConfig: { //绛涢�夐厤缃」
+ remote: true
},
- {
- "渚涘簲鍟嗙紪鐮�":'219',
- "渚涘簲鍟嗗悕绉�":'姹熼棬甯備腑閿愰噾鍒氱煶宸ュ叿鏈夐檺鍏徃',
- "浠ｇ悊浜у搧":'杈呮枡',
- "缁撶畻鏂瑰紡":'璐у埌浠樻',
- "鑱旂郴浜�":'',
- "鑱旂郴鐢佃瘽":'',
- "绋庣巼":'13.00',
- "鍏徃鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鏀惰揣鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鎵�灞為泦鍥�":'',
- "绛夌骇":'',
- "鍗曟嵁鐘舵��":'鏈鏍�',
- "瀹℃牳鍛�":'0.0000',
- "瀹℃牳鏃ユ湡":'2023-11-19',
- "鎹㈢畻鍗曚綅":'0',
- "澶囨敞":'0',
+ customConfig: {
+ storage: true
},
- {
- "渚涘簲鍟嗙紪鐮�":'218',
- "渚涘簲鍟嗗悕绉�":'娣卞湷鎮﹀垱绮惧瘑鑷姩鍖栨妧鏈湁闄愬叕鍙�',
- "浠ｇ悊浜у搧":'杈呮枡',
- "缁撶畻鏂瑰紡":'璐у埌浠樻',
- "鑱旂郴浜�":'',
- "鑱旂郴鐢佃瘽":'',
- "绋庣巼":'13.00',
- "鍏徃鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鏀惰揣鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鎵�灞為泦鍥�":'',
- "绛夌骇":'',
- "鍗曟嵁鐘舵��":'鏈鏍�',
- "瀹℃牳鍛�":'0.0000',
- "瀹℃牳鏃ユ湡":'2023-11-19',
- "鎹㈢畻鍗曚綅":'0',
- "澶囨敞":'0',
+ 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: '110', slots: { default: 'button_slot' },fixed:"left"},
+ {field: 'supplierCode', width:'150', title: '渚涘簲鍟嗙紪鍙�', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
+ {field: 'supplierName', width: '150',title: '渚涘簲鍟嗗悕绉�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'agentProduct', width: '120',title: '浠ｇ悊浜у搧', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'settlementMethod', width: '100',title: '缁撶畻鏂瑰紡', sortable: true},
+ {field: 'contactPerson',width: '100', title: '鑱旂郴浜�', sortable: true,showOverflow:"ellipsis"},
+ {field: 'taxRate', width: '80',title: '绋庣巼', sortable: true},
+ {field: 'companyAddress',width: '100', title: '鍏徃鍦板潃', sortable: true},
+ {field: 'receivingAddress', width: '100',title: '鏀惰揣鍦板潃', sortable: true},
+ {field: 'belongingGroup',width: '100', title: '鎵�灞為泦鍥�', sortable: true},
+ {field: 'grade', width: '80',title: '绛夌骇', sortable: true},
+ {field: 'documentStatus',width: '100', title: '鍗曟嵁鐘舵��', sortable: true},
+ {field: 'auditor', width: '100',title: '瀹℃牳鍛�', sortable: true},
+ {field: 'auditDate',width: '110', title: '瀹℃牳鏃ユ湡', sortable: true},
+ {field: 'conversionUnit',width: '100', title: '鎹㈢畻鍗曚綅', sortable: true},
+ {field: 'remark',width: '80', title: '澶囨敞', sortable: true},
+ ],//琛ㄥご鎸夐挳
+ toolbarConfig: {
+ buttons: [{
+ 'name': '鏂板',
+ 'code':'add'
+ },],
+ import: false,
+ export: true,
+ print: true,
+ zoom: true,
+ custom: true
},
- {
- "渚涘簲鍟嗙紪鐮�":'217',
- "渚涘簲鍟嗗悕绉�":'娣卞湷甯備集娆ｇ鎶�鏈夐檺鍏徃',
- "浠ｇ悊浜у搧":'杈呮枡',
- "缁撶畻鏂瑰紡":'璐у埌浠樻',
- "鑱旂郴浜�":'',
- "鑱旂郴鐢佃瘽":'',
- "绋庣巼":'13.00',
- "鍏徃鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鏀惰揣鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鎵�灞為泦鍥�":'',
- "绛夌骇":'',
- "鍗曟嵁鐘舵��":'鏈鏍�',
- "瀹℃牳鍛�":'0.0000',
- "瀹℃牳鏃ユ湡":'2023-11-19',
- "鎹㈢畻鍗曚綅":'0',
- "澶囨敞":'0',
+ data: [
+ {
+ "supplierCode": 216,
+ "supplierName": "瀹胯縼瀹ｄ箣鏂囩數瀛愬晢鍔℃湁闄愬叕鍙�",
+ "agentProduct": "杈呮枡",
+ "settlementMethod": "璐у埌浠樻",
+ "contactPerson": "骞抽挗",
+ "taxRate": 13.00,
+ "companyAddress": "鍖椾含甯傝緰鍖轰笢鍩庡尯",
+ "receivingAddress": "鍖椾含甯傝緰鍖轰笢鍩庡尯",
+ "belongingGroup": "涓婃捣鍖楃幓",
+ "grade": "5",
+ "documentStatus": "鏈鏍�",
+ "auditor": "灏忓渤",
+ "auditDate": "2023-11-19",
+ "conversionUnit": "0",
+ "remark": "娴嬭瘯",
+ },
+ {
+ "supplierCode": 215,
+ "supplierName": "瀹胯縼瀹ｄ箣鏂囩數瀛愬晢鍔℃湁闄愬叕鍙�",
+ "agentProduct": "杈呮枡",
+ "settlementMethod": "璐у埌浠樻",
+ "contactPerson": "灏忓渤",
+ "taxRate": 13.00,
+ "companyAddress": "鍖椾含甯傝緰鍖轰笢鍩庡尯",
+ "receivingAddress": "鍖椾含甯傝緰鍖轰笢鍩庡尯",
+ "belongingGroup": "涓婃捣鍖楃幓",
+ "grade": "5",
+ "documentStatus": "鏈鏍�",
+ "auditor": "灏忓渤",
+ "auditDate": "2023-11-19",
+ "conversionUnit": "0",
+ "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 ''
+ })
+ ]
+ }
+
+})
+
+const xGrid = ref();
+
+const gridEvents = {
+ toolbarButtonClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'add': {
+
+ router.push({path: '/main/trader/CreateTrader'})
+ /*if($grid.getCheckboxRecords().length==0){
+ VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
+ return
+ }*/
+ return;
+ }
+
+ }
+ }
},
- {
- "渚涘簲鍟嗙紪鐮�":'216',
- "渚涘簲鍟嗗悕绉�":'瀹胯縼瀹ｄ箣鏂囩數瀛愬晢鍔℃湁闄愬叕鍙�',
- "浠ｇ悊浜у搧":'杈呮枡',
- "缁撶畻鏂瑰紡":'璐у埌浠樻',
- "鑱旂郴浜�":'',
- "鑱旂郴鐢佃瘽":'',
- "绋庣巼":'13.00',
- "鍏徃鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鏀惰揣鍦板潃":'鍖椾含甯傝緰鍖轰笢鍩庡尯',
- "鎵�灞為泦鍥�":'',
- "绛夌骇":'',
- "鍗曟嵁鐘舵��":'鏈鏍�',
- "瀹℃牳鍛�":'0.0000',
- "瀹℃牳鏃ユ湡":'2023-11-19',
- "鎹㈢畻鍗曚綅":'0',
- "澶囨敞":'0',
+ toolbarToolClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'myPrint': {
+ $grid.print()
+ break
+ }
+ }
+ }
},
-])
+}
+
+
+
</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"
+ v-on="gridEvents"
-<!-- <el-row gutter="5">-->
-<!-- <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="4">-->
-<!-- <el-input v-model="salId" placeholder="璇疯緭鍏ヨ仈绯讳汉" style="width: 200px; height: 30px;" />-->
-<!-- </el-col>-->
-<!-- <el-col :span="4">-->
-<!-- <el-button id="searchButton" type="primary" :icon="Search">鏌ヨ</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-item size="large">
- <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
- <el-button @click="resetForm">閲嶇疆</el-button>
- </el-form-item>-->
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
+ <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ </template>
- </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 fixed="left" label="鎿嶄綔" width="120">
- <template #default>
- <el-button link type="primary" size="small" @click="handleClick"
- >淇敼</el-button
- >
- <el-button link type="primary" size="small">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
+ <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