From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/index.vue | 243 ++++--------------------------------------------
1 files changed, 20 insertions(+), 223 deletions(-)
diff --git a/admin/src/views/platform/index.vue b/admin/src/views/platform/index.vue
index 85fa291..7bc61bf 100644
--- a/admin/src/views/platform/index.vue
+++ b/admin/src/views/platform/index.vue
@@ -63,7 +63,7 @@
</div>
<div class="line">
<div class="left">
- <span class="primaryColor pointer" @click="isShowDetail = true"
+ <span class="primaryColor pointer" @click="handleDetail"
>杩愬崟璇︽儏</span
>
</div>
@@ -112,108 +112,22 @@
</span>
</el-dialog>
<!-- 杩愬崟璇︽儏 -->
- <el-dialog
- title="杩愬崟璇︽儏"
- center
- :visible.sync="isShowDetail"
- width="420px"
- >
- <div class="detail_modal">
- <div class="head">
- <div class="plate">鐨朅12122</div>
- <div class="list">
- <div class="item">
- <span>杩愯緭鍗曞彿锛�</span>
- <span>22222</span>
- </div>
- <div class="item">
- <span>鎬昏繍杈撻噺锛�</span>
- <span>22222</span>
- </div>
- <div class="item">
- <span>椹鹃┒鍛橈細</span>
- <span>22222</span>
- </div>
- </div>
- </div>
- <div class="title">鍚堝悓鍒楄〃</div>
- <div class="content">
- <div class="item">
- <div class="contract">鍚堝悓鍙凤細1292992</div>
- <div class="placeholder6">鏀惰揣鍦帮細address</div>
- <div class="list">
- <div class="line">
- <div class="left"><span>鐗╂枡鍚嶇О锛�</span><span>榛勫北</span></div>
- <div class="right"><span>鏁伴噺锛�</span><span>100</span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="isShowDetail = false">鍏抽棴</el-button>
- </span>
- </el-dialog>
<!-- -->
- <el-drawer
- title="鏈堝彴鍙彿-xx鍙锋湀鍙�"
- :visible.sync="isShowQueuing"
- size="720px"
- >
- <div class="queuing_modal">
- <div class="df_ac mb20">
- <span>鎼滅储杞﹁締锛�</span>
- <el-input
- class="flex1 mr20"
- v-model="queuingForm.aa"
- placeholder="璇疯緭鍏ヨ溅鐗屽彿"
- ></el-input>
- <el-button type="primary">鏌ユ壘</el-button>
- <el-button>閲嶇疆</el-button>
- </div>
- <div class="list">
- <div class="item">
- <div class="head df_sb">
- <div class="plate">鐨朅12122</div>
- <div class="status">宸茬鍒�</div>
- </div>
- <div class="info">
- <div class="ite">
- <span>杩愯緭鍗曞彿锛�</span>
- <span>12312</span>
- </div>
- <div class="ite">
- <span>椹鹃┒鍛橈細</span>
- <span>12312</span>
- </div>
- <div class="ite">
- <span>鎵嬫満鍙凤細</span>
- <span>12312</span>
- </div>
- <div class="ite">
- <span>鎬昏繍杈撻噺锛�</span>
- <span>12312</span>
- </div>
- <div class="ite" style="width: 66%">
- <span>杩愯緭鍏徃锛�</span>
- <span>12312</span>
- </div>
- </div>
- <div class="footer df_sb">
- <div class="detail">杩愬崟璇︽儏</div>
- <el-button type="primary">鍙彿</el-button>
- </div>
- </div>
- </div>
- <el-button class="mt30" @click="isShowQueuing = false">鍏抽棴</el-button>
- </div>
- </el-drawer>
+ <!-- 鍙彿 -->
+ <PlatformQueuing ref="PlatformQueuingRef" v-if="isShowQueuing" @success="getList" @close="isShowQueuing = false" />
+ <WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
</div>
</template>
<script>
import { getPlatform, getPlatformJob } from '@/api'
+import PlatformQueuing from './components/PlatformQueuing.vue'
+import WaybillDetail from './components/WaybillDetail.vue'
export default {
+ components: {
+ PlatformQueuing,
+ WaybillDetail
+ },
data () {
return {
platformId: '',
@@ -224,8 +138,7 @@
setParam: {},
isShowDetail: false, // 杩愬崟璇︽儏
detail: {},
- isShowQueuing: false,
- queuingForm: {}
+ isShowQueuing: false
}
},
created () {
@@ -235,6 +148,15 @@
methods: {
handleQueuing (row) {
this.isShowQueuing = true
+ this.$nextTick(() => {
+ this.$refs.PlatformQueuingRef.isShowModal = true
+ })
+ },
+ handleDetail () {
+ this.isShowDetail = true
+ this.$nextTick(() => {
+ this.$refs.WaybillDetailRef.isShowModal = true
+ })
},
getList () {
const { platformId } = this
@@ -392,130 +314,5 @@
}
}
/* */
-.detail_modal {
- font-size: 12px;
- color: #282828;
- .head {
- background: rgba(39, 155, 170, 0.05);
- border-radius: 4px;
- border: 1px solid #dfe2e8;
- padding: 16px;
- .plate {
- width: 90px;
- text-align: center;
- font-size: 15px;
- color: #111111;
- padding: 4px 5px;
- font-weight: 700;
- border: 1px solid #279baa;
- background-color: #fff;
- }
- .list {
- display: flex;
- flex-wrap: wrap;
- margin-top: 16px;
- .item {
- width: 50%;
- margin-bottom: 8px;
- span {
- &:nth-child(1) {
- color: #666666;
- }
- }
- }
- }
- }
- .title {
- margin: 16px 0;
- font-weight: 500;
- font-size: 16px;
- color: #222222;
- }
- .content {
- .item {
- border-radius: 4px;
- border: 1px solid #dfe2e8;
- padding: 16px;
- .list {
- background: #f7f7f7;
- border-radius: 4px;
- padding: 12px 16px;
- margin-top: 10px;
- }
- .contract {
- font-weight: 500;
- font-size: 15px;
- color: #279baa;
- margin-bottom: 4px;
- }
- .line {
- display: flex;
- margin-bottom: 8px;
- &:nth-last-child(1) {
- margin: 0;
- }
- div {
- span {
- &:nth-child(1) {
- color: #666666;
- }
- }
- }
- .left {
- flex: 6;
- }
- .right {
- flex: 4;
- }
- }
- }
- }
-}
/* */
-.queuing_modal {
- padding: 10px 30px;
- .list {
- .item {
- background: #f4fafb;
- border-radius: 2px;
- border: 1px solid #dfe2e8;
- margin-bottom: 10px;
- padding: 16px;
- .head {
- margin-bottom: 15px;
- .plate {
- width: 90px;
- text-align: center;
- font-size: 15px;
- color: #111111;
- padding: 4px 5px;
- font-weight: 700;
- border: 1px solid #279baa;
- background-color: #fff;
- }
- .status {
- color: $primaryColor;
- }
- }
- .info {
- display: flex;
- flex-wrap: wrap;
- .ite {
- width: 33.3%;
- margin-bottom: 8px;
- span {
- &:nth-child(1) {
- color: #666666;
- }
- }
- }
- }
- .footer {
- .detail {
- color: $primaryColor;
- }
- }
- }
- }
-}
</style>
--
Gitblit v1.9.3