From 32ec691abab0c837f34ce2c4908a40a10b9dbec7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 29 七月 2022 17:20:15 +0800
Subject: [PATCH] 1.优化项目2.综合看板静态页面初步实现
---
src/views/jcsz/wldw.vue | 271 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 207 insertions(+), 64 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 2dbf1d1..d7961cd 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;">
- <div style="height: 50px;">
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -9,15 +9,21 @@
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.CuntUnitCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.CuntUnitCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" style=" display: flex;">
- <el-input v-model="form.CuntUnitName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.CuntUnitName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍗曚綅灞炴��" style=" display: flex;">
- <el-select v-model="form.UnitAttr" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.UnitAttr"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in UnitAttrArr"
:key="item.value"
@@ -27,27 +33,37 @@
</el-select>
</el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.CreateUser" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.CreateUser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
+ <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>
</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-upload2">瀵煎叆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchPartner"
+ >鍚屾寰�鏉ュ崟浣�
+ </el-button>
+ <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
- <!-- :style="{width: 100+'%',height:isCompatible?(tableHeight+'px'):'800px'}"-->
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
+ :height="tableHeight+'px'"
+ stripe
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ :style="{width: 100+'%',height:tableHeight+'px'}"
@sort-change="sortChange"
>
<!-- <el-table-column-->
@@ -57,29 +73,30 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
prop="code"
label="鍗曚綅缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="name"
label="鍗曚綅鍚嶇О"
- show-overflow-tooltip
sortable="custom"
- min-width="200px"
+ min-width="160px"
/>
<el-table-column
label="鍗曚綅灞炴��"
- width="150"
+ width="240"
>
<!-- sortable="custom"-->
<el-table-column
prop="mtype"
- width="120"
+ width="80"
>
<template slot-scope="{row}">
<div v-if="row.mtype==='WG'">澶栬喘渚涙柟</div>
@@ -88,62 +105,61 @@
</el-table-column>
<el-table-column
prop="btype"
- width="120"
+ width="80"
>
<template slot-scope="{row}">
- <div v-if="row.btype==='WX'">澶栨枩渚涙柟</div>
+ <div v-if="row.btype==='WX'">澶栧崗渚涙柟</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="htype"
- width="120"
+ width="80"
>
<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="conttacts"
label="鑱旂郴浜�"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="conttphone"
label="鑱旂郴鏂瑰紡"
+ width="160"
sortable="custom"
/>
<el-table-column
prop="addr"
+ min-width="160"
label="琛ュ厖鎻忚堪"
sortable="custom"
/>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
- width="200"
- show-overflow-tooltip
+ width="160"
/>
<el-table-column
label="鎿嶄綔"
+ 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-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
+ <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
</el-table-column>
@@ -163,26 +179,26 @@
</div>
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
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="unitcode">
+ <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="unitname">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitname">
<el-input v-model="dialogForm.unitname" style="width: 220px" />
</el-form-item>
- <el-form-item style="width: 100%" label="渚涙柟灞炴��" prop="checkboxIsSelected">
+ <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 key="WG" value="WG" label="澶栬喘渚涙柟" />
+ <el-checkbox key="WX" value="WX" label="澶栧崗渚涙柟" />
+ <el-checkbox key="KH" value="KH" label="瀹㈡埛" />
</el-checkbox-group>
</el-form-item>
<el-form-item label="鑱旂郴浜�" prop="person">
@@ -202,26 +218,26 @@
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
import {
- AddUpdateCurrentUnit,
- AddUpdateOrganization,
- CurrentUnitSearch,
- DeleteOrganization,
- OrganizationSearch,
- PrentOrganization
+ AddUpdateCurrentUnit, CurrentUnitSearch, DeleteCurrentUnit
} from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
+import { SeaveSearchPartner } from '@/api/ErpSyncMes'
+import ImportPicker from '@/components/ImportPicker'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'WLDW',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
const validateName = (rule, value, callback) => {
@@ -235,8 +251,23 @@
}
}
}
+ const validateMobile = (rule, value, callback) => {
+ if (!value) {
+ callback()
+ // return callback(new Error('璇疯緭鍏ョ數璇濆彿鐮�'))
+ } else {
+ const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // 闀垮彿
+ const mobile2 = /^[0-9]{6}$/ // 鐭彿
+ if (mobile.test(value) || mobile2.test(value)) {
+ callback()
+ // return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+ } else {
+ return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+ // callback()
+ }
+ }
+ }
return {
- isCompatible: false, // 鏄惁鍏煎
mainHeight: 0,
tableHeight: 0,
form: {
@@ -247,7 +278,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
UnitAttrArr: [
{ label: '澶栬喘渚涙柟', value: 'WG' },
@@ -281,9 +312,22 @@
],
checkboxIsSelected: [
{ required: true, message: '璇烽�夋嫨渚涙柟灞炴��', trigger: ['blur', 'change'] }
+ ],
+ contact: [
+ { required: false, validator: validateMobile, trigger: ['blur', 'change'] }
]
- }
+ },
+ title_value: '鏁版嵁瀵煎叆 / 寰�鏉ュ崟浣�',
+ code: '4',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getCurrentUnitSearch()
+ }
}
},
created() {
@@ -314,6 +358,29 @@
this.tableData = res.data
this.total = res.count
},
+ // 鍚屾寰�鏉ュ崟浣�
+ async syncSeaveSearchPartner() {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍚屾寰�鏉ュ崟浣嶏紝璇风◢绛�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const res = await SeaveSearchPartner()
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getCurrentUnitSearch()
+ loading.close()
+ this.$message.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ } else {
+ setTimeout(() => {
+ loading.close()
+ this.$message.error('鍚屾澶辫触锛�')
+ }, 10000)
+ }
+ },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
@@ -341,7 +408,8 @@
},
// 澶嶉�夋鏀瑰彉浜嬩欢
checkboxGroupChange(val) {
- console.log(val)
+ this.dialogForm.checkboxIsSelected = val
+ this.dialogForm.checkboxIsSelected = this.dialogForm.checkboxIsSelected.filter(item => item !== null)
},
// 鏂板鎸夐挳
add(operation) {
@@ -353,25 +421,43 @@
this.operation = operation
this.dialogVisible = true
+ this.dialogForm.id = row.id
+ let mtype = null
+ let btype = null
+ let htype = null
+
+ if (row.mtype === 'WG') {
+ mtype = '澶栬喘渚涙柟'
+ }
+ if (row.btype === 'WX') {
+ btype = '澶栧崗渚涙柟'
+ }
+ if (row.htype === 'KH') {
+ htype = '瀹㈡埛'
+ }
+
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.checkboxIsSelected = [btype, htype, mtype]
+ this.dialogForm.unitcode = row.code
+ this.dialogForm.unitname = row.name
+ this.dialogForm.person = row.conttacts
+ this.dialogForm.contact = row.conttphone
+ this.dialogForm.description = row.addr
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- // DeleteOrganization({ orgid: id }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // this.getCurrentUnitSearch()
- // }
- // })
+ DeleteCurrentUnit({ unitcode: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getCurrentUnitSearch()
+ }
+ })
}).catch(() => {
this.$message.info('宸插彇娑堝垹闄�')
})
@@ -383,6 +469,7 @@
this.dialogForm.person = ''
this.dialogForm.contact = ''
this.dialogForm.description = ''
+ this.dialogForm.checkboxIsSelected = []
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -417,9 +504,8 @@
contact: this.dialogForm.contact,
description: this.dialogForm.description,
OperType: this.operation === 'add' ? 'Add' : 'Update'
- // Operator: getCookie('admin')
}
- console.log(data)
+ // console.log(data, 2)
AddUpdateCurrentUnit(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
@@ -435,9 +521,17 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
})
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
}
}
}
@@ -450,6 +544,13 @@
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 {
@@ -457,10 +558,20 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
}
::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 {
@@ -473,6 +584,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -499,7 +611,7 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
}
@@ -561,4 +673,35 @@
::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;
+}
+
</style>
--
Gitblit v1.9.3