From edce1f4bd7767b1a62fb70fd926b98796498c6d4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 三月 2025 15:45:58 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/layouts/TableLayout.vue | 3 +++
admin/src/views/business/visits.vue | 8 +++-----
admin/src/views/operation/serviceCar/apprRecord.vue | 30 +++++++++++++++++++-----------
admin/src/views/business/userActionOther.vue | 8 ++++----
4 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index 77c558e..9a2e9b6 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -65,6 +65,9 @@
padding-top: 0;
}
}
+.danger-column{
+ color: red;
+}
// 澶撮儴
.table-header {
overflow: hidden;
diff --git a/admin/src/views/business/userActionOther.vue b/admin/src/views/business/userActionOther.vue
index 325800b..eea0a1c 100644
--- a/admin/src/views/business/userActionOther.vue
+++ b/admin/src/views/business/userActionOther.vue
@@ -28,10 +28,10 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="createName" label="鎿嶄綔浜哄憳"></el-table-column>
- <el-table-column prop="typeName" label="鎿嶄綔绫诲瀷" />
- <el-table-column prop="remark" label="鎿嶄綔鍐呭" width="900"/>
- <el-table-column prop="createDate" label="鎿嶄綔鏃堕棿"></el-table-column>
+ <el-table-column prop="createName" align="center" width="150" label="鎿嶄綔浜哄憳"></el-table-column>
+ <el-table-column prop="typeName" align="center" width="150" label="鎿嶄綔绫诲瀷" class-name="danger-column"/>
+ <el-table-column prop="remark" label="鎿嶄綔鍐呭" min-width="900"/>
+ <el-table-column prop="createDate" align="center" width="150" label="鎿嶄綔鏃堕棿"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index f136dc0..d314a78 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -86,18 +86,16 @@
<span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
</template>
</el-table-column>
+ <el-table-column prop="remark" label="涓嬪彂澶囨敞" min-width="100px"></el-table-column>
<el-table-column v-if="containPermissions(['business:visits:update', 'business:visits:delete'])" label="鎿嶄綔"
min-width="200" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red" v-if="row.status == 7">绂诲満</el-button>
<!-- <el-button type="text" @click="cancel(row.id)" v-permissions="['business:visits:cancel']"
icon="el-icon-delete" style="color: red" v-if="row.status == 5">鍙栨秷棰勭害</el-button>-->
- <el-button type="text" @click="resend(row.id)" v-permissions="['business:visits:update']"
- icon="el-icon-edit" v-if="row.status == 6">閲嶆柊涓嬪彂</el-button>
- <!-- <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('璇︽儏', row.id)" icon="el-icon-view">璇︽儏</el-button> -->
+ <el-button type="text" @click="resend(row.id)" v-permissions="['business:visits:update']" icon="el-icon-edit" v-if="row.status == 6">閲嶆柊涓嬪彂</el-button>
<el-button type="text" @click="handleDetail(row)" icon="el-icon-view">璇︽儏</el-button>
+ <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red" v-if="row.status == 7">绂诲満</el-button>
<el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
- <!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>-->
</template>
</el-table-column>
</el-table>
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 7c6e24d..cff731b 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -56,7 +56,7 @@
<el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
+ <el-form-item label="鐢宠鏃堕棿" prop="startTime">
<el-date-picker
@change="seleTime"
v-model="time"
@@ -184,7 +184,7 @@
></el-table-column>
<el-table-column
label="鎿嶄綔"
- min-width="160"
+ min-width="180"
align="center"
fixed="right"
>
@@ -196,7 +196,10 @@
>鏌ョ湅璇︽儏</el-button
>
<!-- <el-button v-if="(row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button> -->
- <el-button style="color: red" v-if=" (row.status === 0 || row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime() " type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button>
+ <el-button style="color: red" v-if="row.hasRole ==1" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button>
+<!--
+ <el-button style="color: red" v-if="(row.status === 0 && row.creator == userInfo.id)||((row.status === 0 || row.status === 1 ) || ( row.status === 2 && new Date().getTime() < new Date(row.startTime).getTime() ))" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button>
+-->
<el-button style="color: red" type="text" icon="el-icon-delete" @click="deleteById(row)" >鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -254,6 +257,7 @@
components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
data () {
return {
+ // userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
memberName: '',
@@ -283,7 +287,7 @@
'field.main': 'id'
})
// this.search()
- this.changeRadio('0')
+ this.changeRadio(0)
this.loadParams()
},
methods: {
@@ -321,15 +325,15 @@
},
changeRadio (e) {
this.searchForm.radio = e
- if (e === '0') {
+ if (e == 0) {
this.searchForm.queryStartTime = timeForMat(0)[0]
this.searchForm.queryEndTime = timeForMat(0)[1]
this.time = timeForMat(0)
- } else if (e === '1') {
+ } else if (e == 1) {
this.searchForm.queryStartTime = timeForMat(6)[0]
this.searchForm.queryEndTime = timeForMat(6)[1]
this.time = timeForMat(6)
- } else if (e === '2') {
+ } else if (e == 2) {
this.searchForm.queryStartTime = timeForMat(29)[0]
this.searchForm.queryEndTime = timeForMat(29)[1]
this.time = timeForMat(29)
@@ -361,15 +365,19 @@
})
},
seleTime (e) {
- this.searchForm.queryStartTime = e[0]
- this.searchForm.queryEndTime = e[1]
+ this.searchForm.queryStartTime = null
+ this.searchForm.queryEndTime = null
+ if (e != null && e.length >= 2) {
+ this.searchForm.queryStartTime = e[0]
+ this.searchForm.queryEndTime = e[1]
+ }
this.searchForm.radio = null
this.search()
},
reset () {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = '0'
- this.changeRadio('0')
+ this.searchForm.radio = 0
+ this.changeRadio(0)
// this.search()
}
}
--
Gitblit v1.9.3