From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 406 +++++++++++++++++++++++++++------------------------------
1 files changed, 190 insertions(+), 216 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index 3ddf3dd..443bbc8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -15,12 +15,16 @@
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import {useI18n} from 'vue-i18n'
import footSum from "@/hook/footSum"
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
+const orderInfo = useOrderInfoStore()
+
const getTableRow = (row, type) => {
switch (type) {
case 'edit' : {
@@ -29,16 +33,12 @@
break
}
- case 'setType': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
- break
- }
}
}
//宸ュ簭
-const value = ref('鍒囧壊')
+const processVal = ref(t('machine.cutting'))
//鎺掍骇鐘舵��
@@ -54,10 +54,6 @@
},
]
-function padLeftZero(str) {
- return ('00' + str).substr(str.length)
-}
-
//瀹氫箟琛ㄥ崟鍊�
const form = reactive({
date1: '',
@@ -70,25 +66,6 @@
})
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
-
-//瀹氫箟婊氬姩鏉￠珮搴�
-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: {
@@ -117,11 +94,11 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�3澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -134,10 +111,12 @@
})
//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
-let selectProcesses = value.value
+if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
+ orderInfo.workOrderDate=getNowTime()
+}
+let startTime = orderInfo.workOrderDate[0]
+let endTime = orderInfo.workOrderDate[1]
+let selectProcesses = processVal.value
let inputVal = form.orderId
if (inputVal == '') {
inputVal = null
@@ -154,9 +133,10 @@
titleSelectJson.value.processType = res.data.process
gridOptions.loading = false
- //绂佺敤鍒犻櫎銆佷繚瀛樻寜閽�
+ //绂佺敤鍒犻櫎銆佸鏍告寜閽�
gridOptions.toolbarConfig.buttons[0].disabled = true
gridOptions.toolbarConfig.buttons[1].disabled = true
+ gridOptions.toolbarConfig.buttons[2].disabled = true
} else {
ElMessage.warning(res.msg)
}
@@ -164,9 +144,9 @@
//鐐瑰嚮鏃舵煡璇�
const getWorkOrder = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- let selectProcesses = value.value
+ let startTime = orderInfo.workOrderDate[0]
+ let endTime = orderInfo.workOrderDate[1]
+ let selectProcesses = processVal.value
let selectState = stateValue.value
let inputVal = form.orderId
if (inputVal == '') {
@@ -175,24 +155,6 @@
if (selectProcesses == '') {
selectProcesses = null
}
- // if (inputVal == null && selectState == 1) {
- // //鏍规嵁鏃堕棿鏌ヨ鏈帓浜ф暟鎹�
- // request.post(`/productionScheduling/selectLastScheduling/${startTime}/${endTime}/${selectProcesses}/${inputVal}`, filterData.value).then((res) => {
- //
- // if (res.code == 200) {
- // pageTotal.value = res.data.total
- // xGrid.value.loadData(res.data.data)
- // gridOptions.loading = false
- // //绂佺敤鍒犻櫎銆佸鏍告寜閽�
- // gridOptions.toolbarConfig.buttons[0].disabled = true
- // gridOptions.toolbarConfig.buttons[1].disabled = true
- // //鍚敤淇濆瓨
- // gridOptions.toolbarConfig.buttons[2].disabled = false
- // } else {
- // ElMessage.warning(res.msg)
- // }
- // })
- // } else if (inputVal != null && selectState == 1) {
//鏍规嵁宸ュ簭鏌ヨ鏈帓浜ф暟鎹�
request.post(`/productionScheduling/selectScheduling/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -200,50 +162,27 @@
total.pageTotal = res.data.total.pageTotal
pageTotal.value = res.data.total
xGrid.value.loadData(res.data.data)
- console.log(res.data.data)
gridOptions.loading = false
- //绂佺敤鍒犻櫎銆佸鏍告寜閽�
- gridOptions.toolbarConfig.buttons[0].disabled = true
- gridOptions.toolbarConfig.buttons[1].disabled = true
- //鍚敤淇濆瓨
- gridOptions.toolbarConfig.buttons[2].disabled = false
+ if (selectState==1){
+ //绂佺敤鍒犻櫎銆佸鏍告寜閽�
+ gridOptions.toolbarConfig.buttons[0].disabled = true
+ gridOptions.toolbarConfig.buttons[1].disabled = true
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ //鍚敤淇濆瓨
+ gridOptions.toolbarConfig.buttons[3].disabled = false
+ }else{
+ //鍚敤鍒犻櫎銆佸鏍告寜閽�
+ gridOptions.toolbarConfig.buttons[0].disabled = false
+ gridOptions.toolbarConfig.buttons[1].disabled = false
+ gridOptions.toolbarConfig.buttons[2].disabled = false
+ //绂佺敤淇濆瓨
+ gridOptions.toolbarConfig.buttons[3].disabled = true
+
+ }
} else {
ElMessage.warning(res.msg)
}
})
- // } else if (inputVal == null && selectState == 2) {
- // //鏍规嵁鏃堕棿鏌ヨ宸叉帓浜ф暟鎹�
- // request.post(`/productionScheduling/selectScheduling/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
- // if (res.code == 200) {
- // pageTotal.value = res.data.total
- // xGrid.value.loadData(res.data.data)
- // gridOptions.loading = false
- // //鍚敤鍒犻櫎銆佸鏍告寜閽�
- // gridOptions.toolbarConfig.buttons[0].disabled = false
- // gridOptions.toolbarConfig.buttons[1].disabled = false
- // //绂佺敤淇濆瓨
- // gridOptions.toolbarConfig.buttons[2].disabled = true
- // } else {
- // ElMessage.warning(res.msg)
- // }
- // })
- // } else if (inputVal != null && selectState == 2) {
- // //鏍规嵁璁㈠崟鍙锋煡璇㈠凡鎺掍骇鏁版嵁
- // request.post(`/productionScheduling/selectSchedulingNot/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
- // if (res.code == 200) {
- // pageTotal.value = res.data.total
- // xGrid.value.loadData(res.data.data)
- // gridOptions.loading = false
- // //鍚敤鍒犻櫎銆佸鏍告寜閽�
- // gridOptions.toolbarConfig.buttons[0].disabled = false
- // gridOptions.toolbarConfig.buttons[1].disabled = false
- // //绂佺敤淇濆瓨
- // gridOptions.toolbarConfig.buttons[2].disabled = true
- // } else {
- // ElMessage.warning(res.msg)
- // }
- // })
- // }
}
@@ -270,9 +209,9 @@
}
//鑾峰彇閫変腑鏃堕棿
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- let selectProcesses = value.value
+ let startTime = orderInfo.workOrderDate[0]
+ let endTime = orderInfo.workOrderDate[1]
+ let selectProcesses = processVal.value
let selectState = stateValue.value
let inputVal = form.orderId
if (inputVal == '') {
@@ -281,7 +220,6 @@
if (selectProcesses == '') {
selectProcesses = null
}
-
request.post(`/productionScheduling/selectScheduling/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total * 1
@@ -289,11 +227,6 @@
pageNum.value = 1
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
- //绂佺敤鍒犻櫎銆佸鏍告寜閽�
- gridOptions.toolbarConfig.buttons[0].disabled = true
- gridOptions.toolbarConfig.buttons[1].disabled = true
- //鍚敤淇濆瓨
- gridOptions.toolbarConfig.buttons[2].disabled = false
} else {
ElMessage.warning(res.msg)
}
@@ -316,7 +249,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'productionScheduling',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -333,9 +266,8 @@
customConfig: {
storage: true
},
-
editConfig: {
- trigger: 'click',
+ trigger: 'dblclick',
mode: 'row',
showStatus: true
},
@@ -370,28 +302,37 @@
},
//琛ㄥご鍙傛暟
columns: [
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+ {type: 'expand',fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{
- field: 'scheduled_start_time',
- width: 120,
- editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
+ field: 'scheduledStartTime',
+ width: 130,
+ editRender: {name: 'input', attrs: {placeholder: '', type: 'date'},},
title: t('processCard.scheduledStartTime')
},
{
- field: 'plan_end_time',
- width: 120,
+ field: 'planEndTime',
+ width: 130,
editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
title: t('processCard.planEndTime')
},
+ {
+ field: 'schedulingQuantity',
+ width: 120,
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ title: t('processCard.productionSchedulingQuantity'),
+ sortable: true
+ },
+ {field: 'notes', title: t('processCard.notes'), editRender: {name: 'input', attrs: {placeholder: ''}}, width: 120},
+
// {field: '鎺掍骇缂栧彿', title: '鎺掍骇缂栧彿', width: 120 },
{
- field: 'orderGlassDetail.orderId',
+ field: 'order.orderId',
title: t('order.orderId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 100,
+ width: 110,
},
{
field: 'order.customerName',
@@ -412,14 +353,14 @@
title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 70,
+ width: 100,
},
{
field: 'technologyNumber',
title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 70,
+ width: 100,
},
{
field: 'orderGlassDetail.childWidth',
@@ -431,24 +372,17 @@
title: t('order.height'),
width: 60,
},
- {field: 'orderDetail.quantity', title: t('processCard.orderQuantity'), width: 70},
+ {field: 'orderDetail.quantity', title: t('processCard.orderQuantity'), width: 90},
{field: 'orderGlassDetail.area', title: t('processCard.orderArea'), width: 90},
- {
- field: 'schedulingQuantity',
- width: 120,
- editRender: {name: 'input', attrs: {placeholder: ''}},
- title: t('processCard.productionSchedulingQuantity'),
- sortable: true
- },
- {field: 'pendingProductionQuantity', title: t('processCard.quantityToScheduled'), width: 120},
- {field: 'pendingProductionArea', title: t('processCard.areaToScheduled'), width: 120},
- {field: 'productionScheduledQuantity', title: t('processCard.plannedProductionQuantity'), width: 120},
- {field: 'productionScheduledArea', title: t('processCard.plannedProductionArea'), width: 120},
- {field: 'reviewStatus', title: t('processCard.reviewedState'), width: 140},
- {field: 'reviewer', title: t('processCard.reviewed'), width: 140},
- {field: 'orderGlassDetail.glassChild', title: t('order.product'), width: 140},
+
+ {field: 'pendingProductionQuantity', title: t('processCard.quantityToScheduled'), width: 100},
+ {field: 'pendingProductionArea', title: t('processCard.areaToScheduled'), width: 100},
+ {field: 'productionScheduledQuantity', title: t('processCard.plannedProductionQuantity'), width: 100},
+ {field: 'productionScheduledArea', title: t('processCard.plannedProductionArea'), width: 100},
+ {field: 'reviewStatus', title: t('processCard.reviewedState'), width: 80},
+ {field: 'reviewer', title: t('processCard.reviewed'), width: 80},
+ {field: 'orderDetail.productName', title: t('order.product'), width: 140},
{field: 'orderDetail.shape', title: t('order.shape'), width: 80},
- {field: 'notes', title: t('processCard.notes'), editRender: {name: 'input', attrs: {placeholder: ''}}, width: 120},
{field: 'schedulingId', title: t('processCard.schedulingId'), width: 120},
],//琛ㄥご鎸夐挳
@@ -456,6 +390,7 @@
buttons: [
{code: 'delete', name: t('basicData.delete'), status: 'primary'},
{code: 'review', name: t('basicData.review'), status: 'primary'},
+ {code: 'cancelReview', name: t('basicData.cancelReview'), status: 'primary'},
{code: 'save', name: t('processCard.scheduling'), status: 'primary', icon: 'vxe-icon-save'},
],
import: false,
@@ -496,22 +431,22 @@
if ($table) {
const selectRecords = $table.getCheckboxRecords()
if (selectRecords.length == 0) {
- ElMessage.warning("璇峰嬀閫夋帓浜ф暟鎹�")
+ ElMessage.warning(t('processCard.checkProductionScheduling'))
return;
}
for (let i = 0; i < selectRecords.length; i++) {
- let start = selectRecords[i].scheduled_start_time
- let end = selectRecords[i].plan_end_time
- let number = selectRecords[i].scheduling_quantity
+ let start = selectRecords[i].scheduledStartTime
+ let end = selectRecords[i].planEndTime
+ let number = selectRecords[i].schedulingQuantity
//璁″垝寮�濮嬨�佺粨鏉熸椂闂达紝鎺掍骇鏁伴噺涓嶈兘涓虹┖
if (start == null || end == null || number == null) {
- ElMessage.warning("璇峰～鍏ュ搴旂殑鍊煎啀杩涜淇濆瓨")
+ ElMessage.warning(t('processCard.saveCorrespondingValues'))
return;
}
}
- let selectProcesses = value.value
+ let selectProcesses = processVal.value
if (selectProcesses == null || selectProcesses == "") {
- ElMessage.warning("璇烽�夋嫨鎺掍骇宸ュ簭")
+ ElMessage.warning(t('processCard.selectProductionSchedulingProcess'))
return;
}
@@ -525,7 +460,7 @@
//淇濆瓨鎺掍骇鏁版嵁
request.post("/productionScheduling/addScheduling", schedulingData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("淇濆瓨鎴愬姛")
+ ElMessage.success(t('basicData.msg.saveSuccess'))
// 鍚敤淇濆瓨
gridOptions.toolbarConfig.buttons[2].disabled = false
router.push({
@@ -550,10 +485,11 @@
const selectRecords = $table.getCheckboxRecords()
if ($table) {
if (selectRecords.length == 0) {
- ElMessage.warning("璇峰嬀閫夋帓浜ф暟鎹�")
+ ElMessage.warning(t('processCard.checkProductionScheduling'))
return;
}
- const type = await VXETable.modal.confirm('鎮ㄧ‘瀹氳鍒犻櫎璇ユ暟鎹�?')
+
+ const type = await VXETable.modal.confirm(t('processCard.deleteThisData'))
if (type === 'confirm') {
let schedulingData = ref({
scheduling: selectRecords,
@@ -561,7 +497,7 @@
request.post("/productionScheduling/deleteScheduling", schedulingData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("鍒犻櫎鎴愬姛")
+ ElMessage.success(t('basicData.msg.deleteSuccess'))
location.reload();
} else {
ElMessage.warning(res.msg)
@@ -575,9 +511,13 @@
case 'review': {
const $table = xGrid.value
const selectRecords = $table.getCheckboxRecords()
+ let date = form.date1
+ let selectProcesses = processVal.value
+ let selectState = stateValue.value
+ let inputVal = form.orderId
if ($table) {
if (selectRecords.length == 0) {
- ElMessage.warning("璇峰嬀閫夋帓浜ф暟鎹�")
+ ElMessage.warning(t('processCard.checkProductionScheduling'))
return;
}
let schedulingData = ref({
@@ -586,7 +526,35 @@
})
request.post("/productionScheduling/examineScheduling", schedulingData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("瀹℃牳鎴愬姛")
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
+ router.push({
+ path: '/main/processCard/ProductionScheduling',
+ query: {random: Math.random()}
+ })
+ } else {
+ ElMessage.warning(res.msg)
+
+ }
+ })
+
+ }
+ return;
+ }
+ case 'cancelReview': {
+ const $table = xGrid.value
+ const selectRecords = $table.getCheckboxRecords()
+ if ($table) {
+ if (selectRecords.length == 0) {
+ ElMessage.warning(t('processCard.checkProductionScheduling'))
+ return;
+ }
+ let schedulingData = ref({
+ scheduling: selectRecords,
+ userName: username//瀹℃牳浜�
+ })
+ request.post("/productionScheduling/cancelReviewScheduling", schedulingData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
location.reload();
} else {
ElMessage.warning(res.msg)
@@ -606,7 +574,7 @@
switch (menu.code) {
case 'copyChecked' : {
let result = toolbarButtonClickEvent()
- if (result.cell === "scheduled_start_time" || result.cell === "plan_end_time") {
+ if (result.cell === "scheduledStartTime" || result.cell === "planEndTime" || result.cell === "schedulingQuantity"){
if (result) {
const dataList = xGrid.value.getTableData().visibleData
const val = dataList[result.start][result.cell]
@@ -622,7 +590,7 @@
}
case 'copyAll' : {
let result = toolbarButtonClickEvent()
- if (result.cell === "scheduled_start_time" || result.cell === "plan_end_time") {
+ if (result.cell === "scheduledStartTime" || result.cell === "planEndTime"|| result.cell === "schedulingQuantity") {
if (result) {
const dataList = xGrid.value.getTableData().visibleData
const val = dataList[result.start][result.cell]
@@ -637,7 +605,7 @@
}
case 'clearChecked' : {
let result = toolbarButtonClickEvent()
- if (result.cell === "scheduled_start_time" || result.cell === "plan_end_time") {
+ if (result.cell === "scheduledStartTime" || result.cell === "planEndTime"|| result.cell === "schedulingQuantity") {
if (result) {
const dataList = xGrid.value.getTableData().visibleData
dataList.forEach((item, index) => {
@@ -659,30 +627,38 @@
const table = $grid.getTableData().fullData
const selectRecords = $grid.getCheckboxRecords()
let selectState = stateValue.value
- table.forEach((selectRecords) => {
- if (selectRecords.scheduling_quantity > selectRecords.pendingProductionQuantity && selectState == 1) {
- ElMessage.warning("鎺掍骇鏁伴噺涓嶈兘澶т簬寰呮帓浜ф暟閲�")
+ selectRecords.forEach((selectRecords) => {
+ if (selectRecords.schedulingQuantity > selectRecords.pendingProductionQuantity) {
+ ElMessage.warning(ElMessage.warning(t('processCard.schedulingQuantityNoQuantityScheduled')))
//绂佺敤淇濆瓨鎸夐挳
//gridOptions.toolbarConfig.buttons[2].disabled = true
}
-
-
})
}
+const checkBoxConfig = {
+ checkMethod: ({ row }) => {
+ if (row['reviewStatus']==="宸插鏍�"){
+ return row.disable
+ }else{
+ return !row.disable
+ }
+ },
+ reserve:true
+
+}
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.workOrderDate"
:default-time="defaultTime"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
format="YYYY/MM/DD"
- start-placeholder="寮�濮嬫椂闂�"
type="daterange"
value-format="YYYY-MM-DD"
@@ -690,7 +666,7 @@
<el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 110px"></el-input>
- <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
+ <el-select v-model="processVal" clearable default-value="default_city" style="width: 120px">
<el-option
v-for="item in titleSelectJson['processType']"
:key="item.id"
@@ -699,7 +675,7 @@
/>
</el-select>
- <el-select v-model="stateValue" class="m-2" placeholder="鏄惁鎺掍骇" style="width: 120px">
+ <el-select v-model="stateValue" class="m-2" :placeholder="$t('processCard.whetherToScheduleProduction')" style="width: 120px">
<el-option
v-for="item in stateOptions"
:key="item.value"
@@ -713,71 +689,69 @@
:icon="Search"
type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
</el-button>
- </el-row>
</div>
- <vxe-grid
- ref="xGrid"
- class="mytable-scrollbar"
- height="500px"
- max-height="100%"
- v-bind="gridOptions"
- v-on="gridEvents"
- @filter-change="filterChanged"
- @checkbox-change="determineNum"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
- <span v-else>{{ row[item.field] }}</span>
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+ @filter-change="filterChanged"
- </li>
- </ul>
- </template>
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+
+ >
+ <!-- :checkbox-config="checkBoxConfig" @checkbox-change="determineNum"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
+
+ </li>
+ </ul>
+ </template>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
- <template #pager>
- <!--浣跨敤 pager 鎻掓Ы-->
- <!-- 'PrevJump','NextJump', -->
- <vxe-pager
- v-model:current-page="pageNum"
- v-model:page-size="total.pageSize"
- v-model:pager-count="total.pageTotal"
- :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
- :total="total.dataTotal"
- @page-change="handlePageChange"
- >
- </vxe-pager>
- </template>
+ </template>
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <!-- 'PrevJump','NextJump', -->
+ <vxe-pager
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ :total="total.dataTotal"
+ @page-change="handlePageChange"
+ >
+ </vxe-pager>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
- <div ref="cellArea" class="vxe-table--cell-area">
- <span class="vxe-table--cell-main-area"></span>
- <span class="vxe-table--cell-active-area"></span>
- </div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 70%;
- height: 6%;
- text-align: center;
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
.vxe-grid {
--
Gitblit v1.8.0