From 3f386968d4b5cbb002ad93483f86a5443159e18a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 08 二月 2025 09:54:32 +0800
Subject: [PATCH] 1.递交
---
src/views/basicSettings/organizationList.vue | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/src/views/basicSettings/organizationList.vue b/src/views/basicSettings/organizationList.vue
index 76e2b73..0c8cdb7 100644
--- a/src/views/basicSettings/organizationList.vue
+++ b/src/views/basicSettings/organizationList.vue
@@ -20,6 +20,22 @@
<el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
<el-input v-model="form.storg_name" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
+ <el-form-item label="缁勭粐绫诲瀷" prop="torgtype_code">
+ <el-select
+ v-model="form.torgtype_code"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in OrgTypeArr"
+ :key="item.torgtype_code"
+ :label="item.torgtype_name"
+ :value="item.torgtype_code"
+ />
+ </el-select>
+ </el-form-item>
</div>
<div
class="bodySearchReset"
@@ -82,6 +98,11 @@
sortable="custom"
/>
<el-table-column
+ prop="torgtype_name"
+ label="缁勭粐绫诲瀷"
+ sortable="custom"
+ />
+ <el-table-column
prop="status"
label="鐘舵��"
sortable="custom"
@@ -131,15 +152,15 @@
</el-table>
</div>
<!--鍒嗛〉-->
- <pagination
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="total,prev, pager, next,sizes,jumper"
- popper-class="select_bottom"
- @pagination="getSTorgData"
- />
+ <!-- <pagination-->
+ <!-- :total="total"-->
+ <!-- :page.sync="form.page"-->
+ <!-- :limit.sync="form.rows"-->
+ <!-- align="right"-->
+ <!-- layout="total,prev, pager, next,sizes,jumper"-->
+ <!-- popper-class="select_bottom"-->
+ <!-- @pagination="getSTorgData"-->
+ <!-- />-->
</div>
<el-dialog
@@ -153,11 +174,28 @@
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+
<el-form-item label="缁勭粐缂栫爜" prop="OrganCode">
<el-input v-model="dialogForm.OrganCode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" prop="OrganName">
<el-input v-model="dialogForm.OrganName" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐绫诲瀷" prop="torgtype_code">
+ <el-select
+ v-model="dialogForm.torgtype_code"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in OrgTypeArr"
+ :key="item.torgtype_code"
+ :label="item.torgtype_name"
+ :value="item.torgtype_code"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鎵�灞炵粍缁�" prop="storgcode">
<el-cascader
@@ -205,7 +243,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import arrayToTree from 'array-to-tree'
-import { PrentOrganization } from '@/api/GeneralBasicData'
+import { PrentOrganization, TOrganTypeDate } from '@/api/GeneralBasicData'
export default {
name: 'Zzjg',
@@ -218,17 +256,19 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ torgtype_code: '',
storg_code: '', // 缁勭粐鏋舵瀯缂栫爜
- storg_name: '', // 缁勭粐鏋舵瀯鍚嶇О
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
- page: 1, // 绗嚑椤�
- rows: 20 // 姣忛〉澶氬皯鏉�
+ storg_name: '' // 缁勭粐鏋舵瀯鍚嶇О
+ // prop: 'lm_date', // 鎺掑簭瀛楁
+ // order: 'desc', // 鎺掑簭瀛楁
+ // page: 1, // 绗嚑椤�
+ // rows: 20 // 姣忛〉澶氬皯鏉�
},
total: 10,
tableData: [],
dialogVisible: false,
dialogForm: {
+ torgtype_code: '', // 缁勭粐绫诲瀷
OrganCode: '', // 缁勭粐缂栫爜
OrganName: '', // 缁勭粐鍚嶇О
leve: 0, // 灞傜骇缂栫爜
@@ -239,6 +279,9 @@
},
operation: '',
dialogFormRules: {
+ torgtype_code: [
+ { required: true, message: '璇烽�夋嫨缁勭粐绫诲瀷', trigger: ['blur', 'change'] }
+ ],
OrganCode: [
{ required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
@@ -256,18 +299,31 @@
label: 'torg_name'
},
Options: [],
- cascaderOptions: []
+ cascaderOptions: [],
+ OrgTypeArr: [
+ // { label: '宸ュ巶', value: 'F' },
+ // { label: '閮ㄩ棬', value: 'D' },
+ // { label: '杞﹂棿', value: 'W' }
+ // { label: '绉戝', value: 'K' },
+ // { label: '鐢熶骇绾�', value: 'L' }
+ ]
}
},
created() {
this.getSTorgData()
+ this.getTOrganTypeDate()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 鏌ヨ缁勭粐绫诲瀷
+ async getTOrganTypeDate() {
+ const { data: res } = await TOrganTypeDate()
+ this.OrgTypeArr = res
+ },
// 缁勭粐鏋舵瀯澶у垪琛ㄦ煡璇�
async getSTorgData() {
const res = await STorgData(this.form)
@@ -303,6 +359,7 @@
},
// 閲嶇疆
reset() {
+ this.form.torgtype_code = ''
this.form.storg_code = ''
this.form.storg_name = ''
this.getSTorgData()
@@ -322,6 +379,7 @@
await this.getPrentOrganization()
this.cascaderOptions = this.filterChildren(this.cascaderOptions, row.torg_code)
this.$nextTick(() => {
+ this.dialogForm.torgtype_code = row.torgtype_code
this.dialogForm.OrganCode = row.torg_code
this.dialogForm.OrganName = row.torg_name
this.dialogForm.leve = parseFloat(row.leve)
@@ -392,6 +450,7 @@
this.dialogForm.OrganName = ''
this.dialogForm.storgcode = ''
this.dialogForm.parent_id = ''
+ this.dialogForm.torgtype_code = ''
this.dialogForm.status = 'Y'
this.dialogForm.leve = 0
this.$refs.cascader.checkedValue = ''
@@ -431,9 +490,12 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 137
this.$refs.tableDataRef.doLayout()
})
+ },
+ changeRadio(val) {
+
}
}
}
--
Gitblit v1.9.3