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/jkSketch.vue | 170 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 97 insertions(+), 73 deletions(-)
diff --git a/admin/src/views/business/jkSketch.vue b/admin/src/views/business/jkSketch.vue
index 8dc4322..134b626 100644
--- a/admin/src/views/business/jkSketch.vue
+++ b/admin/src/views/business/jkSketch.vue
@@ -2,81 +2,57 @@
<TableLayout :permissions="['business:jksketch: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="涓荤嚎璺紪鐮侊紙鍏宠仈category)" prop="categoryId">
- <el-input v-model="searchForm.categoryId" placeholder="璇疯緭鍏ヤ富绾胯矾缂栫爜锛堝叧鑱攃ategory)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閫佽揣閲�" prop="totalNum">
- <el-input v-model="searchForm.totalNum" 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="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>
- <el-form-item label="鏃ユ湡" prop="dateInfo">
+ <el-form-item label="閫佽揣鏃ユ湡" prop="dateInfo">
<el-date-picker v-model="searchForm.dateInfo" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ棩鏈�" @change="search"/>
</el-form-item>
- <el-form-item label="浼樺寲璁板綍缂栫爜(浣滀负key鍊煎瓨redis锛�" prop="jobId">
- <el-input v-model="searchForm.jobId" placeholder="璇疯緭鍏ヤ紭鍖栬褰曠紪鐮�(浣滀负key鍊煎瓨redis锛�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鐘舵��" prop="status" >
+ <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @change="search">
+ <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>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:jksketch:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:jksketch:create', 'business:jksketch:delete']">
- <li><el-button type="primary" @click="$refs.operaJkSketchWindow.open('鏂板缓浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:jksketch:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jksketch:delete']">鍒犻櫎</el-button></li>
+ <ul class="toolbar" v-permissions="['business:jksketch:create']">
+ <li><el-button icon="el-icon-upload" type="primary" @click="$refs.OperaJkSketchImportWindow.open('閿�鍞鍗曞鍏�')" v-permissions="['business:jksketch:create']">閿�鍞鍗曞鍏�</el-button></li>
+ <!--
+ <li><el-button type="primary" @click="$refs.operaJkSketchWindow.open('鏂板缓浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:jksketch:create']">鏂板缓</el-button></li>
+ -->
+ <li> <el-button type="primary" :loading="isWorking.export" v-permissions="['business:jksketch:exportExcel']" @click="exportExcel">瀵煎嚭鍒楄〃鏁版嵁</el-button></li>
+ <li> <el-button type="primary" :loading="isWorking.export1" v-permissions="['business:jksketch:exportExcel']" @click="exportExcel1">瀵煎嚭浼樺寲缁撴灉</el-button></li>
+ <li> <el-button type="primary" :loading="isWorking.export2" v-permissions="['business:jksketch:exportExcel']" @click="exportExcel2">瀵煎嚭閿�鍞鍗�</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
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="info" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="categoryId" label="涓荤嚎璺紪鐮侊紙鍏宠仈category)" min-width="100px"></el-table-column>
- <el-table-column prop="totalNum" label="閫佽揣閲�" min-width="100px"></el-table-column>
- <el-table-column prop="orderNum" 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="dateInfo" label="鏃ユ湡" min-width="100px"></el-table-column>
- <el-table-column prop="jobId" label="浼樺寲璁板綍缂栫爜(浣滀负key鍊煎瓨redis锛�" min-width="100px"></el-table-column>
+-->
+ <el-table-column prop="dateInfo" label="閫佽揣鏃ユ湡" min-width="130px"></el-table-column>
+ <el-table-column prop="categoryName" label="涓荤嚎璺�" min-width="130px">
+ <template slot-scope="{row}">
+ <span class="blue" style="cursor: pointer" @click="$refs.operaJkSketchLineListWindow.open('閰嶉�佺嚎璺槑缁�', row)">{{ row.categoryName }}锛坽{row.lineNum||0}}鏉＄嚎璺級</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="orderNum" label="瀹㈡埛鏁�(鎴�)" min-width="130px"></el-table-column>
+ <el-table-column prop="totalNum" label="閫佽揣閲�(鏉�)" min-width="130px"></el-table-column>
+ <el-table-column prop="status" label="浼樺寲鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.status === 0" class="blue">鏈紭鍖�</span>
+ <span v-if="row.status === 1" class="red">浼樺寲涓�</span>
+ <span v-if="row.status === 2" class="green">宸蹭紭鍖�</span>
+ </template>
+ </el-table-column>
<el-table-column
v-if="containPermissions(['business:jksketch:update', 'business:jksketch:delete'])"
label="鎿嶄綔"
@@ -84,8 +60,8 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaJkSketchWindow.open('缂栬緫浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:jksketch:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jksketch:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.operaJkSketchWindow.open('绾胯矾浼樺寲', row)" icon="el-icon-edit" v-permissions="['business:jksketch:update']">绾胯矾浼樺寲</el-button>
+ <el-button type="text" @click="$refs.OperaJkSketchResultWindow.open('绾胯矾浼樺寲缁撴灉', row)" icon="el-icon-view" v-if="row.status ==2" >浼樺寲缁撴灉</el-button>
</template>
</el-table-column>
</el-table>
@@ -98,6 +74,9 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaJkSketchWindow ref="operaJkSketchWindow" @success="handlePageChange"/>
+ <OperaJkSketchResultWindow ref="OperaJkSketchResultWindow" @success="handlePageChange"/>
+ <OperaJkSketchImportWindow ref="OperaJkSketchImportWindow" @success="handlePageChange"/>
+ <OperaJkSketchLineListWindow ref="operaJkSketchLineListWindow" />
</TableLayout>
</template>
@@ -106,28 +85,23 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaJkSketchWindow from '@/components/business/OperaJkSketchWindow'
+import OperaJkSketchLineListWindow from '@/components/business/OperaJkSketchLineListWindow'
+import OperaJkSketchResultWindow from '@/components/business/OperaJkSketchResultWindow'
+import OperaJkSketchImportWindow from '@/components/business/OperaJkSketchImportWindow'
export default {
name: 'JkSketch',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaJkSketchWindow },
+ components: { TableLayout, Pagination, OperaJkSketchWindow, OperaJkSketchResultWindow, OperaJkSketchImportWindow, OperaJkSketchLineListWindow },
data () {
return {
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- info: '',
- categoryId: '',
- totalNum: '',
- orderNum: '',
status: '',
- sortnum: '',
- dateInfo: '',
- jobId: ''
+ dateInfo: ''
+ },
+ isWorking: {
+ export1: false,
+ export2: false
}
}
},
@@ -139,6 +113,56 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ exportExcel1 () {
+ if (!this.searchForm.dateInfo) {
+ this.$message.error('璇烽�夋嫨鎸囧畾鏃ユ湡杩涜璇ュ鍑烘搷浣滐紒')
+ return
+ }
+ this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
+ .then(() => {
+ this.exLoading = true
+ this.api.exportResultExcel({
+ page: 1,
+ capacity: 1000000,
+ model: {dateInfo:this.searchForm.dateInfo}
+ })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.exLoading = false
+ })
+ })
+ },
+ exportExcel2 () {
+ if (!this.searchForm.dateInfo) {
+ this.$message.error('璇烽�夋嫨鎸囧畾鏃ユ湡杩涜璇ュ鍑烘搷浣滐紒')
+ return
+ }
+ this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
+ .then(() => {
+ this.exLoading = true
+ this.api.exportOrdersExcel({
+ page: 1,
+ capacity: 1000000,
+ model: {dateInfo:this.searchForm.dateInfo}
+ })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.exLoading = false
+ })
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3