| pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/customer-page/customer-index/customer-index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/customer-page/customer-my/customer-my.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/customer-page/fleet-management/fleet-management.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/driver-page/appointment/appointment.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/driver-page/driver-index/driver-index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/userPassword.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/register/register.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| utils/util.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; 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(); }); }, // 领取点击 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; }); } 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` }); }, // 车队详情 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代表的是司机 }); } } 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, '货代详情'); }); } 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> 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; } } } } 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) { 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> utils/util.js
New file @@ -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 }
