From 5b36142869f824399ab1ad1f0eaaea8ecf0ca83d Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期五, 17 三月 2023 19:01:35 +0800
Subject: [PATCH] 细节修改
---
pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue | 2
pages/login/userPassword.vue | 5
pages/driver-page/appointment/appointment.vue | 3
utils/util.js | 7 +
pages/register/register.vue | 4
pages/customer-page/customer-index/customer-index.vue | 11 +-
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 27 ++++--
pages/customer-page/fleet-management/fleet-management.vue | 30 +++---
pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue | 5 -
pages/customer-page/customer-my/customer-my.vue | 2
pages/driver-page/driver-index/driver-index.vue | 114 ++++++++++++++++++++--------
11 files changed, 136 insertions(+), 74 deletions(-)
diff --git a/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue b/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue
index f4379b0..c039c5b 100644
--- a/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue
+++ b/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue
@@ -17,7 +17,7 @@
<script>
import { customerId } from '@/utils/status.js';
export default {
- onLoad(params) {
+ onLoad(params) {
this.role = params.role;
if (params.fleetId) {
this.fleetId = params.fleetId;
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index cc34f45..fb836d1 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -9,15 +9,15 @@
寮�
</view>
<view class="card-left__utils">
- <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars == item.cars2 ? false : true" shape="circle"></u-button>
- <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
+ <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars2 == 0" shape="circle"></u-button>
+ <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNumSurplus1 == 0"></u-button>
</view>
</template>
<template v-slot:right-top>
<view class="right-top">
<view class="card-right-top-row">
<view>
- <text>{{ item.compName || '' }}</text>
+ <text>{{ item.deptName || '' }}</text>
</view>
<view>
<text>{{ item.coalName }}</text>
@@ -62,7 +62,7 @@
import card from '@/components/card/card.vue';
import { customerId } from '@/utils/status';
import colorGradient from '@/uni_modules/uview-ui/libs/function/colorGradient';
-
+import { todayDate } from '@/utils/util.js';
export default {
components: {
card
@@ -80,6 +80,7 @@
},
onShow() {
this.init();
+ console.log(todayDate, '鑾峰彇浠婂ぉ鐨勬棩鏈�');
},
methods: {
init() {
@@ -92,7 +93,7 @@
});
this.$reqGet('GetOrderPlan').then(res => {
this.orderPlanData = res.data;
- uni.hideLoading()
+ uni.hideLoading();
});
},
// 棰嗗彇鐐瑰嚮
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index f471d3e..348131f 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -5,12 +5,24 @@
<view class="comp">{{ orderPlanDetail.compName }}</view>
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-td align="left">璐т唬棰嗗彇</uni-td>
- <uni-td align="left">{{ orderPlanDetail.huodaiSum||0 }}寮�</uni-td>
+ <uni-th align="left">鎬婚鍙栭噺</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.fowerdsum || 0 }}寮�</uni-td>
</uni-tr>
<uni-tr>
- <uni-td align="left">鍙告満棰嗗彇</uni-td>
- <uni-td align="left">{{ orderPlanDetail.sijiSum||0 }}寮�</uni-td>
+ <uni-th align="left">杞﹂槦鍜岃揣浠�</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.fleetOrHuodaiNub || 0 }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">杞﹂槦</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.cheduiList || 0 }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璐т唬</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.huodaiList || 0 }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍙告満</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.sijiSum || 0 }}寮�</uni-td>
</uni-tr>
</uni-table>
</view>
@@ -18,9 +30,9 @@
<view class="compDetails">
<view class="comp">棰勭害鎯呭喌</view>
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
- <uni-tr v-for="(item, index) in orderPlanDetail.list">
- <uni-td align="left">{{ orderPlanDetail.coalName }}</uni-td>
- <uni-td align="left">{{ orderPlanDetail.cars }}寮�</uni-td>
+ <uni-tr v-for="(item, index) in orderPlanDetail.yyDailyList">
+ <uni-td align="left">{{ orderPlanDetail.yyDailyList }}</uni-td>
+ <uni-td align="left">{{ orderPlanDetail.yyDailyList }}寮�</uni-td>
</uni-tr>
</uni-table>
</view>
@@ -52,7 +64,6 @@
// 鑾峰彇鍙戣繍璁″垝璇︽儏
GetOrderPlanDetail() {
this.$reqGet('xiangqingList', { orderPlanId: this.orderPlanId }).then(res => {
- console.log('鍙戣繍璁″垝璇︽儏', res);
this.orderPlanDetail = res.data;
});
}
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 69316dc..39a651b 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -250,7 +250,7 @@
// 璐т唬璇︽儏
toFreightForwarderDetails(id) {
uni.navigateTo({
- url: `/pages/customer-page/freight-forwarder-details/freight-forwarder-details?huoDaiId=${id}`
+ url: `/pages/customer-page/freight-forwarder-details/freight-forwarder-details`
});
},
// 杞﹂槦璇︽儏
diff --git a/pages/customer-page/fleet-management/fleet-management.vue b/pages/customer-page/fleet-management/fleet-management.vue
index 9738713..5d3a8ef 100644
--- a/pages/customer-page/fleet-management/fleet-management.vue
+++ b/pages/customer-page/fleet-management/fleet-management.vue
@@ -8,8 +8,8 @@
<view class="myCarContainer">
<u-swipe-action>
<u-cell-group>
- <u-swipe-action-item :options="options1" v-for="(item, index) in fleetDriverData" :key="index" :index="item.id" :name="item.id" @click="deleteGroupClick">
- <u-cell icon="car" iconStyle="font-size:20px;" :title="item.carNo" :value="item.realName"></u-cell>
+ <u-swipe-action-item :options="options1" v-for="(item, index) in fleetDriverData" :key="index" :index="item.id" :name="item.userId" @click="deleteGroupClick">
+ <u-cell icon="car" iconStyle="font-size:20px;" :title="item.carNo" :value="item.name"></u-cell>
</u-swipe-action-item>
</u-cell-group>
</u-swipe-action>
@@ -31,7 +31,6 @@
<view class="slot-content"><rich-text :nodes="content"></rich-text></view>
</u-modal>
</view>
-
<view class="updateGroupButton"><u-button text="閭�璇峰徃鏈哄姞鍏�" type="primary" @click="addDrvier"></u-button></view>
</view>
</template>
@@ -39,11 +38,10 @@
<script>
export default {
onLoad(params) {
- this.fleetId = params.id;
+ this.deleteDriveObj.fleetId = params.id;
},
data() {
return {
- fleetId: null,
text1: '鍚戝乏婊戝姩杞﹁締鍙繘琛屽垹闄よ溅闃熸搷浣滐紒锛侊紒',
groupCarsShow: true,
fleetDriverData: [],
@@ -54,7 +52,10 @@
text: '鍒犻櫎'
}
],
- deleteGroupId: null, // 鍒犻櫎杞﹁締灏忕粍id
+ deleteDriveObj: {
+ id: null, // 鍒犻櫎杞﹁締灏忕粍id
+ fleetId: null
+ },
// 鍒犻櫎灏忕粍妯℃�佹
title: '鎻愮ず',
content: '',
@@ -73,7 +74,7 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- this.$reqGet('GetUserFleet', { fleetId: this.fleetId }).then(res => {
+ this.$reqGet('GetUserFleet', { fleetId: this.deleteDriveObj.fleetId }).then(res => {
uni.hideLoading();
this.fleetDriverData = res.data;
});
@@ -82,17 +83,16 @@
close() {},
open() {},
deleteGroupClick(args) {
- console.log(args);
- this.deleteGroupId = args.name;
- this.fleetDriverData.forEach(item=>{
- if(item.id = this.deleteGroupId){
- this.content = '纭鍒犻櫎鍙告満锛�' + item.realName;
+ this.deleteDriveObj.id = args.name;
+ this.fleetDriverData.forEach(item => {
+ if (item.userId == this.deleteDriveObj.id) {
+ this.content = '纭鍒犻櫎鍙告満锛�' + item.name;
}
- })
+ });
this.deleteGroupShow = true;
},
deleteConfirm() {
- this.$reqPost('deleteSiJi', { id: this.deleteGroupId }, 'params').then(res => {
+ this.$reqPost('deleteSiJi', this.deleteDriveObj, 'params').then(res => {
console.log('鍒犻櫎鍙告満', res);
this.GetUserFleet();
if (res.code == 0) {
@@ -118,7 +118,7 @@
// 閭�璇峰徃鏈哄姞鍏�
addDrvier() {
uni.navigateTo({
- url: `/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=2&fleetId=${this.fleetId}` // 2浠ｈ〃鐨勬槸鍙告満
+ url: `/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=2&fleetId=${this.deleteDriveObj.fleetId}` // 2浠ｈ〃鐨勬槸鍙告満
});
}
}
diff --git a/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue b/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue
index 482f9fe..73112b5 100644
--- a/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue
+++ b/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue
@@ -51,9 +51,6 @@
<script>
export default {
- onLoad(params) {
- this.huoDaiId = params.huoDaiId;
- },
data() {
return {
huoDaiId: null
@@ -67,7 +64,7 @@
this.getHuoDaiDetail();
},
getHuoDaiDetail() {
- this.$reqGet('getHuoDaiDetail', { huoDaiId: this.huoDaiId }).then(res => {
+ this.$reqGet('getHuoDaiDetail').then(res => {
console.log(res, '璐т唬璇︽儏');
});
}
diff --git a/pages/driver-page/appointment/appointment.vue b/pages/driver-page/appointment/appointment.vue
index 4e8099d..80923af 100644
--- a/pages/driver-page/appointment/appointment.vue
+++ b/pages/driver-page/appointment/appointment.vue
@@ -1,7 +1,6 @@
<template>
<view class="appointment">
- <!-- <h1>涓滃簽鐭库�斺��1/3鎻愮叅鍗�</h1> -->
- <combined-title title="涓滃簽鐭库�斺��1/3鎻愮叅鍗�"></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-tr>
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 1520179..41a08cd 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -16,7 +16,7 @@
<text>{{ item.carNum }}</text>
寮�
</view>
- <view class="card-left__utils"><u-button @tap.stop="qiangDanClick(item.orderPlanId)" text="鎶㈠崟" type="primary" shape="circle"></u-button></view>
+ <view class="card-left__utils"><u-button @tap.stop="qiangDanBtn(item.orderPlanId)" text="鎶㈠崟" type="primary" shape="circle"></u-button></view>
</template>
<template v-slot:right-top>
<view class="right-top">
@@ -37,26 +37,19 @@
</template>
</card>
- <!-- 鎴戠殑鎻愮叅鍗� -->
- <combined-title title="鎴戠殑鎻愮叅鍗�"></combined-title>
- <!-- 鍗＄墖 -->
- <!-- <view v-for="(item, index) in driverBillOfLoadingData.list2" :key="index"> -->
+ <!-- 鎶㈠崟鎻愮ず妯℃�佹 -->
+ <view class="qianDanModel">
+ <u-modal :show="qiangDanShow" :title="qiangDanTitle" showCancelButton :content="qiangDanContent" @confirm="qiangDanConfirm" @cancel="qiangDanCancel"></u-modal>
+ </view>
+
+ <!-- 寰呴绾︽彁鐓ゅ崟 -->
+ <combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
<u-empty
mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
- v-if="
- driverBillOfLoadingData.list2
- ? driverBillOfLoadingData.list2.length == 0
- ? true
- : false
- : true && driverBillOfLoadingData.list3
- ? driverBillOfLoadingData.list3.length == 0
- ? true
- : false
- : true
- "
+ v-if="driverBillOfLoadingData.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true"
></u-empty>
<view>
<!-- 寰呴绾︽彁鐓ゅ崟 -->
@@ -65,13 +58,46 @@
<text>鎻愮叅鍗曠紪鍙凤細{{ item.code }}</text>
</view>
<view class="daiYuYueTable">
- <view>{{ item.deptName }}</view>
+ <!-- <view>{{ item.deptName }}</view>
<view>{{ item.coalName }}</view>
- <view>宸查绾︼細{{ item.cars }} 杞�</view>
+ <view>宸查绾︼細{{ item.cars }} 杞�</view> -->
+ <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-tr>
+ <uni-tr>
+ <uni-td align="left">{{ item.deptName || '' }}</uni-td>
+ <uni-td align="left">{{ item.coalName || '' }}</uni-td>
+ <uni-td align="left">{{ item.cars || '' }} 杞�</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="center">鍙戣繍鏃ユ湡</uni-th>
+ <uni-th align="center">鐓ゅ満</uni-th>
+ <uni-th align="center">瀹㈡埛</uni-th>
+ </uni-tr>
+ <uni-tr>
+ <uni-td align="left">{{ item.sendDate || '' }}</uni-td>
+ <uni-td align="left">{{ item.filedName || '' }}</uni-td>
+ <uni-td align="left">{{ item.customerName || '' }}</uni-td>
+ </uni-tr>
+ </uni-table>
</view>
<view><u-button text="棰勭害" type="primary" @click="toAppointmentClick(item)"></u-button></view>
</view>
- <!-- 宸查绾︽彁鐓ゅ崟 -->
+ </view>
+
+ <!-- 宸查绾︽彁鐓ゅ崟 -->
+ <combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
+ <u-empty
+ mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ textSize="30"
+ iconSize="1000"
+ v-if="driverBillOfLoadingData.list2 ? (driverBillOfLoadingData.list2.length == 0 ? true : false) : true"
+ ></u-empty>
+ <view class="">
<view @click="list3CardIconClick(item)" class="haveYuYue" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index">
<view class="haveYuYueTop">
<text>鎻愮叅鍗曠紪鍙凤細{{ item.code || '' }}</text>
@@ -96,7 +122,11 @@
export default {
data() {
return {
- driverBillOfLoadingData: []
+ driverBillOfLoadingData: [],
+ // 鎶㈠崟妯℃�佹
+ qiangDanShow: false,
+ qiangDanTitle: '鎶㈠崟鎻愮ず',
+ qiangDanContent: ''
};
},
onShow() {
@@ -118,8 +148,20 @@
this.driverBillOfLoadingData = res.data;
});
},
- // 鎶㈠崟
- qiangDanClick(id) {
+ // 鎶㈠崟鎸夐挳
+ qiangDanBtn(value) {
+ if (value.taskNum == 0) {
+ this.qiangDan(value.orderPlanId);
+ } else {
+ }
+ },
+ // 鎶㈠崟妯℃�佹
+ qiangDanConfirm() {},
+ qiangDanCancel() {
+ this.qiangDanShow = false;
+ },
+ // 鎶㈠崟璇锋眰
+ qiangDan(id) {
// this.$reqPost('qiangDan', { orderPlanId: id, wxUserId: customerId }, 'params').then(res => {
this.$reqPost('qiangDan', { orderPlanId: id }, 'params').then(res => {
if (res.code == 0) {
@@ -209,18 +251,22 @@
font-weight: 400;
}
&Table {
- border: vww(1) solid #eeeeee;
- border-top: none;
- display: flex;
- flex: 1;
- height: vww(40);
- line-height: vww(40);
- view {
- border-right: vww(1) solid #eeeeee;
- width: 33.3%;
- text-align: center;
- &:nth-child(3) {
- border-right: none;
+ .uni-table {
+ .uni-table-tr {
+ padding: 0;
+ .uni-table-th {
+ line-height: 58rpx;
+ padding: vww(5) vww(10);
+ color: #111111;
+ font-weight: 400;
+ background: #e5e5e5;
+ }
+ .uni-table-td {
+ font-weight: 400;
+ line-height: 58rpx;
+ padding: vww(5) vww(10);
+ color: #111111;
+ }
}
}
}
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 1a37db5..5e3f0dc 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -43,7 +43,8 @@
},
data() {
return {
- username: '18812345677',
+ username: '18804050607',//瀹㈡埛
+ // username: '18805080506',//鐜嬫锛堝徃鏈猴級
password: '123456',
remember: true,
baseUrl: ''
@@ -54,7 +55,7 @@
//鐧诲綍
async submit() {
uni.showLoading({
- title: '鐧婚檰涓�...'
+ title: '鐧诲綍涓�...'
});
//琛ㄥ崟鏍￠獙
if (this.username.length === 0) {
diff --git a/pages/register/register.vue b/pages/register/register.vue
index b27729d..f15f3bf 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -36,13 +36,13 @@
<u--input v-model="registerFormModel.carNo" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
</u-form-item>
<u-form-item prop="carImg" label="杞﹁締鐓х墖" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
- <u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" width="250" height="150">
+ <u-upload :fileList="fileList1" deletable @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" width="250" height="150">
<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
mode="widthFix" style="width: 250px;height: 150px;"></image> -->
</u-upload>
</u-form-item>
<u-form-item prop="drivingImg" label="琛岄┒璇�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
- <u-upload :fileList="fileList2" @afterRead="afterRead" @delete="deletePic" name="2" multiple :maxCount="1" width="250" height="150">
+ <u-upload :fileList="fileList2" deletable @afterRead="afterRead" @delete="deletePic" name="2" multiple :maxCount="1" width="250" height="150">
<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
mode="widthFix" style="width: 250px;height: 150px;"></image> -->
</u-upload>
diff --git a/utils/util.js b/utils/util.js
new file mode 100644
index 0000000..f5e9768
--- /dev/null
+++ b/utils/util.js
@@ -0,0 +1,7 @@
+export function todayDate(){
+ let date = new Date()
+ let year = date.getFullYear()
+ let month = date.getMonth() + 1;
+ let day = date.getDate()
+ return year + '-' + month + '-' + day
+}
\ No newline at end of file
--
Gitblit v1.9.1