From bc95be087fbf1b6c93bb8cdb8f0478305ec1199f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 04 七月 2022 17:35:39 +0800
Subject: [PATCH] 1.MES系统中ERP生产订单页面开发
---
src/views/jcsz/jsqd.vue | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index a3325dc..40bbad5 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -89,7 +89,6 @@
<el-table-column
prop="description"
label="瑙掕壊鎻忚堪"
- show-overflow-tooltip
sortable="custom"
/>
<el-table-column
@@ -101,7 +100,6 @@
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
- show-overflow-tooltip
/>
<el-table-column
prop="lm_date"
@@ -128,7 +126,7 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
<el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
@@ -150,26 +148,27 @@
<!-- 鏂板淇敼瀵硅瘽妗�-->
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="65%"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="瑙掕壊缂栫爜" prop="RoleCode">
- <el-input v-model="dialogForm.RoleCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.RoleCode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" prop="RoleName">
- <el-input v-model="dialogForm.RoleName" style="width: 220px" />
+ <el-input v-model="dialogForm.RoleName" style="width: 200px" />
</el-form-item>
<el-form-item prop="RoleTypeCode" label="瑙掕壊绫诲瀷">
<el-select
v-model="dialogForm.RoleTypeCode"
filterable
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -181,7 +180,7 @@
</el-select>
</el-form-item>
<el-form-item label="瑙掕壊鎻忚堪" prop="description">
- <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
+ <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -193,10 +192,11 @@
</el-dialog>
<!-- 璁剧疆鎸夐挳瀵硅瘽妗�-->
<el-dialog
- title="瑙掕壊绫诲瀷"
+ title="璁剧疆"
:visible.sync="settingDialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
class="settingDialogVisible"
@close="handleCloseSetting"
>
@@ -207,12 +207,14 @@
<el-table
:data="RoleTypeCodeArr"
border
+ height="300"
highlight-current-row
- :style="{width: 100+'%',height:tableHeight-300+'px'}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfSetting"
>
+ <!-- :style="{width: 100+'%',height:tableHeight-300+'px'}"-->
+
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="50"-->
@@ -275,7 +277,9 @@
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
width="80%"
+ :close-on-click-modal="false"
top="15vh"
+ :fullscreen="isFullscreen"
class="userDialogVisible"
@closed="handleCloseUser"
@close="handleCloseUser"
@@ -290,10 +294,10 @@
<div style="display: flex;min-height: 50px">
<el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
<el-form-item label="鐢ㄦ埛缂栫爜">
- <el-input v-model="dialogFormUser.usercode" class="userDialogVisibleInput" style="width: 220px" />
+ <el-input v-model="dialogFormUser.usercode" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О">
- <el-input v-model="dialogFormUser.username" class="userDialogVisibleInput" style="width: 220px" />
+ <el-input v-model="dialogFormUser.username" style="width: 200px" />
</el-form-item>
<el-form-item label="鎵�灞炵粍缁�">
<el-cascader
@@ -304,8 +308,7 @@
:append-to-body="false"
:options="StuOrgArr"
:props="defaultProps"
- class="userDialogVisibleInput"
- style="width: 220px;"
+ style="width: 200px;"
@change="dialogCascaderChange"
/>
@@ -315,9 +318,8 @@
v-model="dialogFormUser.isrole"
filterable
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
- class="userDialogVisibleInput"
>
<el-option
v-for="item in roleArr"
@@ -348,7 +350,7 @@
:data="dialogFormUserTable"
border
highlight-current-row
- :style="{width: 100+'%',height:tableHeight-300+'px'}"
+ height="300"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
:row-key="getRowKey"
@@ -419,6 +421,8 @@
:visible.sync="dialogVisibleRight"
width="50%"
top="15vh"
+ :fullscreen="isFullscreen"
+ :close-on-click-modal="false"
class="dialogVisibleRight"
@closed="handleCloseRight"
@close="handleCloseRight"
@@ -529,6 +533,7 @@
// }
// }
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -781,8 +786,11 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
+ console.log(window.innerHeight)
+ console.log(window.innerHeight)
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ this.isFullscreen = window.innerHeight < 800
})
},
/* 璁剧疆妯″潡*/
@@ -804,7 +812,9 @@
},
// 娣诲姞鎸夐挳
addSetting() {
- const data = { roletype_code: '', roletype_name: '', isVisible: 1 }
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? Math.random() * Math.random() : number
+ const data = { roletype_code: '', roletype_name: '', isVisible: 1, number: number }
this.RoleTypeCodeArr.unshift(data)
},
// 鍒犻櫎鎸夐挳
@@ -845,7 +855,7 @@
// 璁剧疆琛ㄥ崟鍙栨秷浜嬩欢
formSettingCancel(row) {
this.RoleTypeCodeArr.forEach((item, index) => {
- if (item.isVisible === 1 && item.roletype_code === row.roletype_code) {
+ if (item.isVisible === 1 && item.number === row.number) {
this.RoleTypeCodeArr.splice(index, 1)
}
})
@@ -1352,9 +1362,9 @@
color: #606266;
}
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
+//::v-deep .el-dialog__body {
+// padding: 20px 100px !important;
+//}
.settingDialogVisible, .userDialogVisible, .dialogVisibleRight {
::v-deep .el-dialog__body {
@@ -1420,16 +1430,6 @@
background-color: $main_color;
}
}
-}
-
-.userDialogVisible {
- ::v-deep .userDialogVisibleInput {
- //width:calc(100% - 30px) !important;
- }
-
- //::v-deep .el-form-item {
- // width:calc(100% - 30px) !important;
- //}
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
--
Gitblit v1.9.3