From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/jcsz/wldw.vue | 637 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 387 insertions(+), 250 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 8f58012..58da740 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -1,25 +1,45 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div style="height: 50px;">
+ <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>
+ <div style="display: flex">
+ <el-button
+ v-waves
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchPartner"
+ >鍚屾寰�鏉ュ崟浣�
+ </el-button>
+ <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
+ </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%">
+ <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.CuntUnitCode" 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.CuntUnitName" 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.UnitAttr"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
- v-for="item in OrgTypeArr"
+ v-for="item in UnitAttrArr"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -27,28 +47,34 @@
</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: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
- <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-upload2">瀵煎叆</el-button>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
- <div style="display: flex;border: 1px solid #eee">
+ <div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
+ class="tableFixed"
+ :height="tableHeight+'px'"
+ :row-class-name="tableRowClassName"
highlight-current-row
- :style="{width: 100+'%',height:tableHeight+'px'}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ :style="{width: 100+'%',height:tableHeight+'px'}"
@sort-change="sortChange"
>
<!-- <el-table-column-->
@@ -56,55 +82,109 @@
<!-- width="50"-->
<!-- />-->
<el-table-column
- prop="id"
+ prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
- label="缁勭粐缂栫爜"
+ prop="code"
+ label="鍗曚綅缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
+ min-width="110"
/>
<el-table-column
- prop="org_name"
- label="缁勭粐鍚嶇О"
+ prop="name"
+ label="鍗曚綅鍚嶇О"
sortable="custom"
+ min-width="240px"
+ show-tooltip-when-overflow
/>
<el-table-column
- prop="description"
- label="缁勭粐绫诲瀷"
+ label="鍗曚綅灞炴��"
+ show-tooltip-when-overflow
+ width="160"
+ sortable="custom"
+ prop="type"
+ >
+ <!-- sortable="custom"-->
+ <template slot-scope="{row}">
+ <div v-if="row.type==='226'">瀹㈡埛</div>
+ <div v-else-if="row.type==='211'">渚涘簲鍟�</div>
+ <div v-else-if="row.type==='228'">瀹㈡埛/渚涘簲鍟�</div>
+ <div v-else>/</div>
+ <!-- <div style="display: flex;justify-content: flex-start">-->
+ <!-- <div v-if="row.mtype==='211'" style="margin-right: 15px">渚涘簲鍟�</div>-->
+ <!-- <div v-if="row.btype==='228'" style="margin-right: 15px;">瀹㈡埛/渚涘簲鍟�</div>-->
+ <!-- <div v-if="row.htype==='226'">瀹㈡埛</div>-->
+ <!-- </div>-->
+ </template>
+
+ </el-table-column>
+ <el-table-column
+ prop="conttacts"
+ label="鑱旂郴浜�"
+ width="110"
+ show-tooltip-when-overflow
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>
+ <div v-if="row.conttacts">{{ row.conttacts }}</div>
+ <div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="parentorg_name"
- label="涓婄骇鍗曚綅"
+ prop="conttphone"
+ label="鑱旂郴鏂瑰紡"
+ show-tooltip-when-overflow
+ width="160"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.conttphone">{{ row.conttphone }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="addr"
+ min-width="160"
+ label="琛ュ厖鎻忚堪"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.addr">{{ row.addr }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
+ width="160"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="120"
>
<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 :style="{color:$store.state.settings.theme}" 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 :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -112,98 +192,116 @@
</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"
+ @pagination="getCurrentUnitSearch"
/>
</div>
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ v-el-drag-dialog
+ :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" :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-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="unitname">
+ <el-input v-model="dialogForm.unitname" style="width: 220px" />
+ </el-form-item>
+ <el-form-item style="width: 100%" label="鍗曚綅灞炴��" prop="type">
+ <el-radio-group v-model="dialogForm.type">
+ <el-radio key="226" value="226" label="瀹㈡埛" />
+ <el-radio key="211" value="211" label="渚涘簲鍟�" />
+ <el-radio key="228" value="228" label="瀹㈡埛/渚涘簲鍟�" />
</el-radio-group>
+
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.UnitAttr"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- filterable-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in UnitAttrArr"-->
+ <!-- :key="item.value"-->
+ <!-- :label="item.label"-->
+ <!-- :value="item.value"-->
+ <!-- />-->
+ <!-- </el-select>-->
</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="person">
+ <el-input v-model="dialogForm.person" style="width: 220px" />
</el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="contact">
+ <el-input v-model="dialogForm.contact" style="width: 220px" />
</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="description">
+ <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
</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"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @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 { getCookie } from '@/utils/auth'
-
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import {
+ AddUpdateCurrentUnit, CurrentUnitSearch, DeleteCurrentUnit
+} from '@/api/jcsz'
+import { SeaveSearchPartner } from '@/api/ErpSyncMes'
+import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
- name: 'Zzjg',
+ name: 'WLDW',
components: {
- Pagination
+ Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
- const validateName = (rule, value, callback) => {
+ const validateMobile = (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 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 {
@@ -217,57 +315,104 @@
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' }
+ UnitAttrArr: [
+ { label: '瀹㈡埛', value: '226' },
+ { label: '渚涘簲鍟�', value: '211' },
+ { label: '瀹㈡埛/渚涘簲鍟�', value: '228' }
],
-
- total: 10,
tableData: [],
+ total: 10,
dialogVisible: false,
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ id: '', // 寰�鏉ュ崟浣峣d
+ unitcode: '', // 寰�鏉ュ崟浣嶇紪鐮�
+ unitname: '', // 寰�鏉ュ崟浣嶅悕绉�
+ type: '', // 鍗曚綅灞炴��
+ person: '', // 鑱旂郴浜�
+ contact: '', // 鑱旂郴鏂瑰紡
+ description: '', // 琛ュ厖鎻忚堪
+ OperType: '' // 鎿嶄綔绫诲瀷
},
- SupUnitArr: [],
- dialogFormOrgTypeSelected: '',
operation: '',
dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ unitcode: [
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
- OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ unitname: [
+ { required: true, message: '璇疯緭鍏ュ崟浣嶅悕绉�', trigger: ['blur', 'change'] }
],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ type: [
+ { required: true, message: '璇烽�夋嫨鍗曚綅灞炴��', trigger: ['blur', 'change'] }
],
- SupUnit: [
- { required: true, validator: validateTypeCode, 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() {
- 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
+ },
+ // 鍚屾寰�鏉ュ崟浣�
+ 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 }) {
@@ -280,36 +425,19 @@
}
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()
- },
- // 鍗曢�夋鏀瑰彉鏃�
- 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
- }
+ this.form.CuntUnitCode = ''
+ this.form.CuntUnitName = ''
+ this.form.UnitAttr = ''
+ this.form.CreateUser = ''
+ this.getCurrentUnitSearch()
},
// 鏂板鎸夐挳
@@ -321,35 +449,31 @@
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
+ this.dialogForm.id = row.id
+ this.dialogForm.type = this.UnitAttrArr.find(i => i.value === row.type).label
+ 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 => {
+ DeleteCurrentUnit({ unitcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
- this.getOrganizationSearch()
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getCurrentUnitSearch()
}
})
}).catch(() => {
@@ -358,10 +482,12 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
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.dialogForm.type = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -372,150 +498,161 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
+
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')
+ id: this.dialogForm.id,
+ unitcode: this.dialogForm.unitcode,
+ unitname: this.dialogForm.unitname,
+ typecode: this.UnitAttrArr.find(i => i.label === this.dialogForm.type).value,
+ person: this.dialogForm.person,
+ contact: this.dialogForm.contact,
+ description: this.dialogForm.description,
+ OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- AddUpdateOrganization(data).then(res => {
+
+ AddUpdateCurrentUnit(data).then(res => {
if (res.code === '200') {
+ this.dialogVisible = false
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.getOrganizationSearch()
+ this.getCurrentUnitSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$store.state.app.buttonIsDisabled = false
}
})
-
- this.dialogVisible = false
}
})
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 195
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 40
+ }
+ this.$refs.tableDataRef.doLayout()
})
+ },
+
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
+
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
}
}
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+.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
+::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;
+}
+.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