From 3a9879dfcf271846605c7f896d0397472cf5e839 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期三, 05 一月 2022 11:15:20 +0800
Subject: [PATCH] 默认更改列表
---
src/views/main-components/footer.vue | 42 +-
src/views/your/car-manage/carManage.vue | 26 +
src/views/main-components/message-tip.vue | 588 ++++++++++++++++++++++----------------------
src/views/sys/user-manage/addEdit.vue | 70 ++--
4 files changed, 364 insertions(+), 362 deletions(-)
diff --git a/src/views/main-components/footer.vue b/src/views/main-components/footer.vue
index e46c957..43293d6 100644
--- a/src/views/main-components/footer.vue
+++ b/src/views/main-components/footer.vue
@@ -1,26 +1,26 @@
<template>
<div class="foot">
- <Row type="flex" justify="space-around" class="foot-item">
- <a
- class="item"
- href="https://www.kancloud.cn/exrick/xboot/1009234"
- target="_blank"
- >{{ $t("docs") }}</a
- >
- <a class="item" href="https://github.com/Exrick/x-boot" target="_blank">
- <Icon custom="iconfont icon-github" size="16" />
- </a>
- <a class="item" href="http://xpay.exrick.cn/pay?xboot" target="_blank">{{
- $t("fullVersion")
- }}</a>
- </Row>
- <Row type="flex" justify="center" class="copyright">
- Copyright 漏 2018 - Present
- <a href="http://exrick.cn" target="_blank" style="margin: 0 5px"
- >Exrick</a
- >
- {{ $t("rights") }}
- </Row>
+ <!--<Row type="flex" justify="space-around" class="foot-item">-->
+ <!--<a-->
+ <!--class="item"-->
+ <!--href="https://www.kancloud.cn/exrick/xboot/1009234"-->
+ <!--target="_blank"-->
+ <!-->{{ $t("docs") }}</a-->
+ <!-->-->
+ <!--<a class="item" href="https://github.com/Exrick/x-boot" target="_blank">-->
+ <!--<Icon custom="iconfont icon-github" size="16" />-->
+ <!--</a>-->
+ <!--<a class="item" href="http://xpay.exrick.cn/pay?xboot" target="_blank">{{-->
+ <!--$t("fullVersion")-->
+ <!--}}</a>-->
+ <!--</Row>-->
+ <!--<Row type="flex" justify="center" class="copyright">-->
+ <!--Copyright 漏 2018 - Present-->
+ <!--<a href="http://exrick.cn" target="_blank" style="margin: 0 5px"-->
+ <!-->Exrick</a-->
+ <!-->-->
+ <!--{{ $t("rights") }}-->
+ <!--</Row>-->
</div>
</template>
diff --git a/src/views/main-components/message-tip.vue b/src/views/main-components/message-tip.vue
index 8affd2e..dc34542 100644
--- a/src/views/main-components/message-tip.vue
+++ b/src/views/main-components/message-tip.vue
@@ -1,297 +1,297 @@
-<template>
- <div style="display: inline-block" class="message-content">
- <Dropdown trigger="click" placement="bottom-end">
- <div style="display: inline-block">
- <div class="header-right-icon header-action">
- <Badge :count="messageCount">
- <Icon type="md-notifications" :size="20" style="margin-top: 3px" />
- </Badge>
- </div>
- </div>
- <div slot="list" class="message-tip">
- <div class="title-content">
- <div class="title">{{ $t("Notifications") }}</div>
- <a class="mark" v-if="messageList.length > 0" @click="markAll">{{
- $t("markAll")
- }}</a>
- <a class="mark" v-else @click="getData">{{
- $t("refresh")
- }}</a>
- </div>
- <div class="mes-list">
- <div v-if="messageList.length == 0" class="empty-message">
- <Icon type="ios-mail-open-outline" size="70" color="#e4e4e4" />
- <p>{{ $t("noNewMes") }}</p>
- </div>
- <div v-else>
- <div
- v-for="(item, index) in messageList"
- :key="index"
- :class="{
- 'mes-item': item.status == 0,
- 'mes-item opacity': item.status == 1,
- }"
- @click="messageDetail(item)"
- >
- <div class="icon">
- <Avatar
- v-if="item.type == '閫氱煡'"
- style="background-color: #ff9900"
- icon="md-send"
- class="icon"
- />
- <Avatar
- v-else-if="item.type == '鎻愰啋'"
- style="background-color: #ed4014"
- icon="md-alarm"
- class="icon"
- />
- <Avatar
- v-else-if="item.type == '绉佷俊'"
- style="background-color: #87d068"
- icon="md-person"
- class="icon"
- />
- <Avatar
- v-else-if="item.type == '宸ヤ綔娴�'"
- style="background-color: #2db7f5"
- icon="md-briefcase"
- class="icon"
- />
- <Avatar
- v-else-if="item.type == '绯荤粺鍏憡'"
- style="background-color: #2d8cf0"
- icon="md-mail"
- class="icon"
- />
- <Avatar v-else icon="ios-mail" class="icon" />
- </div>
- <div class="detail">
- <div class="mes-title">{{ item.title }}</div>
- <div class="mes-time">
- <Icon type="md-time" style="margin-right: 3px" /><Time
- :time="item.createTime"
- />
- </div>
- </div>
- </div>
- </div>
- <Spin fix v-if="loading" />
- </div>
- <a class="show-more" @click="showMessage">
- <Icon
- type="ios-arrow-dropright-circle"
- size="16"
- style="margin: 0 5px 2px 0"
- />{{ $t("showMore") }}
- </a>
- </div>
- </Dropdown>
- </div>
-</template>
+<!--<template>-->
+ <!--<div style="display: inline-block" class="message-content">-->
+ <!--<Dropdown trigger="click" placement="bottom-end">-->
+ <!--<div style="display: inline-block">-->
+ <!--<div class="header-right-icon header-action">-->
+ <!--<Badge :count="messageCount">-->
+ <!--<Icon type="md-notifications" :size="20" style="margin-top: 3px" />-->
+ <!--</Badge>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div slot="list" class="message-tip">-->
+ <!--<div class="title-content">-->
+ <!--<div class="title">{{ $t("Notifications") }}</div>-->
+ <!--<a class="mark" v-if="messageList.length > 0" @click="markAll">{{-->
+ <!--$t("markAll")-->
+ <!--}}</a>-->
+ <!--<a class="mark" v-else @click="getData">{{-->
+ <!--$t("refresh")-->
+ <!--}}</a>-->
+ <!--</div>-->
+ <!--<div class="mes-list">-->
+ <!--<div v-if="messageList.length == 0" class="empty-message">-->
+ <!--<Icon type="ios-mail-open-outline" size="70" color="#e4e4e4" />-->
+ <!--<p>{{ $t("noNewMes") }}</p>-->
+ <!--</div>-->
+ <!--<div v-else>-->
+ <!--<div-->
+ <!--v-for="(item, index) in messageList"-->
+ <!--:key="index"-->
+ <!--:class="{-->
+ <!--'mes-item': item.status == 0,-->
+ <!--'mes-item opacity': item.status == 1,-->
+ <!--}"-->
+ <!--@click="messageDetail(item)"-->
+ <!-->-->
+ <!--<div class="icon">-->
+ <!--<Avatar-->
+ <!--v-if="item.type == '閫氱煡'"-->
+ <!--style="background-color: #ff9900"-->
+ <!--icon="md-send"-->
+ <!--class="icon"-->
+ <!--/>-->
+ <!--<Avatar-->
+ <!--v-else-if="item.type == '鎻愰啋'"-->
+ <!--style="background-color: #ed4014"-->
+ <!--icon="md-alarm"-->
+ <!--class="icon"-->
+ <!--/>-->
+ <!--<Avatar-->
+ <!--v-else-if="item.type == '绉佷俊'"-->
+ <!--style="background-color: #87d068"-->
+ <!--icon="md-person"-->
+ <!--class="icon"-->
+ <!--/>-->
+ <!--<Avatar-->
+ <!--v-else-if="item.type == '宸ヤ綔娴�'"-->
+ <!--style="background-color: #2db7f5"-->
+ <!--icon="md-briefcase"-->
+ <!--class="icon"-->
+ <!--/>-->
+ <!--<Avatar-->
+ <!--v-else-if="item.type == '绯荤粺鍏憡'"-->
+ <!--style="background-color: #2d8cf0"-->
+ <!--icon="md-mail"-->
+ <!--class="icon"-->
+ <!--/>-->
+ <!--<Avatar v-else icon="ios-mail" class="icon" />-->
+ <!--</div>-->
+ <!--<div class="detail">-->
+ <!--<div class="mes-title">{{ item.title }}</div>-->
+ <!--<div class="mes-time">-->
+ <!--<Icon type="md-time" style="margin-right: 3px" /><Time-->
+ <!--:time="item.createTime"-->
+ <!--/>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<Spin fix v-if="loading" />-->
+ <!--</div>-->
+ <!--<a class="show-more" @click="showMessage">-->
+ <!--<Icon-->
+ <!--type="ios-arrow-dropright-circle"-->
+ <!--size="16"-->
+ <!--style="margin: 0 5px 2px 0"-->
+ <!--/>{{ $t("showMore") }}-->
+ <!--</a>-->
+ <!--</div>-->
+ <!--</Dropdown>-->
+ <!--</div>-->
+<!--</template>-->
-<script>
-import { ws, getMessageSendData, allMessageSend } from "@/api/index";
-import SockJS from "sockjs-client";
-import Stomp from "stompjs";
-import util from "@/libs/util.js";
-import Cookies from "js-cookie";
-export default {
- name: "messageTip",
- props: {},
- data() {
- return {
- loading: false,
- userId: "",
- messageList: [],
- client: null,
- };
- },
- computed: {
- messageCount() {
- return this.$store.state.app.messageCount;
- },
- },
- stompClient: {
- monitorIntervalTime: 100,
- stompReconnect: true,
- timeout(orgCmd) {},
- },
- methods: {
- init() {
- let userInfo = JSON.parse(Cookies.get("userInfo"));
- this.userId = userInfo.id;
- this.getData();
- // 娑堟伅寮�鍏� websocket
- let messageOpen = this.getStore("messageOpen");
- if (messageOpen != "0") {
- this.connect();
- }
- },
- getData() {
- // 璇诲彇鏈娑堟伅
- this.loading = true;
- getMessageSendData({
- userId: this.userId,
- status: 0,
- pageSize: 5,
- sort: "createTime",
- order: "desc",
- }).then((res) => {
- if (res.success) {
- this.loading = false;
- this.messageList = res.result.content;
- this.$store.commit("setMessageCount", res.result.totalElements);
- }
- });
- },
- showMessage() {
- util.openNewPage(this, "message_index");
- if (this.$route.name == "message_index") {
- return;
- }
- this.$router.push({
- name: "message_index",
- });
- },
- connect() {
- let headers = {};
- this.client = Stomp.over(new SockJS(ws));
- this.client.connect(headers, this.onConnected, this.onFailed);
- },
- onConnected(frame) {
- console.log("杩炴帴ws鎴愬姛: " + frame);
- let topicSubscription = this.client.subscribe(
- "/topic/subscribe",
- this.responseCallback
- );
- let queueSubscription = this.client.subscribe(
- "/user/" + this.userId + "/queue/subscribe",
- this.responseCallback
- );
- },
- onFailed(frame) {
- console.log("杩炴帴ws澶辫触锛� " + JSON.stringify(frame));
- },
- responseCallback(frame) {
- console.log("鏀跺埌娑堟伅锛�" + frame.body);
- this.getData();
- },
- messageDetail(v) {
- if (v.status == 1) {
- return;
- }
- util.openNewPage(this, "message_index");
- this.$router.push({
- name: "message_index",
- query: { count: this.messageCount, content: v },
- });
- v.status = 1;
- },
- markAll() {
- allMessageSend(0).then((res) => {
- if (res.success) {
- this.getData();
- }
- });
- },
- },
- mounted() {
- this.init();
- },
-};
-</script>
+<!--<script>-->
+<!--import { ws, getMessageSendData, allMessageSend } from "@/api/index";-->
+<!--import SockJS from "sockjs-client";-->
+<!--import Stomp from "stompjs";-->
+<!--import util from "@/libs/util.js";-->
+<!--import Cookies from "js-cookie";-->
+<!--export default {-->
+ <!--name: "messageTip",-->
+ <!--props: {},-->
+ <!--data() {-->
+ <!--return {-->
+ <!--loading: false,-->
+ <!--userId: "",-->
+ <!--messageList: [],-->
+ <!--client: null,-->
+ <!--};-->
+ <!--},-->
+ <!--computed: {-->
+ <!--messageCount() {-->
+ <!--return this.$store.state.app.messageCount;-->
+ <!--},-->
+ <!--},-->
+ <!--stompClient: {-->
+ <!--monitorIntervalTime: 100,-->
+ <!--stompReconnect: true,-->
+ <!--timeout(orgCmd) {},-->
+ <!--},-->
+ <!--methods: {-->
+ <!--init() {-->
+ <!--let userInfo = JSON.parse(Cookies.get("userInfo"));-->
+ <!--this.userId = userInfo.id;-->
+ <!--this.getData();-->
+ <!--// 娑堟伅寮�鍏� websocket-->
+ <!--let messageOpen = this.getStore("messageOpen");-->
+ <!--if (messageOpen != "0") {-->
+ <!--this.connect();-->
+ <!--}-->
+ <!--},-->
+ <!--getData() {-->
+ <!--// 璇诲彇鏈娑堟伅-->
+ <!--this.loading = true;-->
+ <!--getMessageSendData({-->
+ <!--userId: this.userId,-->
+ <!--status: 0,-->
+ <!--pageSize: 5,-->
+ <!--sort: "createTime",-->
+ <!--order: "desc",-->
+ <!--}).then((res) => {-->
+ <!--if (res.success) {-->
+ <!--this.loading = false;-->
+ <!--this.messageList = res.result.content;-->
+ <!--this.$store.commit("setMessageCount", res.result.totalElements);-->
+ <!--}-->
+ <!--});-->
+ <!--},-->
+ <!--showMessage() {-->
+ <!--util.openNewPage(this, "message_index");-->
+ <!--if (this.$route.name == "message_index") {-->
+ <!--return;-->
+ <!--}-->
+ <!--this.$router.push({-->
+ <!--name: "message_index",-->
+ <!--});-->
+ <!--},-->
+ <!--connect() {-->
+ <!--let headers = {};-->
+ <!--this.client = Stomp.over(new SockJS(ws));-->
+ <!--this.client.connect(headers, this.onConnected, this.onFailed);-->
+ <!--},-->
+ <!--onConnected(frame) {-->
+ <!--console.log("杩炴帴ws鎴愬姛: " + frame);-->
+ <!--let topicSubscription = this.client.subscribe(-->
+ <!--"/topic/subscribe",-->
+ <!--this.responseCallback-->
+ <!--);-->
+ <!--let queueSubscription = this.client.subscribe(-->
+ <!--"/user/" + this.userId + "/queue/subscribe",-->
+ <!--this.responseCallback-->
+ <!--);-->
+ <!--},-->
+ <!--onFailed(frame) {-->
+ <!--console.log("杩炴帴ws澶辫触锛� " + JSON.stringify(frame));-->
+ <!--},-->
+ <!--responseCallback(frame) {-->
+ <!--console.log("鏀跺埌娑堟伅锛�" + frame.body);-->
+ <!--this.getData();-->
+ <!--},-->
+ <!--messageDetail(v) {-->
+ <!--if (v.status == 1) {-->
+ <!--return;-->
+ <!--}-->
+ <!--util.openNewPage(this, "message_index");-->
+ <!--this.$router.push({-->
+ <!--name: "message_index",-->
+ <!--query: { count: this.messageCount, content: v },-->
+ <!--});-->
+ <!--v.status = 1;-->
+ <!--},-->
+ <!--markAll() {-->
+ <!--allMessageSend(0).then((res) => {-->
+ <!--if (res.success) {-->
+ <!--this.getData();-->
+ <!--}-->
+ <!--});-->
+ <!--},-->
+ <!--},-->
+ <!--mounted() {-->
+ <!--this.init();-->
+ <!--},-->
+<!--};-->
+<!--</script>-->
-<style lang="less">
-.message-content .ivu-select-dropdown {
- padding: 0;
-}
-.message-tip {
- display: flex;
- flex-direction: column;
- width: 320px;
- .title-content {
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 16px;
- .title {
- color: #515a6e;
- font-size: 16px;
- font-weight: 500;
- }
- .mark {
- font-size: 12px;
- }
- }
- .empty-message {
- height: 220px;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- color: #a7a7a7;
- p {
- margin-top: 10px;
- }
- }
- .mes-list {
- position: relative;
- display: flex;
- flex-direction: column;
- max-height: 261px;
- overflow: auto;
- .mes-item {
- display: flex;
- height: 87px;
- padding: 12px 16px 12px 16px;
- cursor: pointer;
- transition: all 0.2s ease-in-out;
- &:hover {
- background-color: #f6f6f6;
- }
- .icon {
- margin: 1px 16px 0 0;
- width: 32px;
- }
- .detail {
- .mes-title {
- color: #515a6e;
- min-height: 42px;
- margin-bottom: 5px;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
- .mes-time {
- font-size: 12px;
- color: #869ac0;
- }
- }
- }
- .opacity {
- opacity: 0.4;
- }
- }
- .mes-list::-webkit-scrollbar {
- width: 6px;
- height: 6px;
- }
+<!--<style lang="less">-->
+<!--.message-content .ivu-select-dropdown {-->
+ <!--padding: 0;-->
+<!--}-->
+<!--.message-tip {-->
+ <!--display: flex;-->
+ <!--flex-direction: column;-->
+ <!--width: 320px;-->
+ <!--.title-content {-->
+ <!--display: flex;-->
+ <!--justify-content: space-between;-->
+ <!--align-items: center;-->
+ <!--padding: 16px;-->
+ <!--.title {-->
+ <!--color: #515a6e;-->
+ <!--font-size: 16px;-->
+ <!--font-weight: 500;-->
+ <!--}-->
+ <!--.mark {-->
+ <!--font-size: 12px;-->
+ <!--}-->
+ <!--}-->
+ <!--.empty-message {-->
+ <!--height: 220px;-->
+ <!--display: flex;-->
+ <!--flex-direction: column;-->
+ <!--align-items: center;-->
+ <!--justify-content: center;-->
+ <!--color: #a7a7a7;-->
+ <!--p {-->
+ <!--margin-top: 10px;-->
+ <!--}-->
+ <!--}-->
+ <!--.mes-list {-->
+ <!--position: relative;-->
+ <!--display: flex;-->
+ <!--flex-direction: column;-->
+ <!--max-height: 261px;-->
+ <!--overflow: auto;-->
+ <!--.mes-item {-->
+ <!--display: flex;-->
+ <!--height: 87px;-->
+ <!--padding: 12px 16px 12px 16px;-->
+ <!--cursor: pointer;-->
+ <!--transition: all 0.2s ease-in-out;-->
+ <!--&:hover {-->
+ <!--background-color: #f6f6f6;-->
+ <!--}-->
+ <!--.icon {-->
+ <!--margin: 1px 16px 0 0;-->
+ <!--width: 32px;-->
+ <!--}-->
+ <!--.detail {-->
+ <!--.mes-title {-->
+ <!--color: #515a6e;-->
+ <!--min-height: 42px;-->
+ <!--margin-bottom: 5px;-->
+ <!--overflow: hidden;-->
+ <!--text-overflow: ellipsis;-->
+ <!--display: -webkit-box;-->
+ <!-- -webkit-line-clamp: 2;-->
+ <!-- -webkit-box-orient: vertical;-->
+ <!--}-->
+ <!--.mes-time {-->
+ <!--font-size: 12px;-->
+ <!--color: #869ac0;-->
+ <!--}-->
+ <!--}-->
+ <!--}-->
+ <!--.opacity {-->
+ <!--opacity: 0.4;-->
+ <!--}-->
+ <!--}-->
+ <!--.mes-list::-webkit-scrollbar {-->
+ <!--width: 6px;-->
+ <!--height: 6px;-->
+ <!--}-->
- .mes-list::-webkit-scrollbar-thumb {
- border-radius: 4px;
- -webkit-box-shadow: inset 0 0 2px #d1d1d1;
- background: #e4e4e4;
- }
- .show-more {
- border-top: 1px solid #eff2f7;
- padding: 16px;
- display: flex;
- align-content: center;
- justify-content: center;
- align-items: center;
- }
-}
-</style>
\ No newline at end of file
+ <!--.mes-list::-webkit-scrollbar-thumb {-->
+ <!--border-radius: 4px;-->
+ <!-- -webkit-box-shadow: inset 0 0 2px #d1d1d1;-->
+ <!--background: #e4e4e4;-->
+ <!--}-->
+ <!--.show-more {-->
+ <!--border-top: 1px solid #eff2f7;-->
+ <!--padding: 16px;-->
+ <!--display: flex;-->
+ <!--align-content: center;-->
+ <!--justify-content: center;-->
+ <!--align-items: center;-->
+ <!--}-->
+<!--}-->
+<!--</style>-->
\ No newline at end of file
diff --git a/src/views/sys/user-manage/addEdit.vue b/src/views/sys/user-manage/addEdit.vue
index ecc3e9b..32aa818 100644
--- a/src/views/sys/user-manage/addEdit.vue
+++ b/src/views/sys/user-manage/addEdit.vue
@@ -141,41 +141,41 @@
</Col>
</Row>
<Divider />
- <p class="drawer-title">涓汉璧勬枡</p>
- <Row :gutter="32">
- <Col span="12">
- <FormItem label="鎵�鍦ㄥ湴鍖�" prop="address">
- <al-cascader
- v-model="form.address"
- data-type="name"
- level="2"
- transfer
- />
- </FormItem>
- </Col>
- <Col span="12">
- <FormItem label="琛楅亾鍦板潃">
- <Input v-model="form.street" />
- </FormItem>
- </Col>
- </Row>
- <Row :gutter="32">
- <Col span="12">
- <FormItem label="鐢熸棩" prop="birth">
- <DatePicker
- v-model="form.birth"
- style="display: block"
- type="date"
- transfer
- ></DatePicker>
- </FormItem>
- </Col>
- <Col span="24">
- <FormItem label="绠�浠�">
- <Input type="textarea" v-model="form.description" :rows="4" />
- </FormItem>
- </Col>
- </Row>
+ <!--<p class="drawer-title">涓汉璧勬枡</p>-->
+ <!--<Row :gutter="32">-->
+ <!--<Col span="12">-->
+ <!--<FormItem label="鎵�鍦ㄥ湴鍖�" prop="address">-->
+ <!--<al-cascader-->
+ <!--v-model="form.address"-->
+ <!--data-type="name"-->
+ <!--level="2"-->
+ <!--transfer-->
+ <!--/>-->
+ <!--</FormItem>-->
+ <!--</Col>-->
+ <!--<Col span="12">-->
+ <!--<FormItem label="琛楅亾鍦板潃">-->
+ <!--<Input v-model="form.street" />-->
+ <!--</FormItem>-->
+ <!--</Col>-->
+ <!--</Row>-->
+ <!--<Row :gutter="32">-->
+ <!--<Col span="12">-->
+ <!--<FormItem label="鐢熸棩" prop="birth">-->
+ <!--<DatePicker-->
+ <!--v-model="form.birth"-->
+ <!--style="display: block"-->
+ <!--type="date"-->
+ <!--transfer-->
+ <!--></DatePicker>-->
+ <!--</FormItem>-->
+ <!--</Col>-->
+ <!--<Col span="24">-->
+ <!--<FormItem label="绠�浠�">-->
+ <!--<Input type="textarea" v-model="form.description" :rows="4" />-->
+ <!--</FormItem>-->
+ <!--</Col>-->
+ <!--</Row>-->
</Form>
</div>
<div class="drawer-footer br" v-show="type != '0'">
diff --git a/src/views/your/car-manage/carManage.vue b/src/views/your/car-manage/carManage.vue
index aa41752..5559641 100644
--- a/src/views/your/car-manage/carManage.vue
+++ b/src/views/your/car-manage/carManage.vue
@@ -81,14 +81,14 @@
<Input v-model="carForm.carNo" />
</FormItem>
<FormItem label="鍔犳补鍗″彿" prop="addOilCode">
- <Input v-model="carForm.addOilCode" type="number"/>
+ <Input v-model="carForm.addOilCode" />
</FormItem>
- <FormItem label="椹鹃┒浜�" prop="userId">
+ <FormItem label="鍙告満" prop="userId">
<Select v-model="carForm.userId" filterable>
<Option v-for="item in userList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
</Select>
</FormItem>
- <FormItem label="璺熻溅浜�" prop="followUserId">
+ <FormItem label="閰嶉�佸憳" prop="followUserId">
<Select v-model="carForm.followUserId" filterable>
<Option v-for="item in driverList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
</Select>
@@ -352,12 +352,12 @@
sortable: true,
},
{
- title: "椹鹃┒浜�",
+ title: "鍙告満",
key: "nickName",
width: 100,
},
{
- title: "璺熻溅浜�",
+ title: "閰嶉�佸憳",
key: "followNickName",
width: 100,
},
@@ -378,15 +378,21 @@
sortable: true,
},
{
+ title: "鍔犳补鍗″彿",
+ key: "addOilCode",
+ minWidth: 120,
+ sortable: true,
+ },
+ {
title: "璐疆骞翠唤",
key: "buyYear",
minWidth: 120,
sortable: true,
},
{
- title: "鍔犳补鍗″彿",
- key: "addOilCode",
- minWidth: 120,
+ title: "鐧昏鏃ユ湡",
+ key: "createTime",
+ minWidth: 180,
sortable: true,
},
{
@@ -759,7 +765,6 @@
this.$Message.success("鎿嶄綔鎴愬姛");
this.getDataList();
this.roleModalVisible = false;
- this.carForm={};
}
});
} else {
@@ -770,7 +775,6 @@
this.$Message.success("鎿嶄綔鎴愬姛");
this.getDataList();
this.roleModalVisible = false;
- this.carForm={};
}
});
}
@@ -791,7 +795,6 @@
this.getEquipmentList(this.carId);
this.addEquipmentVisible = false;
this.getEquipmentList(this.carId);
- this.equipmentForm={};
}
});
} else {
@@ -802,7 +805,6 @@
this.$Message.success("鎿嶄綔鎴愬姛");
this.getEquipmentList(this.carId);
this.addEquipmentVisible = false;
- this.equipmentForm={};
}
});
}
--
Gitblit v1.9.1