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/purchaseOrder/Select.vue | 427 ++++++++++++++++++++---------------------------------
1 files changed, 162 insertions(+), 265 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue
index 11161c1..fe28c9d 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue
@@ -23,306 +23,189 @@
id="select"
type="primary"
:icon="Search"
- @click="BtnSearchPurchaseOrder">鏌ヨ
+ @click="autoAddRow">鏌ヨ
</el-button>
</el-col>
</el-row>
+
</el-header>
- <el-main style="padding-top: 5px;height:100%">
- <vxe-grid
+ <el-main style="padding-top: 5px">
+ <div @scroll="handleTableScroll">
- max-height="600"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
- >
+ <el-table :data="tableData" empty-text="鏆傛棤鏁版嵁" style="width: 100%" max-height="550px" border
+ show-summary
+ sum-text=" ">
+ <el-table-column fixed="left" prop="rIndex" label="" width="50" align="center"></el-table-column>
- <!-- @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,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
-<!-- <el-button @click="cellClickEvent" link type="primary" size="small">璇︽儏</el-button>-->
- </template>
+ <el-table-column fixed="left" label="鎿嶄綔" width="120">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ size="small"
+ @click.prevent="editRow(scope.$index)"
+ >
+ 缂栬緫
+ </el-button>
+ <el-button
+ link
+ type="primary"
+ size="small"
+ @click.prevent="deleteRow(scope.$index)"
+ >
+ 鍒犻櫎
+ </el-button>
+ </template>
+ </el-table-column>
- <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>
+ <el-table-column prop="ordernumber" label="閲囪喘鍗曞彿" width="150"/>
+ <el-table-column prop="name" label="渚涘簲鍟�" width="120"/>
+ <el-table-column prop="strockNumber" label="鐗╂枡缂栧彿" width="200"/>
+ <el-table-column prop="city" label="鐗╂枡鍚嶇О" width="120"/>
+ <el-table-column prop="width" sortable label="瀹藉害" width="120"/>
+ <el-table-column prop="height" sortable label="楂樺害" width="120"/>
+ <el-table-column prop="thick" sortable label="鍘氬害" width="120"/>
+ <el-table-column prop="zip" label="鍨嬪彿" width="120"/>
+ <el-table-column prop="number" label="鍗曚綅" width="120"/>
+ <el-table-column prop="number" sortable label="涓嶅惈绋庡崟浠�" width="120"/>
+ <el-table-column prop="number" label="鏁伴噺" width="120" show-summary="ture"/>
+ <el-table-column prop="number" label="宸查噰璐暟閲�" width="120"/>
+ <el-table-column prop="zip" sortable label="閲戦" width="120"/>
+ <el-table-column prop="zip" label="涓嶅惈绋庨噾棰�" width="120"/>
+ <el-table-column prop="date" label="绋庣巼" width="120"/>
+ <el-table-column prop="date" label="搴撳瓨" width="120"/>
+ <el-table-column prop="zip" label="鍛ㄧ敤閲�" width="120"/>
+ <el-table-column prop="zip" label="鏈堢敤閲�" width="120"/>
+ <el-table-column prop="state" label="鍗曟嵁鐘舵��" width="120"/>
+ <el-table-column prop="ordernumber" label="閿�鍞崟鍙�" width="200"/>
+ <el-table-column prop="date" label="鍒跺崟鏃ユ湡" width="120"/>
+ <el-table-column prop="zip" label="鍒跺崟浜�" width="120"/>
+ <el-table-column prop="zip" label="閲囪喘閮ㄩ棬" width="120"/>
+ <el-table-column prop="zip" label="閲囪喘缁勭粐" width="120"/>
+ <el-table-column prop="zip" label="澶囨敞" width="200"/>
- <vxe-modal v-model="showDetails" title="鏌ョ湅璇︽儏" width="600" height="400" :mask="false" :lock-view="false" resize>
- <template #default>
- <vxe-table
- border="inner"
- auto-resize
- show-overflow
- height="auto"
- :row-config="{isHover: true}"
- :show-header="false"
- :sync-resize="showDetails"
- :data="detailData">
- <vxe-column field="label" width="40%"></vxe-column>
- <vxe-column field="value"></vxe-column>
- </vxe-table>
- </template>
- </vxe-modal>
+ </el-table>
+ </div>
</el-main>
</el-container>
</template>
<script setup>
-import {ref} from "vue";
-import {reactive} from "vue";
-import {useRouter} from 'vue-router'
-import {Search} from "@element-plus/icons-vue";
-import dayjs from "dayjs";
-import {VXETable} from "vxe-table";
+import {ref} from 'vue'
+import {Plus, Search} from "@element-plus/icons-vue";
-let router = useRouter()
-const getTableRow = (row, type) => {
- switch (type) {
- case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/purchaseOrder/CreatePurchaseOrder', query: {id: row.id}})
- break
- }
- case 'delete': {
+const s_wuliaomingcheng = ref('')
+const s_buyOrderNumber = ref('')
+const s_width = ref('')
+const s_height = ref('')
+const s_thick = ref('')
-
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅'+row.id)
- break
- }
- }
-}
-
-const xGrid = ref()
-const gridEvents = {
- toolbarButtonClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'Add': {//鏂板
- router.push({path: '/main/purchaseOrder/CreatePurchaseOrder'})
- break
- }
- case 'AddNo': {//鏃犲崟鏂板
- openAlert({type: 'alert', content: '鐐瑰嚮浜嗘棤鍗曟柊澧�', status: 'success'})
- break
- }
-
- }
- }
+const options = [
+ {
+ value: '0',
+ label: '鍏ㄩ儴'
},
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
+ {
+ value: '1',
+ label: '鍘熺墖'
},
-}
-
-const openAlert = (options) => {
- if(options.type==='message'){
- VXETable.modal.message(options)
- }else{
- VXETable.modal.alert(options)
- }
-
-}
-const closeAlert = (id) => {
- VXETable.modal.close(id)
-}
-
-const confirmEvent = async () => {
- const type = await VXETable.modal.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵')
- VXETable.modal.message({ content: `鐐瑰嚮浜� ${type}` })
-}
-
-const BtnSearchPurchaseOrder =()=>{
- for (let i = 1; i < 6; i++) {
- const randomInt = Math.floor(Math.random() * 999) + 1000;//4浣嶆暟闅忔満鏁�
- const randomSumInt = Math.floor(Math.random() * 99) + 10;//2浣嶆暟闅忔満鏁�
- const randomOrderInt = Math.floor(Math.random() * 99) + 100;//3浣嶆暟闅忔満鏁�
- const t = i % 2 === 0 ? 5 : 6;
- const s = i % 2 === 0 ? '鍏ュ簱':i % 3 === 0 ? '寰呭鏍�' : i % 5 === 0 ? '宸查噰璐�' :'閫�搴�';
- const CGNo = 'NGCG231200' + randomOrderInt;//閲囪喘缂栧彿
- const wlNo = 'NGWL1000' + randomInt;
- const xh = 'NGXH' + randomSumInt;
- const wlmc = 'WLMC' + randomInt;
- const gys = '渚涘簲鍟�' + randomSumInt;
- const xhdh='NG231200'+randomOrderInt;
- const w = i % 2 === 0 ? '3300' : i % 3 === 0 ? '3660' : i % 4 === 0 ? '2250' : '2580';
- const h = i % 2 === 0 ? '2440' : i % 3 === 0 ? '2440' : i % 4 === 0 ? '2000' : '2300';
- const dw = i % 2 === 0 ? '鐗�' : i % 3 === 0 ? '骞崇背' : i % 4 === 0 ? '鍖�' : '鍚�';
- now.setDate(now.getDate() + 1);
- gridOptions.data.push({
- cgdh: CGNo,
- h: t,
- xh: xh,
- wlbh: wlNo,
- wlmc: wlmc,
- gys: gys,
- w: w,
- g: h,
- dw: dw,
- cgzt:s,
- rq:dayjs(now).format('YYYY-MM-DD'),
- yl:randomSumInt,
- sl:randomOrderInt,
- xsdh:xhdh,
- je:randomInt,
- 6: '139xxxxxxxx',
-
- })
- }
-
-}
-
-
-
-//缁勪欢鎺ユ敹鍙傛暟
-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
+ {
+ value: '2',
+ label: '鍖栧鍝�'
},
- filterConfig: { //绛涢�夐厤缃」
- remote: true
+ {
+ value: '3',
+ label: '宸ュ叿'
},
- customConfig: {
- storage: true
+ {
+ value: '4',
+ label: '鏈ㄧ'
},
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
+ {
+ value: '5',
+ label: '鐧界幓'
},
- columns: [
- {title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},
- {type: 'seq', fixed: "left", title: ' ', width: 50},
- { type: 'checkbox',fixed:"left", title: '', width: 50 },
- {type: 'expand', title:'璇︽儏', fixed: "left", slots: {content: 'content'}, width: 50},
- {field: 'cgdh', width: '10%', title: '閲囪喘鍗曞彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'cgzt', width: '10%', title: '鐘舵��', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'gys', width: '10%',title: '渚涘簲鍟�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'wlbh', width: '10%',title: '鐗╂枡缂栧彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'wlmc', width: '10%', title: '鐗╂枡鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'w', width: '8%',title: '瀹藉害', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'g', width: '8%',title: '楂樺害', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'h', width: '8%',title: '鍘氬害', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'xh', width: '8%',title: '鍨嬪彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'dw', width: '8%',title: '鍗曚綅', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: '6', width: '12%',title: '涓嶅惈绋庡崟浠�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'sl', width: '8%',title: '鏁伴噺', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'sl', width: '12%',title: '宸查噰璐暟閲�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'je', width: '8%',title: '閲戦', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'je', width: '12%',title: '涓嶅惈绋庨噾棰�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: '6', width: '8%',title: '绋庣巼', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'sl', width: '8%',title: '搴撳瓨', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'yl', width: '10%',title: '鍛ㄧ敤閲�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'yl', width: '10%',title: '鏈堢敤閲�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'cgzt', width: '10%',title: '鍗曟嵁鐘舵��', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'xsdh', width: '10%',title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'rq', width: '10%',title: '鍒跺崟鏃ユ湡', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: '6', width: '10%', title: '鍒跺崟浜�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: '6', width: '10%',title: '閲囪喘閮ㄩ棬', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: '6', width: '10%',title: '閲囪喘缁勭粐', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: '6', width: '10%',title: '澶囨敞', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true}
- ],//琛ㄥご鍙傛暟
- toolbarConfig: {
- buttons: [/*{type:'text'},
- {
- 'name': '鍒涘缓璁㈠崟',
+]
- 'code':'Add',
- },
-
- {
- 'name': '鏃犲崟鏂板',
-
- 'code':'AddNo'
- }*/
- ],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- style: 'paddling-left:10px'
- },//琛ㄥご鎸夐挳
- data: [],//table body瀹為檯鏁版嵁
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 4}
- ],//鍚堝苟鑴�
- 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 buyerOptions = [
+ {
+ value: '0',
+ label: '鍏ㄩ儴'
},
+ {
+ value: '1',
+ label: '閲囪喘鐢�'
+ },
+ {
+ value: '2',
+ label: '閲囪喘涔�'
+ },
+]
-})
+const stateOptions = [
+ {
+ value: '0',
+ label: '寰呭鏍�'
+ },
+ {
+ value: '1',
+ label: '寰呴噰璐�'
+ },
+ {
+ value: '2',
+ label: '宸查噰璐�'
+ },
+]
-/*const showDetails = ref(false)
-const detailData = ref([])
-const cellClickEvent = ({ row }) => {
- detailData.value = ['閲囪喘鍗曞彿', 'wlbh', 'wlmc', 'gys', 'h', 'k', 'g'].map(field => {
- return { label: field, value: row[field] }
- })
- showDetails.value = true
-}*/
-
+import dayjs from 'dayjs'
+import 'dayjs/locale/zh-cn'
const now = new Date()
-//鏃堕棿蹇嵎閫夋嫨
+const tableData = ref([])
+
+const autoAddRow = () => {
+ for (let i = 0; i < 10; i++) {
+ now.setDate(now.getDate() + 1)
+ const randomInt = Math.floor(Math.random() * 999) + 1000;
+ const randomOrderInt = Math.floor(Math.random() * 99) + 100;
+ const randomSumInt = Math.floor(Math.random() * 99) + 10;
+ var t = i % 2 === 0 ? 5 : 6;
+ var s = i % 3 === 0 ? '' : i % 4 === 0 ? '宸查噰璐�' : '寰呭鏍�';
+ var oNo = 'NGNO100000' + randomOrderInt;//璁㈠崟缂栧彿
+ var wlNo = 'NGWL100000' + randomInt
+ tableData.value.push({
+
+ date: dayjs(now).format('YYYY-MM-DD'),
+ name: '渚涘簲鍟�' + randomSumInt,
+ state: s,
+ city: 'Los Angeles',
+ address: 'No. 189, Grove St, Los Angeles',
+ zip: 'CA 90036',
+ number: randomInt,
+ width: '3660',
+ height: '2440',
+ rIndex: tableData.value.length + 1,
+ ordernumber: oNo,
+ strockNumber: wlNo,
+ thick: t
+ })
+ }
+}
+
+const CreatePurchaseOrder = () => {
+
+
+}
+
const datevalue = ref('')
+
const shortcuts = [
{
text: '杩戜竴鍛�',
@@ -357,5 +240,19 @@
<style scoped>
+.el-row {
+ margin-bottom: 20px;
+}
+.el-row:last-child {
+ margin-bottom: 0;
+}
+
+.el-col {
+ border-radius: 4px;
+}
+
+.m-header {
+ height: 32px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0