From e45cb00314d0d027996a6155d05bde749ab4acd8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 22 六月 2022 10:57:56 +0800
Subject: [PATCH] 1.解决了部分浏览器兼容问题
---
src/views/jcsz/wldw.vue | 341 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 192 insertions(+), 149 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 8f58012..2dbf1d1 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
+ <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;">
<div style="height: 50px;">
<el-form
ref="form"
@@ -11,15 +11,15 @@
>
<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)" />
+ <el-input v-model="form.CuntUnitCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</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.CuntUnitName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</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.UnitAttr" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in OrgTypeArr"
+ v-for="item in UnitAttrArr"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -27,7 +27,7 @@
</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.CreateUser" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
<div style="display: flex;align-items: start;margin-top: 5px;">
@@ -40,13 +40,12 @@
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>
</div>
-
+ <!-- :style="{width: 100+'%',height:isCompatible?(tableHeight+'px'):'800px'}"-->
<div style="display: flex;border: 1px solid #eee">
<el-table
:data="tableData"
border
highlight-current-row
- :style="{width: 100+'%',height:tableHeight+'px'}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -56,36 +55,74 @@
<!-- width="50"-->
<!-- />-->
<el-table-column
- prop="id"
+ prop="RowNum"
width="50"
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
- label="缁勭粐缂栫爜"
+ prop="code"
+ label="鍗曚綅缂栫爜"
sortable="custom"
/>
<el-table-column
- prop="org_name"
- label="缁勭粐鍚嶇О"
+ prop="name"
+ label="鍗曚綅鍚嶇О"
+ show-overflow-tooltip
sortable="custom"
+ min-width="200px"
/>
<el-table-column
- prop="description"
- label="缁勭粐绫诲瀷"
- sortable="custom"
+ label="鍗曚綅灞炴��"
+ width="150"
>
- <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>
+ <!-- sortable="custom"-->
+
+ <el-table-column
+ prop="mtype"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.mtype==='WG'">澶栬喘渚涙柟</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="btype"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.btype==='WX'">澶栨枩渚涙柟</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="htype"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.htype==='KH'">瀹㈡埛</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.unitattribute==='WG'">澶栬喘</div>-->
+ <!-- <div v-if="row.unitattribute==='WX'">澶栧崗</div>-->
+ <!-- <div v-if="row.unitattribute==='KH'">瀹㈡埛</div>-->
+ <!-- </template>-->
</el-table-column>
<el-table-column
- prop="parentorg_name"
- label="涓婄骇鍗曚綅"
+ prop="conttacts"
+ label="鑱旂郴浜�"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="conttphone"
+ label="鑱旂郴鏂瑰紡"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="addr"
+ label="琛ュ厖鎻忚堪"
sortable="custom"
/>
<el-table-column
@@ -97,6 +134,8 @@
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
+ width="200"
+ show-overflow-tooltip
/>
<el-table-column
label="鎿嶄綔"
@@ -119,7 +158,7 @@
align="right"
layout="prev, pager, next,sizes"
popper-class="select_bottom"
- @pagination="getOrganizationSearch"
+ @pagination="getCurrentUnitSearch"
/>
</div>
@@ -131,39 +170,29 @@
@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 ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+
+ <el-form-item label="渚涙柟缂栫爜" prop="unitcode">
+ <el-input v-model="dialogForm.unitcode" :disabled="operation!=='add'" style="width: 220px" />
</el-form-item>
- <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-form-item label="渚涙柟鍚嶇О" prop="unitname">
+ <el-input v-model="dialogForm.unitname" style="width: 220px" />
</el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item style="width: 100%" label="渚涙柟灞炴��" prop="checkboxIsSelected">
+ <el-checkbox-group v-model="dialogForm.checkboxIsSelected" @change="checkboxGroupChange">
+ <el-checkbox label="澶栬喘渚涙柟" />
+ <el-checkbox label="澶栧崗渚涙柟" />
+ <el-checkbox label="瀹㈡埛" />
+ </el-checkbox-group>
</el-form-item>
- <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
- <el-select
- v-model="dialogForm.SupUnit"
- style="width: 220px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in SupUnitArr"
- :label="item.org_name"
- :value="item.id"
- />
- </el-select>
+ <el-form-item label="鑱旂郴浜�" prop="person">
+ <el-input v-model="dialogForm.person" style="width: 220px" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="contact">
+ <el-input v-model="dialogForm.contact" style="width: 220px" />
+ </el-form-item>
+ <el-form-item label="琛ュ厖鎻忚堪" prop="description">
+ <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -178,7 +207,14 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import {
+ AddUpdateCurrentUnit,
+ AddUpdateOrganization,
+ CurrentUnitSearch,
+ DeleteOrganization,
+ OrganizationSearch,
+ PrentOrganization
+} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
@@ -199,14 +235,8 @@
}
}
}
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
+ isCompatible: false, // 鏄惁鍏煎
mainHeight: 0,
tableHeight: 0,
form: {
@@ -219,53 +249,68 @@
page: 1, // 绗嚑椤�
rows: 10 // 姣忛〉澶氬皯鏉�
},
- OrgTypeArr: [
- { label: '宸ュ巶', value: 'F' },
- { label: '閮ㄩ棬', value: 'D' },
- { label: '杞﹂棿', value: 'W' },
- { label: '绉戝', value: 'K' },
- { label: '鐢熶骇绾�', value: 'L' }
+ UnitAttrArr: [
+ { label: '澶栬喘渚涙柟', value: 'WG' },
+ { label: '澶栧崗渚涙柟', value: 'WX' },
+ { label: '瀹㈡埛', value: 'KH' }
],
-
- total: 10,
tableData: [],
+ total: 10,
dialogVisible: false,
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ checkboxIsSelected: [], // 瀛樺偍el-checkbox-grounp閫変腑鐨勫��
+
+ id: '', // 寰�鏉ュ崟浣峣d
+ unitcode: '', // 寰�鏉ュ崟浣嶇紪鐮�
+ unitname: '', // 寰�鏉ュ崟浣嶅悕绉�
+ // mtypecode: '', // 澶栬喘缂栫爜
+ // btypecode: '', // 澶栧崗缂栫爜
+ // htypecode: '', // 瀹㈡埛缂栫爜
+ person: '', // 鑱旂郴浜�
+ contact: '', // 鑱旂郴鏂瑰紡
+ description: '', // 琛ュ厖鎻忚堪
+ OperType: '' // 鎿嶄綔绫诲瀷
},
- SupUnitArr: [],
- dialogFormOrgTypeSelected: '',
operation: '',
dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
+ unitcode: [
{ required: true, validator: validateName, trigger: ['blur', 'change'] }
],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ unitname: [
+ { required: true, message: '璇疯緭鍏ヤ緵鏂瑰悕绉�', trigger: ['blur', 'change'] }
],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ checkboxIsSelected: [
+ { required: true, message: '璇烽�夋嫨渚涙柟灞炴��', trigger: ['blur', 'change'] }
]
}
}
},
created() {
- this.getOrganizationSearch()
+ this.getCurrentUnitSearch()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+
+ // 鍒ゆ柇褰撳墠鎵�鐢ㄦ祻瑙堝櫒
+ // const explorer = navigator.userAgent
+ // if (explorer.indexOf('Firefox') >= 0) {
+ // // firefox
+ // console.log('Firefox')
+ // this.isCompatible = true
+ // } else if (explorer.indexOf('Chrome') >= 0) {
+ // // Chrome
+ // console.log('Chrome')
+ // this.isCompatible = true
+ // } else {
+ // console.log('other')
+ // this.isCompatible = false
+ // }
},
methods: {
- async getOrganizationSearch() {
- const res = await OrganizationSearch(this.form)
+ async getCurrentUnitSearch() {
+ const res = await CurrentUnitSearch(this.form)
this.tableData = res.data
this.total = res.count
},
@@ -280,38 +325,24 @@
}
this.form.order = order
this.form.prop = prop
- this.getOrganizationSearch()
+ this.getCurrentUnitSearch()
},
// 鏌ヨ
search() {
- this.getOrganizationSearch()
+ this.getCurrentUnitSearch()
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
- this.getOrganizationSearch()
+ this.form.CuntUnitCode = ''
+ this.form.CuntUnitName = ''
+ this.form.UnitAttr = ''
+ this.form.CreateUser = ''
+ this.getCurrentUnitSearch()
},
- // 鍗曢�夋鏀瑰彉鏃�
- 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
- }
+ // 澶嶉�夋鏀瑰彉浜嬩欢
+ checkboxGroupChange(val) {
+ console.log(val)
},
-
// 鏂板鎸夐挳
add(operation) {
this.operation = operation
@@ -321,19 +352,8 @@
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
@@ -346,22 +366,23 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: id }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- this.getOrganizationSearch()
- }
- })
+ // DeleteOrganization({ orgid: id }).then(res => {
+ // if (res.code === '200') {
+ // this.$message.success('鍒犻櫎鎴愬姛!')
+ // this.getCurrentUnitSearch()
+ // }
+ // })
}).catch(() => {
this.$message.info('宸插彇娑堝垹闄�')
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.unitcode = ''
+ this.dialogForm.unitname = ''
+ this.dialogForm.person = ''
+ this.dialogForm.contact = ''
+ this.dialogForm.description = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -372,24 +393,42 @@
dialogVisibleConfirm() {
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')
+ let mtypecode = null // 澶栬喘缂栫爜
+ let btypecode = null // 澶栧崗缂栫爜
+ let htypecode = null // 瀹㈡埛缂栫爜
+ const checkboxIsSelected = this.dialogForm.checkboxIsSelected// 瀛樺偍el-checkbox-grounp閫変腑鐨勫��
+ if (checkboxIsSelected.includes('澶栬喘渚涙柟')) {
+ mtypecode = 'WG'
}
- AddUpdateOrganization(data).then(res => {
+ if (checkboxIsSelected.includes('澶栧崗渚涙柟')) {
+ btypecode = 'WX'
+ }
+ if (checkboxIsSelected.includes('瀹㈡埛')) {
+ htypecode = 'KH'
+ }
+ const data = {
+ id: this.dialogForm.id,
+ unitcode: this.dialogForm.unitcode,
+ unitname: this.dialogForm.unitname,
+ mtypecode: mtypecode,
+ btypecode: btypecode,
+ htypecode: htypecode,
+ person: this.dialogForm.person,
+ contact: this.dialogForm.contact,
+ description: this.dialogForm.description,
+ OperType: this.operation === 'add' ? 'Add' : 'Update'
+ // Operator: getCookie('admin')
+ }
+ console.log(data)
+ AddUpdateCurrentUnit(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.getOrganizationSearch()
+ this.dialogVisible = false
+ this.getCurrentUnitSearch()
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
})
-
- this.dialogVisible = false
}
})
},
@@ -459,7 +498,9 @@
}
::v-deep .el-input__inner {
- height: 30px
+ height: 30px;
+ line-height:30px;
+
}
::v-deep .el-table .caret-wrapper {
@@ -494,20 +535,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;
}
--
Gitblit v1.9.3