From 078a5c4ced367fdbd5a16c27c8bada6e44e632d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:00:33 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/jkCustomer.vue | 140 ++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 73 deletions(-)
diff --git a/admin/src/views/business/jkCustomer.vue b/admin/src/views/business/jkCustomer.vue
index 3fcc724..8c003f3 100644
--- a/admin/src/views/business/jkCustomer.vue
+++ b/admin/src/views/business/jkCustomer.vue
@@ -2,53 +2,32 @@
<TableLayout :permissions="['business:jkcustomer: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 label="瀹㈡埛绠�鐮�" prop="code">
+ <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ鎴风畝鐮�" clearable @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 label="瀹㈡埛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" clearable @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 label="鍦板潃" prop="location">
+ <el-input v-model="searchForm.location" placeholder="璇疯緭鍏ュ湴鍧�" clearable @keypress.enter.native="search"></el-input>
</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 label="閰嶉�佸懆鏈�" prop="lineWeeks">
+ <el-select v-model="searchForm.lineWeeks" clearable filterable placeholder="璇烽�夋嫨閰嶉�佸懆鏈�" @change="search">
+ <el-option v-for="item in weeksList" :key="item" :label="item" :value="item">
+ </el-option>
+ </el-select>
</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 label="鎵�灞炰富绾胯矾" prop="categoryId">
+ <el-select v-model="searchForm.categoryId" clearable filterable placeholder="璇烽�夋嫨鎵�灞炰富绾胯矾" @change="loadLines();search()">
+ <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
</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="info">
- <el-input v-model="searchForm.info" 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-form-item>
- <el-form-item label="缂栫爜" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ョ紪鐮�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵�鍦ㄤ綅缃�" prop="lacation">
- <el-input v-model="searchForm.lacation" placeholder="璇疯緭鍏ユ墍鍦ㄤ綅缃�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁忓害" prop="longitude">
- <el-input v-model="searchForm.longitude" placeholder="璇疯緭鍏ョ粡搴�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁村害" prop="latitude">
- <el-input v-model="searchForm.latitude" placeholder="璇疯緭鍏ョ淮搴�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閰嶉�佸懆鏈�" prop="weeks">
- <el-input v-model="searchForm.weeks" placeholder="璇疯緭鍏ラ厤閫佸懆鏈�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)" prop="lineId">
- <el-input v-model="searchForm.lineId" placeholder="璇疯緭鍏ラ�佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0姝ｅ父 绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0姝ｅ父 绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
+ <el-form-item label="閫佽揣绾胯矾" prop="lineId">
+ <el-select v-model="searchForm.lineId" clearable filterable placeholder="璇烽�夋嫨閫佽揣绾胯矾" @change="search">
+ <el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -59,8 +38,11 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:jkcustomer:create', 'business:jkcustomer:delete']">
+<!--
<li><el-button type="primary" @click="$refs.operaJkCustomerWindow.open('鏂板缓浜ゆ帶-瀹㈡埛淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:jkcustomer:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">鍒犻櫎</el-button></li>
+-->
+ <li><el-button icon="el-icon-upload" type="primary" @click="$refs.OperaJkCustomerImportWindowRef.open('瀹㈡埛瀵煎叆')" v-permissions="['business:jkcustomer:create']">瀹㈡埛瀵煎叆</el-button></li>
+ <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -69,22 +51,15 @@
@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="info" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="lacation" label="鎵�鍦ㄤ綅缃�" min-width="100px"></el-table-column>
- <el-table-column prop="longitude" label="缁忓害" min-width="100px"></el-table-column>
- <el-table-column prop="latitude" label="缁村害" min-width="100px"></el-table-column>
- <el-table-column prop="weeks" label="閰嶉�佸懆鏈�" min-width="100px"></el-table-column>
- <el-table-column prop="lineId" label="閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0姝ｅ父 绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="瀹㈡埛绠�鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="瀹㈡埛鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="location" label="鍦板潃" min-width="200px" show-tooltip-when-overflow></el-table-column>
+ <el-table-column prop="locationInfo" label="缁忕含搴�" min-width="150px"> </el-table-column>
+ <el-table-column prop="lineWeeks" label="閰嶉�佸懆鏈�" min-width="100px"></el-table-column>
+ <el-table-column prop="lineName" label="閫佽揣绾胯矾" min-width="200px" show-tooltip-when-overflow></el-table-column>
+ <el-table-column prop="categoryName" label="鎵�灞炰富绾胯矾" min-width="100px"></el-table-column>
+ <el-table-column prop="sortno" label="搴忓彿" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:jkcustomer:update', 'business:jkcustomer:delete'])"
label="鎿嶄綔"
@@ -92,8 +67,8 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaJkCustomerWindow.open('缂栬緫浜ゆ帶-瀹㈡埛淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:jkcustomer:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.operaJkCustomerWindow.open('缂栬緫瀹㈡埛淇℃伅', row)" icon="el-icon-edit" v-permissions="['business:jkcustomer:update']">缂栬緫</el-button>
+ <el-button type="text" style="color: red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -106,6 +81,7 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaJkCustomerWindow ref="operaJkCustomerWindow" @success="handlePageChange"/>
+ <OperaJkCustomerImportWindow ref="OperaJkCustomerImportWindowRef" @success="handlePageChange" />
</TableLayout>
</template>
@@ -114,31 +90,30 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaJkCustomerWindow from '@/components/business/OperaJkCustomerWindow'
+import OperaJkCustomerImportWindow from '@/components/business/OperaJkCustomerImportWindow'
+import { fetchCateList } from '@/api/business/category'
+import { allList } from '@/api/business/jkLine'
export default {
name: 'JkCustomer',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaJkCustomerWindow },
+ components: { TableLayout, Pagination, OperaJkCustomerWindow, OperaJkCustomerImportWindow },
data () {
return {
// 鎼滅储
searchForm: {
id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- info: '',
+ categoryId: '',
name: '',
code: '',
- lacation: '',
- longitude: '',
- latitude: '',
- weeks: '',
+ location: '',
+ lineWeeks: '',
lineId: '',
status: '',
sortnum: ''
- }
+ },
+ categoryList: [],
+ lineList: [],
+ weeksList: ['鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚', '鍛ㄦ棩']
}
},
created () {
@@ -149,6 +124,25 @@
'field.main': 'id'
})
this.search()
+ this.loadCategory()
+ this.loadLines()
+ },
+ methods: {
+ loadCategory () {
+ fetchCateList({
+ type: 4
+ }).then(res => {
+ this.categoryList = res
+ })
+ },
+ loadLines () {
+ this.searchForm.lineId =''
+ allList({
+ categoryId: this.searchForm.categoryId
+ }).then(res => {
+ this.lineList = res
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3