From b621a252c58ad2a0fe751076fe20859906f67810 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 21 六月 2024 09:48:29 +0800
Subject: [PATCH] ''
---
pda/pages/index/index.vue | 46 ++-
admin/src/views/platform/set/group.vue | 18 +
admin/src/views/platform/set/application.vue | 10
admin/src/views/platform/set/index.vue | 25 -
admin/src/views/platform/components/PlatformQueuing.vue | 141 ++++++++++++
admin/src/views/platform/index.vue | 243 +--------------------
admin/src/views/platform/components/WaybillDetail.vue | 161 ++++++++++++++
7 files changed, 373 insertions(+), 271 deletions(-)
diff --git a/admin/src/views/platform/components/PlatformQueuing.vue b/admin/src/views/platform/components/PlatformQueuing.vue
new file mode 100644
index 0000000..592bbda
--- /dev/null
+++ b/admin/src/views/platform/components/PlatformQueuing.vue
@@ -0,0 +1,141 @@
+<template>
+ <GlobalWindow
+ title="鏈堝彴鍙彿-xx鍙锋湀鍙�"
+ :visible.sync="isShowModal"
+ width="800px"
+ :confirm-working="subLoading"
+ @confirm="handleSub"
+ >
+ <div class="queuing_modal">
+ <div class="df_ac mb20">
+ <span>鎼滅储杞﹁締锛�</span>
+ <el-input
+ class="flex1 mr20"
+ v-model="param.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>
+ </div>
+ </GlobalWindow>
+</template>
+
+<script>
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { getPlatform, PlatformEdit, PlatformDel } from '@/api'
+export default {
+ components: {
+ GlobalWindow
+ },
+ data () {
+ return {
+ isShowModal: false,
+ subLoading: false,
+ param: {}
+
+ }
+ },
+ methods: {
+ handleSub () {
+ const { param } = this
+ this.subLoading = true
+ PlatformEdit({
+ ...param
+ }).then(res => {
+ this.subLoading = false
+ this.isShowEdit = false
+ this.$tip.success('鎻愪氦鎴愬姛')
+ this.getList()
+ }, () => {
+ this.subLoading = false
+ })
+ },
+ }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/style/variables.scss";
+.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>
diff --git a/admin/src/views/platform/components/WaybillDetail.vue b/admin/src/views/platform/components/WaybillDetail.vue
new file mode 100644
index 0000000..76f726f
--- /dev/null
+++ b/admin/src/views/platform/components/WaybillDetail.vue
@@ -0,0 +1,161 @@
+<template>
+ <GlobalWindow
+ title="杩愬崟璇︽儏"
+ center
+ :visible.sync="isShowModal"
+ width="420px"
+ :confirm-working="subLoading"
+ @confirm="isShowDetail = false"
+ >
+ <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>
+ </GlobalWindow>
+</template>
+
+<script>
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { getPlatform, PlatformEdit, PlatformDel } from '@/api'
+export default {
+ components: {
+ GlobalWindow
+ },
+ data() {
+ return {
+ isShowModal: false,
+ subLoading: false,
+ param: {}
+
+ }
+ },
+ methods: {
+ handleSub() {
+ const { param } = this
+ this.subLoading = true
+ PlatformEdit({
+ ...param
+ }).then(res => {
+ this.subLoading = false
+ this.isShowEdit = false
+ this.$tip.success('鎻愪氦鎴愬姛')
+ this.getList()
+ }, () => {
+ this.subLoading = false
+ })
+ }
+ }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/style/variables.scss";
+.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;
+ }
+ }
+ }
+ }
+}
+</style>
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>
diff --git a/admin/src/views/platform/set/application.vue b/admin/src/views/platform/set/application.vue
index caba2c0..078a60c 100644
--- a/admin/src/views/platform/set/application.vue
+++ b/admin/src/views/platform/set/application.vue
@@ -7,11 +7,11 @@
ref="ruleForm"
label-width="140px"
>
- <el-form-item label="甯傚叕鍙稿鎵逛汉">
+ <!-- <el-form-item label="甯傚叕鍙稿鎵逛汉">
<el-select v-model="param.aa" class="w400" placeholder="璇烽�夋嫨锛屽閫�">
- <!-- <el-option></el-option> -->
+ <el-option></el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="甯傚叕鍙告棩浣滀笟閲�">
<el-input v-model="param.bbb" class="w400" placeholder="璇疯緭鍏�"></el-input>
<span>涓囨敮</span>
@@ -22,6 +22,10 @@
<el-form-item label="鐗╂祦杞﹀洯鍖哄瑙堝浘">
<RichEditor v-model="param.context" style="width: 900px" placeholder="璇疯緭鍏ュ唴瀹�" :default="param.context" />
</el-form-item>
+ <el-form-item>
+ <el-button type="primary">淇濆瓨閰嶇疆椤�</el-button>
+ </el-form-item>
+
</el-form>
</div>
</template>
diff --git a/admin/src/views/platform/set/group.vue b/admin/src/views/platform/set/group.vue
index ae8cfa3..27c9270 100644
--- a/admin/src/views/platform/set/group.vue
+++ b/admin/src/views/platform/set/group.vue
@@ -41,10 +41,12 @@
@current-change="getList"
:pagination="pagination"
/>
- <el-dialog
+ <GlobalWindow
:title="param.id ? '缂栬緫鏈堝彴' : '鏂板鏈堝彴'"
:visible.sync="isShowEdit"
width="800px"
+ :confirm-working="subLoading"
+ @confirm="handleSub"
>
<el-form
:model="param"
@@ -75,26 +77,25 @@
</el-transfer>
</el-form-item>
</el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="isShowEdit = false">鍙栨秷</el-button>
- <el-button type="primary" @click="handleSub">纭畾</el-button>
- </span>
- </el-dialog>
+ </GlobalWindow>
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import GlobalWindow from '@/components/common/GlobalWindow'
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ GlobalWindow
},
data () {
return {
filters: {},
loading: false,
+ subLoading: false,
queryFormConfig: {
formItems: [
{
@@ -127,6 +128,9 @@
}
},
methods: {
+ handleSub () {
+ this.isShowEdit = false
+ },
getList (page) { },
clear () { },
handleEdit (row) {
diff --git a/admin/src/views/platform/set/index.vue b/admin/src/views/platform/set/index.vue
index 9c2c790..106df34 100644
--- a/admin/src/views/platform/set/index.vue
+++ b/admin/src/views/platform/set/index.vue
@@ -82,10 +82,12 @@
@current-change="getList"
:pagination="pagination"
/>
- <el-dialog
+ <GlobalWindow
:title="param.id ? '缂栬緫鏈堝彴閰嶇疆' : '鏂板鏈堝彴閰嶇疆'"
:visible.sync="isShowEdit"
width="600px"
+ :confirm-working="subLoading"
+ @confirm="handleSub"
>
<el-form
:model="param"
@@ -152,27 +154,26 @@
<span class="ml10">鍒嗛挓</span>
</el-form-item>
</el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="isShowEdit = false">鍙栨秷</el-button>
- <el-button type="primary" @click="handleSub">纭畾</el-button>
- </span>
- </el-dialog>
+ </GlobalWindow>
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import GlobalWindow from '@/components/common/GlobalWindow'
import { getPlatform, PlatformEdit, PlatformDel } from '@/api'
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ GlobalWindow
},
data () {
return {
filters: {},
loading: false,
+ subLoading: false,
queryFormConfig: {
formItems: [
{
@@ -218,16 +219,6 @@
this.getList()
this.$tip.success('鍒犻櫎鎴愬姛')
})
- })
- },
- handleSub () {
- const { param } = this
- PlatformEdit({
- ...param
- }).then(res => {
- this.isShowEdit = false
- this.$tip.success('鎻愪氦鎴愬姛')
- this.getList()
})
},
changeStatus (item) {
diff --git a/pda/pages/index/index.vue b/pda/pages/index/index.vue
index 0d7f78b..3d00c04 100644
--- a/pda/pages/index/index.vue
+++ b/pda/pages/index/index.vue
@@ -4,28 +4,28 @@
<image src="@/static/banner_diaodu@2x.png" mode=""></image>
</view>
<view class="module">
- <view class="item">
+ <view class="item" @click="jump('/pages/index/center')">
<image src="@/static/ic_yuetaidiaodu@2x.png" mode=""></image>
<view class="text">鏈堝彴璋冨害涓績</view>
</view>
- <view class="item">
+ <view class="item" @click="jump('/pages/index/queueup')">
<image src="@/static/ic_cheliangpaidui@2x.png" mode=""></image>
<view class="text">杞﹂槦鎺掗槦鎯呭喌</view>
</view>
- <view class="item">
+ <view class="item" @click="jump('/pages/index/control')">
<image src="@/static/ic_qiyong@2x.png" mode=""></image>
<view class="text">鏈堝彴鍚敤鍋滅敤</view>
</view>
- <view class="item">
+ <view class="item" @click="jump('/pages/index/set')">
<image src="@/static/ic_peizhiyuetai@2x.png" mode=""></image>
<view class="text">閰嶇疆鏄剧ず鏈堝彴</view>
</view>
</view>
<!-- footer -->
<view class="main_footer">
- <image src="@/static/logo@2x.png" mode=""></image>
- <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
- </view>
+ <image src="@/static/logo@2x.png" mode=""></image>
+ <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
+ </view>
</view>
</template>
@@ -40,7 +40,11 @@
},
methods: {
-
+ jump(path) {
+ uni.navigateTo({
+ url: path
+ })
+ },
}
}
</script>
@@ -87,18 +91,18 @@
}
}
}
- .main_footer{
- width: 100%;
- position: fixed;
- bottom: 84rpx;
- display: flex;
- justify-content: center;
- font-size: 24rpx;
- color: #666666;
- image{
- width: 40rpx;
- height: 40rpx;
- }
- }
+ .main_footer {
+ width: 100%;
+ position: fixed;
+ bottom: 84rpx;
+ display: flex;
+ justify-content: center;
+ font-size: 24rpx;
+ color: #666666;
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ }
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3