From 3d73201f0830320c703cfb3d36b47976eb3d94e7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:34:21 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/views/template.vue | 423 ++++++++++++++++++++++++++--------------------------
1 files changed, 212 insertions(+), 211 deletions(-)
diff --git a/src/views/template.vue b/src/views/template.vue
index 2b60672..6f02a6c 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -1,64 +1,96 @@
<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 class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
- <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
- <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <div class="elForm">
+ <el-form-item label="姣嶄欢缂栫爜" style=" display: flex;">
+ <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-form-item label="姣嶄欢鍚嶇О" style=" display: flex;">
+ <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-form-item label="姣嶄欢瑙勬牸" style=" display: flex;">
+ <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: 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-form-item v-show="isExpandForm" label="鐗堟湰缂栧彿" style=" display: flex;">
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍒涘缓鏃ユ湡" style=" display: flex;">
+ <el-date-picker
+ v-model="form.createdate"
+ style="width: 200px"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
- </div>
- <div style="margin-bottom: 20px;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>-->
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <div style="display: flex;border: 1px solid #eee">
+ <div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
- :style="{width: 100+'%',height:tableHeight+'px',}"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -75,15 +107,7 @@
prop="description"
label="缁勭粐绫诲瀷"
sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.description==='F'">宸ュ巶</div>
- <div v-if="row.description==='D'">閮ㄩ棬</div>
- <div v-if="row.description==='W'">杞﹂棿</div>
- <div v-if="row.description==='K'">绉戝</div>
- <div v-if="row.description==='L'">鐢熶骇绾�</div>
- </template>
- </el-table-column>
+ />
<el-table-column
prop="parentorg_name"
label="涓婄骇鍗曚綅"
@@ -97,15 +121,22 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
label="鎿嶄綔"
+ width="120"
+ fixed="right"
>
<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-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -113,101 +144,82 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getOrganizationSearch"
/>
</div>
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
+ :close-on-click-modal="false"
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>
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/basicSettings'
import { getCookie } from '@/utils/auth'
+import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'Zzjg',
components: {
- Pagination
+ Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -215,17 +227,15 @@
OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
OrgType: '', // 缁勭粐绫诲瀷
UserName: '', // 鍒涘缓浜哄憳
+ createdate: '',
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
OrgTypeArr: [
- { label: '宸ュ巶', value: 'F' },
- { label: '閮ㄩ棬', value: 'D' },
- { label: '杞﹂棿', value: 'W' },
- { label: '绉戝', value: 'K' },
- { label: '鐢熶骇绾�', value: 'L' }
+ { label: '鏄�', value: 'Y' },
+ { label: '鍚�', value: 'N' }
],
total: 10,
@@ -237,24 +247,31 @@
OrgName: '',
SupUnit: ''// 涓婄骇鍗曚綅
},
- SupUnitArr: [],
- dialogFormOrgTypeSelected: '',
operation: '',
dialogFormRules: {
OrgType: [
{ required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
],
OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
OrgName: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
]
- }
+ },
+
+ title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
+ code: '4',
+ shows: false
+
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getOrganizationSearch()
+ }
}
},
created() {
@@ -287,6 +304,14 @@
search() {
this.getOrganizationSearch()
},
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
// 閲嶇疆
reset() {
this.form.OrgCode = ''
@@ -294,23 +319,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,34 +330,26 @@
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('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getOrganizationSearch()
}
})
@@ -374,10 +374,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,127 +394,130 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 255
+ this.$refs.tableDataRef.doLayout()
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+::v-deep .el-button--text{
+ font-size: 14px ;
+ cursor: pointer ;
+}
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
+}
+.el-icon-edit-outline{
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
-}
-
-::v-deep .el-button--info {
//background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
-
-.footerButton {
- display: flex;
- justify-content: end;
}
::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
+ background-color: #f8f8fa;
+ border: none;
}
-::v-deep .el-button--default:hover {
- color: #606266;
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
::v-deep .el-dialog__body {
padding: 20px 100px !important;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
}
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
}
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height:30px;
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.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-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::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-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
}
-::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
}
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
}
</style>
--
Gitblit v1.9.3