From 6a232ec3d1d75af66b5afb475895d585a494cbaf Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期六, 29 六月 2024 16:24:35 +0800
Subject: [PATCH] feat:小程序修改问题若干
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 833 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 671 insertions(+), 162 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 8a1686f..d9f67c7 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,28 +1,31 @@
<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>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.toFiledName || '' }}</view>
<view class="cutomer-name"
v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class=""
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.filedName || '' }}</view>
<view class=""
- v-else>鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+ v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
<view class="block-main">
<view class="basic">
- <view class="coalName">{{ coalDetailsData.coalName }}</view>
+ <view class="coalName">{{ coalDetailsData.productNames || coalDetailsData.productName }}</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">
@@ -31,43 +34,113 @@
size="40"></u-icon></view>
<view class="send-date">{{ coalDetailsData.sendDate }}</view>
</view>
- <view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
- <view class="order-code">
+ <view class="coal-code">绫诲瀷: {{ coalDetailsData.orderType || '' }}</view>
+ <view class="coal-code">鏀跺彂鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
+ <view class="coal-code">杞︾墝鍙�: {{ coalDetailsData.carNo || '' }}</view>
+ <view class="order-code"
+ v-if="!isSpecial">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
- <view class="weigh-item">
+ <view class="stream-view"
+ style="color: #475bfd;"
+ @click="streamView"
+ v-show="timeLineStatus===9">
+ 鏌ョ湅瑁呰浇鎯呭喌
+ </view>
+ <view class="weigh-item" v-if="isShowClean">
<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" v-if="weightObj.skin">{{ Number(weightObj.skin).toFixed(2) ||"" }}</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" v-if="weightObj.hair">{{ Number(weightObj.hair).toFixed(2) ||"" }}</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" v-if="weightObj.clean">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view>
</view>
</view>
</view>
</view>
</view>
+ <!-- 瀛愯彍鍗� ---琛ㄦ牸 -->
+ <view class="sub-table">
+ <view class="first-line"><combined-title title="浜у搧淇℃伅"></combined-title></view>
+ <view class="table">
+ <uni-table border
+ id="table-box"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <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-th align="center">鎵ｅ惃</uni-th>
+ <uni-th align="center">浠舵暟</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
+ <uni-td align="center">
+ <view class="name">{{ subItem.productName }}</view></uni-td>
+ <uni-td align='right'>
+ <view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td>
+
+ 聽 <uni-td align="right">
+ <view>{{ subItem.discount }}</view
+ ></uni-td>
+ <uni-td align="right">
+ <view>{{ subItem.productQuantity }}</view
+ ></uni-td>
+ </uni-tr>
+ </uni-table>
+ </view>
+ <!-- 璇疯緭鍏ラ泦瑁呯鍙� -->
+ <view class="codeBox" v-if="coalDetailsData.isContainerNum">
+ <text>闆嗚绠卞彿:</text>
+ <view class="inp">
+ <u--input
+ placeholder="璇疯緭鍏ラ泦瑁呯鍙�"
+ v-model="coalDetailsData.containerNumber"
+ ></u--input>
+ </view>
+ <view>
+ <u-button type="primary" text="纭畾" @click="enterClick"></u-button>
+ </view>
+ </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"
+ <!-- 鎶樺彔 -->
+ <zh-collapse accordion>
+ <zh-collapse-item
+ class="collItem">
+ <!-- title -->
+ <view slot="title">
+ <view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
+ </view>
+ <view class="" slot='cont'>
+ <u-form :model="originInfoForm"
+ :rules="rules"
label-position="top"
label-width="160"
:label-style="{'marginLeft':'9px'}"
ref="originInfoRef">
- <u-form-item prop="coalContactSkin">
+ <view v-if="coalDetailsData.isWeight">
+ <u-form-item prop="coalContactSkin">
<view class="second-line">
<view class="label-text"
:class="{ focusClass: isfocus1 }"><text style="color: #f56c6c;">*</text>鐨噸</view>
@@ -115,7 +188,47 @@
</view>
<view class="unit">鍚�</view>
</view>
- </u-form-item>
+ </u-form-item>
+ </view>
+ <!-- 杈撳叆鏁伴噺 -->
+ <view v-else class="table-div">
+ <uni-table
+ border
+ id="table-box"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <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-th align="center">鏁伴噺</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(subItem, index) in coalDetailsData.tmTaskCoalList" :key="index">
+ <uni-td align="center">
+ <view class="name">{{ subItem.productName }}</view></uni-td>
+ <!-- <uni-td align='right'>
+ <view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td> -->
+
+ 聽 <uni-td align="right">
+ <view>
+ <u--input
+ placeholder="璇疯緭鍏ヤ骇鍝佹暟閲�"
+ type='number'
+ v-model="subItem.productQuantity"
+ ></u--input>
+ </view></uni-td>
+
+ </uni-tr>
+ </uni-table>
+ </view>
+
<u-form-item prop='contactPicture'>
<view class="label-text">
<text style="color: #f56c6c;">*</text>鍘熷彂纾呭崟
@@ -130,15 +243,21 @@
height="150"
:previewFullImage="true"
:disabled="isModifyoriginInfo"
- :deletable='!deletable'></u-upload>
+ :deletable="!deletable"></u-upload>
</u-form-item>
</u-form>
<view class="submit-button">
<u-button text="鎻愪氦"
type="primary"
@click.stop="submitOriginInfo"
- :disabled="isModifyoriginInfo"></u-button>
+ :disabled="isModifyoriginInfo"
+ :loading="submitOriginInfoLoading"></u-button>
</view>
+ </view>
+ </zh-collapse-item>
+ </zh-collapse>
+
+
</view>
</view>
</view>
@@ -157,63 +276,72 @@
<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"
- v-show='ablePrintInduction'>
+ <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&&!(coalDetailsData.skin&&coalDetailsData.hair)'>
<u-button text="鎵撳嵃鍏ラ棬璇�"
- @click="printEntryCertificate"
+ @click="printBefore('in')"
type="primary"
shape="circle"
:loading="enterLoading"
loadingText="鎵撳嵃涓�,璇风◢鍊�"></u-button>
- </view>
- <view class="weigh-button"
+ </view> -->
+ <!-- <view class="weigh-button"
v-show="ablePrintOut">
<u-button text="鎵撳嵃鍑洪棬璇�"
- @click="printExitPermit"
+ @click="printBefore('out')"
type="primary"
shape="circle"
:loading="outLoading"
loadingText="鎵撳嵃涓�,璇风◢鍊�"></u-button>
- </view>
- <view class="weigh-button"><u-button text="灞曠ず鎻愮叅鍗�"
+ </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"
+ <!-- 鏌ョ湅璺嚎鎸囧紩 -->
+ <view class="weigh-button"><u-button text="鏌ョ湅璺嚎鎸囧紩"
+ @click="reviewGuidelines"
type="primary"
- shape="circle"
- :disabled="haveInputOrigin"></u-button></view>
+ shape="circle"></u-button></view>
</view>
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -223,14 +351,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"
@@ -239,54 +367,91 @@
:show="servieceShow"
cancelText="鍙栨秷"></u-action-sheet>
</view>
+ <u-popup :show="guideLineshow" mode="bottom" @close="close">
+ <view style="margin-top: 35rpx;padding-left: 20rpx;">
+ <u-radio-group
+ v-model="radioValue"
+ placement="row"
+ @change="radioChange"
+ >
+ <u-radio label="鍦哄湴" :name="'鍦哄湴'" :labelSize="30" :size="30"></u-radio>
+ <u-radio v-for="(item,index) in wareList" :label="'浠撳簱'+(index+1)" :name="index":labelSize="30" :size="30" ></u-radio>
+ </u-radio-group>
+
+ <div class="guidebox">
+ <u-swiper
+ v-if="guideLineshow"
+ :height="400"
+ @click="swiperClick"
+ :list="swiperList"
+ keyName="image"
+ circular
+ ></u-swiper>
+ <view>{{ activeText }}</view>
+ <u-album :urls="swiperList" ref="swiperAlbum" keyName="src2"></u-album>
+ </div>
+ </view>
+ </u-popup>
<!-- 纾呮埧蹇欑鎻愮ず寮圭獥 -->
<view class="">
- <u-modal :show="wsgVisiable"
+ <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')
- import isBetween from 'dayjs/plugin/isBetween'
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 = []
- dayjs.extend(isBetween)
+ 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) {
+ if (this.originInfoVisible && !this.isSpecial) {
this.$refs.originInfoRef.setRules(this.rules);
}
},
@@ -295,10 +460,23 @@
},
data() {
return {
+ swiperList:[],
orderPlanId: null,
+ radioValue:'鍦哄湴',
+ tmTaskCoalList:[],
+ currentNum:0,
+ guideLineshow:false,
yyId: null,
dayRZ: [],
- coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
+ activeText:'',
+ activeObj:{
+ affiliationId:'',
+ type:2,
+ },
+ wareList:[],
+ coalDetailsData: {
+ tmTaskCoalList:[]
+ }, // 鎻愮叅鍗曡鎯�
currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
@@ -326,7 +504,7 @@
serviecePhone: ''
},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑'
], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
@@ -381,32 +559,30 @@
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,
+ timeLineStatus: null,
+ timeLineEqCode: '',
+ originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺',
+ submitOriginInfoLoading: false,
+ ischeckedDefault: 0,
+ isSpecial: null, //1 鏄壒娈� 0涓嶆槸鐗规畩
+ printerType: '', //鍒ゆ柇鎵撳嵃鐨勬槸鍑洪棬璇佽繕鏄叆闂ㄨ瘉
+ weighHouseLoading: false
};
},
+ watch: {
+ '$store.state.wsgVisiable': {
+ deep: true,
+ handler: function(val) {
+ this.wsgShow = val
+ }
+ }
+ },
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing', ]),
name() {
return uni.getStorageSync('name');
},
@@ -428,12 +604,28 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus !== 3;
+ return this.correctStatus !== 3
},
coalContactClean() {
+ if(this.coalDetailsData.isWeight){
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
+ }else{
+ //鏁伴噺
+ if(!this.coalDetailsData.tmTaskCoalList.length){
+ return false
+ }else{
+ const reslut = this.coalDetailsData.tmTaskCoalList.find(item=>!item.productQuantity);
+ console.log(reslut);
+ if(reslut){
+ return false
+ }else{
+ return true
+ }
+ }
+ }
+
},
currentTime() {
let currentDate = new Date();
@@ -444,6 +636,42 @@
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')
+ },
+ //鏄惁灞曠ず鐨瘺鍑�
+ isShowClean(){
+ let flag = true;
+ console.log(this.coalDetailsData.tmTaskCoalList)
+ const tempArr = this.coalDetailsData.tmTaskCoalList.filter(item=> item.isWeight === 1);
+ if(!tempArr.length ){
+ return false; //濡傛灉閮芥病鏈夎繑鍥炲亣
+ } else {
+ flag = tempArr.every(obj => obj['skin'] !== null && obj['clean'] !== null && obj['hair'] !== null );
+ console.log(flag,'f;ag')
+ return flag;
+ }
+
+ },
+ //鐨瘺鍑�
+ weightObj(){
+ const index = 0;//涓嬫爣浣� 锛岃鍙栫鍑犵粍鐨勭毊姣涘噣锛�,榛樿鏈�鍚庝竴缁�;
+ const tempArr = this.coalDetailsData.tmTaskCoalList.filter(item=> item.isWeight === 1);
+ const result =tempArr.find(item=>!item.skin || !item.hair || !item.clean);
+ console.log(result,'result')
+ if(result){
+ return result
+ }else{
+ return tempArr[index];
+ }
+
+
+
}
},
methods: {
@@ -451,7 +679,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) {
@@ -480,7 +709,7 @@
uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
uni.setStorageSync('customerName', this.serviceInfoObj.openName);
}
- });
+ })
},
// 鑾峰彇鎻愮叅鍗曡鎯�
getTakeCoal() {
@@ -493,11 +722,14 @@
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.wareList=res.data.bunkerIds.split(",")
+ // // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
+ // 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;
@@ -517,24 +749,24 @@
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
- // 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
- 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('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
- this.timeout = '1'
- }
// 鍏ラ棬璇� 鍜� 鍑洪棬璇� 鏄惁鏄剧ず
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.isModifyoriginInfo = this.coalDetailsData.status > 3
+ const originFlag = this.coalDetailsData.tmTaskCoalList.find(item=>!item.productQuantity);
+ if(this.coalDetailsData.isWeight === 1){
+ this.haveInputOrigin = (!this.coalDetailsData.skinTwo && this.coalDetailsData.orderType ===
+ '澶栬喘')
+ }else{
+ this.haveInputOrigin = !!originFlag
+ }
+ console.log(originFlag,this.coalDetailsData.tmTaskCoalList,'origin')
+ this.deletable = this.coalDetailsData.status > 3
this.originInfoForm.coalContactSkin = this.coalDetailsData.skinTwo;
this.originInfoForm.coalContactHair = this.coalDetailsData.hairTwo;
+ this.originInfoForm.contactPicture = this.coalDetailsData.contactPicture
+ this.tmTaskCoalList = this.coalDetailsData.tmTaskCoalList;
if (this.coalDetailsData.contactPicture) {
this.fileList1 = this.coalDetailsData.contactPicture.split(',').map(v => {
return {
@@ -549,23 +781,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, '瀹屾垚澶栭攢璁㈠崟');
- }
- })
+ // 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
+ ;
+ if([1, 2, 13].includes(this.coalDetailsData.status) ){
+ 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)
}
- }).then(() => {
- this.getgetService(); //鑾峰彇瀹㈡湇
+
})
},
// 鏃ュ織鏌ヨ
@@ -573,6 +807,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) {
@@ -595,19 +831,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() {
@@ -674,25 +912,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() {
@@ -702,16 +951,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;
}
});
@@ -731,21 +984,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
})
},
// 鎵撳嵃鍑洪棬璇�
@@ -753,15 +1042,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() {
@@ -781,7 +1092,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;
}
},
@@ -823,7 +1135,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}`);
}
}
@@ -843,25 +1156,173 @@
taskCoalCode: this.coalDetailsData.code,
carNo: this.coalDetailsData.carNo,
}
- this.$refs.originInfoRef.validate().then(res => {
+ if(this.coalDetailsData.isWeight === 1){
+ 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)
+ })
+ } else {
+ uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
+ }
+ }else{
+ //鏁伴噺
+ form.numDtoList = this.coalDetailsData.tmTaskCoalList.map(item=>{
+ let obj = {
+ tmId:item.id,
+ num:Number(item.productQuantity)
+ }
+ return obj;
+ });
+ //鍒犻櫎鐨瘺鍑�
+ delete form.clean;
+ delete form.hair;
+ delete form.skin;
+ if (this.coalContactClean && this
+ .originInfoForm
+ .contactPicture) {
+ this.submitOriginInfoLoading = true;
+ console.log(form,'form')
+ this.$reqPost('appSaveContact', form, 'json').then(res => {
+ if (res.code === 0) {
+ this.$u.toast('鎻愪氦鎴愬姛')
+ this.submitOriginInfoLoading = false
+ } else {
+ this.submitOriginInfoLoading = false
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}`
+ })
+ },
+ getguideFun(){
+ this.$reqGet('getRoute', this.activeObj).then((res)=>{
+ console.log(res,'res');
+ if(res.data.length){
+ this.swiperList = res.data[0].guideImg.split(',').map(item=>{
+ return BaseUrl + item;
+ });//鏁扮粍
+ console.log(this.swiperList,'swiperList');
+ this.activeText = res.data[0].guideText;
+ }else{
+ this.swiperList = [];
+ this.activeText = '鏆傛棤鏁版嵁'
+ }
+
+ })
+
+ },
+ reviewGuidelines(){
+ this.guideLineshow = true;
+ this.swiperList = [];
+ this.activeText = '';
+ this.activeObj.affiliationId = this.coalDetailsData.filedId;
+ this.getguideFun();
+
+ },
+ close(){
+ this.guideLineshow = false;
+ },
+ radioChange(item){
+ console.log(111,item,this.coalDetailsData,this.wareList);
+ if(item == '鍦哄湴'){
+ this.activeObj.affiliationId = this.coalDetailsData.filedId;
+ this.activeObj.type = 2
+ }else{
+ this.activeObj.affiliationId = this.wareList.length>0?this.wareList[item]:this.coalDetailsData.deptId;
+ this.activeObj.type = 1
+ }
+ this.getguideFun();
+
+ },
+ //鎵撳紑鍥剧墖棰勮
+ swiperClick(){
+ console.log(this.$refs.swiperAlbum,'swiperAlbum')
+ this.$nextTick(()=>{
+ this.$refs.swiperAlbum.onPreviewTap();
+ this.$refs.swiperAlbum.openPage();
+ })
+ },
+ enterClick(){
+ console.log('click')
+ this.$reqPut('addContainer',{id:this.coalDetailsData.id,containerNumber:this.coalDetailsData.containerNumber},'json').then(res=>{
+ console.log(res,'res')
+ this.$u.toast('鎿嶄綔鎴愬姛')
})
}
}
};
</script>
-<style lang="scss"
- scoped>
+<style lang="scss" scoped>
+.codeBox{
+ height: 100rpx;
+ display: flex;
+ width: 100%;
+ justify-content: space-around;
+ align-items: center;
+ .inp{
+ border: solid 1px #ccc;
+ input{
+
+ text-indent: 15px;
+ }
+
+ }
+
+
+}
+.table{
+ width: 100%;
+ /deep/ .uni-table{
+ min-width: 0!important;
+ margin-left: 20rpx;
+ }
+
+}
+ .guidebox{
+ height:600rpx;
+ padding: 20rpx
+ }
+ .indicator-num {
+ padding: 2px 0;
+ background-color: rgba(0, 0, 0, 0.35);
+ border-radius: 100px;
+ width: 35px;
+ @include flex;
+ justify-content: center;
+
+ &__text {
+ color: #FFFFFF;
+ font-size: 12px;
+ }
+ }
/deep/.u-steps {
.u-steps-item {
.u-steps-item__content {
@@ -897,7 +1358,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;
@@ -941,7 +1403,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;
@@ -959,6 +1422,10 @@
position: absolute;
right: vww(10);
color: #fff;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
}
.basic {
@@ -1011,6 +1478,12 @@
color: #7d7d7d;
}
+ .stream-view {
+ height: vww(18);
+ margin: vww(8);
+ margin-left: 0;
+ }
+
.weigh-item {
width: 100%;
height: vww(36);
@@ -1041,10 +1514,28 @@
}
}
}
+ .sub-table{
+ width: 690rpx;
+ min-height: 300rpx;
+ 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;
+ flex-direction: column;
+ justify-content: center;
+ overflow: hidden;
+ position: relative;
+ top: vww(130);
+ align-items: flex-start;
+ /deep/ .uni-table{
+ min-width: 0!important;
+ }
+
+ }
.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);
@@ -1053,11 +1544,10 @@
justify-content: center;
overflow: hidden;
position: relative;
- top: vww(120);
+ top: vww(130);
&_wrapper {
width: 650rpx;
- height: 600rpx;
@include flex;
flex-direction: column;
margin-bottom: vww(20);
@@ -1165,14 +1655,30 @@
width: 100%;
margin: 0 auto;
- .top-button,
- .bottom-button {
+ .top-button {
width: 100%;
height: vww(47);
@include flex;
.u-button {
width: 40%;
+ height: 60rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #497bfb;
+ 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;
@@ -1210,4 +1716,7 @@
}
}
}
+ ::v-deep .u-album{
+ display: none!important;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1