From fee184ae9a10e661b9904e06d2dfb91bc71c9474 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 四月 2025 16:31:52 +0800
Subject: [PATCH] 代码初始化
---
admin/src/views/business/workorderShe.vue | 8 ++++----
admin/src/views/system/job.vue | 3 ++-
admin/src/views/business/workorderDbh.vue | 8 ++++----
server/src/main/java/com/doumee/api/business/WorkorderController.java | 6 +++---
admin/src/views/system/snippet.vue | 1 +
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/workorderDbh.vue b/admin/src/views/business/workorderDbh.vue
index 3e28e14..c4a78c2 100644
--- a/admin/src/views/business/workorderDbh.vue
+++ b/admin/src/views/business/workorderDbh.vue
@@ -62,15 +62,15 @@
</el-table-column>
<el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column prop="locationName" label="鍙戠敓鍦扮偣" min-width="100px"></el-table-column>
- <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="100px"></el-table-column>
- <el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="100px">
+ <el-table-column prop="locationName" label="鍙戠敓鍦扮偣" min-width="150px"></el-table-column>
+ <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="200px"></el-table-column>
+ <el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="150px">
<template slot-scope="{row}">
<span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>
<span v-else >{{row.memberName}} </span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>
<el-table-column prop="memberNames" label="閫氱煡浜�" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
diff --git a/admin/src/views/business/workorderShe.vue b/admin/src/views/business/workorderShe.vue
index 2a23867..7a4f74e 100644
--- a/admin/src/views/business/workorderShe.vue
+++ b/admin/src/views/business/workorderShe.vue
@@ -69,7 +69,7 @@
</template>
</el-table-column>
<el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column prop="locationName" label="鍙戠敓鍦扮偣" min-width="100px"></el-table-column>
+ <el-table-column prop="locationName" label="鍙戠敓鍦扮偣" min-width="200px"></el-table-column>
<el-table-column prop="remark" label="鍏蜂綋浣嶇疆" min-width="100px"></el-table-column>
<el-table-column prop="outJiuyi" label="灏卞尰鎯呭喌" min-width="100px">
<template slot-scope="{row}">
@@ -89,14 +89,14 @@
<span v-else>鍚�</span>
</template>
</el-table-column>
- <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="100px"></el-table-column>
- <el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="100px">
+ <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="200px"></el-table-column>
+ <el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="150px">
<template slot-scope="{row}">
<span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>
<span v-else >{{row.memberName}} </span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></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'])"
diff --git a/admin/src/views/system/job.vue b/admin/src/views/system/job.vue
index 2f444e8..92da19e 100644
--- a/admin/src/views/system/job.vue
+++ b/admin/src/views/system/job.vue
@@ -17,6 +17,7 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:job:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -59,7 +60,7 @@
<el-table-column
v-if="containPermissions(['system:job:update', 'system:job:delete'])"
label="鎿嶄綔"
- min-width="160"
+ min-width="200"
fixed="right"
>
<template slot-scope="{row}">
diff --git a/admin/src/views/system/snippet.vue b/admin/src/views/system/snippet.vue
index 2526c5d..4c7576e 100644
--- a/admin/src/views/system/snippet.vue
+++ b/admin/src/views/system/snippet.vue
@@ -22,6 +22,7 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:job:snippet:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
diff --git a/server/src/main/java/com/doumee/api/business/WorkorderController.java b/server/src/main/java/com/doumee/api/business/WorkorderController.java
index 0ae2e7f..a8e7979 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -111,11 +111,11 @@
}
t.setMemberNames("鏈汉");
if(Constants.equalsInteger(model.getMemberType(),Constants.ONE)){
- t.setMemberNames("鍚屼簨");
- }else if(Constants.equalsInteger(model.getIsHurted(),Constants.TWO)){
+ t.setMemberNames( "鍚屼簨-"+StringUtils.defaultString(model.getMemberNames(),""));
+ }else if(Constants.equalsInteger(model.getMemberType(),Constants.TWO)){
t.setMemberNames("渚涘簲鍟�");
+ t.setMemberNames( "渚涘簲鍟�-"+StringUtils.defaultString(model.getMemberNames(),""));
}
- t.setMemberNames(t.getMemberNames()+"-"+StringUtils.defaultString(model.getMemberNames(),""));
list.add(t);
}
}
--
Gitblit v1.9.3