From 96db936c641b23897636ff6a15e31f8f87964342 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 11 十月 2023 13:44:05 +0800
Subject: [PATCH] 确定装卸逻辑修改 增加称重时稳定态
---
pages/driver-page/appointment/appointment.vue | 294 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 155 insertions(+), 139 deletions(-)
diff --git a/pages/driver-page/appointment/appointment.vue b/pages/driver-page/appointment/appointment.vue
index bb1935a..4837339 100644
--- a/pages/driver-page/appointment/appointment.vue
+++ b/pages/driver-page/appointment/appointment.vue
@@ -1,19 +1,26 @@
<template>
<view class="appointment">
- <combined-title :title="yuYueData.length != 0 ? yuYueData[0].filedName + '鈥斺��' + yuYueData[0].sendDate : '鏆傛棤棰勭害鍒楄〃'"></combined-title>
+ <combined-title
+ :title="yuYueData.length != 0 ? yuYueData[0].filedName + '鈥斺��' + yuYueData[0].sendDate : '鏆傛棤棰勭害鍒楄〃'"></combined-title>
<view class="appointment-table">
- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-table border
+ stripe
+ emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
<uni-th align="center">鏃堕棿娈�</uni-th>
<uni-th align="center">鍙绾�</uni-th>
<uni-th align="center">宸查绾�</uni-th>
<uni-th align="center">鎿嶄綔</uni-th>
</uni-tr>
- <uni-tr v-for="(item, index) in yuYueData" :key="item.id">
+ <uni-tr v-for="(item, index) in yuYueData"
+ :key="item.id">
<uni-td align="center">{{ (item.startTime || '') + '-' + (item.endTime || '') }}</uni-td>
<uni-td align="center">{{ item.carNum || '' }}</uni-td>
<uni-td align="center">{{ item.carNum1 || '' }}</uni-td>
- <uni-td><u-button text="閫夋嫨" type="primary" :disabled="item.carNum == item.carNum1" @click="yuYueBtnClick(item)"></u-button></uni-td>
+ <uni-td><u-button text="閫夋嫨"
+ type="primary"
+ :disabled="item.carNum == item.carNum1"
+ @click="yuYueBtnClick(item)"></u-button></uni-td>
</uni-tr>
</uni-table>
</view>
@@ -21,155 +28,164 @@
</template>
<script>
-import combinedTitle from '@/components/combined-title/combined-title.vue';
-export default {
- components: {
- combinedTitle
- },
- data() {
- return {
- // 棰勭害鍒楄〃璇锋眰鍙傛暟
- yuYueListParams: {
- filedId: '',
- deptId: '',
- sendDate: ''
- },
- // 棰勭害璇锋眰鍙傛暟
- yuYuePostParams: {
- takeCoalId: null,
- yuYueId: null
- },
- yuYueData: [],
- isRCSQ: false, // 鍏ュ満鐢宠鎺ュ彛鎺у埗
- rcsqData: {
- taskId: '',
- originalYyId: '',
- yyId: '',
- deptId: '',
- filedId: '',
- remark: ''
+ import combinedTitle from '@/components/combined-title/combined-title.vue';
+ export default {
+ components: {
+ combinedTitle
+ },
+ data() {
+ return {
+ // 棰勭害鍒楄〃璇锋眰鍙傛暟
+ yuYueListParams: {
+ filedId: '',
+ deptId: '',
+ sendDate: ''
+ },
+ // 棰勭害璇锋眰鍙傛暟
+ yuYuePostParams: {
+ takeCoalId: null,
+ yuYueId: null
+ },
+ yuYueData: [],
+ isRCSQ: false, // 鍏ュ満鐢宠鎺ュ彛鎺у埗
+ rcsqData: {
+ taskId: '',
+ originalYyId: '',
+ yyId: '',
+ deptId: '',
+ filedId: '',
+ remark: ''
+ }
+ };
+ },
+ onLoad(params) {
+ if (params.type == '鍏ュ満鐢宠') {
+ this.isRCSQ = true;
+ this.rcsqData.originalYyId = params.yyId;
}
- };
- },
- onLoad(params) {
- console.log('appointment,params', params);
- if (params.type == '鍏ュ満鐢宠') {
- this.isRCSQ = true;
- this.rcsqData.originalYyId = params.yyId;
- }
- this.yuYuePostParams.takeCoalId = params.takeCoalId;
- this.yuYueListParams.filedId = params.filedId;
- this.yuYueListParams.deptId = params.deptId;
- this.yuYueListParams.sendDate = params.sendDate;
- },
- onShow() {
- this.init();
- },
- methods: {
- init() {
- this.yuYueList();
+ this.yuYuePostParams.takeCoalId = params.takeCoalId;
+ this.yuYueListParams.filedId = params.filedId;
+ this.yuYueListParams.deptId = params.deptId;
+ this.yuYueListParams.sendDate = params.sendDate;
},
- // 棰勭害鍒楄〃
- yuYueList() {
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
- this.$reqGet('yuYueList', this.yuYueListParams).then(res => {
- uni.hideLoading();
- if (res.code == 0) {
- this.yuYueData = res.data;
+ onShow() {
+ this.init();
+ },
+ methods: {
+ init() {
+ this.yuYueList();
+ },
+ // 棰勭害鍒楄〃
+ yuYueList() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ this.$reqGet('yuYueList', this.yuYueListParams).then(res => {
+ uni.hideLoading();
+ if (res.code == 0) {
+ this.yuYueData = res.data;
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
+ }
+ });
+ },
+ // 棰勭害鍜屽叆鍦虹敵璇峰叡鐢ㄤ簨浠�
+ yuYueBtnClick(value) {
+ if (this.isRCSQ) {
+ this.rcsqData.taskId = this.yuYuePostParams.takeCoalId;
+ this.saveRCSQ(value);
} else {
- this.$u.toast('鍔犺浇澶辫触');
+ this.yuYueClick(value.id);
}
- });
- },
- // 棰勭害鍜屽叆鍦虹敵璇峰叡鐢ㄤ簨浠�
- yuYueBtnClick(value) {
- if (this.isRCSQ) {
- this.rcsqData.taskId = this.yuYuePostParams.takeCoalId;
- this.saveRCSQ(value);
- } else {
- this.yuYueClick(value.id);
+ },
+ // 棰勭害
+ yuYueClick(id) {
+ this.yuYuePostParams.yuYueId = id;
+ this.$reqPost('yuYue', {
+ takeCoalId: this.yuYuePostParams.takeCoalId,
+ yuYueId: this.yuYuePostParams.yuYueId
+ }, 'params').then(res => {
+ if (res.code == 0) {
+ this.yuYueList();
+ this.$u.toast('棰勭害鎴愬姛');
+ let timer = setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 500);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '棰勭害澶辫触');
+ }
+ })
+ },
+ // 鍏ュ満鐢宠
+ saveRCSQ(value) {
+ this.rcsqData.yyId = value.id;
+ this.rcsqData.deptId = value.deptId;
+ this.rcsqData.filedId = value.filedId;
+ this.$reqPost('saveRCSQ', this.rcsqData, 'json').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鍏ュ満鐢宠鎴愬姛');
+ let timer = setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 500);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鍏ュ満鐢宠澶辫触锛岃绋嶅悗閲嶈瘯');
+ }
+ });
}
- },
- // 棰勭害
- yuYueClick(id) {
- this.yuYuePostParams.yuYueId = id;
- this.$reqPost('yuYue', { takeCoalId: this.yuYuePostParams.takeCoalId, yuYueId: this.yuYuePostParams.yuYueId }, 'params').then(res => {
- if (res.code == 0) {
- this.$u.toast('棰勭害鎴愬姛锛�');
- let timer = setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 500);
- } else {
- this.$u.toast(res.msg ? res.msg : '棰勭害澶辫触');
- }
- setTimeout(() => {
- this.yuYueList();
- }, 500);
- });
- },
- // 鍏ュ満鐢宠
- saveRCSQ(value) {
- this.rcsqData.yyId = value.id;
- this.rcsqData.deptId = value.deptId;
- this.rcsqData.filedId = value.filedId;
- this.$reqPost('saveRCSQ', this.rcsqData, 'json').then(res => {
- if (res.code == 0) {
- this.$u.toast('鍏ュ満鐢宠鎴愬姛');
- } else {
- this.$u.toast(res.msg ? res.msg : '鍏ュ満鐢宠澶辫触锛岃绋嶅悗閲嶈瘯');
- }
- });
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-::v-deep.appointment {
- width: 94%;
- margin: 0 auto;
- h1 {
- font-size: vww(20);
- text-align: center;
- font-weight: 550;
- margin: vww(30) 0 vww(18) 0;
- }
- // 琛ㄦ牸
- .uni-table-scroll {
- width: 100%;
- overflow-x: hidden;
+<style lang="scss"
+ scoped>
+ ::v-deep.appointment {
+ width: 94%;
+ margin: 0 auto;
- .uni-table {
- min-width: 0 !important;
+ h1 {
+ font-size: vww(20);
+ text-align: center;
+ font-weight: 550;
+ margin: vww(30) 0 vww(18) 0;
+ }
- .uni-table-tr {
- padding: 0;
- font-size: vww(13);
+ // 琛ㄦ牸
+ .uni-table-scroll {
+ width: 100%;
+ overflow-x: hidden;
- .uni-table-th {
- height: vww(32);
- line-height: vww(20);
- padding: vww(5) vww(10);
- color: #111111;
- font-weight: 550;
- background: #f5f5f5;
- }
+ .uni-table {
+ min-width: 0 !important;
- .uni-table-td {
- height: vww(32);
- line-height: vww(20);
- padding: vww(5) vww(10);
- color: #111111;
- .u-button {
- height: vww(23);
+ .uni-table-tr {
+ padding: 0;
+ font-size: vww(13);
+
+ .uni-table-th {
+ height: vww(32);
+ line-height: vww(20);
+ padding: vww(5) vww(10);
+ color: #111111;
+ font-weight: 550;
+ background: #f5f5f5;
+ }
+
+ .uni-table-td {
+ height: vww(32);
+ line-height: vww(20);
+ padding: vww(5) vww(10);
+ color: #111111;
+
+ .u-button {
+ height: vww(23);
+ }
}
}
}
}
}
-}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1