From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 15:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/categorySeg.vue | 127 +++++++++++++-----------------------------
1 files changed, 40 insertions(+), 87 deletions(-)
diff --git a/admin/src/views/business/categorySeg.vue b/admin/src/views/business/categorySeg.vue
index 185d9f2..1057634 100644
--- a/admin/src/views/business/categorySeg.vue
+++ b/admin/src/views/business/categorySeg.vue
@@ -2,38 +2,16 @@
<TableLayout :permissions="['business:categoryseg: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>
<el-form-item label="鍝佺被缂栫爜" prop="unitCode">
- <el-input v-model="searchForm.unitCode" placeholder="璇疯緭鍏ュ搧绫荤紪鐮�" @keypress.enter.native="search"></el-input>
+ <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="segId">
- <el-input v-model="searchForm.segId" placeholder="璇疯緭鍏ユ垬鍖虹紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="F鐮�" prop="orgId">
+ <el-input v-model="searchForm.orgId" placeholder="璇疯緭鍏鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐪佸尯缂栫爜" prop="segId2">
- <el-input v-model="searchForm.segId2" placeholder="璇疯緭鍏ョ渷鍖虹紪鐮�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="甯傚尯缂栫爜" prop="segId3">
- <el-input v-model="searchForm.segId3" placeholder="璇疯緭鍏ュ競鍖虹紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="S鐮�" prop="scode">
+ <el-input v-model="searchForm.scode" placeholder="璇疯緭鍏鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎴樺尯鍚嶇О" prop="segName">
<el-input v-model="searchForm.segName" placeholder="璇疯緭鍏ユ垬鍖哄悕绉�" @keypress.enter.native="search"></el-input>
@@ -43,15 +21,6 @@
</el-form-item>
<el-form-item label="甯傚尯鍚嶇О" prop="segName3">
<el-input v-model="searchForm.segName3" placeholder="璇疯緭鍏ュ競鍖哄悕绉�" @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>
- <el-form-item label="鏀惰揣鍦板潃" prop="shipToAddress">
- <el-input v-model="searchForm.shipToAddress" placeholder="璇疯緭鍏ユ敹璐у湴鍧�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鏀惰揣浜�" prop="shipToPerson">
<el-input v-model="searchForm.shipToPerson" placeholder="璇疯緭鍏ユ敹璐т汉" @keypress.enter.native="search"></el-input>
@@ -67,47 +36,33 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:categoryseg:create', 'business:categoryseg:delete']">
- <li><el-button type="primary" @click="$refs.operaCategorySegWindow.open('鏂板缓蹇楅偊钀ラ攢鍖哄煙鍝佺被淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:categoryseg:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:categoryseg:delete']">鍒犻櫎</el-button></li>
- </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
@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="鍝佺被缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segId" label="鎴樺尯缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segId2" label="鐪佸尯缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segId3" label="甯傚尯缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segName" label="鎴樺尯鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="segName2" label="鐪佸尯鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="segName3" label="甯傚尯鍚嶇О" 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 prop="shipToAddress" label="鏀惰揣鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="shipToPerson" label="鏀惰揣浜�" min-width="100px"></el-table-column>
- <el-table-column prop="shipToPhone" label="鏀惰揣浜虹數璇�" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:categoryseg:update', 'business:categoryseg:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaCategorySegWindow.open('缂栬緫蹇楅偊钀ラ攢鍖哄煙鍝佺被淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:categoryseg:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:categoryseg:delete']">鍒犻櫎</el-button>
- </template>
+ <el-table-column type="selection" width="55" fixed></el-table-column>
+ <el-table-column label="S鐮�" prop="scode" fixed min-width="80px"></el-table-column>
+ <el-table-column label="涓�浣撳晢" prop="sname" fixed min-width="180px"></el-table-column>
+ <el-table-column label="F鐮�" prop="orgId" fixed min-width="80px"></el-table-column>
+ <el-table-column label="鍔犵洘鍟�" prop="orgName" fixed min-width="180px"></el-table-column>
+ <el-table-column prop="unitCode" label="鍝佺被" min-width="150px">
+ <template slot-scope="{row}"> {{row.unitCode}} / {{row.unitName}}</template>
</el-table-column>
+ <el-table-column prop="segId" label="鎴樺尯" min-width="150px">
+ <template slot-scope="{row}"> {{row.segId}} / {{row.segName}}</template>
+ </el-table-column>
+ <el-table-column prop="segId2" label="鐪佸尯" min-width="150px">
+ <template slot-scope="{row}"> {{row.segId2}} / {{row.segName2}}</template>
+ </el-table-column>
+ <el-table-column prop="segId3" label="鐗囧尯" min-width="150px">
+ <template slot-scope="{row}"> {{row.segId3}} / {{row.segName3}}</template>
+ </el-table-column>
+ <el-table-column prop="shipToPerson" label="鏀惰揣浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="shipToPhone" label="鏀惰揣浜虹數璇�" min-width="120px"></el-table-column>
+ <el-table-column prop="shipToAddress" label="鏀惰揣鍦板潃" min-width="250px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -126,33 +81,22 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCategorySegWindow from '@/components/business/OperaCategorySegWindow'
+import { getUnitList } from '@/api/business/segments'
export default {
name: 'CategorySeg',
extends: BaseTable,
components: { TableLayout, Pagination, OperaCategorySegWindow },
data () {
return {
+ unitList:[],
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
unitCode: '',
- segId: '',
- segId2: '',
- segId3: '',
segName: '',
segName2: '',
segName3: '',
- syncDate: '',
- syncInfo: '',
- shipToAddress: '',
- shipToPerson: '',
- shipToPhone: ''
+ scode: '',
+ orgId: ''
}
}
},
@@ -163,7 +107,16 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.loadUnitList()
this.search()
+ },
+ methods: {
+ loadUnitList () {
+ getUnitList()
+ .then(data => {
+ this.unitList = data
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3