From 46124fe454f90d24171ebc5be0d9cfe2ab22cbc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 13 十月 2025 09:47:51 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/jkSketch.vue |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/business/jkSketch.vue b/admin/src/views/business/jkSketch.vue
index 134b626..96b57a0 100644
--- a/admin/src/views/business/jkSketch.vue
+++ b/admin/src/views/business/jkSketch.vue
@@ -38,30 +38,33 @@
 <!--
         <el-table-column type="selection" width="55"></el-table-column>
 -->
-        <el-table-column prop="dateInfo" label="閫佽揣鏃ユ湡" min-width="130px"></el-table-column>
-        <el-table-column prop="categoryName" label="涓荤嚎璺�" min-width="130px">
+        <el-table-column prop="dateInfo" label="閫佽揣鏃ユ湡" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="categoryName" label="涓荤嚎璺�-褰撳墠绾胯矾鏁�" min-width="200px" align="center">
           <template slot-scope="{row}">
-            <span class="blue" style="cursor: pointer" @click="$refs.operaJkSketchLineListWindow.open('閰嶉�佺嚎璺槑缁�', row)">{{ row.categoryName }}锛坽{row.lineNum||0}}鏉$嚎璺級</span>
+            <span class="blue" style="cursor: pointer" @click="$refs.operaJkSketchLineListWindow.open('閰嶉�佺嚎璺槑缁�', row)">{{ row.categoryName }}</span>
+            <span class="orange" style="margin-left: 10px">銆� {{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">
+        <el-table-column prop="orderNum" label="瀹㈡埛鏁�(鎴�)" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="totalNum" label="閫佽揣閲�(鏉�)" min-width="100px" align="center"></el-table-column>
+        <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">浼樺寲涓�</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>
           </template>
         </el-table-column>
         <el-table-column
           v-if="containPermissions(['business:jksketch:update', 'business:jksketch:delete'])"
           label="鎿嶄綔"
           min-width="120"
+          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-view" v-if="row.status ==2" >浼樺寲缁撴灉</el-button>
+            <el-button type="text" @click="$refs.OperaJkSketchResultWindow.open('浼樺寲缁撴灉寰皟-', row)" icon="el-icon-edit" v-if="row.status ==2" >浼樺寲缁撴灉寰皟</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,7 +79,7 @@
     <OperaJkSketchWindow ref="operaJkSketchWindow" @success="handlePageChange"/>
     <OperaJkSketchResultWindow ref="OperaJkSketchResultWindow" @success="handlePageChange"/>
     <OperaJkSketchImportWindow ref="OperaJkSketchImportWindow" @success="handlePageChange"/>
-    <OperaJkSketchLineListWindow ref="operaJkSketchLineListWindow"  />
+    <OperaJkSketchLineListWindow ref="operaJkSketchLineListWindow"  @success="handlePageChange" />
   </TableLayout>
 </template>
 

--
Gitblit v1.9.3