From 1e9fa82cb2fe2c15f46bd1dd73f5c878c74b83b8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 04 八月 2022 15:35:50 +0800
Subject: [PATCH] 1.系统多账号登录问题2.采购订单页面样式修改及数据渲染
---
src/views/template.vue | 176 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 93 insertions(+), 83 deletions(-)
diff --git a/src/views/template.vue b/src/views/template.vue
index 2b60672..8338413 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -9,25 +9,25 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
- <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
- <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
- <el-select v-model="form.OrgType" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.OrgType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in OrgTypeArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
<div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
@@ -36,16 +36,18 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-edit" @click="edit('edit')">淇敼</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-delete" @click="del">鎵归噺鍒犻櫎</el-button>-->
+ <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
+ :height="tableHeight+'px'"
border
+ stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -97,6 +99,7 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
@@ -104,8 +107,8 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
- <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
+ <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
</el-table-column>
@@ -125,44 +128,32 @@
</div>
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
- <el-radio-group
- v-model="dialogForm.OrgType"
- style="display: flex;align-items: end;height: 29px;"
- @change="changeRadio"
- >
- <el-radio
- v-for="item in OrgTypeArr"
- :key="item.value"
- :value="item.value"
- :label="item.label"
- />
- </el-radio-group>
- </el-form-item>
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-input v-model="dialogForm.OrgName" style="width: 200px" />
</el-form-item>
- <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-form-item prop="SupUnit" label="涓婄骇鍗曚綅">
<el-select
v-model="dialogForm.SupUnit"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
>
<el-option
v-for="item in SupUnitArr"
- :label="item.org_name"
- :value="item.id"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -218,7 +209,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
OrgTypeArr: [
{ label: '宸ュ巶', value: 'F' },
@@ -237,8 +228,6 @@
OrgName: '',
SupUnit: ''// 涓婄骇鍗曚綅
},
- SupUnitArr: [],
- dialogFormOrgTypeSelected: '',
operation: '',
dialogFormRules: {
OrgType: [
@@ -287,6 +276,9 @@
search() {
this.getOrganizationSearch()
},
+ upload() {
+
+ },
// 閲嶇疆
reset() {
this.form.OrgCode = ''
@@ -294,23 +286,6 @@
this.form.OrgType = ''
this.form.UserName = ''
this.getOrganizationSearch()
- },
- // 鍗曢�夋鏀瑰彉鏃�
- async changeRadio(val) {
- if (val.length > 1) {
- this.OrgTypeArr.forEach(item => {
- if (item.label === val) {
- this.dialogFormOrgTypeSelected = item.value
- }
- })
- this.dialogForm.SupUnit = ''
- } else {
- this.dialogFormOrgTypeSelected = val
- }
- if (this.dialogFormOrgTypeSelected !== 'F') {
- const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
- this.SupUnitArr = res
- }
},
// 鏂板鎸夐挳
@@ -322,32 +297,21 @@
edit(operation, row) {
this.operation = operation
this.dialogVisible = true
- if (row.description === 'F') {
- this.dialogForm.OrgType = '宸ュ巶'
- } else if (row.description === 'D') {
- this.dialogForm.OrgType = '閮ㄩ棬'
- } else if (row.description === 'W') {
- this.dialogForm.OrgType = '杞﹂棿'
- } else if (row.description === 'K') {
- this.dialogForm.OrgType = '绉戝'
- } else if (row.description === 'L') {
- this.dialogForm.OrgType = '鐢熶骇绾�'
- }
+
this.$nextTick(() => {
- this.changeRadio(this.dialogForm.OrgType)
this.dialogForm.OrgCode = row.org_code
this.dialogForm.OrgName = row.org_name
this.dialogForm.SupUnit = row.parent_id
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: id }).then(res => {
+ DeleteOrganization({ orgid: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
this.getOrganizationSearch()
@@ -374,10 +338,8 @@
this.$refs.dialogForm.validate(valid => {
if (valid) {
const data = {
- OrganType: this.dialogFormOrgTypeSelected,
OrganCode: this.dialogForm.OrgCode,
OrganName: this.dialogForm.OrgName,
- SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
OperType: this.operation === 'add' ? 'Add' : 'Update',
Operator: getCookie('admin')
}
@@ -396,7 +358,7 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
})
}
@@ -411,17 +373,27 @@
height: 30px;
display: flex;
align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
}
-
+::v-deep .el-button--primary:hover {
+ border: none;
+}
::v-deep .el-button--info {
- //background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -434,6 +406,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -460,11 +433,13 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
@@ -495,20 +470,22 @@
.el-checkbox.is-bordered.is-checked {
border-color: $main_color;
}
+
::v-deep .el-radio__input.is-checked .el-radio__inner {
border-color: $main_color;
background: $main_color;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: $main_color;
background: $main_color;
}
+
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
color: $main_color !important;
}
-::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin: 10px 30px 0px 0;
}
@@ -519,4 +496,37 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+ border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
</style>
--
Gitblit v1.9.3