From 9f7777c83f2d07c8d83c506ab2a13bc543f47de9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/workorderShe.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/workorderShe.vue b/admin/src/views/business/workorderShe.vue
index a70a1a7..0b601b6 100644
--- a/admin/src/views/business/workorderShe.vue
+++ b/admin/src/views/business/workorderShe.vue
@@ -35,13 +35,13 @@
stripe
@selection-change="handleSelectionChange"
>
- <el-table-column prop="code" label="宸ュ崟鍙�" min-width="100px" fixed>
+ <el-table-column prop="code" label="宸ュ崟鍙�" min-width="150px" fixed>
<template slot-scope="{row}">
<span style="color: #2E68EC;cursor: pointer" @click="$refs.operaWorkorderWindow.open('SHE浜嬩欢宸ュ崟璇︽儏', row)" >{{ row.code || '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="typeName" label="浼ゅ绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status ==0">寰呭鐞�</span>
@@ -63,17 +63,17 @@
<span v-else>鏈汉</span>
</template>
</el-table-column>
- <el-table-column prop="localtionName" label="鍙戠敓鍦扮偣" min-width="100px"></el-table-column>
+ <el-table-column prop="locationName" label="鍙戠敓鍦扮偣" min-width="100px"></el-table-column>
<el-table-column prop="outJiuyi" label="灏卞尰鎯呭喌" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.outJiuyi == 1">澶栭儴灏卞尰-
- <span v-if="row.isYiwushi == 1">鍖诲姟瀹�-
- <span v-if="row.isHurted == 1">鍙椾激</span>
- <span v-else>鏈彈浼�</span>
+ <span v-if="row.outJiuyi == 0">闈炲閮ㄥ氨鍖�-
+ <span v-if="row.isYiwushi == 0">闈炲尰鍔″-
+ <span v-if="row.isHurted == 0">鏈彈浼�</span>
+ <span v-else>鍙椾激</span>
</span>
- <span v-else>闈炲尰鍔″</span>
+ <span v-else>鍖诲姟瀹�</span>
</span>
- <span v-else>闈炲閮ㄥ氨鍖�</span>
+ <span v-else>澶栭儴灏卞尰</span>
</template>
</el-table-column>
<el-table-column prop="workRelated" label="鍜屽伐浣滅浉鍏�" min-width="100px">
@@ -83,8 +83,7 @@
</template>
</el-table-column>
<el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
label="鎿嶄綔"
--
Gitblit v1.9.3