From 8e95706c67eed1424b2654eaab232307cb12df2d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 05 七月 2024 18:32:44 +0800
Subject: [PATCH] ‘’
---
admin/src/api/business/carUseBook.js | 6
h5/pages/appointmentDetails/appointmentDetails.vue | 4
h5/pages/staff/index.vue | 22 +-
admin/src/components/business/OperaCarUseBookWindow.vue | 9
admin/src/views/business/approvalConfiguration.vue | 67 +++++-
admin/src/views/operation/serviceCar/apprConfig.vue | 64 +++++-
admin/src/views/business/approvalReport.vue | 74 +++++--
admin/src/views/meeting/components/OperaBookingsWindow.vue | 2
admin/src/views/operation/serviceCar/apprRecord.vue | 250 +++++++++++++++++++++------
h5/pages/applicationRecord/applicationRecord.vue | 4
10 files changed, 373 insertions(+), 129 deletions(-)
diff --git a/admin/src/api/business/carUseBook.js b/admin/src/api/business/carUseBook.js
index 2bafdea..b7527f0 100644
--- a/admin/src/api/business/carUseBook.js
+++ b/admin/src/api/business/carUseBook.js
@@ -41,8 +41,10 @@
return request.get(`/visitsAdmin/cloudService/business/carUseBook/delete/${id}`)
}
// 鎾ら攢
-export function revokeById (id) {
- return request.get(`/visitsAdmin/cloudService/business/carUseBook/revoke?id=${id}`)
+export function revokeById (params) {
+ return request.get('/visitsAdmin/cloudService/business/carUseBook/revoke', {
+ params
+ })
}
// 鏍规嵁ID鏌ヨ
export function detail (id) {
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 607212d..6af1e03 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -122,9 +122,9 @@
:visible.sync="isShowProblem"
width="480px"
>
- <el-form :model="dealForm" ref="dealForm" >
+ <el-form :model="dealForm" :rules="rules" ref="dealForm" >
<!-- <el-form-item label="娲捐溅鍙告満" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam === 1"> -->
- <el-form-item label="娲捐溅鍙告満" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam == 1">
+ <el-form-item label="娲捐溅鍙告満" prop="driverId" v-if="model.approveDateVO!=null && model.approveDateVO.driverParam == 1">
<el-select v-model="dealForm.driverId" style="width: 300px" filterable clearable placeholder="璇烽�夋嫨娲鹃仯鍙告満">
<el-option
v-for="item in memberList"
@@ -200,6 +200,9 @@
},
backForm: {
checkInfo: null
+ },
+ rules: {
+ driverId: [{ required: true, message: '璇烽�夋嫨娲鹃仯鍙告満', trigger: 'blur' }]
}
}
},
@@ -263,7 +266,7 @@
objId: this.dataId,
objType: this.model.type == 1 ? 4 : 3,
status: 3,
- checkInfo: this.dealForm.checkInfo
+ checkInfo: this.backForm.checkInfo
}).then(res => {
this.$tip.apiSuccess('閫�鍥炴垚鍔�')
this.getDetail()
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index eba5df1..c295e5a 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -30,18 +30,57 @@
>
<div class="head">{{ item.remark }}</div>
<div class="content">
- <div v-if="item.objIds && item.objIds.length === 1 ">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
- </div>
- <div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} 绛�</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
- </div>
- <div v-else>璇烽�夋嫨</div>
- <i class="el-icon-arrow-right"></i>
+ <!-- 瀹℃壒 -->
+ <template v-if="item.type == 0">
+ <template v-if="item.memberType == '0'">
+ <div>琚浜�</div>
+ </template>
+ <template v-if="item.memberType == '2'">
+ <div>閮ㄩ棬涓荤</div>
+ </template>
+ <template v-if="item.memberType == '1'">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i class="el-icon-arrow-right"></i>
+ </template>
+ </template>
+ <!-- 鎶勯�� -->
+ <template v-if="item.type == 1">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i
+ v-if="item.memberType == '1'"
+ class="el-icon-arrow-right"
+ ></i>
+ </template>
</div>
</div>
<div class="arrows">
@@ -72,12 +111,12 @@
<template v-if="apprList[activeIndex].type == '1'">
<div class="config_data_item_reviewed_content">
<div
- v-for="mem in apprList[activeIndex].objIds"
+ v-for="mem, memIndex in apprList[activeIndex].objIds"
:key="mem.id"
class="config_data_item_reviewed_content_item"
>
<span>{{ mem.name }}</span>
- <i class="el-icon-close"></i>
+ <i @click="memDel(memIndex)" class="el-icon-close"></i>
</div>
<span class="add" @click="selStaff">+娣诲姞</span>
</div>
diff --git a/admin/src/views/business/approvalReport.vue b/admin/src/views/business/approvalReport.vue
index b264bba..b5b2c9f 100644
--- a/admin/src/views/business/approvalReport.vue
+++ b/admin/src/views/business/approvalReport.vue
@@ -26,29 +26,57 @@
>
<div class="head">{{ item.remark }}</div>
<div class="content">
- <div v-if="item.objIds && item.objIds.length === 1">
- <span
- >{{ item.objIds[0].name }}
- {{ item.objIds[0].companyName }}</span
- >
- <span v-if="item.approveType == 0 && item.type == '0'">
- 鎴栫</span
- >
- <span v-if="item.approveType == 1 && item.type == '0'">
- 浼氱</span
- >
- </div>
- <div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} 绛�</span>
- <span v-if="item.approveType == 0 && item.type == '0'">
- 鎴栫</span
- >
- <span v-if="item.approveType == 1 && item.type == '0'">
- 浼氱</span
- >
- </div>
- <div v-else>璇烽�夋嫨</div>
- <i class="el-icon-arrow-right"></i>
+ <!-- 瀹℃壒 -->
+ <template v-if="item.type == 0">
+ <template v-if="item.memberType == '0'">
+ <div>琚浜�</div>
+ </template>
+ <template v-if="item.memberType == '2'">
+ <div>閮ㄩ棬涓荤</div>
+ </template>
+ <template v-if="item.memberType == '1'">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i class="el-icon-arrow-right"></i>
+ </template>
+ </template>
+ <!-- 鎶勯�� -->
+ <template v-if="item.type == 1">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i
+ v-if="item.memberType == '1'"
+ class="el-icon-arrow-right"
+ ></i>
+ </template>
</div>
</div>
<div class="arrows">
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 7730505..2975fec 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -198,7 +198,7 @@
userList({
page: 1,
capacity: 9999,
- model: { realname: this.filterText, memberType: 2 }
+ model: { realname: this.filterText, memberType: 2, companyType: 1 }
})
.then(res => {
console.log('userList', res)
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index 93ec48d..daef69a 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -30,18 +30,54 @@
>
<div class="head">{{ item.remark }}</div>
<div class="content">
- <div v-if="item.objIds && item.objIds.length === 1 ">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
- </div>
- <div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} 绛�</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
- </div>
- <div v-else>璇烽�夋嫨</div>
- <i class="el-icon-arrow-right"></i>
+ <!-- 瀹℃壒 -->
+ <template v-if="item.type == 0">
+ <template v-if="item.memberType == '2'">
+ <div>閮ㄩ棬涓荤</div>
+ </template>
+ <template v-if="item.memberType == '1'">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i class="el-icon-arrow-right"></i>
+ </template>
+ </template>
+ <!-- 鎶勯�� -->
+ <template v-if="item.type == 1">
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ </div>
+ <div v-else-if="item.objIds && item.objIds.length > 1">
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ </div>
+ <div v-else>璇烽�夋嫨</div>
+ <i
+ v-if="item.memberType == '1'"
+ class="el-icon-arrow-right"
+ ></i>
+ </template>
</div>
</div>
<div class="arrows">
@@ -72,12 +108,12 @@
<template v-if="apprList[activeIndex].type == '1'">
<div class="config_data_item_reviewed_content">
<div
- v-for="mem in apprList[activeIndex].objIds"
+ v-for="mem, memIndex in apprList[activeIndex].objIds"
:key="mem.id"
class="config_data_item_reviewed_content_item"
>
<span>{{ mem.name }}</span>
- <i class="el-icon-close"></i>
+ <i @click="memDel(memIndex)" class="el-icon-close"></i>
</div>
<span class="add" @click="selStaff">+娣诲姞</span>
</div>
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 85828a2..08e9f8a 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -1,18 +1,43 @@
<template>
<TableLayout :permissions="['business:empower:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form
+ ref="searchForm"
+ slot="search-form"
+ :model="searchForm"
+ label-width="100px"
+ inline
+ >
<el-form-item label="鐢宠浜�" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-input
+ v-model="searchForm.memberName"
+ placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�"
+ @keypress.enter.native="search"
+ ></el-input>
</el-form-item>
<el-form-item label="鐢宠浜虹粍缁�" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ敵璇蜂汉缁勭粐" clearable @keypress.enter.native="search"></el-input>
+ <el-input
+ v-model="searchForm.companyName"
+ placeholder="璇疯緭鍏ョ敵璇蜂汉缁勭粐"
+ clearable
+ @keypress.enter.native="search"
+ ></el-input>
</el-form-item>
<el-form-item label="杞︾墝鍙�" prop="carCode">
- <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" clearable @keypress.enter.native="search"></el-input>
+ <el-input
+ v-model="searchForm.carCode"
+ placeholder="璇疯緭鍏ヨ溅鐗屽彿"
+ clearable
+ @keypress.enter.native="search"
+ ></el-input>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
+ <el-select
+ v-model="searchForm.status"
+ @change="search"
+ clearable
+ placeholder="鐘舵��"
+ >
<el-option label="鐢宠涓�" value="0"></el-option>
<el-option label="瀹℃牳涓�" value="1"></el-option>
<el-option label="瀹℃壒閫氳繃" value="2"></el-option>
@@ -21,26 +46,36 @@
</el-select>
</el-form-item>
<el-form-item label="鐩殑鍦扮被鍨�" prop="type">
- <el-select v-model="searchForm.type" @change="search" clearable placeholder="鐩殑鍦扮被鍨�">
+ <el-select
+ v-model="searchForm.type"
+ @change="search"
+ clearable
+ placeholder="鐩殑鍦扮被鍨�"
+ >
<el-option label="甯傚唴鐢ㄨ溅" value="0"></el-option>
<el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
<el-date-picker
- @change="seleTime"
- v-model="time"
- @keypress.enter.native="search"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- :default-time="['00:00:00', '23:59:59']"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ @change="seleTime"
+ v-model="time"
+ @keypress.enter.native="search"
+ type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ :default-time="['00:00:00', '23:59:59']"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-group
+ v-model="searchForm.radio"
+ size="small"
+ @input="changeRadio"
+ >
<el-radio-button label="0">褰撳ぉ</el-radio-button>
<el-radio-button label="1">杩�7澶�</el-radio-button>
<el-radio-button label="2">杩�30澶�</el-radio-button>
@@ -52,67 +87,154 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:carusebook:create','business:carusebook:exportExcel']">
- <li><el-button type="primary" @click="handleEdit" icon="el-icon-plus" v-permissions="['business:carusebook:create']">鏂板缓</el-button></li>
- <li><el-button type="primary" @click="handleEx" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button></li>
+ <ul
+ class="toolbar"
+ v-permissions="[
+ 'business:carusebook:create',
+ 'business:carusebook:exportExcel',
+ ]"
+ >
+ <li>
+ <el-button
+ type="primary"
+ @click="handleEdit"
+ icon="el-icon-plus"
+ v-permissions="['business:carusebook:create']"
+ >鏂板缓</el-button
+ >
+ </li>
+ <li>
+ <el-button
+ type="primary"
+ @click="handleEx"
+ v-permissions="['business:carusebook:exportExcel']"
+ >瀵煎嚭</el-button
+ >
+ </li>
</ul>
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
+ 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="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
- <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column
+ prop="memberName"
+ label="鎻愭姤浜�"
+ min-width="80px"
+ ></el-table-column>
+ <el-table-column
+ prop="companyName"
+ label="鎵�灞炵粍缁�"
+ min-width="150px"
+ ></el-table-column>
+ <el-table-column
+ prop="carCode"
+ label="杞︾墝鍙�"
+ min-width="100px"
+ ></el-table-column>
<el-table-column label="鐢ㄨ溅鏃堕棿" min-width="170px">
- <template slot-scope="{row}">
- <span>璧�:{{row.startTime || ''}}</span><br>
- <span>姝�:{{row.endTime || ''}}</span>
+ <template slot-scope="{ row }">
+ <span>璧�:{{ row.startTime || "" }}</span
+ ><br />
+ <span>姝�:{{ row.endTime || "" }}</span>
</template>
</el-table-column>
- <el-table-column prop="planUseDate" label="鍑哄彂鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column
+ prop="planUseDate"
+ label="鍑哄彂鏃堕棿"
+ min-width="150px"
+ ></el-table-column>
<el-table-column label="鐩殑鍦�" min-width="200px">
- <template slot-scope="{row}">
+ <template slot-scope="{ row }">
<span class="status-green" v-if="row.type === 0">銆愬競鍐呫��</span>
- <span class="status-red" v-if="row.type === 1">銆愬競澶栥��</span>
- <span >{{ row.addr }}</span>
+ <span class="status-red" v-if="row.type === 1">銆愬競澶栥��</span>
+ <span>{{ row.addr }}</span>
</template>
</el-table-column>
<el-table-column label="鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span class="status-blue" v-if="row.status === 0">鐢宠涓�</span>
- <span class="status-blue" v-if="row.status === 1">瀹℃牳涓�</span>
+ <template slot-scope="{ row }">
+ <span class="status-blue" v-if="row.status === 0">鐢宠涓�</span>
+ <span class="status-blue" v-if="row.status === 1">瀹℃牳涓�</span>
<span class="status-green" v-if="row.status === 2">瀹℃壒閫氳繃</span>
- <span class="status-red" v-if="row.status === 3">瀹℃壒涓嶉�氳繃</span>
- <span class="status-red" v-if="row.status === 4">宸叉挙閿�</span>
+ <span class="status-red" v-if="row.status === 3">瀹℃壒涓嶉�氳繃</span>
+ <span class="status-red" v-if="row.status === 4">宸叉挙閿�</span>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鐢宠鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
- label="鎿嶄綔"
- min-width="140"
- align="center"
- fixed="right"
+ prop="createDate"
+ label="鐢宠鏃堕棿"
+ min-width="150px"
+ ></el-table-column>
+ <el-table-column
+ prop="editDate"
+ label="鎿嶄綔鏃堕棿"
+ min-width="150px"
+ ></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="160"
+ align="center"
+ fixed="right"
>
- <template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�',row)" >鏌ョ湅璇︽儏</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>
+ <template slot-scope="{ row }">
+ <el-button
+ type="text"
+ icon="el-icon-edit"
+ @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)"
+ >鏌ョ湅璇︽儏</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
+ 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
+ >
</template>
</el-table-column>
</el-table>
<pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
>
</pagination>
</template>
- <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="handlePageChange"/>
- <OperaCarUseBookParamWindow ref="OperaParamWindow" @success="search"/>
+ <!-- -->
+ <el-dialog title="鐢ㄨ溅鎾ら攢" :visible.sync="isShowBack" width="520px">
+ <el-form
+ :model="backParam"
+ :rules="rules"
+ ref="backForm"
+ label-width="100px"
+ class="demo-ruleForm"
+ >
+ <el-form-item label="璇存槑" prop="info">
+ <el-input
+ type="textarea"
+ :rows="4"
+ v-model="backParam.info"
+ placeholder="璇疯緭鍏ユ挙閿�璇存槑"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="isShowBack = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="backSubmit">纭畾</el-button>
+ </span>
+ </el-dialog>
+ <OperaCarUseBookWindow
+ ref="OperaDetailsWindow"
+ @success="handlePageChange"
+ />
+ <OperaCarUseBookParamWindow ref="OperaParamWindow" @success="search" />
</TableLayout>
</template>
@@ -143,7 +265,13 @@
},
cateList: [],
areaList: [],
- time: []
+ time: [],
+
+ isShowBack: false,
+ backParam: {},
+ rules: {
+ info: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }]
+ }
}
},
created () {
@@ -159,7 +287,19 @@
},
methods: {
rowRevokeClick (row) {
- revokeById(row.id)
+ this.isShowBack = true
+ this.backParam = {}
+ this.$set(this.backParam, 'id', row.id)
+ this.$nextTick(() => {
+ this.$refs.backForm.clearValidate()
+ })
+ },
+ backSubmit () {
+ revokeById({ ...this.backParam }).then(res => {
+ this.$tip.success('鎾ら攢鎴愬姛')
+ this.isShowBack = false
+ this.search()
+ })
},
handleEx () {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index 98b1598..3cac6b9 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -37,7 +37,7 @@
>
<view class="box_list_item_head">
<text>{{ item.name }}鎻愪氦鐨勮瀹㈢敵璇�</text>
- <text class="loading">{{ statusMap[item.status] }}</text>
+ <text class="loading" :class="{error: item.status == 3}">{{ statusMap[item.status] }}</text>
</view>
<view class="box_list_item_nr">
<view class="box_list_item_nr_item">
@@ -93,7 +93,7 @@
0: '寰呭鏍�',
1: '宸叉彁浜�',
2: '瀹℃牳閫氳繃',
- 3: '瀹℃牳涓嶉�氳繃',
+ 3: '瀹℃牳椹冲洖',
4: '鍙栨秷',
5: '涓嬪彂鎴愬姛',
6: '涓嬪彂澶辫触',
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index e9a26ee..4577ecd 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -20,9 +20,9 @@
</view>
<view class="box_list">
<view class="box_list_label">鎷滆淇℃伅</view>
- <view class="box_list_tips" v-if="info.status == 6 || info.status == 3"
+ <!-- <view class="box_list_tips" v-if="info.status == 6 || info.status == 3"
>璇锋敞鎰忔煡鐪嬪嚭鍏ラ棬绂佷笅鍙戞儏鍐碉紝濡傝嫢涓嬪彂澶辫触闇�閲嶆柊鐢宠</view
- >
+ > -->
<view class="box_list_item">
<view class="box_list_item_label">琚浜哄憳锛�</view>
<view class="box_list_item_val"
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index 5b07e1b..a33d932 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -139,21 +139,17 @@
// }
this.getTaskInfo()
// 鍒锋柊token
- // const token = uni.getStorageSync('token')
- // if (token) {
- // refreshToken().then(res => {
- // if (res.code && res.code === 200) {
- // this.$store.commit('setToken', res.data)
- // console.log('res', res.data);
- // // setTimeout(() => {
- // // this.getTaskInfo()
- // // }, 1000)
- // }
- // })
- // }
+ setTimeout(() => {
+ refreshToken().then(res => {
+ if (res.code && res.code === 200) {
+ this.$store.commit('setToken', res.data)
+ }
+ })
+ }, 3000)
},
mounted() {
this.$eventBus.$on('taskBack', () => {
+ console.log('----');
this.getTaskInfo()
})
},
@@ -174,7 +170,7 @@
stagingHead({
isDetail: '1'
}).then(res => {
- this.taskInfo = res.data
+ this.taskInfo = res.data || ''
})
},
}
--
Gitblit v1.9.3