From 32d14164407e86bc68d4ba5e37b1d07eea134dcb Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 08 七月 2022 17:31:08 +0800
Subject: [PATCH] 1.打印测试部分完成 对接grf文件
---
src/views/zzmx/chda.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 5d81552..fe0cd74 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -103,20 +103,17 @@
/>
<el-table-column
prop="partcode"
- show-overflow-tooltip
label="鐗╂枡缂栫爜"
sortable="custom"
/>
<el-table-column
prop="partname"
- show-overflow-tooltip
label="鐗╂枡鍚嶇О"
sortable="custom"
/>
<el-table-column
prop="partspec"
label="鐗╂枡瑙勬牸"
- show-overflow-tooltip
width="110"
sortable="custom"
/>
@@ -139,7 +136,6 @@
<el-table-column
prop="stck_name"
label="浠撳簱鍚嶇О"
- show-overflow-tooltip
sortable="custom"
/>
<el-table-column
@@ -163,8 +159,8 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
- show-overflow-tooltip
sortable="custom"
+ width="160"
/>
<el-table-column
label="宸ヨ壓璺嚎"
@@ -206,26 +202,26 @@
:close-on-click-modal="false"
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="鐗╂枡缂栫爜" prop="materialcode">
- <el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="materialname">
- <el-input v-model="dialogForm.materialname" style="width: 220px" />
+ <el-input v-model="dialogForm.materialname" style="width: 200px" />
</el-form-item>
<el-form-item label="鐗╂枡瑙勬牸" prop="materialspec">
- <el-input v-model="dialogForm.materialspec" style="width: 220px" />
+ <el-input v-model="dialogForm.materialspec" style="width: 200px" />
</el-form-item>
<el-form-item label="浣跨敤鍗曚綅" prop="uomcode">
<el-select
v-model="dialogForm.uomcode"
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -240,7 +236,7 @@
<el-select
v-model="dialogForm.warehousecode"
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -255,7 +251,7 @@
<el-select
v-model="dialogForm.stocktypecode"
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
@change="val=>stocktypecodeChange(val,'dialogForm')"
>
@@ -271,7 +267,7 @@
<el-select
v-model="dialogForm.materialtypecode"
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
:disabled="dialogForm.stocktypecode===''"
placeholder="璇烽�夋嫨"
>
@@ -284,10 +280,10 @@
</el-select>
</el-form-item>
<el-form-item label="鏈�灏忓簱瀛�" prop="minstockqty">
- <el-input v-model="dialogForm.minstockqty" style="width: 220px" />
+ <el-input v-model="dialogForm.minstockqty" style="width: 200px" />
</el-form-item>
<el-form-item label="鏈�澶у簱瀛�" prop="maxstockqty">
- <el-input v-model="dialogForm.maxstockqty" style="width: 220px" />
+ <el-input v-model="dialogForm.maxstockqty" style="width: 200px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -303,7 +299,7 @@
:close-on-click-modal="false"
title="鍗曚綅璁剧疆"
:visible.sync="officeDialogVisible"
- width="50%"
+ width="800px"
top="15vh"
class="officeDialogVisible"
@close="handleCloseOffice"
@@ -316,7 +312,7 @@
:data="officeTableData"
border
highlight-current-row
- height="400"
+ height="300"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfOffice"
@@ -423,8 +419,9 @@
:close-on-click-modal="false"
title="鍏宠仈宸ヨ壓璺嚎"
:visible.sync="dialogVisibleRoute"
- width="50%"
+ width="800px"
top="15vh"
+ :fullscreen="isFullscreen"
class="dialogVisibleRoute"
@closed="handleCloseRoute"
@close="handleCloseRoute"
@@ -542,6 +539,7 @@
}
}
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -791,6 +789,10 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ this.isFullscreen = window.innerHeight < 800
+ if (window.innerHeight < 800) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
},
/* 鐐瑰嚮鍏宠仈宸ヨ壓璺嚎妯″潡*/
@@ -966,7 +968,7 @@
// 鏂板
addOffice() {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- number = number === 0 ? Math.random() * Math.random() : number
+ number = number === 0 ? (10 + Math.random()) : number
const data = { code: '', name: '', digdect: '', r_ule: '', isVisible: 1, number: number }
this.officeTableData.unshift(data)
},
--
Gitblit v1.9.3