pages/customer-page/customer-index/customer-index.vue
@@ -64,7 +64,7 @@ </view> <view class="forward" @click.stop="validateClick(index)" v-else> v-if='roleType===4'> <view class="button-image">验质</view> </view> </view> pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -212,8 +212,9 @@ clean: "" }, completeOutSaleShow: false, overTmWaixiao: null overTmWaixiao: null, // 判读网络状态， normalCode: null }; }, onShow() { @@ -259,7 +260,6 @@ init() { this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => { if (res.code == 0) { // this.dayRZ = res.data; this.dayRZ = res.data.map(v => { let slicedate = v.taskStatusDes.slice(0, 10); if (slicedate == this.currentDate) { @@ -349,10 +349,11 @@ }, // 日志查询 coalDayPage() { if (this.normalCode) { this.interval = setInterval(() => { this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => { if (res.code == 0) { // this.dayRZ = res.data; this.normalCode = true; this.dayRZ = res.data.map(v => { let slicedate = v.taskStatusDes.slice(0, 10); if (slicedate == this.currentDate) { @@ -364,9 +365,15 @@ return { ...v } } }); } else { this.normalCode = false; } }); }, 10000); } else { clearInterval(this.interval) this.$u.toast('服务器错误,请稍后重试') } }, // 展示提煤单详情 showCaolPickUpBill() { @@ -703,7 +710,7 @@ .timeLine { height: 40%; height: 300rpx; min-height: 300rpx; margin: vww(20); position: relative; pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -5,7 +5,7 @@ icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="showWeigh"></u-empty> v-if="showWeigh.length===0"></u-empty> <view class="main-block" v-for="(item,i) in showWeigh" :key="i"> @@ -94,8 +94,6 @@ </template> <script> import loginVue from '../../../../login/login.vue'; export default { data() { return { pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -185,11 +185,11 @@ :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian" v-if="outsourcing"></u-button> v-if="outBuy"></u-button> <u-button type="primary" text="继续卸货" @click="UnloadingAgainHandle" v-if='outBuy'></u-button> v-if='canUnload'></u-button> </view> <!-- <view class="four" v-if="weighList.orderType !== '外购'">如您需要调整装载货品吨数，请点击返回加减吨</view> --> <!-- 放空弹窗 --> @@ -280,8 +280,8 @@ isfocus2: false, // 外购类型 outBuy: true, // 外销类型 outsourcing: true // 继续卸货按钮 canUnload: false }; }, watch: { @@ -373,19 +373,9 @@ this.weighData.filedId = res.data.filedId; this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0; this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0; this.outBuy = this.weighList.orderType == '外购' && this.weighList.hair > 0; this.outsourcing = this.weighList.orderType == '外销' && this.weighList.hair > 0; // if (this.weighList.orderType == '外购') { // if (this.weighList.hair > 0) { // this.outBuy = true // this.outsourcing = false; // } // } else if (this.weighList.orderType == '外销') { // if (this.weighList.hair > 0) { // this.outsourcing = true; // this.outBuy = false // } // } this.outBuy = (this.weighList.orderType.indexOf('销') !== -1) && this.showWeigh.hair > 0; // 继续卸货第二次称重就会有，无订单类型限制 this.canUnload = this.showWeigh.hair > 0 || this.showWeigh.skin > 0; } }); }, @@ -698,7 +688,7 @@ width: calc(100% - 60rpx); box-sizing: border-box; height: 630rpx; margin: 0 vww(15) vww(45) vww(15); margin: 0 vww(15) vww(25) vww(15); background: #ffffff; box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12); border-radius: 20rpx; @@ -740,20 +730,27 @@ } .three { margin: 0 auto vww(20); flex: 0.7; display: flex; margin: 0 auto vww(5); width: 96%; display: grid; grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); justify-content: center; gap: vww(10); color: #939393; .u-button { &:nth-of-type(2) { margin-left: vww(10); width: vww(90); } &:nth-of-type(3) { margin-left: vww(10); } } // .u-button { // &:nth-of-type(2) { // margin-left: vww(10); // } // &:nth-of-type(3) { // margin-left: vww(10); // } // } } .four { pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -13,7 +13,7 @@ </view> </view> </view> <customer-index v-if="roleType == 1" <customer-index v-if="roleType == 1||roleType == 4" ref="customerIndexRef" :orderPlanDataStore="orderPlanDataStore"></customer-index> <freight-forwarder-index v-if="roleType == 2"
