From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 142 ++++++++++++++++++++++++++++-------------------
1 files changed, 84 insertions(+), 58 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index 838d370..247e008 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -1,7 +1,16 @@
<script setup>
-import {reactive} from "vue";
-import {useRouter} from 'vue-router'
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {ElDatePicker, ElMessage} from "element-plus"
+import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import GlassType from "@/components/sd/product/GlassType.vue"
+import {useRouter} from 'vue-router'
+import Sortable from 'sortablejs'
+import BasicTable from '@/components/basic/BasicTable.vue'
+import {VXETable} from "vxe-table";
let router=useRouter()
const getTableRow = (row,type) =>{
switch (type) {
@@ -21,6 +30,58 @@
}
}
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
+}
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+ order: {
+ batch: ''
+ },
+ orderDetail: {
+ productName: '',
+ computeArea: '',
+ quantity: '',
+ computeGrossArea: '',
+ perimeter: '',
+ bendRadius: '',
+ processingNote: ''
+ }
+
+})
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = $ref(1)
+let pageState = null
+
+const { currentRoute } = useRouter()
+const route = currentRoute.value
+
+let id=route.query.orderId
+
+request.post(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ console.log(res.data.data)
+ pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
let count = 0
@@ -31,20 +92,22 @@
}
//瀛愮粍浠舵帴鏀跺弬鏁�
-
+const xGrid = ref()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ loading: true,
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'demo_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollX: {enabled: true},
+ scrollY: {enabled: true, gt: 0},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
@@ -64,13 +127,13 @@
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '浜у搧缂栧彿', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '鎬绘暟閲�', title: '鎬绘暟閲�', sortable: true,showOverflow:"ellipsis"},
- {field: '鎬婚潰绉�', title: '鎬婚潰绉�', sortable: true},
- {field: '鍛ㄩ暱', title: '鍛ㄩ暱', sortable: true},
+ {field: 'orderId', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: 'productionId', title: '鐢熶骇璁㈠崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'productId', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'quantity', title: '鎬绘暟閲�', sortable: true,showOverflow:"ellipsis"},
+ {field: 'computeGrossArea', title: '鎬婚潰绉�', sortable: true},
+ {field: 'perimeter', title: '鍛ㄩ暱', sortable: true},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -83,44 +146,7 @@
zoom: true,
custom: true
},
- data: [
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�: 'NG231201A',
- 浜у搧缂栧彿: '9001010203000008',
- 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- 鎬绘暟閲�: '169',
- 鎬婚潰绉�: '175.31',
- 鍛ㄩ暱: '99.84',
- },
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�: 'NG231201A',
- 浜у搧缂栧彿: '9001010203000008',
- 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- 鎬绘暟閲�: '169',
- 鎬婚潰绉�: '175.31',
- 鍛ㄩ暱: '99.84',
- },
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�: 'NG231201A',
- 浜у搧缂栧彿: '9001010203000008',
- 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- 鎬绘暟閲�: '169',
- 鎬婚潰绉�: '175.31',
- 鍛ㄩ暱: '99.84',
- },
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�: 'NG231201A',
- 浜у搧缂栧彿: '9001010203000008',
- 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- 鎬绘暟閲�: '169',
- 鎬婚潰绉�: '175.31',
- 鍛ㄩ暱: '99.84',
- },
- ],//table body瀹為檯鏁版嵁
+ data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
let footList=['鎬绘暟閲�','鎬婚潰绉�']
@@ -155,11 +181,11 @@
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
+ <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 v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{item.title+': '}}</span>
+ <span>{{ row[item.field] }}</span>
</li>
</ul>
</template>
--
Gitblit v1.8.0