From 6cf36f0e43c9add691b9a375526ce7dc26209574 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 13 十一月 2025 14:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/jkSketch.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/jkSketch.vue b/admin/src/views/business/jkSketch.vue
index d355e38..6cb865b 100644
--- a/admin/src/views/business/jkSketch.vue
+++ b/admin/src/views/business/jkSketch.vue
@@ -50,7 +50,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 +64,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 || row.status ==3" >浼樺寲缁撴灉寰皟</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>
@@ -115,6 +115,11 @@
'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()
},
methods: {
--
Gitblit v1.9.3