From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/workorderDca.vue | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/admin/src/views/business/workorderDca.vue b/admin/src/views/business/workorderDca.vue
index 84848d3..9a99868 100644
--- a/admin/src/views/business/workorderDca.vue
+++ b/admin/src/views/business/workorderDca.vue
@@ -3,8 +3,8 @@
<!-- 鎼滅储琛ㄥ崟 -->
<div slot="search-form">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
- <el-form-item label="椋庨櫓绫诲瀷" prop="typeId">
- <el-select v-model="searchForm.typeId">
+ <el-form-item label="瑙傚療涓婚" prop="typeId">
+ <el-select v-model="searchForm.typeId" @change="search">
<el-option clearable filterable
v-for="item in categorys"
:key="item.id"
@@ -41,34 +41,25 @@
>
<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>
+ <span style="color: #2E68EC;cursor: pointer" @click="$refs.operaWorkorderWindow.open('DCA浜嬩欢宸ュ崟璁板綍璇︽儏', row)" >{{ row.code || '-'}}</span>
</template>
</el-table-column>
+ <el-table-column prop="typeName" label="瑙傚療涓婚" min-width="150px"></el-table-column>
+ <el-table-column prop="dcaYesNum" label="瑙傚療椤圭粺璁�" min-width="150px">
+ <template slot-scope="{row}">
+ <span style="color: #1562e2" >绗﹀悎锛歿{row.dcaYesNum}} 锛屼笉绗﹀悎锛�<span style="color:red;">{{row.dcaNoNum}}</span> </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="locationName" label="浣嶇疆" min-width="150px"></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="memberName" label="涓婃姤浜哄憳" min-width="100px">
<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="status" label="鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.status ==0">寰呭鐞�</span>
- <span v-else-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
- <span v-else>澶勭悊涓�</span>
- </template>
- </el-table-column>
-<!--
- <el-table-column prop="typeName" label="DCA绫诲瀷" min-width="100px"></el-table-column>
--->
- <el-table-column prop="typeName" label="瑙傚療涓婚" min-width="150px"></el-table-column>
- <el-table-column prop="dcaYesNum" label="瑙傚療椤圭粺璁�" min-width="150px">
- <template slot-scope="{row}">
- <span style="color: #1562e2" >绗﹀悎锛歿{row.dcaYesNum}} 涓嶇鍚堬細{{row.dcaNoNum}}</span>
- </template>
- </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="companyName" 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'])"
@@ -77,7 +68,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaWorkorderWindow.open('DCA浜嬩欢宸ュ崟璇︽儏', row)" icon="el-icon-zoom-out" >鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.operaWorkorderWindow.open('DCA浜嬩欢宸ュ崟璁板綍璇︽儏', row)" icon="el-icon-zoom-out" >鏌ョ湅璇︽儏</el-button>
<!--<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button>-->
</template>
</el-table-column>
--
Gitblit v1.9.3