From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
admin/src/views/business/jkSketch.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/jkSketch.vue b/admin/src/views/business/jkSketch.vue
index 96b57a0..3d55f95 100644
--- a/admin/src/views/business/jkSketch.vue
+++ b/admin/src/views/business/jkSketch.vue
@@ -50,21 +50,21 @@
<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="green">浼樺寲澶辫触</span>
+ <span v-if="row.status === 3" class="grey">浼樺寲澶辫触</span>
</template>
</el-table-column>
<el-table-column
v-if="containPermissions(['business:jksketch:update', 'business:jksketch:delete'])"
label="鎿嶄綔"
- min-width="120"
+ min-width="140"
align="left"
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="$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>
--
Gitblit v1.9.3