From f37f50c13d1cfb858e34b39f6d3588d5ddb263ae Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 08 四月 2025 13:38:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/workorderShe.vue | 179 ++++++++++++++++++++++++++++++++++++++++++++
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 17 ++++
2 files changed, 195 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/business/workorderShe.vue b/admin/src/views/business/workorderShe.vue
new file mode 100644
index 0000000..88aba45
--- /dev/null
+++ b/admin/src/views/business/workorderShe.vue
@@ -0,0 +1,179 @@
+<template>
+ <TableLayout :permissions="['business:workorder:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <SearchFormCollapse slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)" prop="categoryId">
+ <el-input v-model="searchForm.categoryId" placeholder="璇疯緭鍏ユ墍灞炲垎绫荤紪锛堝叧鑱攃ategory)" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="涓婃姤浜哄憳缂栫爜锛堝叧鑱攎ember)" prop="memberId">
+ <el-input v-model="searchForm.memberId" placeholder="璇疯緭鍏ヤ笂鎶ヤ汉鍛樼紪鐮侊紙鍏宠仈member)" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬缂栫爜" prop="companyId">
+ <el-input v-model="searchForm.companyId" placeholder="璇疯緭鍏ラ儴闂ㄧ紪鐮�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�" prop="memberType">
+ <el-input v-model="searchForm.memberType" placeholder="璇疯緭鍏HE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="SHE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�" prop="memberNames">
+ <el-input v-model="searchForm.memberNames" placeholder="璇疯緭鍏HE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鍙戠敓鍦扮偣/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�" prop="localtionId">
+ <el-input v-model="searchForm.localtionId" placeholder="璇疯緭鍏ュ彂鐢熷湴鐐�/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="椋庨櫓绫诲瀷(鍏宠仈category锛�" prop="typeId">
+ <el-date-picker v-model="searchForm.typeId" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ラ闄╃被鍨�(鍏宠仈category锛�" @change="search"/>
+ </el-form-item>
+ <el-form-item label="浣嶇疆鍦扮偣璺緞鍚嶇О" prop="locationName">
+ <el-input v-model="searchForm.locationName" placeholder="璇疯緭鍏ヤ綅缃湴鐐硅矾寰勫悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="宸ュ崟鍙�" prop="code">
+ <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍗曞彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </SearchFormCollapse>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:workorder:create', 'business:workorder:delete']">
+ <li><el-button type="primary" @click="$refs.operaWorkorderWindow.open('鏂板缓宸ュ崟淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:workorder:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button></li>
+ </ul>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
+ <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
+ <el-table-column prop="categoryId" label="鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="status" label="鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3 宸叉挙鍥� 4宸插鐞�" min-width="100px"></el-table-column>
+ <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="type" label="绫诲瀷 0浣嶇疆璐ｄ换浜� 1鐝暱 2鐗╀笟涓荤 3宸ョ▼甯� 4SHE璐熻矗浜� 5SHE宸ュ崟閭鎶勯�佷汉" min-width="100px"></el-table-column>
+ <el-table-column prop="memberId" label="涓婃姤浜哄憳缂栫爜锛堝叧鑱攎ember)" min-width="100px"></el-table-column>
+ <el-table-column prop="companyId" label="閮ㄩ棬缂栫爜" min-width="100px"></el-table-column>
+ <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="memberType" label="SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberQwids" label="SHE娑夊強浜哄憳浼佷笟缂栫爜闆嗗悎" min-width="100px"></el-table-column>
+ <el-table-column prop="memberNames" label="SHE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�" min-width="100px"></el-table-column>
+ <el-table-column prop="localtionId" label="鍙戠敓鍦扮偣/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="outJiuyi" label="鏄惁澶栭儴灏卞尰 0鍚� 1鏄�" min-width="100px"></el-table-column>
+ <el-table-column prop="isYiwushi" label="鏄惁鍖诲姟瀹� 0鍚� 1鏄�" min-width="100px"></el-table-column>
+ <el-table-column prop="isHurted" label="鏄惁鍙椾激 0鍚� 1鏄�" min-width="100px"></el-table-column>
+ <el-table-column prop="workRelated" label="鏄惁鍜屽伐浣滅浉鍏�" min-width="100px"></el-table-column>
+ <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="100px"></el-table-column>
+ <el-table-column prop="emialMemberIds" label="閭欢閫氱煡浜哄憳缂栫爜闆嗗悎" min-width="100px"></el-table-column>
+ <el-table-column prop="qwnoticeMemberIds" label="浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎" min-width="100px"></el-table-column>
+ <el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="typeId" label="椋庨櫓绫诲瀷(鍏宠仈category锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="100px"></el-table-column>
+ <el-table-column prop="managerId" label="褰撳墠鐗╀笟涓荤缂栫爜锛堝叧鑱攎ember锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="dealerId" label="褰撳墠澶勭悊浜哄憳缂栫爜锛堝叧鑱攎ember)" min-width="100px"></el-table-column>
+ <el-table-column prop="dispatchTime" label="鍒嗛厤鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="dispatchInfo" label="鍒嗛厤澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="dealTime" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="problemId" label="DCA闂缂栫爜" min-width="100px"></el-table-column>
+ <el-table-column prop="problemNum" label="DCA闂鏁伴噺" min-width="100px"></el-table-column>
+ <el-table-column prop="locationName" label="浣嶇疆鍦扮偣璺緞鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="宸ュ崟鍙�" min-width="100px"></el-table-column>
+ <el-table-column
+ v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaWorkorderWindow.open('缂栬緫宸ュ崟淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:workorder:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaWorkorderWindow ref="operaWorkorderWindow" @success="handlePageChange"/>
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import SearchFormCollapse from '@/components/common/SearchFormCollapse'
+import Pagination from '@/components/common/Pagination'
+import OperaWorkorderWindow from '@/components/business/OperaWorkorderWindow'
+export default {
+ name: 'Workorder',
+ extends: BaseTable,
+ components: { SearchFormCollapse, TableLayout, Pagination, OperaWorkorderWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ id: '',
+ creator: '',
+ createDate: '',
+ editor: '',
+ editDate: '',
+ isdeleted: '',
+ categoryId: '',
+ remark: '',
+ status: '',
+ sortnum: '',
+ type: '',
+ memberId: '',
+ companyId: '',
+ submitDate: '',
+ memberType: '',
+ memberQwids: '',
+ memberNames: '',
+ localtionId: '',
+ outJiuyi: '',
+ isYiwushi: '',
+ isHurted: '',
+ workRelated: '',
+ eventInfo: '',
+ emialMemberIds: '',
+ qwnoticeMemberIds: '',
+ happenTime: '',
+ typeId: '',
+ riskInfo: '',
+ managerId: '',
+ dealerId: '',
+ dispatchTime: '',
+ dispatchInfo: '',
+ dealTime: '',
+ dealInfo: '',
+ problemId: '',
+ problemNum: '',
+ locationName: '',
+ code: ''
+ }
+ }
+ },
+ created () {
+ this.config({
+ module: '宸ュ崟淇℃伅琛�',
+ api: '/business/workorder',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ }
+}
+</script>
diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
index 92307c3..a0fd7e4 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
@@ -157,7 +157,6 @@
@ApiModelProperty(value = "澶勭悊鏃堕棿")
@ExcelExportColumn(name="澶勭悊鏃堕棿")
-
private Date dealTime;
@ApiModelProperty(value = "澶勭悊澶囨敞")
@@ -234,4 +233,20 @@
private String colleague;
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "涓婃姤浜哄悕绉�")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "涓婃姤浜烘墜鏈哄彿")
+ @TableField(exist = false)
+ private String memberPhone;
+ @ApiModelProperty(value = "绫诲瀷鍚嶇О")
+ @TableField(exist = false)
+ private String typeName;
+ @ApiModelProperty(value = "涓婃姤闄勪欢闆嗗悎")
+ @TableField(exist = false)
+ private Multifile fileList;
+
}
--
Gitblit v1.9.3