From 8134798d85d2abb086f727fde8b6fd20d3acd670 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 24 十一月 2025 09:04:36 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/jkSketch.vue | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/jkSketch.vue b/admin/src/views/business/jkSketch.vue
index fc55295..ff2f105 100644
--- a/admin/src/views/business/jkSketch.vue
+++ b/admin/src/views/business/jkSketch.vue
@@ -5,6 +5,12 @@
<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="鎵�灞炰富绾胯矾" 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="鐘舵��" prop="status" >
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @change="search">
<el-option label="鏈紭鍖�" value="0"></el-option>
@@ -50,7 +56,7 @@
<el-table-column prop="status" label="浼樺寲鐘舵��" min-width="100px" align="center">
<template slot-scope="{row}">
<span v-if="row.status === 0" class="blue">鏈紭鍖�</span>
- <span v-if="row.status === 1" class="red">浼樺寲涓� 銆� {{row.planLineNum||0}} 銆戞潯绾胯矾</span>
+ <span v-if="row.status === 1" class="red">浼樺寲涓�<!-- 銆� {{row.planLineNum||0}} 銆戞潯绾胯矾--></span>
<span v-if="row.status === 2" class="green">宸蹭紭鍖�</span>
<span v-if="row.status === 3" class="grey">浼樺寲澶辫触</span>
</template>
@@ -64,7 +70,7 @@
>
<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" class="red" @click="$refs.OperaJkSketchResultWindow.open('浼樺寲缁撴灉寰皟-', row)" icon="el-icon-edit" v-if="row.status ==2" >浼樺寲缁撴灉寰皟</el-button>
+ <el-button type="text" class="red" @click="$refs.OperaJkSketchResultWindow.open('浼樺寲缁撴灉寰皟-', row)" icon="el-icon-edit" v-if="row.optStatus === 1" >浼樺寲缁撴灉寰皟</el-button>
</template>
</el-table-column>
</el-table>
@@ -91,6 +97,7 @@
import OperaJkSketchLineListWindow from '@/components/business/OperaJkSketchLineListWindow'
import OperaJkSketchResultWindow from '@/components/business/OperaJkSketchResultWindow'
import OperaJkSketchImportWindow from '@/components/business/OperaJkSketchImportWindow'
+import {fetchCateList} from "@/api/business/category";
export default {
name: 'JkSketch',
extends: BaseTable,
@@ -100,12 +107,14 @@
// 鎼滅储
searchForm: {
status: '',
+ categoryId: '',
dateInfo: ''
},
isWorking: {
export1: false,
export2: false
- }
+ },
+ categoryList: []
}
},
created () {
@@ -115,9 +124,20 @@
'field.id': 'id',
'field.main': 'id'
})
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = now.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1
+ const day = now.getDate();
+ this.searchForm.dateInfo = `${year}-${month}-${day}`
this.search()
+ this.loadCategory()
},
methods: {
+ loadCategory () {
+ fetchCateList({ type: 4 }).then(res => {
+ this.categoryList = res || []
+ })
+ },
exportExcel1 () {
if (!this.searchForm.dateInfo) {
this.$message.error('璇烽�夋嫨鎸囧畾鏃ユ湡杩涜璇ュ鍑烘搷浣滐紒')
--
Gitblit v1.9.3