api/globalApi.js
@@ -313,5 +313,10 @@ getTmTaskCoalData: { url: '/wrzs/tmtaskcoal/getTmTaskCoalData', method: 'GET' }, //根据id拿到转发中的原始数量 jhorderplanforward: { url: '/wrzs/jhorderplanforward/getAppById', method: 'GET' } } components/tab-bar/tab-bar.vue
@@ -22,13 +22,14 @@ // tabBarList: this.$store.state.userTabbar }; }, computed:{ tabBarList(){ return this.$store.state.userTabbar computed: { tabBarList() { return this.$store.state.userTabbar; } }, methods: { tabbarchange(e) { console.log(e, 'tab切换地址'); uni.switchTab({ url: '/' + this.tabBarList[e].pagePath }); @@ -40,7 +41,7 @@ ::v-deep.tab-bar { .u-tabbar { &__content { background: #ececec!important; background: #ececec !important; &__item-wrapper { height: vww(50); } pages.json
@@ -167,17 +167,15 @@ "enablePullDownRefresh": false } }, { "path": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false } } ,{ "path" : "pages/customer-page/customer-my/faYunstatistics/faYunstatistics", "style" : { "navigationBarTitleText": "", "enablePullDownRefresh": false } } ], ], "subPackages": [{ "root": "pages/register", "pages": [{ @@ -202,25 +200,21 @@ "enablePullDownRefresh": true } } ,{ "path" : "messageDetails/messageDetails", "style" : { "navigationBarTitleText": "", "enablePullDownRefresh": false } } ,{ "path" : "faYunstatisticsDetails/faYunstatisticsDetails", "style" : { "navigationBarTitleText": "", "enablePullDownRefresh": false } } ] }, { "path": "messageDetails/messageDetails", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false } }, { "path": "faYunstatisticsDetails/faYunstatisticsDetails", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false } }] }, { "root": "pages/driver-page/appointment", "pages": [{ @@ -310,6 +304,9 @@ // "text": "结算" // }, { "pagePath": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics" }, { "pagePath": "pages/tabbar-page/myPage-tabbar/myPage-tabbar" // "iconPath": "static/tabBar-icon/Gmine10.png", // "selectedIconPath": "static/tabBar-icon/Bmine57.png", pages/customer-page/customer-index/customer-index.vue
@@ -49,26 +49,39 @@ <view class="history-numbers"> <combined-title title="历史提煤单"></combined-title> <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower"> <uni-table border stripe emptyText="暂无更多数据" :loading="loading"> <uni-tr> <uni-th width="100" align="center">发运日期</uni-th> <uni-th width="100" align="center">所属单位</uni-th> <uni-th align="center" width="150">煤场名称</uni-th> <uni-th align="center" width="100">煤种名称</uni-th> <uni-th align="center" width="150">订单编号</uni-th> <uni-th align="center" width="100">订单剩余量</uni-th> <uni-th align="center" width="80">提煤单个数</uni-th> </uni-tr> <uni-tr v-for="(item, index) in historyCoalData" :key="index"> <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate || '' }}</uni-td> <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount || '' }}</uni-td> </uni-tr> </uni-table> <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)"> <view class="history-sendate"> <text>发运日期 {{ item.sendDate || '' }}</text> <view class="view-more"> <text style="color: #449cfc;">详情</text> <view class="arrow-right"><u-icon name="arrow-right" size="40" color="#449cfc"></u-icon></view> </view> </view> <view class="history-main"> <view class="main-left"> <view class="history-body"> <text>所属单位 {{ item.deptName || '' }}</text> </view> <view class="history-body"> <text>煤场名称 {{ item.filedName || '' }}</text> </view> <view class="history-body"> <text>煤种名称 {{ item.coalName || '' }}</text> </view> </view> <view class="main-right"> <view class="history-body"> <text style="word-break: break-all;">订单编号 {{ item.orderCode || '' }}</text> </view> <view class="history-body"> <text>订单剩余量 {{ item.carNumSurplus || '' }}</text> </view> <view class="history-body"> <text>提煤单个数 {{ item.tmCount || '' }}</text> </view> </view> </view> </view> <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view> </scroll-view> </view> @@ -242,6 +255,7 @@ }, // 转发 forwardClick(obj) { if (obj.cars2 == 0) return this.$u.toast('请先领取后再转发'); uni.navigateTo({ url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}` }); } } @@ -250,10 +264,52 @@ <style lang="scss" scoped> .scroll-Y { height: 600rpx; margin-bottom: vww(50); height: 900rpx; background-color: #e2e2e2; border-radius: vww(10); .history-information { width: 94%; display: flex; flex-direction: column; border: 1px solid #e2e2e2; background-color: #fff; border-radius: vww(10); margin: vww(10); .history-sendate { height: vww(40); border-bottom: 1px solid #e2e2e2; line-height: vww(40); padding-left: vww(8); position: relative; .view-more { display: flex; width: vww(80); position: absolute; right: vww(10); top: vww(-1); .arrow-right { position: absolute; right: vww(27); top: vww(12); } } } .history-main { min-height: vww(120); display: flex; justify-content: space-between; .main-left, .main-right { width: 45%; display: flex; flex-direction: column; justify-content: space-between; padding: vww(4) vww(4); } } } .more_text { color: #999; color: #333; font-size: 24rpx; text-align: center; } pages/customer-page/customer-my/customer-my.vue
@@ -33,7 +33,7 @@ </view> </view> <view class="statistics"><u-button text="发运统计" type="primary" @click="statistics"></u-button></view> <!-- <view class="statistics"><u-button text="发运统计" type="primary" @click="statistics"></u-button></view> --> <view class="logout"><u-button text="退出登录" type="primary" @click="logout()"></u-button></view> <!-- 新建车队弹出框 --> pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -8,158 +8,124 @@ </view> </view> <view class="collapse-main"> <u-collapse> <u-collapse-item :title="dateRange" value="筛选"> <view class="filter-main"> <view class="filter-body"> <view class="condition-name">煤种：</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in coalList" :key="index" @click="filterCondition(0, index, item.condition)"> <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < coalShow"></u-button> </view> <view class="toggle-button"> <u-button shape="circle" :text="coalShow < coalTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(0)" v-if="coalTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body"> <view class="condition-name">类型：</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in typeList" :key="index" @click="filterCondition(1, index, item.condition)"> <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button> </view> <view class="toggle-button"> <u-button shape="circle" :text="typeShow < typeTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(1)" v-if="typeTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body"> <view class="condition-name">客户：</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in customerList" :key="index" @click="filterCondition(2, index, item.condition)"> <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button> </view> <view class="toggle-button"> <u-button shape="circle" :text="customerShow < customerTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(2)" v-if="customerTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType == 1"> <view class="condition-name">货代：</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in forwarderList" :key="index" @click="filterCondition(3, index, item.condition)"> <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button> </view> <view class="toggle-button"> <u-button shape="circle" :text="forwarderShow < forwarderTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(3)" v-if="forwarderTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType != 3"> <view class="condition-name">车队：</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in fleetList" :key="index" @click="filterCondition(4, index, item.condition)"> <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button> </view> <view class="toggle-button"> <u-button shape="circle" :text="fleetShow < fleetTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(4)" v-if="fleetTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType != 1"> <view class="condition-name">矿场：</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in filedList" :key="index" @click="filterCondition(5, index, item.condition)"> <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button> </view> <view class="toggle-button"> <u-button shape="circle" :text="filedShow < filedTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(5)" v-if="filedTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType == 2"> <view class="condition-name">车牌号：</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in carNoList" :key="index" @click="filterCondition(6, index, item.condition)"> <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button> </view> <view class="toggle-button"> <u-button shape="circle" :text="carNoShow < carNoTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(6)" v-if="carNoTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body"> <view class="condition-name">日期：</view> <view class="filter-name"> <u-button :text="dateselect" @click="opencalendar"></u-button> <view class="filter-button"> <uni-calendar ref="calendar" class="uni-calendar--hook" :clear-date="true" :date="info.date" :insert="info.insert" :lunar="info.lunar" :startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm" /> </view> <view class="filter-show"> <view class="filtershow-date">{{ dateRange }}</view> <view class="filter-icon"><u-icon name="grid" :size="40" color="#9ec16c "></u-icon></view> <view class="filtershow-text" @click="showPopup">筛选</view> </view> <u-popup :show="conditinonShow" mode="top" :closeable="true" :closeOnClickOverlay="true" @close="conditinonclose"> <view class="filter-main"> <view class="filter-body date-button"> <view class="condition-name">日期</view> <view class="filter-name"> <u-button :text="dateselect" @click="opencalendar"></u-button> <view class="filter-button "> <uni-calendar ref="calendar" class="uni-calendar--hook" :clear-date="true" :date="info.date" :insert="info.insert" :lunar="info.lunar" :startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm" /> </view> </view> </view> </u-collapse-item> </u-collapse> <view class="filter-body"> <view class="condition-name">煤种</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in coalList" :key="index" @click="filterCondition(0, index, item.condition)"> <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < coalShow"></u-button> </view> <view class="toggle-button"> <u-button :text="coalShow < coalTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(0)" v-if="coalTotal > 3"></u-button> </view> </view> </view> <view class="filter-body"> <view class="condition-name">类型</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in typeList" :key="index" @click="filterCondition(1, index, item.condition)"> <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < typeShow"></u-button> </view> <view class="toggle-button"> <u-button :text="typeShow < typeTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(1)" v-if="typeTotal > 3"></u-button> </view> </view> </view> <view class="filter-body"> <view class="condition-name">客户</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in customerList" :key="index" @click="filterCondition(2, index, item.condition)"> <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < customerShow"></u-button> </view> <view class="toggle-button"> <u-button :text="customerShow < customerTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(2)" v-if="customerTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType == 1"> <view class="condition-name">货代</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in forwarderList" :key="index" @click="filterCondition(3, index, item.condition)"> <u-button :text="item.condition" :type="item.active ? 'success' : ''" v-if="index < forwarderShow"></u-button> </view> <view class="toggle-button"> <u-button :text="forwarderShow < forwarderTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(3)" v-if="forwarderTotal > 3" ></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType != 3"> <view class="condition-name">车队</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in fleetList" :key="index" @click="filterCondition(4, index, item.condition)"> <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < fleetShow"></u-button> </view> <view class="toggle-button"> <u-button :text="fleetShow < fleetTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(4)" v-if="fleetTotal > 3"></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType != 1"> <view class="condition-name">矿场</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in filedList" :key="index" @click="filterCondition(5, index, item.condition)"> <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < filedShow"></u-button> </view> <view class="toggle-button"> <u-button :text="filedShow < filedTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(5)" v-if="filedTotal > 3"></u-button> </view> </view> </view> <view class="filter-body" v-if="roleType == 2"> <view class="condition-name">车牌号</view> <view class="filter-name"> <view class="filter-button" v-for="(item, index) in carNoList" :key="index" @click="filterCondition(6, index, item.condition)"> <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < carNoShow"></u-button> </view> <view class="toggle-button"> <u-button :text="carNoShow < carNoTotal ? '查看更多' : '收起'" type="primary" size="small" @click="toggle(6)" v-if="carNoTotal > 3"></u-button> </view> </view> </view> </view> </u-popup> </view> <view class="date-information"> <view class="statistics-card" v-for="(item, index) in filterList" :key="index"> @@ -173,8 +139,8 @@ }}吨 </view> </view> <view class="card-main" v-for="(value, i) in item.taskCoalList" :key="i"> <view class="arrow-right" @click="faYunDetail(value.id)"><u-icon name="arrow-right" size="50"></u-icon></view> <view class="card-main" v-for="(value, i) in item.taskCoalList" :key="i" @click="faYunDetail(value.id)"> <view class="arrow-right"><u-icon name="arrow-right" size="50"></u-icon></view> <view class="main-body"> <view class="coal-name">煤种:{{ value.coalName || '' }}</view> <view class="clean">执行量:{{ value.clean.toFixed(2) || 0 }}</view> @@ -185,6 +151,7 @@ </view> </view> </view> <tab-bar :current="1"></tab-bar> </view> </template> @@ -213,6 +180,8 @@ filterList: [], totalLength: 0, totalTon: 0, // 筛选弹出层 conditinonShow: false, // 超过两行自动隐藏 coalShow: 3, typeShow: 3, @@ -414,6 +383,7 @@ } }, confirm(e) { console.log(e, '日期选择'); this.first = e.range.before; this.last = e.range.after; }, @@ -494,8 +464,13 @@ url: `/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails?id=${takeCoalId}` }); }, confirm() { this.modalShow = false; // 打开筛选条件弹窗 showPopup() { this.conditinonShow = true; }, // 关闭筛选条件弹窗 conditinonclose() { this.conditinonShow = false; } }, computed: { @@ -544,15 +519,14 @@ </script> <style lang="scss" scoped> ::v-deep .u-cell__value { color: #9ec16c !important; font-size: vww(18) !important; ::v-deep .toggle-button .u-button { width: vww(40); } ::v-deep .filter-name:nth-last-child(1) { .u-button { width: 66%; } } // ::v-deep .filter-name:nth-last-child(1) { // .u-button { // width: 66%; // } // } .main { width: 96%; margin: 0 auto; @@ -586,11 +560,54 @@ background-color: #fff; border: 1px solid #cccccc; border-radius: vww(5); .filter-show { width: 100%; height: vww(40); background-color: #fff; border-radius: vww(5); font-size: vww(18); color: #333; position: relative; display: flex; justify-content: space-between; align-items: center; .filtershow-date { font-size: vww(15); padding-left: vww(8); } .filter-icon { position: absolute; right: vww(45); top: vww(11); } .filtershow-text { color: #9ec16c; padding-right: vww(8); position: relative; &::before { content: ''; position: absolute; width: 1px; height: vww(22); background-color: #dcdfe6; right: 94px; bottom: 0; } } } .filter-main { width: 100%; display: flex; flex-direction: column; justify-content: space-around; .date-button { width: 80%; height: vww(80); margin: vww(5) auto; .condition-name { margin-bottom: vww(10); } } .filter-body { width: 100%; position: relative; @@ -598,31 +615,34 @@ justify-content: flex-start; flex-wrap: wrap; .condition-name { margin-left: vww(15); margin-top: vww(10); font-size: vww(16); color: #686868; } .filter-name { width: 100%; width: 94%; margin: 0 auto; position: relative; display: flex; flex-wrap: wrap; justify-content: flex-start; align-items: flex-start; position: relative; top: vww(-34); .filter-button { color: #393a3c; height: vww(16); padding: vww(8); margin: vww(5) vww(5); &:nth-child(1) { margin-left: vww(48); } margin-bottom: vww(10); } .toggle-button { margin: vww(12) auto; position: relative; left: -10%; transform: translateX(-50%); width: 30%; display: flex; justify-content: center; position: absolute; right: vww(-21); top: vww(-23); } } } pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -1,8 +1,56 @@ <template> <view class="bill-of-lading-details"> <view class="bangDanMessage"> <scroll-view class="bangDanMessage" :scroll-top="scrollTop" scroll-y="true"> <uni-table border stripe emptyText="暂无更多数据"> <uni-tr> <uni-th align="left">客户</uni-th> <uni-td align="right">{{ coalDetailsData.customerName || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">矿场</uni-th> <uni-td align="right">{{ coalDetailsData.deptName || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">毛重</uni-th> <uni-td align="right">{{ coalDetailsData.hair || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">皮重</uni-th> <uni-td align="right">{{ coalDetailsData.skin || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">净重</uni-th> <uni-td align="right">{{ coalDetailsData.clean || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">磅单类型</uni-th> <uni-td align="right">{{ coalDetailsData.orderType || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">状态</uni-th> <uni-td align="right">{{ coalStatus[coalDetailsData.status] }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">煤场</uni-th> <uni-td align="right">{{ coalDetailsData.filedName || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">发运时间</uni-th> <uni-td align="right">{{ coalDetailsData.sendDate || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">提煤单编号</uni-th> <uni-td align="right">{{ coalDetailsData.code || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">订单编号</uni-th> <uni-td align="right">{{ coalDetailsData.orderCode || '' }}</uni-td> </uni-tr> </uni-table> </scroll-view> <!-- <view class="bangDanMessage"> <view class=""> <text>客户：{{ coalDetailsData.customerName || '' }}</text> <text>客户：{{}}</text> <text>矿场：{{ coalDetailsData.deptName || '' }}</text> </view> <view class=""> @@ -20,7 +68,7 @@ <text>提煤单编号：{{ coalDetailsData.code || '' }}</text> <text>订单编号：{{ coalDetailsData.orderCode || '' }}</text> </view> </view> </view> --> <view class="timeLine" style="font-size: 16rpx;"> <u--text type="primary" size="30" plain v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text> </view> @@ -106,7 +154,8 @@ // 原发信息 primarySkin: null, primaryHair: null, primaryClean: null primaryClean: null, scrollTop: 0 }; }, onShow() { @@ -307,47 +356,73 @@ display: flex; flex-direction: column; .bangDanMessage { padding: vww(10); border: vww(2) solid #dddddd; border-radius: vww(20); margin: vww(20); margin-bottom: vww(10); height: 40%; font-size: vww(18); font-weight: 600; view { margin-bottom: vww(10); } view:nth-of-type(1) { display: flex; text { width: 50%; text-align: center; width: 96%; margin: 0 auto; height: 50%; } // 表格样式 .uni-table { .uni-table-tr { padding: 0; border: vww(1) solid #c6c6c6; .uni-table-th { font-size: vww(14); height: vww(20); line-height: vww(20); // padding: vww(5) vww(10); color: #111111; font-weight: 500; background: #e2e2e2; } } view:nth-of-type(2) { display: flex; text { width: 33%; text-align: center; } } view:nth-of-type(3) { display: flex; text { width: 50%; text-align: center; } } view:nth-of-type(4) { display: flex; flex-direction: column; text { margin-bottom: vww(10); text-align: center; .uni-table-td { font-size: vww(14); font-weight: 400; height: vww(20); line-height: vww(20); padding: vww(5) vww(10); color: #111111; } } } // .bangDanMessage { // margin: vww(20); // margin-bottom: vww(10); // height: 40%; // font-size: vww(18); // font-weight: 600; // view { // margin-bottom: vww(10); // } // view:nth-of-type(1) { // display: flex; // text { // width: 50%; // text-align: center; // } // } // view:nth-of-type(2) { // display: flex; // text { // width: 33%; // text-align: center; // } // } // view:nth-of-type(3) { // display: flex; // text { // width: 50%; // text-align: center; // } // } // view:nth-of-type(4) { // display: flex; // flex-direction: column; // text { // margin-bottom: vww(10); // text-align: center; // } // } // } .timeLine { height: 25%; margin: vww(20); pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -20,19 +20,60 @@ </view> --> </view> </view> <view class="bottom" v-if="weighList.orderType == '外销' || weighList.orderType == '转出' || weighList.orderType == '外购'"> <view class="bottom" v-if="weighList.orderType == '内购' || weighList.orderType == '转入'"> <view> <view style="font-weight: 600;">原发信息</view> <text v-if="weighList.orderType == '外购' && weighList.hair == 0"> 毛重:{{ coalContactHair || '' }}皮重:{{ coalContactSkin || '' }}净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }} </text> <text v-else>毛重:{{ primaryHair || '' }}皮重:{{ primarySkin || '' }}净重:{{ primaryClean || '' }}</text> <text>毛重:{{ primaryHair || '' }}皮重:{{ primarySkin || '' }}净重:{{ primaryClean || '' }}</text> </view> </view> <view class="bottom" v-else-if="weighList.orderType == '外购' && weighList.hair == 0"> <text> 毛重:{{ coalContactHair || '' }}皮重:{{ coalContactSkin || '' }}净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }} </text> </view> <view class="bottom"><text>TIP:当前状态为正常时可以称重</text></view> </view> <view class="two"> <p>订单编号：{{ weighList.code || '' }}</p> <uni-table border stripe emptyText="暂无更多数据"> <uni-tr> <uni-th align="left">订单编号</uni-th> <uni-td align="right">{{ weighList.code || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">订单类型</uni-th> <uni-td align="right">{{ weighList.orderType || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">订单余量</uni-th> <uni-td align="right">{{ weighList.orderSurplus || 0 }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">毛重</uni-th> <uni-td align="right">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">皮重</uni-th> <uni-td align="right">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">净重</uni-th> <uni-td align="right">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">煤种名称</uni-th> <uni-td align="right">{{ weighList.coalName || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">矿场名称</uni-th> <uni-td align="right">{{ weighList.deptName || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="left">煤场名称</uni-th> <uni-td align="right">{{ weighList.filedName || '' }}</uni-td> </uni-tr> </uni-table> <!-- <p>订单编号：{{ weighList.code || '' }}</p> <p>订单类型：{{ weighList.orderType || '' }}</p> <p>订单余量：{{ weighList.orderSurplus || 0 }}</p> <p>皮重：{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p> @@ -40,7 +81,7 @@ <p>净重：{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</p> <p>煤种名称：{{ weighList.coalName || '' }}</p> <p>单位名称：{{ weighList.deptName || '' }}</p> <p>矿场名称：{{ weighList.filedName || '' }}</p> <p>矿场名称：{{ weighList.filedName || '' }}</p> --> </view> <view class="three"> <!-- 放空 --> @@ -129,7 +170,7 @@ takeCoalId: null, weighHouseCode: '', isConfirmWeighLoading: false, //确定称重按钮 realTimeWeigh: '', realTimeWeigh: 0, weighList: {}, // 临时称重对象 temporaryWeighObj: { @@ -162,6 +203,7 @@ if (this.weighList.skin == 0) { // this.temporaryWeighObj.skin = this.realTimeWeigh; this.temporaryWeighObj.skin = newV; this.isweigh = this.temporaryWeighObj.skin > this.weighList.orderSurplus; } else { // this.temporaryWeighObj.hair = this.realTimeWeigh; this.temporaryWeighObj.hair = newV; @@ -172,6 +214,7 @@ if (this.weighList.hair == 0) { // this.temporaryWeighObj.hair = this.realTimeWeigh; this.temporaryWeighObj.hair = newV; this.isweigh = this.temporaryWeighObj.hair > this.weighList.orderSurplus; } else { // this.temporaryWeighObj.skin = this.realTimeWeigh; this.temporaryWeighObj.skin = newV; @@ -186,11 +229,13 @@ this.weighData.weigh = this.realTimeWeigh = v; console.log(this.realTimeWeigh, '真实重量改变了'); }, deep: true deep: true, immediate: true } }, onShow() { this.init(); this.realTimeWeigh = 0; // this.initWebSocket(); }, computed: { @@ -389,12 +434,12 @@ display: flex; flex-direction: column; .one { flex: 2; flex: 3; border: vww(2) solid #dddddd; margin: vww(20) vww(20) 0 vww(20); border-radius: vww(15); .top { height: 80%; height: 75%; display: flex; .top_left { flex: 3; @@ -415,8 +460,13 @@ } .bottom { text-align: center; position: relative; top: vww(-30); height: 25%; display: flex; justify-content: space-between; align-items: center; flex-direction: column; // position: relative; // top: vww(-10); } } .two { @@ -425,6 +475,29 @@ margin: vww(20); border-radius: vww(10); padding: vww(20); .uni-table { .uni-table-tr { padding: 0; border: vww(1) solid #c6c6c6; .uni-table-th { font-size: vww(14); height: vww(30); line-height: vww(30); padding: vww(5) vww(10); color: #111111; font-weight: 500; background: #e2e2e2; } .uni-table-td { font-size: vww(14); font-weight: 400; height: vww(30); line-height: vww(30); padding: vww(5) vww(10); color: #111111; } } } p { text-align: center; font-size: vww(20); pages/driver-page/driver-index/driver-index.vue
@@ -13,8 +13,15 @@ <card v-for="(item, index) in driverBillOfLoadingData.list1" :key="index" :name="item.id" backgroundType="2"> <template v-slot:left> <view class="card-left__top"> <text>{{ item.carNum }}</text> 张 <view> {{ item.carNum }} <text>张</text> </view> <view> {{ item.carNum - item.taskNum }} <text>张</text> </view> </view> <view class="card-left__utils"> <u-button @tap.stop="qiangDanBtn(item)" text="抢单" type="primary" shape="circle" v-if="item.carNum - item.taskNum !== 0"></u-button> @@ -77,20 +84,18 @@ <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> <uni-td align="left">{{ item.deptName || '' }}</uni-td> <uni-td align="left">{{ item.coalName || '' }}</uni-td> <uni-td align="left">{{ item.cars || 0 }} 车次</uni-td> <uni-td align="left">{{ item.sendDate || '' }}</uni-td> </uni-tr> <uni-tr> <uni-th align="center">发运日期</uni-th> <uni-tr style="margin: 0 auto;"> <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-tr style="margin: 0 auto;"> <uni-td align="left">{{ item.filedName || '' }}</uni-td> <uni-td align="left">{{ item.customerName || '' }}</uni-td> </uni-tr> @@ -244,12 +249,35 @@ margin-bottom: vww(56); // 卡片样式 .card-left__top { margin-top: vww(26); margin: vww(10) 0; padding-left: vww(4); display: flex; flex-direction: column; flex-wrap: wrap; justify-content: flex-start; height: vww(80); text-align: center; color: #ffffff; text { &:after { content: ''; position: absolute; width: 5px; height: vww(80); background-color: #fff; left: vww(81); } view { font-size: vww(48); font-weight: 800; width: 50%; display: flex; flex-direction: column; justify-content: flex-start; align-items: center; text { font-size: vww(16); font-weight: bold; } } } .card-left__utils { pages/driver-page/drvier-my/drvier-my.vue
@@ -52,7 +52,7 @@ <u-button text="退出登录" type="primary" @click="logout"></u-button> <u-button text="修改个人资料" type="primary" @click="editBtnClick"></u-button> </view> <view class="statistics"><u-button text="发运统计" type="primary" @click="statistics"></u-button></view> <!-- <view class="statistics"><u-button text="发运统计" type="primary" @click="statistics"></u-button></view> --> </view> <!-- 图片预览弹出框 --> pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -32,26 +32,39 @@ <view class="history-numbers"> <combined-title title="历史提煤单"></combined-title> <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower"> <uni-table border stripe emptyText="暂无更多数据" :loading="loading"> <uni-tr> <uni-th width="100" align="center">发运日期</uni-th> <uni-th width="100" align="center">所属单位</uni-th> <uni-th align="center" width="150">煤场名称</uni-th> <uni-th align="center" width="100">煤种名称</uni-th> <uni-th align="center" width="150">订单编号</uni-th> <uni-th align="center" width="100">订单剩余量</uni-th> <uni-th align="center" width="80">提煤单个数</uni-th> </uni-tr> <uni-tr v-for="(item, index) in historyCoalData" :key="index"> <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate || '' }}</uni-td> <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus || '' }}</uni-td> <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount || '' }}</uni-td> </uni-tr> </uni-table> <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)"> <view class="history-sendate"> <text>发运日期 {{ item.sendDate || '' }}</text> <view class="view-more"> <text style="color: #449cfc;">详情</text> <view class="arrow-right"><u-icon name="arrow-right" size="40" color="#449cfc"></u-icon></view> </view> </view> <view class="history-main"> <view class="main-left"> <view class="history-body"> <text>所属单位 {{ item.deptName || '' }}</text> </view> <view class="history-body"> <text>煤场名称 {{ item.filedName || '' }}</text> </view> <view class="history-body"> <text>煤种名称 {{ item.coalName || '' }}</text> </view> </view> <view class="main-right"> <view class="history-body"> <text style="word-break: break-all;">订单编号 {{ item.orderCode || '' }}</text> </view> <view class="history-body"> <text>订单剩余量 {{ item.carNumSurplus || '' }}</text> </view> <view class="history-body"> <text>提煤单个数 {{ item.tmCount || '' }}</text> </view> </view> </view> </view> <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view> </scroll-view> </view> @@ -186,10 +199,52 @@ <style lang="scss" scoped> .scroll-Y { height: 600rpx; margin-bottom: vww(50); height: 900rpx; background-color: #e2e2e2; border-radius: vww(10); .history-information { width: 94%; display: flex; flex-direction: column; border: 1px solid #e2e2e2; background-color: #fff; border-radius: vww(10); margin: vww(10); .history-sendate { height: vww(40); border-bottom: 1px solid #e2e2e2; line-height: vww(40); padding-left: vww(8); position: relative; .view-more { display: flex; width: vww(80); position: absolute; right: vww(10); top: vww(-1); .arrow-right { position: absolute; right: vww(27); top: vww(12); } } } .history-main { min-height: vww(120); display: flex; justify-content: space-between; .main-left, .main-right { width: 45%; display: flex; flex-direction: column; justify-content: space-between; padding: vww(4) vww(4); } } } .more_text { color: #999; color: #333; font-size: 24rpx; text-align: center; } pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -35,7 +35,7 @@ </u-popup> </view> <view class="statistics"><u-button text="发运统计" type="primary" @click="statistics"></u-button></view> <!-- <view class="statistics"><u-button text="发运统计" type="primary" @click="statistics"></u-button></view> --> <view class="utils"><u-button text="退出登录" type="primary" @click="logout"></u-button></view> <!-- 删除车队模态框 --> pages/public-page/forward/forward.vue
@@ -11,7 +11,7 @@ <u-form-item label="输入数量" labelWidth="20%" ref="item1"> <view class="forward-card-amount"> <view class="forward-card-amount-input"><u--input v-model="val.carNum" placeholder="请输入转发数量"></u--input></view> <u-checkbox-group v-model="val.checkboxValue1" placement="column" @change="v => checkboxChange(v, index)"> <u-checkbox-group v-model="val.checkboxValue1" placement="column" @change="v => checkboxChange(v, index, val)"> <u-checkbox :customStyle="{ marginBottom: '8px' }" size="30" labelSize="30" label="全部转发" name="全部转发" :disabled="val.ischecked"></u-checkbox> </u-checkbox-group> </view> @@ -131,7 +131,9 @@ cars2: '', carNum: '', carNumSurplusHuodai: '', formNum: 1 formNum: 1, // 个人转发数据 personalForward: {} }; }, onShow() { @@ -154,7 +156,6 @@ }, methods: { init() { console.log('roleType', this.roleType); switch (this.roleType) { case 1: this.getAllHuoDaiByCustomerId(); @@ -185,7 +186,7 @@ return Number(x); } }, checkboxChange(value, index) { checkboxChange(value, index, v) { uni.setStorageSync('allrelay', this.jhOrderPlanForwardList[index].carNum); this.jhOrderPlanForwardList = this.jhOrderPlanForwardList.map((v, i) => { return { @@ -196,17 +197,23 @@ if (value.length != 0) { let tempforwardSurplus = this.forwardSurplus; let tempcarNumSurplus1 = this.carNumSurplus1; // 计算全部转发数 // 客户 if (this.roleType == 1) { this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, tempcarNumSurplus1); } tempcarNumSurplus1 = 0; // 货代 if (this.roleType == 2) { this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, tempforwardSurplus); } tempforwardSurplus = 0; let jhorderplanforward = () => { this.$reqGet('jhorderplanforward', { forwardId: v.id }).then(res => { this.personalForward = res.data; // 计算全部转发数 // 客户 if (this.roleType == 1) { this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempcarNumSurplus1); } tempcarNumSurplus1 = 0; // 货代 if (this.roleType == 2) { this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempforwardSurplus); } tempforwardSurplus = 0; }); }; jhorderplanforward(); // 选择一个后其余禁止复选 this.jhOrderPlanForwardList.forEach((v, i) => { if (i !== index) { pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -249,12 +249,12 @@ this.messageList = JSON.parse(res.data.slice(5)); this.messagePushShow = true; } else { console.log('websocket还在活着'); console.log('websocket启动中'); } }); socket.onClose(e => { console.log('webSocketClose', e); this.$u.toast('连接已断开，请重新进入该页面，重试！！'); // this.$u.toast('连接已断开，请重新进入该页面，重试！！'); this.isconnect = false; }); socket.onError(err => { pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
@@ -3,7 +3,7 @@ <customer-my-page v-if="roleType == 1" ref="customerMyPageRef"></customer-my-page> <freight-forwarder-my-page v-if="roleType == 2" ref="freightForwarderMyPageRef"></freight-forwarder-my-page> <driver-my-page v-if="roleType == 3" ref="driverMyRef"></driver-my-page> <tab-bar :current="1"></tab-bar> <tab-bar :current="2"></tab-bar> </view> </template>
@@ -11,6 +11,12 @@ text: '首页' }, { pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics', iconPath: '../../static/tabBar-icon/statistics.png', selectedIconPath: '../../static/tabBar-icon/statisticsactive.png', text: '发运统计' }, { pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar', iconPath: '../../static/tabBar-icon/Gmine10.png', selectedIconPath: '../../static/tabBar-icon/Bmine57.png', @@ -24,6 +30,12 @@ text: '首页' }, { pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics', iconPath: '../../static/tabBar-icon/statistics.png', selectedIconPath: '../../static/tabBar-icon/statisticsactive.png', text: '发运统计' }, { pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar', iconPath: '../../static/tabBar-icon/Gmine10.png', selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
