From a75b18a4157ab486e0b51c438ac165ab3a08e3e0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 18:10:00 +0800
Subject: [PATCH] 代码提交
---
admin/src/views/business/segments.vue | 94 +++++++++++++++++------------------------------
1 files changed, 34 insertions(+), 60 deletions(-)
diff --git a/admin/src/views/business/segments.vue b/admin/src/views/business/segments.vue
index 14d0402..0c4eb6b 100644
--- a/admin/src/views/business/segments.vue
+++ b/admin/src/views/business/segments.vue
@@ -2,50 +2,26 @@
<TableLayout :permissions="['business:segments:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鎵�灞炲搧鐗�" prop="segmentId">
+ <el-select v-model="searchForm.unitCode" @change="search" clearable placeholder="鎵�灞炲搧鐗�">
+ <el-option v-for="(item) in unitList " :key="item.code" :label="item.name" :value="item.code"></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鍖哄煙缂栫爜" prop="segmentId">
- <el-input v-model="searchForm.segmentId" placeholder="璇疯緭鍏ュ尯鍩熺紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.segmentId" clearable placeholder="璇疯緭鍏ュ尯鍩熺紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="涓婄骇鍖哄煙缂栫爜" prop="parentId">
- <el-input v-model="searchForm.parentId" placeholder="璇疯緭鍏ヤ笂绾у尯鍩熺紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鐖剁骇鍖哄煙缂栫爜" prop="name">
+ <el-input v-model="searchForm.parentId" placeholder="璇疯緭鍏ョ埗绾у尯鍩熺紪鐮�" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="orderNum">
- <el-input v-model="searchForm.orderNum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绫诲瀷 0鎴樺尯 1鐪佸尯 2甯傚尯" prop="type">
- <el-input v-model="searchForm.type" placeholder="璇疯緭鍏ョ被鍨� 0鎴樺尯 1鐪佸尯 2甯傚尯" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏈�杩戝悓姝ユ椂闂�" prop="syncDate">
- <el-date-picker v-model="searchForm.syncDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ渶杩戝悓姝ユ椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏈�杩戝悓姝ュ娉�" prop="syncInfo">
- <el-input v-model="searchForm.syncInfo" placeholder="璇疯緭鍏ユ渶杩戝悓姝ュ娉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" @change="search" clearable placeholder="绫诲瀷" >
+ <el-option label="鎴樺尯" value="0"></el-option>
+ <el-option label="鐪佸尯" value="1"></el-option>
+ <el-option label="鐗囧尯" value="2"></el-option>
+ </el-select>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -66,32 +42,20 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="unitCode" label="鍝佺墝code" min-width="100px"></el-table-column>
+ <el-table-column prop="unitName" label="鍝佺墝鍚嶇О" min-width="100px"> </el-table-column>
<el-table-column prop="segmentId" label="鍖哄煙缂栫爜" min-width="100px"></el-table-column>
<el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="parentId" label="涓婄骇鍖哄煙缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵��" min-width="100px"></el-table-column>
- <el-table-column prop="orderNum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="type" label="绫诲瀷 0鎴樺尯 1鐪佸尯 2甯傚尯" min-width="100px"></el-table-column>
- <el-table-column prop="syncDate" label="鏈�杩戝悓姝ユ椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="syncInfo" label="鏈�杩戝悓姝ュ娉�" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:segments:update', 'business:segments:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaSegmentsWindow.open('缂栬緫蹇楅偊钀ラ攢鍖哄煙淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:segments:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:segments:delete']">鍒犻櫎</el-button>
+ <el-table-column prop="type" label="绫诲瀷" min-width="100px">
+ <template scope="{row}">
+ <span v-if="row.type == 0">鎴樺尯</span>
+ <span v-if="row.type == 1">鐪佸尯</span>
+ <span v-if="row.type == 2">鐗囧尯</span>
</template>
</el-table-column>
+ <el-table-column prop="remark" label="绛夌骇璺緞" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -133,7 +97,8 @@
type: '',
syncDate: '',
syncInfo: ''
- }
+ },
+ unitList: []
}
},
created () {
@@ -144,6 +109,15 @@
'field.main': 'id'
})
this.search()
+ this.loadUnitList()
+ },
+ methods: {
+ loadUnitList () {
+ this.api.getUnitList()
+ .then(data => {
+ this.unitList = data
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3