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/sd/order/UpdateOrderCraft.vue | 193 +++++++++++++++++++++++++++++++----------------
1 files changed, 126 insertions(+), 67 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index b27d91d..a290769 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -1,25 +1,78 @@
<script setup>
- let titleList = [
- '搴忓彿',
- '妤煎彿',
- '鎴愬搧鍚嶇О',
- '鏍囪',
- '瀛愪骇鍝�',
- '鎴愬搧瀹�',
- '鎴愬搧楂�',
- '褰㈢姸',
- '鎴愬搧灏哄',
- '纾ㄨ竟绫诲瀷',
- '鍗曠墖瀹�',
- '鍗曠墖楂�',
- '鍗曠墖灏哄',
- '鏁伴噺',
- '宸ヨ壓娴佺▼',
- '鍔犲伐瑕佹眰',
- '澶囨敞'
- ]
+import {reactive, ref} from "vue"
+import {useRouter} from "vue-router"
+const router = useRouter()
- let dataList = [
+
+const xGrid = ref()
+const gridOptions = reactive({
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe:true,//鏂戦┈绾规ゼ鍙�
+ rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'OrderList',
+ 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:[
+ {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left",},
+ {field: '0',width:120, title: '搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '1',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '2',width:120, title: '鎴愬搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '3',width:120, title: '鏍囪',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '4',width:120, title: '瀛愪骇鍝�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '5',width:120, title: '鎴愬搧瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '6',width:120, title: '鎴愬搧楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '7',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '8',width:120, title: '鎴愬搧灏哄',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '9',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '10',width:120, title: '鍗曠墖瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '11',width:120, title: '鍗曠墖楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '12',width:120, title: '鍗曠墖灏哄',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '13',width:120, title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '14',width:120, title: '宸ヨ壓娴佺▼',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '15',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '16',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+ ],//琛ㄥご鎸夐挳
+ mergeCells: [
+ { row: 0, col: 1, rowspan: 2, colspan: 1 },
+ { row: 0, col: 2, rowspan: 2, colspan: 1 },
+ { row: 0, col: 3, rowspan: 2, colspan: 1 },
+ { row: 0, col: 6, rowspan: 2, colspan: 1 },
+ { row: 0, col: 7, rowspan: 2, colspan: 1 },
+ ],
+ toolbarConfig: {
+ buttons: [
+ {'code': 'remarks', 'name': '鍔犲伐瑕佹眰'},
+ {'code': 'Craft', 'name': '璁㈠崟璇︽儏',status: 'primary'},
+ {'code': 'Craft', 'name': '瀹℃牳',status: 'primary'},
+ ],
+ import: false,
+ export: true,
+ print: true,
+ zoom: true,
+ custom: true
+ },
+ data: [
{
'0' : '1',
'1' : 'JHH-T33-G-07A-01',
@@ -60,28 +113,36 @@
'16' : '',
'17' : 0,
}
- ]
+ ],//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 objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+})
- if (columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
- // 鑾峰彇褰撳墠琛岀殑闇�瑕佸悎骞剁殑鍗曞厓鏍兼暟
- const rowNum = dataList[rowIndex]['17']
- if (rowNum) {
- // 涓�涓崟鍏冩牸绾靛悜妯悜鍚堝苟鐨勫崟鍏冩牸鏁伴噺
- return {
- rowspan: rowNum, // 绾靛悜鍚堝苟鍗曞厓鏍肩殑鏁伴噺
- colspan: rowNum > 0 ? 1 : 0 // 妯悜鍚堝苟鍗曞厓鏍肩殑鏁伴噺锛岀旱鍚戝崟鍏冩牸鏁版槸0鐨勮瘽璇存槑浠栨槸琚悎骞剁殑锛屾í鍚戝崟鍏冩牸鏁颁篃灏变负0涓嶆樉绀轰簡锛岃繖閲屼笉鑰冭檻妯悜鍚堝苟鎵�浠ュ啓姝荤殑鏄�1
- };
- } else {
- // 琚悎骞堕」璁剧疆涓�0锛屽嵆涓嶆樉绀哄崟鍏冩牸
- return {
- rowspan: 0,
- colspan: 0
- };
+const gridEvents = {
+ toolbarButtonClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'Craft': {
+ router.push({path: '/main/order/createOrder', query: { orderID: 12123 }})
+ break
+ }
}
}
}
+}
@@ -90,7 +151,7 @@
<template>
<div class="main-div">
- <div class="order-primary">
+ <div class="order-primary" style="background-color: white">
<el-row>
<el-col :span="4"><el-text>閿�鍞崟鍙凤細</el-text></el-col>
<el-col :span="4"><el-text>NG23120704</el-text></el-col>
@@ -112,38 +173,42 @@
<el-col :span="4"><el-text>鏈ㄧ</el-text></el-col>
<el-col :span="4"><el-text>浜よ揣鏃ユ湡锛�</el-text></el-col>
<el-col :span="4"><el-text>2023-11-11</el-text></el-col>
- <el-col style="background-color: #337ecc" :span="4"><el-button style="width: 100%;height: 100%" size="small" type="primary">鍔犲伐瑕佹眰璇︾粏</el-button></el-col>
- <el-col style="background-color: #337ecc" :span="4"><el-button style="width: 100%;height: 100%" size="small" type="primary">瀹℃牳</el-button></el-col>
</el-row>
</div>
<div class="order-detail">
+ <vxe-grid
+ max-height="97%"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
- <el-table
- :data="dataList"
- :header-cell-style="{ 'text-align': 'center' }"
- :cell-style="{ 'text-align': 'center' }"
- border
- :span-method="objectSpanMethod"
>
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <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-table-column type="expand" fixed>
- <template #default="props" >
- <div m="4">
- <p m="t-0 b-2">浜у搧鍚嶇О: {{ props.row['2'] }}</p>
- <p m="t-0 b-2">鍗曠墖: {{ props.row['4'] }}</p>
- <p m="t-0 b-2">宸ヨ壓: {{ props.row['14'] }}</p>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <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>
- </template>
- </el-table-column>
+ </div>
+ </template>
+ </vxe-grid>
- <el-table-column label="鎿嶄綔" fixed><el-button link type="primary" size="small">淇敼宸ヨ壓</el-button></el-table-column>
- <el-table-column
- :prop="index.toString()"
- :show-overflow-tooltip='true'
- width="100"
- v-for="(item,index) in titleList" :label="item" />
- </el-table>
</div>
</div>
</template>
@@ -156,12 +221,6 @@
}
.el-col{
border: #181818 1px solid;
-}
-:deep(.el-input__wrapper) {
- box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
- cursor: default;
- border: none !important;
- background-color: transparent;
}
.order-primary{
width: 100%;
--
Gitblit v1.8.0