From aef949a659d073443e81f22686b44bd440a69a0e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 25 十二月 2023 14:15:46 +0800
Subject: [PATCH] 修改称重连点问题 增加司机注册字段
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 812 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 698 insertions(+), 114 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 7042ecc..45a2f92 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -1,7 +1,10 @@
<template>
<view class="bill-of-lading-details">
<view class="top-banner"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
+ <u-notice-bar :text="originInfoNotice"
+ v-if="haveInputOrigin&&!isSpecial"
+ fontSize='36'></u-notice-bar>
<view class="top-information">
<view class="cutomer-name"
v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
@@ -20,9 +23,9 @@
<view class="basic">
<view class="coalName">{{ coalDetailsData.coalName }}</view>
<view class="status-button"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/statusbutton.png') no-repeat;
background-size: cover;">
- {{ coalStatus[coalDetailsData.status] || '' }}
+ {{coalDetailsData.statusView||''}}
</view>
</view>
<view class="time">
@@ -32,32 +35,125 @@
<view class="send-date">{{ coalDetailsData.sendDate }}</view>
</view>
<view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
- <view class="order-code">
+ <view class="order-code"
+ v-if="!isSpecial">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
+ <view class="stream-view"
+ style="color: #475bfd;"
+ @click="streamView"
+ v-show="timeLineStatus===9">
+ 鏌ョ湅瀹炴椂杞﹁締
+ </view>
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</view>
- <view class="num">{{ coalDetailsData.skin }}</view>
+ <view class="num">{{ coalDetailsData.skin||"" }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</view>
- <view class="num">{{ coalDetailsData.hair }}</view>
+ <view class="num">{{ coalDetailsData.hair||"" }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
- <view class="num">{{ coalDetailsData.clean }}</view>
+ <view class="num">{{ coalDetailsData.clean||"" }}</view>
</view>
</view>
</view>
</view>
</view>
-
+ <view class="origin-info"
+ v-if="originInfoVisible&&!isSpecial">
+ <view class="origin-info_wrapper">
+ <view class="origin-info_content">
+ <view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
+ <u-form :model="originInfoForm"
+ :rules="rules"
+ label-position="top"
+ label-width="160"
+ :label-style="{'marginLeft':'9px'}"
+ ref="originInfoRef">
+ <u-form-item prop="coalContactSkin">
+ <view class="second-line">
+ <view class="label-text"
+ :class="{ focusClass: isfocus1 }"><text style="color: #f56c6c;">*</text>鐨噸</view>
+ <view class="input-container"
+ :class="{ inputClass: isfocus1, disabledClass: isModifyoriginInfo }">
+ <u--input placeholder="璇疯緭鍏ョ毊閲�"
+ border="surround"
+ v-model="originInfoForm.coalContactSkin"
+ @focus="inputFocus(1)"
+ @blur="inputBlur"
+ @change="inputChange"
+ :disabled="isModifyoriginInfo"></u--input>
+ </view>
+ <view class="unit"
+ :class="{ focusClass: isfocus1 }">鍚�</view>
+ </view>
+ </u-form-item>
+ <u-form-item prop="coalContactHair">
+ <view class="second-line">
+ <view class="label-text"
+ :class="{ focusClass: isfocus2 }"><text style="color: #f56c6c;">*</text>姣涢噸</view>
+ <view class="input-container"
+ :class="{ inputClass: isfocus2, disabledClass: isModifyoriginInfo }">
+ <u--input placeholder="璇疯緭鍏ユ瘺閲�"
+ border="surround"
+ v-model="originInfoForm.coalContactHair"
+ @focus="inputFocus(2)"
+ @blur="inputBlur"
+ @change="inputChange"
+ :disabled="isModifyoriginInfo"></u--input>
+ </view>
+ <view class="unit"
+ :class="{ focusClass: isfocus2 }">鍚�</view>
+ </view>
+ </u-form-item>
+ <u-form-item>
+ <view class="second-line">
+ <view class="label-text"><text style="color: #f56c6c;">*</text>鍑�閲�</view>
+ <view class="input-container"
+ :class="{ disabledClass: isModifyoriginInfo }">
+ <u--input placeholder="鍑�閲�"
+ border="surround"
+ v-model="coalContactClean"
+ :disabled="isModifyoriginInfo"></u--input>
+ </view>
+ <view class="unit">鍚�</view>
+ </view>
+ </u-form-item>
+ <u-form-item prop='contactPicture'>
+ <view class="label-text">
+ <text style="color: #f56c6c;">*</text>鍘熷彂纾呭崟
+ </view>
+ <u-upload :fileList="fileList1"
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="1"
+ multiple
+ :maxCount="2"
+ width="250"
+ height="150"
+ :previewFullImage="true"
+ :disabled="isModifyoriginInfo"
+ :deletable="!deletable"></u-upload>
+ </u-form-item>
+ </u-form>
+ <view class="submit-button">
+ <u-button text="鎻愪氦"
+ type="primary"
+ @click.stop="submitOriginInfo"
+ :disabled="isModifyoriginInfo"
+ :loading="submitOriginInfoLoading"></u-button>
+ </view>
+ </view>
+ </view>
+ </view>
<view class="timeLine">
<u-steps :current="dayRZ.length - 1"
direction="column"
@@ -73,42 +169,64 @@
<view class="utilsBox">
<view class="utils_chil utils_chilTop">
<view class="top-button">
- <u-button text="绛惧埌"
- type="primary"
- plain
- @click="arriveClick"
- shape="circle"
- :disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ <u-button text="鏇存崲棰勭害鏃堕棿"
type="primary"
plain
@click="rcsqClick"
shape="circle"
- :disabled="coalDetailsData.status >= 3"></u-button>
- </view>
- <view class="bottom-button">
- <u-button text="鏀剧┖"
+ :disabled="currentPageCoalStatus>= 3"></u-button>
+ <!-- <u-button text="鍏ュ満鐢宠"
type="primary"
plain
- @click="evacuation"
- throttleTime="500"
+ @click="rcsqClick"
shape="circle"
- :disabled="isEvacuation || isapproach"></u-button>
+ :disabled="correctStatus>= 3"></u-button> -->
<u-button text="鍛煎彨瀹㈡湇"
type="primary"
plain
@click="callCustomerService"
shape="circle"></u-button>
</view>
+ <view class="bottom-button">
+ <!-- <u-button text="鏀剧┖"
+ type="primary"
+ plain
+ @click="evacuation"
+ throttleTime="500"
+ shape="circle"
+ :disabled="isEvacuation || isapproach"></u-button> -->
+
+ </view>
</view>
</view>
<view class="weigh-ability">
+ <view class="weigh-button">
+ <u-button text="涓婄璁￠噺"
+ @click="cengZhongClick"
+ type="primary"
+ shape="circle"
+ :disabled="haveInputOrigin&&!isSpecial"></u-button>
+ </view>
+ <view class="weigh-button"
+ v-show='ablePrintInduction&&!(coalDetailsData.skin&&coalDetailsData.hair)'>
+ <u-button text="鎵撳嵃鍏ラ棬璇�"
+ @click="printBefore('in')"
+ type="primary"
+ shape="circle"
+ :loading="enterLoading"
+ loadingText="鎵撳嵃涓�,璇风◢鍊�"></u-button>
+ </view>
+ <view class="weigh-button"
+ v-show="ablePrintOut">
+ <u-button text="鎵撳嵃鍑洪棬璇�"
+ @click="printBefore('out')"
+ type="primary"
+ shape="circle"
+ :loading="outLoading"
+ loadingText="鎵撳嵃涓�,璇风◢鍊�"></u-button>
+ </view>
<view class="weigh-button"><u-button text="灞曠ず鎻愮叅鍗�"
@click="showCaolPickUpBill"
- type="primary"
- shape="circle"></u-button></view>
- <view class="weigh-button"><u-button text="涓婄璁￠噺"
- @click="cengZhongClick"
type="primary"
shape="circle"></u-button></view>
</view>
@@ -120,28 +238,87 @@
@confirm="evacuationConfirm"
@cancel="evacuationCancel"></u-modal>
</view>
- <view class="completeOutSale">
+ <!-- <view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
:showCancelButton="true"
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
+ </view> -->
+ <view class="serviece-customer">
+ <u-action-sheet :actions="list"
+ @select="selectClick"
+ @close='serviceClose'
+ title="鍛煎彨鏂瑰紡"
+ :show="servieceShow"
+ cancelText="鍙栨秷"></u-action-sheet>
</view>
+ <!-- 纾呮埧蹇欑鎻愮ず寮圭獥 -->
+ <view class="">
+ <u-modal :show="wsgShow"
+ title="鎻愮ず"
+ :content="wsgContent"
+ @confirm="wsgContentConfirm"></u-modal>
+ </view>
+ <printerStyle ref="printerStyleRef"
+ @selectedPrint='selectedPrintHandle' />
</view>
</template>
<script>
- import { webSocketUrl } from '@/api/request.js';
+ import { BaseUrl } from '@/api/publicInterface.js';
import { mapState, mapMutations } from 'vuex';
+ import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import printerStyle from './printerStyle/printerStyle.vue'
+ import BigNumber from "bignumber.js"
+ const dayjs = require('dayjs')
export default {
+ components: {
+ combinedTitle,
+ printerStyle
+ },
+ onPullDownRefresh() {
+ this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ uni.stopPullDownRefresh();
+ },
onLoad(value) {
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
- if (value.overTmWaixiao) {
- this.overTmWaixiao = value.overTmWaixiao
- this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
+ this.originInfoVisible = value.orderType === '澶栬喘'
+ // if (value.overTmWaixiao) {
+ // this.overTmWaixiao = value.overTmWaixiao
+ // this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
+ // }
+ this.fileList1 = []
+ this.changeglobalIsFirstWeighing(1)
+ if (this.globalIsFirstWeighing === 1) {
+ console.log('鑾峰彇璇︽儏 onload');
+ this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
}
+ this.init(); //鑾峰彇鏃ュ織
+ this.getgetService(); //鑾峰彇瀹㈡湇
+ },
+ onShow() {
+ this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
+ if (this.globalIsFirstWeighing === 2) {
+ console.log('鑾峰彇璇︽儏 onShow');
+ this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ }
+ },
+ onHide() {
+ clearInterval(this.interval);
+ },
+ onUnload() {
+ clearInterval(this.interval);
+ },
+ onReady() {
+ if (this.originInfoVisible && !this.isSpecial) {
+ this.$refs.originInfoRef.setRules(this.rules);
+ }
+ },
+ beforeDestroy() {
+ clearInterval(this.interval);
},
data() {
return {
@@ -172,10 +349,11 @@
// 瀹㈡湇淇℃伅
serviceInfoObj: {
openId: null,
- openName: ''
+ openName: '',
+ serviecePhone: ''
},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑'
], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
@@ -206,21 +384,52 @@
clean: ""
},
completeOutSaleShow: false,
- overTmWaixiao: null
-
+ overTmWaixiao: null,
+ list: [{ name: '鎵嬫満鍙�', subname: '1213456', id: 1 }, { name: '寰俊璇煶', id: 2 }], //鍛煎彨瀹㈡湇閫夐」
+ servieceShow: false,
+ ablePrintInduction: false, //鍏ラ棬璇佹槸鍚︽樉绀�
+ ablePrintOut: false, //鍑洪棬璇佹槸鍚︽樉绀�
+ enterLoading: false, //鍏ラ棬鎸夐挳loading
+ outLoading: false, //鍑洪棬鎸夐挳loading
+ // 鏄惁濉啓鍘熷彂淇℃伅
+ isInputOrigin: false,
+ haveInputOrigin: false,
+ isModifyoriginInfo: false,
+ // 鑱氱劍鏃舵敼鍙樻牱寮�
+ isfocus1: false,
+ isfocus2: false,
+ // 杈撳叆鐨勫師鍙戜俊鎭�
+ originInfoForm: {
+ coalContactSkin: '',
+ coalContactHair: '',
+ coalContactClean: 0,
+ contactPicture: ''
+ },
+ originInfoVisible: false,
+ fileList1: [], //鍥剧墖鍒楄〃
+ deletable: true,
+ rules: {},
+ timeout: '0',
+ wsgShow: false,
+ timeLineStatus: null,
+ timeLineEqCode: '',
+ originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺',
+ submitOriginInfoLoading: false,
+ ischeckedDefault: 0,
+ isSpecial: null, //1 鏄壒娈� 0涓嶆槸鐗规畩
+ printerType: '', //鍒ゆ柇鎵撳嵃鐨勬槸鍑洪棬璇佽繕鏄叆闂ㄨ瘉
};
},
- onShow() {
- this.init();
- },
- onHide() {
- clearInterval(this.interval);
- },
- beforeDestroy() {
- clearInterval(this.interval);
+ watch: {
+ '$store.state.wsgVisiable': {
+ deep: true,
+ handler: function(val) {
+ this.wsgShow = val
+ }
+ }
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing', ]),
name() {
return uni.getStorageSync('name');
},
@@ -242,14 +451,38 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus <= 3;
+ return this.correctStatus !== 3
+ },
+ coalContactClean() {
+ let xx = BigNumber(this.originInfoForm.coalContactHair ? this.originInfoForm.coalContactHair : 0)
+ let yy = BigNumber(this.originInfoForm.coalContactSkin ? this.originInfoForm.coalContactSkin : 0)
+ return xx.minus(yy).toNumber() > 0 ? xx.minus(yy).toNumber().toFixed(2) : 0
+ },
+ currentTime() {
+ let currentDate = new Date();
+ let year = currentDate.getFullYear();
+ let month = ("0" + (currentDate.getMonth() + 1)).slice(-2);
+ let date = ("0" + currentDate.getDate()).slice(-2);
+ let hours = ("0" + currentDate.getHours()).slice(-2);
+ let minutes = ("0" + currentDate.getMinutes()).slice(-2);
+ let formattedDate = year + "-" + month + "-" + date + " " + hours + ":" + minutes;
+ return formattedDate
+ },
+ correctStatus() {
+ return this.currentPageCoalStatus === this.timeLineStatus ? this.currentPageCoalStatus : this
+ .timeLineStatus
+ },
+ isNeedOrigin() {
+ return uni.getStorageSync('isNeedOrigin')
}
},
methods: {
+ ...mapMutations(['changewsgVisiable', 'changeisUploadimg', 'changeglobalIsFirstWeighing']),
init() {
- this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
- // this.dayRZ = res.data;
+ this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -263,25 +496,22 @@
});
}
});
- this.coalDayPage(); //鑾峰彇鏃ュ織
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
- this.getgetService(); //鑾峰彇瀹㈡湇
},
// 鑾峰彇瀹㈡湇openid
getgetService() {
this.$reqGet('getCallOutList', this.getServiceOpenid).then(res => {
console.log(res, '瀹㈡湇openid');
if (res.code != 0) {
- this.$u.toast('鑾峰彇瀹㈡湇淇℃伅澶辫触');
+ this.$u.toast(res.msg ? res.msg : '鑾峰彇瀹㈡湇淇℃伅澶辫触');
} else {
- if (res.data.length > 0) {
- this.serviceInfoObj.openId = res.data[0].openId;
- this.serviceInfoObj.openName = res.data[0].openName;
- uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
- uni.setStorageSync('customerName', this.serviceInfoObj.openName);
- }
+ this.serviceInfoObj.openId = res.data.openId;
+ this.serviceInfoObj.openName = res.data.openName;
+ this.serviceInfoObj.serviecePhone = res.data.serviecePhone
+ this.$set(this.list[0], 'subname', this.serviceInfoObj.serviecePhone)
+ uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
+ uni.setStorageSync('customerName', this.serviceInfoObj.openName);
}
- });
+ })
},
// 鑾峰彇鎻愮叅鍗曡鎯�
getTakeCoal() {
@@ -294,11 +524,13 @@
console.log(res, '鎻愮叅鍗曡鎯�');
this.coalDetailsData = res.data;
this.orderType = this.coalDetailsData.orderType;
- // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
- this.completeOutSale.orderType = this.coalDetailsData.orderType;
- this.completeOutSale.deptId = this.coalDetailsData.deptId;
- this.completeOutSale.filedId = this.coalDetailsData.filedId;
- this.completeOutSale.clean = this.coalDetailsData.clean;
+ //
+ this.isSpecial = res.data.isSpecial
+ // // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
+ // this.completeOutSale.orderType = this.coalDetailsData.orderType;
+ // this.completeOutSale.deptId = this.coalDetailsData.deptId;
+ // this.completeOutSale.filedId = this.coalDetailsData.filedId;
+ // this.completeOutSale.clean = this.coalDetailsData.clean;
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
@@ -318,33 +550,55 @@
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
+ // 鍏ラ棬璇� 鍜� 鍑洪棬璇� 鏄惁鏄剧ず
+ this.ablePrintInduction = this.coalDetailsData.hair || this.coalDetailsData.skin
+ this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin || this
+ .coalDetailsData.status === 6
+ // 鍘熷彂淇℃伅鍥炴樉浠ュ強鎺у埗鏄惁鍙慨鏀�
+ this.haveInputOrigin = !this.coalDetailsData.skinTwo && this.coalDetailsData.orderType ===
+ '澶栬喘'
+ this.deletable = this.coalDetailsData.status > 3
+ this.originInfoForm.coalContactSkin = this.coalDetailsData.skinTwo;
+ this.originInfoForm.coalContactHair = this.coalDetailsData.hairTwo;
+ this.originInfoForm.contactPicture = this.coalDetailsData.contactPicture
+ if (this.coalDetailsData.contactPicture) {
+ this.fileList1 = this.coalDetailsData.contactPicture.split(',').map(v => {
+ return {
+ url: BaseUrl + v
+ }
+ })
+ } else {
+ this.fileList1 = []
+ }
+
} else {
this.$u.toast('鍔犺浇澶辫触');
}
}).then(() => {
- if (this.completeOutSale.orderType == "鍐呰喘" || this.completeOutSale.orderType == "杞叆") {
- if (this.completeOutSale.clean !== 0 && this.currentPageCoalStatus !== 6 && this
- .currentPageCoalStatus !== 11 && this.currentPageCoalStatus !== 12) {
- this.$reqGet('getTmTaskCoalOrderType', {
- deptId: this.completeOutSale.deptId,
- filedId: this.completeOutSale.filedId,
- orderType: '澶栭攢'
- }).then(res => {
- if (res.data && res.data?.length !== 0) {
- this.completeOutSaleShow = true
- console.log(res, '瀹屾垚澶栭攢璁㈠崟');
- }
- })
+ // 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
+ setTimeout(() => {
+ let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this
+ .coalDetailsData
+ .yuYueSection.slice(-5);
+ // 鏈�澶х害鏉熸椂闂� maxRestrainTime
+ const maxRestrainTime = dayjs().subtract(this.coalDetailsData.flexibleTime,
+ 'minute')
+ .format('YYYY-MM-DD HH:mm:ss');
+ console.log(maxRestrainTime, this.correctStatus);
+ if (dayjs(maxRestrainTime).isAfter(endTime) && this.correctStatus <= 1) {
+ // this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
+ this.timeout = '1'
}
- }
+ }, 1000)
})
},
// 鏃ュ織鏌ヨ
coalDayPage() {
this.interval = setInterval(() => {
- this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
- // this.dayRZ = res.data;
+ this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -367,23 +621,40 @@
});
},
// 绛惧埌
- arriveClick() {
- uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
- this.currentPageCoalStatus
- }&tmId=${this.getWeightHouseObj.tmId}`
- });
- },
- // 鍏ュ満鐢宠
+ // arriveClick() {
+ // uni.navigateTo({
+ // url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
+ // this.correctStatus
+ // }&tmId=${this.getWeightHouseObj.tmId}&timeout=${this.timeout}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
+ // this.getYuYueDataParams.deptId
+ // }&sendDate=${this.getYuYueDataParams.sendDate}&yuYueSection=${this.coalDetailsData.yuYueSection}`
+ // });
+ // },
+ // 鏇存崲棰勭害鏃堕棿娈�
rcsqClick() {
uni.navigateTo({
url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.orderPlanId}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
this.getYuYueDataParams.deptId
- }&sendDate=${this.getYuYueDataParams.sendDate}`
+ }&sendDate=${this.getYuYueDataParams.sendDate}&coalStatus=${this.currentPageCoalStatus}&yuYueSection=${this.coalDetailsData.yuYueSection}&tmId=${this.getWeightHouseObj.tmId}`
});
},
- // 鍛煎彨瀹㈡湇
callCustomerService() {
+ this.servieceShow = true
+ },
+ serviceClose() {
+ this.servieceShow = false
+ },
+ selectClick(v) {
+ if (v.id === 2) {
+ this.callCustomerServiceImpl()
+ } else if (v.id === 1) {
+ wx.makePhoneCall({
+ phoneNumber: this.serviceInfoObj.serviecePhone
+ })
+ }
+ },
+ // 鍛煎彨瀹㈡湇
+ callCustomerServiceImpl() {
// if (!this.serviceInfoObj.openId) {
// this.$u.toast('鏃犲鏈嶄俊鎭�');
// }
@@ -403,7 +674,7 @@
} else {
wx.join1v1Chat({
caller: {
- nickname: uni.getStorageSync('name'),
+ nickname: uni.getStorageSync('username'),
openid: uni.getStorageSync(
'openid')
},
@@ -411,7 +682,7 @@
nickname: uni.getStorageSync('customerName'),
openid: uni.getStorageSync(
'customeropenId')
- }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
+ },
backgroundType: 2,
roomType: 'voice',
success() {
@@ -428,16 +699,9 @@
}
});
},
- calling() {
- // wx.join1v1Chat({
- // caller: { nickname: this.name, openid: this.openid }, //oZjXk5RRmbroAfl1m5aZ6hRNvqh4
- // listener: { nickname: this.serviceInfoObj.openName, openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
- // backgroundType: 2,
- // roomType: 'voice'
- // });
- },
// 绉伴噸
cengZhongClick() {
+ this.changeglobalIsFirstWeighing(2)
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
console.log(res, '鑾峰彇纾呮埧');
if (res.code == 0) {
@@ -445,16 +709,23 @@
this.weighData.gateCameraId = res.data.lastEquipmentId;
this.weighData.equipmentCode = res.data.lastEquipmentCode;
this.weighData.sceneInOut = res.data.sceneInOut;
+ let form = {
+ sceneId: this.weighData.sceneId,
+ gateCameraId: this.weighData.gateCameraId,
+ equipmentCode: this.weighData.equipmentCode,
+ sceneInOut: this.weighData.sceneInOut,
+ }
+ uni.setStorageSync('WeighHouseForm', JSON.stringify(form))
this.weighHouseCode = res.data.code;
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${
res.data.id
}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}&primarySkin=${
this.primarySkin
- }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
+ }&primaryHair=${this.primaryHair}&primaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
});
} else {
- this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
+ this.$u.toast(res.msg ? res.msg : '鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
});
},
@@ -466,16 +737,20 @@
evacuationConfirm() {
this.weighData = {
...this.weighData,
- weigh: this.globalweigh
+ weigh: this.globalweigh,
+ isBackground: 1
};
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
let mix = Object.assign(this.weighData, this.getWeightHouseObj);
this.$reqPost('getOneEvacuation', mix, 'json').then(res => {
- console.log(res, '绗竴娆℃斁绌�');
+ uni.hideLoading()
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛');
this.evacuationModalShow = false;
} else {
- this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯');
this.evacuationModalShow = false;
}
});
@@ -495,6 +770,206 @@
completeOutSaleCancel() {
this.completeOutSaleShow = false
},
+ //鐐瑰嚮鎵撳嵃鍏ラ棬璇佷箣鍓嶅垽鏂槸鍚﹀嬀閫変簡榛樿鎵撳嵃鏍峰紡锛屽惁鍒欏脊鍑洪�夋嫨 鏄殑璇濅紶鏈湴鍌ㄥ瓨閫夋嫨鐨勬牱寮�
+ printBefore(type) {
+ this.printerType = type
+ if (!this.ischeckedDefault && !uni.getStorageSync('ischeckedDefault')) {
+ this.$nextTick(() => {
+ this.$refs.printerStyleRef.init()
+ })
+ } else if (this.ischeckedDefault || uni.getStorageSync('ischeckedDefault')) {
+ this.selectedPrintHandle(true)
+ }
+ },
+ //澶勭悊閫夋嫨鐨勬墦鍗版牱寮�
+ selectedPrintHandle(params1) {
+ this.ischeckedDefault = params1
+ if (this.printerType === 'in') {
+ this.printEntryCertificate()
+ return
+ } else if (this.printerType === 'out') {
+ this.printExitPermit()
+ return
+ }
+ },
+ // 鎵撳嵃鍏ラ棬璇�
+ printEntryCertificate() {
+ uni.showLoading({
+ title: '姝ｅ湪鎵撳嵃涓�,璇风◢鍚�'
+ })
+ this.enterLoading = true
+ let form = {
+ deptId: this.getWeightHouseObj.deptId,
+ tmId: this.getWeightHouseObj.tmId,
+ carNo: uni.getStorageSync('carNo'),
+ type: 2,
+ weighingNumber: 1,
+ printing: uni.getStorageSync('selectedPrintStyle')
+ }
+ let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
+ this.$reqPost('printer', Object.assign(form, JSON.parse(form1)),
+ 'json').then(
+ res => {
+ uni.hideLoading()
+ this.enterLoading = false
+ console.log(res);
+ if (res.code === 0) {
+ this.$u.toast('鎵撳嵃鎴愬姛')
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎵撳嵃澶辫触')
+ }
+ }).catch(e => {
+ uni.hideLoading()
+ this.outLoading = false
+ })
+ },
+ // 鎵撳嵃鍑洪棬璇�
+ printExitPermit() {
+ uni.showLoading({
+ title: '姝ｅ湪鎵撳嵃涓�,璇风◢鍚�'
+ })
+ let form = {
+ deptId: this.getWeightHouseObj.deptId,
+ filedId: this.getWeightHouseObj.filedId,
+ tmId: this.getWeightHouseObj.tmId,
+ carNo: uni.getStorageSync('carNo'),
+ type: 3,
+ weighingNumber: 2,
+ printing: uni.getStorageSync('selectedPrintStyle')
+ }
+ // let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
+
+ this.outLoading = true
+ this.$reqGet('getWeighHouse1', this.getWeightHouseObj).then(r => {
+ let form1 = {
+ sceneId: r.data.id,
+ gateCameraId: r.data.lastEquipmentId,
+ equipmentCode: r.data.lastEquipmentCode,
+ sceneInOut: r.data.sceneInOut
+ }
+ this.$reqPost('printer', Object.assign(form, form1), 'json').then(res => {
+ uni.hideLoading()
+ this.outLoading = false
+ if (res.code === 0) {
+ this.$u.toast('鎵撳嵃鎴愬姛')
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎵撳嵃澶辫触')
+ }
+ }).catch(e => {
+ uni.hideLoading()
+ this.outLoading = false
+ })
+ })
+ },
+ wsgContentConfirm() {
+ this.changewsgVisiable(false)
+ },
+ // input鑱氱劍
+ inputFocus(v) {
+ if (v == 1) {
+ this.isfocus1 = true;
+ } else {
+ this.isfocus2 = true;
+ }
+ },
+ // input澶辩劍
+ inputBlur() {
+ this.isfocus1 = false;
+ this.isfocus2 = false;
+ },
+ inputChange() {
+ if (Number(this.originInfoForm.coalContactHair) > 0 && Number(this.originInfoForm.coalContactSkin >
+ 0)) {
+ this.isInputOrigin = true;
+ }
+ },
+ deletePic(event) {
+ this.changeisUploadimg(true);
+ this[`fileList${event.name}`].splice(event.index, 1);
+ },
+ async afterRead(event) {
+ // 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
+ let lists = [].concat(event.file);
+ let fileListLen = this[`fileList${event.name}`].length;
+ lists.map(item => {
+ this[`fileList${event.name}`].push({
+ ...item,
+ status: 'uploading',
+ message: '涓婁紶涓�'
+ });
+ });
+ for (let i = 0; i < lists.length; i++) {
+ const result = await this.uploadFilePromise(lists[i].url, event.name);
+ let item = this[`fileList${event.name}`][fileListLen];
+ this[`fileList${event.name}`].splice(
+ fileListLen,
+ 1,
+ Object.assign(item, {
+ status: 'success',
+ message: '涓婁紶鎴愬姛',
+ url: result
+ })
+ );
+ fileListLen++;
+ }
+ },
+ uploadFilePromise(url, num) {
+ return new Promise((resolve, reject) => {
+ let a = uni.uploadFile({
+ url: BaseUrl + '/admin/sys-file/uploadUnToken',
+ filePath: url,
+ name: 'file',
+ success: res => {
+ if (num == 1) {
+ this.originInfoForm.contactPicture = JSON.parse(res.data)
+ .data.url;
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ }
+ }
+ });
+ });
+ },
+ submitOriginInfo() {
+ let form = {
+ skin: Number(this.originInfoForm.coalContactSkin),
+ hair: Number(this.originInfoForm.coalContactHair),
+ clean: Number(this.coalContactClean),
+ tmId: this.getWeightHouseObj.tmId,
+ contactPicture: this.originInfoForm.contactPicture,
+ deptId: this.coalDetailsData.deptId,
+ filedId: this.coalDetailsData.filedId,
+ coalName: this.coalDetailsData.coalName,
+ taskCoalCode: this.coalDetailsData.code,
+ carNo: this.coalDetailsData.carNo,
+ }
+ if (this.originInfoForm.coalContactSkin && this.originInfoForm.coalContactHair && this
+ .originInfoForm
+ .contactPicture) {
+ this.submitOriginInfoLoading = true
+ this.$reqPost('appSaveContact', form, 'json').then(res => {
+ if (res.code === 0) {
+ this.$u.toast('鎻愪氦鎴愬姛')
+ this.submitOriginInfoLoading = false
+ } else {
+ this.submitOriginInfoLoading = false
+ this.isModifyoriginInfo = true
+ this.$u.toast(res.msg ? res.msg : '鎻愪氦澶辫触')
+
+ }
+ }).then(() => {
+ setTimeout(() => {
+ this.getTakeCoal()
+ }, 1000)
+ })
+ } else {
+ uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
+ }
+ },
+ streamView() {
+ uni.navigateTo({
+ url: `/pages/public-page/driverStream/driverStream?eqCode=${this.timeLineEqCode}`
+ })
+ }
}
};
</script>
@@ -523,7 +998,7 @@
::v-deep.bill-of-lading-details {
width: 100%;
- height: 100vh;
+ height: 100%;
margin: 0 auto;
display: flex;
flex-direction: column;
@@ -598,6 +1073,10 @@
position: absolute;
right: vww(10);
color: #fff;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
}
.basic {
@@ -650,6 +1129,12 @@
color: #7d7d7d;
}
+ .stream-view {
+ height: vww(18);
+ margin: vww(8);
+ margin-left: 0;
+ }
+
.weigh-item {
width: 100%;
height: vww(36);
@@ -681,8 +1166,88 @@
}
}
+ .origin-info {
+ width: 690rpx;
+ height: 600rpx;
+ margin: vww(20) vww(15) vww(13);
+ 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;
+ @include flex;
+ justify-content: center;
+ overflow: hidden;
+ position: relative;
+ top: vww(130);
+
+ &_wrapper {
+ width: 650rpx;
+ height: 600rpx;
+ @include flex;
+ flex-direction: column;
+ margin-bottom: vww(20);
+ position: relative;
+
+ .origin-info_content {
+ width: 100%;
+ height: 100%;
+ overflow-y: scroll;
+
+ .first-line,
+ .second-line {
+ width: 90%;
+ height: vww(44);
+
+ .focusClass {
+ color: #5b95fd;
+ }
+
+ .inputClass {
+ border: 1px solid rgba(73, 95, 252, 0.6) !important;
+ box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
+ border-radius: 12rpx !important;
+ }
+
+ .isInputOrigin {
+ background-color: #f4f4fc;
+ }
+
+ .input-container {
+ border: 2px solid #c5c5c5;
+ box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
+ border-radius: 12rpx;
+ }
+ }
+
+ .first-line {
+ @include flex;
+ position: relative;
+ top: vww(8);
+ }
+
+ .second-line {
+ @include flex;
+ }
+
+ .submit-button {
+ width: 180rpx;
+ margin: vww(8) auto;
+
+ .u-button {
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff;
+ background: #497bfb;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
+ }
+ }
+ }
+ }
+ }
+
.timeLine {
- height: 40%;
+ height: 300rpx;
margin: vww(20);
position: relative;
top: vww(120);
@@ -724,8 +1289,7 @@
width: 100%;
margin: 0 auto;
- .top-button,
- .bottom-button {
+ .top-button {
width: 100%;
height: vww(47);
@include flex;
@@ -739,20 +1303,40 @@
border: 2px solid #3b56eb;
}
}
+
+ .bottom-button {
+ width: 40%;
+ height: vww(47);
+ padding-left: vww(18);
+ @include flex;
+ justify-content: flex-start;
+
+ .u-button {
+ width: 100%;
+ height: 60rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #497bfb;
+ border: 2px solid #3b56eb;
+ }
+ }
}
}
.weigh-ability {
width: 631rpx;
- height: vww(100);
+ height: vww(200);
margin: vww(80) auto;
- margin-bottom: vww(10);
+ margin-top: vww(100);
+ margin-bottom: vww(20);
@include flex;
flex-direction: column;
+ justify-content: flex-start;
.weigh-button {
width: 631rpx;
- height: vww(89);
+ height: vww(40);
+ margin: vww(10);
.u-button {
font-size: 28rpx;
--
Gitblit v1.9.1