From de2c3068cdea54ffa36d2359b32abd9b8a144cde Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 09 十二月 2024 14:49:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index e5b63f1..8ec533e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -89,7 +89,7 @@
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -230,8 +230,8 @@
buttons: [
{code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
{'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
- {code: 'detailsPrint', name: '鏄庣粏鎵撳嵃', status: 'primary'},
- {code: 'detailsProcessPrint', name: '鏄庣粏鍒嗘灦鎵撳嵃', status: 'primary'},
+ {code: 'detailsPrint', name: t('processCard.detailPrinting'), status: 'primary'},
+ {code: 'detailsProcessPrint', name: t('processCard.detailsPrintedSeparately'), status: 'primary'},
],
@@ -335,9 +335,8 @@
</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="orderInfo.workOrderDate"
:start-placeholder="$t('basicData.startDate')"
@@ -357,13 +356,15 @@
:icon="Search"
type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
</el-button>
- <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value" content="鍚堝苟" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
- </el-row>
+ <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value" :content="$t('processCard.merge')" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
+
</div>
+
+ <div class="main-table">
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- height="95%"
+ height="100%"
v-bind="gridOptions"
v-on="gridEvents"
>
@@ -397,6 +398,7 @@
</vxe-grid>
+ </div>
<el-dialog
id="titleStyle"
:title="$t('processCard.labelStyle')"
@@ -420,12 +422,14 @@
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 60%;
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
:deep(#titleStyle .el-dialog__body){
height: 90%;
--
Gitblit v1.8.0