From 66b84de58e3efae14c1e258ee716e02ad9557497 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 08:48:50 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/jkLine.vue |  102 ++++++++++++++++++---------------------------------
 1 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/admin/src/views/business/jkLine.vue b/admin/src/views/business/jkLine.vue
index 0eb2e07..255cc63 100644
--- a/admin/src/views/business/jkLine.vue
+++ b/admin/src/views/business/jkLine.vue
@@ -2,47 +2,20 @@
   <TableLayout :permissions="['business:jkline: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="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-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="鐝粍缂栫爜锛堝叧鑱攃ategory锛�" prop="categoryId">
-        <el-input v-model="searchForm.categoryId" placeholder="璇疯緭鍏ョ彮缁勭紪鐮侊紙鍏宠仈category锛�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="鎵�灞炰富绾胯矾" prop="categoryId">
+        <el-select v-model="searchForm.categoryId" clearable filterable placeholder="璇烽�夋嫨鎵�灞炰富绾胯矾"  @change="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="鎵�灞炶溅杈�(鍏宠仈cars)" prop="carId">
-        <el-input v-model="searchForm.carId" placeholder="璇疯緭鍏ユ墍灞炶溅杈�(鍏宠仈cars)" @keypress.enter.native="search"></el-input>
+      <el-form-item label="杩愰�佽溅杈�" prop="carId">
+        <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ繍閫佽溅杈�" clearable @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="鏈�澶у鎴烽噺" prop="maxCustomer">
-        <el-input v-model="searchForm.maxCustomer" placeholder="璇疯緭鍏ユ渶澶у鎴烽噺" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="鏈�澶ц鍗曢噺" prop="maxOrder">
-        <el-input v-model="searchForm.maxOrder" placeholder="璇疯緭鍏ユ渶澶ц鍗曢噺" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="鐘舵�� 0鏈粦瀹� 1鍦ㄤ綅 2鍊熷嚭" prop="status">
-        <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鏈粦瀹� 1鍦ㄤ綅 2鍊熷嚭" @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="code">
+        <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ簭鍙�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
@@ -54,7 +27,8 @@
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:jkline:create', 'business:jkline:delete']">
         <li><el-button type="primary" @click="$refs.operaJkLineWindow.open('鏂板缓浜ゆ帶-绾胯矾淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:jkline:create']">鏂板缓</el-button></li>
-        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">鍒犻櫎</el-button></li>
+        <li><el-button icon="el-icon-upload"  type="primary" @click="$refs.OperaJkLineImportWindowRef.open('绾胯矾瀵煎叆')"  v-permissions="['business:jkline:create']">绾胯矾瀵煎叆</el-button></li>
+        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">鍒犻櫎</el-button></li>
       </ul>
       <el-table
         v-loading="isWorking.search"
@@ -63,20 +37,14 @@
         @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="categoryId" label="鐝粍缂栫爜锛堝叧鑱攃ategory锛�" min-width="100px"></el-table-column>
-        <el-table-column prop="carId" label="鎵�灞炶溅杈�(鍏宠仈cars)" min-width="100px"></el-table-column>
-        <el-table-column prop="maxCustomer" label="鏈�澶у鎴烽噺" min-width="100px"></el-table-column>
-        <el-table-column prop="maxOrder" label="鏈�澶ц鍗曢噺" min-width="100px"></el-table-column>
-        <el-table-column prop="status" label="鐘舵�� 0鏈粦瀹� 1鍦ㄤ綅 2鍊熷嚭" min-width="100px"></el-table-column>
-        <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
+        <el-table-column prop="name" label="鍚嶇О" min-width="200px" show-tooltip-when-overflow></el-table-column>
+        <el-table-column prop="categoryName" label="鎵�灞炰富绾胯矾" min-width="140px"></el-table-column>
+        <el-table-column prop="carCode" label="鎵�灞炶溅杈�" min-width="100px"></el-table-column>
+        <el-table-column prop="maxCustomer" label="瀹㈡埛閲�" min-width="100px"></el-table-column>
+        <el-table-column prop="maxOrder" label="璁㈠崟閲�" min-width="100px"></el-table-column>
+        <el-table-column prop="weeks" label="閰嶉�佸懆鏈�" min-width="140px"></el-table-column>
+        <el-table-column prop="code" label="搴忓彿" min-width="100px"></el-table-column>
+        <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
         <el-table-column
           v-if="containPermissions(['business:jkline:update', 'business:jkline:delete'])"
           label="鎿嶄綔"
@@ -98,6 +66,7 @@
     </template>
     <!-- 鏂板缓/淇敼 -->
     <OperaJkLineWindow ref="operaJkLineWindow" @success="handlePageChange"/>
+    <OperaJkLineImportWindow ref="OperaJkLineImportWindowRef" @success="handlePageChange" />
   </TableLayout>
 </template>
 
@@ -106,29 +75,22 @@
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
 import OperaJkLineWindow from '@/components/business/OperaJkLineWindow'
+import OperaJkLineImportWindow from '@/components/business/OperaJkLineImportWindow'
+import { fetchCateList } from '@/api/business/category'
 export default {
   name: 'JkLine',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaJkLineWindow },
+  components: { TableLayout, Pagination, OperaJkLineWindow,OperaJkLineImportWindow },
   data () {
     return {
       // 鎼滅储
       searchForm: {
-        id: '',
-        creator: '',
-        createDate: '',
-        editor: '',
-        editDate: '',
-        isdeleted: '',
-        info: '',
         name: '',
         categoryId: '',
-        carId: '',
-        maxCustomer: '',
-        maxOrder: '',
-        status: '',
-        sortnum: ''
-      }
+        carCode: '',
+        code: ''
+      },
+      categoryList: []
     }
   },
   created () {
@@ -139,6 +101,14 @@
       'field.main': 'id'
     })
     this.search()
+    this.loadCategory()
+  },
+  methods: {
+    loadCategory () {
+      fetchCateList({ type: 4 }).then(res => {
+        this.categoryList = res || []
+      })
+    }
   }
 }
 </script>

--
Gitblit v1.9.3