From 22bf89749751bf2204ca1d1d30bda9ce7fde3e5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 22 三月 2024 10:20:47 +0800
Subject: [PATCH] fix：皮重阈值删除等于
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 407 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 273 insertions(+), 134 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 7e18b5a..7bb0318 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,24 +35,31 @@
<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>
<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>
<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>
@@ -58,11 +68,12 @@
</view>
</view>
<view class="origin-info"
- v-if="originInfoVisible">
+ 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'}"
@@ -137,7 +148,8 @@
<u-button text="鎻愪氦"
type="primary"
@click.stop="submitOriginInfo"
- :disabled="isModifyoriginInfo"></u-button>
+ :disabled="isModifyoriginInfo"
+ :loading="submitOriginInfoLoading"></u-button>
</view>
</view>
</view>
@@ -157,40 +169,49 @@
<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"
+ :loading="weighHouseLoading"></u-button>
+ </view>
<view class="weigh-button"
- v-show='ablePrintInduction'>
+ v-show='ablePrintInduction&&!(coalDetailsData.skin&&coalDetailsData.hair)'>
<u-button text="鎵撳嵃鍏ラ棬璇�"
- @click="printEntryCertificate"
+ @click="printBefore('in')"
type="primary"
shape="circle"
:loading="enterLoading"
@@ -199,7 +220,7 @@
<view class="weigh-button"
v-show="ablePrintOut">
<u-button text="鎵撳嵃鍑洪棬璇�"
- @click="printExitPermit"
+ @click="printBefore('out')"
type="primary"
shape="circle"
:loading="outLoading"
@@ -209,11 +230,6 @@
@click="showCaolPickUpBill"
type="primary"
shape="circle"></u-button></view>
- <view class="weigh-button"><u-button text="涓婄璁￠噺"
- @click="cengZhongClick"
- type="primary"
- shape="circle"
- :disabled="haveInputOrigin"></u-button></view>
</view>
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -223,14 +239,14 @@
@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> -->
<view class="serviece-customer">
<u-action-sheet :actions="list"
@select="selectClick"
@@ -246,28 +262,35 @@
: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
+ combinedTitle,
+ printerStyle
+ },
+ onPullDownRefresh() {
+ this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ uni.stopPullDownRefresh();
},
onLoad(value) {
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
this.originInfoVisible = value.orderType === '澶栬喘'
- if (value.overTmWaixiao) {
- this.overTmWaixiao = value.overTmWaixiao
- this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
- }
+ // if (value.overTmWaixiao) {
+ // this.overTmWaixiao = value.overTmWaixiao
+ // this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
+ // }
this.fileList1 = []
this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
@@ -275,6 +298,7 @@
this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
}
this.init(); //鑾峰彇鏃ュ織
+ this.getgetService(); //鑾峰彇瀹㈡湇
},
onShow() {
this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
@@ -286,8 +310,11 @@
onHide() {
clearInterval(this.interval);
},
+ onUnload() {
+ clearInterval(this.interval);
+ },
onReady() {
- if (this.originInfoVisible) {
+ if (this.originInfoVisible && !this.isSpecial) {
this.$refs.originInfoRef.setRules(this.rules);
}
},
@@ -327,7 +354,7 @@
serviecePhone: ''
},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑'
], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
@@ -382,29 +409,17 @@
originInfoVisible: false,
fileList1: [], //鍥剧墖鍒楄〃
deletable: true,
- rules: {
- contactPicture: {
- type: 'string',
- required: true,
- message: '璇蜂笂浼犲師鍙戠鍗曞浘鐗�',
- trigger: ['blur', 'change']
- },
- coalContactHair: {
- type: 'string',
- required: true,
- message: '璇疯緭鍏ユ瘺閲�',
- trigger: ['blur', 'change']
- },
- coalContactSkin: {
- type: 'string',
- required: true,
- message: '璇疯緭鍏ョ毊閲�',
- trigger: ['blur', 'change']
- }
- },
+ rules: {},
timeout: '0',
- wsgShow: false
-
+ wsgShow: false,
+ timeLineStatus: null,
+ timeLineEqCode: '',
+ originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺',
+ submitOriginInfoLoading: false,
+ ischeckedDefault: 0,
+ isSpecial: null, //1 鏄壒娈� 0涓嶆槸鐗规畩
+ printerType: '', //鍒ゆ柇鎵撳嵃鐨勬槸鍑洪棬璇佽繕鏄叆闂ㄨ瘉
+ weighHouseLoading: false
};
},
watch: {
@@ -416,7 +431,7 @@
}
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing', ]),
name() {
return uni.getStorageSync('name');
},
@@ -438,12 +453,12 @@
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().toFixed(2) || ''
+ return xx.minus(yy).toNumber() > 0 ? xx.minus(yy).toNumber().toFixed(2) : 0
},
currentTime() {
let currentDate = new Date();
@@ -454,6 +469,13 @@
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: {
@@ -461,7 +483,8 @@
init() {
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) {
@@ -490,7 +513,7 @@
uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
uni.setStorageSync('customerName', this.serviceInfoObj.openName);
}
- });
+ })
},
// 鑾峰彇鎻愮叅鍗曡鎯�
getTakeCoal() {
@@ -503,11 +526,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;
@@ -534,9 +559,10 @@
// 鍘熷彂淇℃伅鍥炴樉浠ュ強鎺у埗鏄惁鍙慨鏀�
this.haveInputOrigin = !this.coalDetailsData.skinTwo && this.coalDetailsData.orderType ===
'澶栬喘'
- this.deletable = this.isModifyoriginInfo = this.coalDetailsData.status > 3
+ 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 {
@@ -551,34 +577,25 @@
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, '瀹屾垚澶栭攢璁㈠崟');
- }
- })
- }
- }
- }).then(() => {
- this.getgetService(); //鑾峰彇瀹㈡湇
- }).then(() => {
// 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
- setTimeout(() => {
+ ;
+ if([1, 2, 13].includes(this.coalDetailsData.status) ){
+ setTimeout(() => {
let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this
.coalDetailsData
.yuYueSection.slice(-5);
- if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
- this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
+ // 鏈�澶х害鏉熸椂闂� 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)
+ }
+
})
},
// 鏃ュ織鏌ヨ
@@ -586,6 +603,8 @@
this.interval = setInterval(() => {
this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
+ 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) {
@@ -608,19 +627,21 @@
});
},
// 绛惧埌
- 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() {
@@ -687,25 +708,36 @@
// 绉伴噸
cengZhongClick() {
this.changeglobalIsFirstWeighing(2)
+ this.weighHouseLoading = true
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
console.log(res, '鑾峰彇纾呮埧');
+ this.weighHouseLoading = false
if (res.code == 0) {
this.weighData.sceneId = res.data.id;
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}&primaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
+ }&primaryHair=${this.primaryHair}&primaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}&deptId=${this.getWeightHouseObj.deptId }`
});
} else {
this.$u.toast(res.msg ? res.msg : '鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
- });
+ }).catch(() => {
+ this.weighHouseLoading = false
+ })
},
// 鏀剧┖
evacuation() {
@@ -715,16 +747,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;
}
});
@@ -744,21 +780,57 @@
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
- this.$reqGet('printer', { type: 2, tmId: this.coalDetailsData.id }).then(res => {
+ 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.enterLoading = false
- console.log(res);
- if (res.code === 0) {
- this.$u.toast('鎵撳嵃鎴愬姛')
- } else {
- this.$u.toast(res.msg ? res.msg : '鎵撳嵃澶辫触')
- }
+ this.outLoading = false
})
},
// 鎵撳嵃鍑洪棬璇�
@@ -766,15 +838,37 @@
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('printer', { type: 3, tmId: this.coalDetailsData.id }).then(res => {
- uni.hideLoading()
- this.outLoading = false
- if (res.code === 0) {
- this.$u.toast('鎵撳嵃鎴愬姛')
- } else {
- this.$u.toast(res.msg ? res.msg : '鎵撳嵃澶辫触')
+ 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() {
@@ -794,7 +888,8 @@
this.isfocus2 = false;
},
inputChange() {
- if (Number(this.originInfoForm.coalContactHair) > 0 && Number(this.originInfoForm.coalContactSkin > 0)) {
+ if (Number(this.originInfoForm.coalContactHair) > 0 && Number(this.originInfoForm.coalContactSkin >
+ 0)) {
this.isInputOrigin = true;
}
},
@@ -836,7 +931,8 @@
name: 'file',
success: res => {
if (num == 1) {
- this.originInfoForm.contactPicture = JSON.parse(res.data).data.url;
+ this.originInfoForm.contactPicture = JSON.parse(res.data)
+ .data.url;
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
}
@@ -856,17 +952,32 @@
taskCoalCode: this.coalDetailsData.code,
carNo: this.coalDetailsData.carNo,
}
- this.$refs.originInfoRef.validate().then(res => {
+ 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.getTakeCoal()
+ this.submitOriginInfoLoading = false
} else {
+ this.submitOriginInfoLoading = false
+ this.isModifyoriginInfo = true
this.$u.toast(res.msg ? res.msg : '鎻愪氦澶辫触')
+
}
+ }).then(() => {
+ setTimeout(() => {
+ this.getTakeCoal()
+ }, 1000)
})
- }).catch(errors => {
+ } else {
uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
+ }
+ },
+ streamView() {
+ uni.navigateTo({
+ url: `/pages/public-page/driverStream/driverStream?eqCode=${this.timeLineEqCode}`
})
}
}
@@ -910,7 +1021,8 @@
width: 94%;
margin: 0 auto;
height: vww(52);
- @include flex position: relative;
+ @include flex;
+ position: relative;
flex-direction: column;
justify-content: space-between;
align-items: flex-start;
@@ -954,7 +1066,8 @@
overflow: hidden;
.block-main {
- @include flex width: 94%;
+ @include flex ;
+ width: 94%;
height: 336rpx;
margin: vww(18) vww(7) vww(11) vww(17);
flex-direction: column;
@@ -972,6 +1085,10 @@
position: absolute;
right: vww(10);
color: #fff;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
}
.basic {
@@ -1024,6 +1141,12 @@
color: #7d7d7d;
}
+ .stream-view {
+ height: vww(18);
+ margin: vww(8);
+ margin-left: 0;
+ }
+
.weigh-item {
width: 100%;
height: vww(36);
@@ -1066,7 +1189,7 @@
justify-content: center;
overflow: hidden;
position: relative;
- top: vww(120);
+ top: vww(130);
&_wrapper {
width: 650rpx;
@@ -1178,8 +1301,7 @@
width: 100%;
margin: 0 auto;
- .top-button,
- .bottom-button {
+ .top-button {
width: 100%;
height: vww(47);
@include flex;
@@ -1193,6 +1315,23 @@
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;
+ }
+ }
}
}
--
Gitblit v1.9.1