From 7fc17d062bed6f99fd7860898f474dff5b51cf73 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 26 十一月 2024 14:47:59 +0800
Subject: [PATCH] feat:原发信息增加限制
---
subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 112 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 17 deletions(-)
diff --git a/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index 4117462..76ac501 100644
--- a/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -1,18 +1,18 @@
<template>
<view class="bill-of-lading-details">
<view class="top-banner"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
<view class="top-information">
<view class="cutomer-name"
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="">鍗曚綅:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class=""
v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.filedName || '' }}</view>
<view class=""
- v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+ v-else>鍘傚尯:{{ coalDetailsData.bunkerName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
@@ -20,8 +20,8 @@
<view class="basic">
<view class="coalName">{{ coalDetailsData.productNames || coalDetailsData.productName }}</view>
<view class="status-button"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/statusbutton.png') no-repeat;
- background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/statusbutton.png') no-repeat;
+ background-size: cover;">
{{coalDetailsData.statusView||''}}
</view>
</view>
@@ -46,19 +46,19 @@
<view class="weigh-item" v-if="isShowClean">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</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:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</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:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
<view class="num" v-if="weightObj.clean">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view>
</view>
@@ -72,18 +72,32 @@
<view class="table">
<uni-table border
id="table-box"
+ v-if="coalDetailsData.isWeight === 1"
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-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="center">
+ <view class="name">{{ subItem.productGrade }}</view></uni-td>
+ <uni-td align="center">
+ <view class="name">{{ proType[subItem.packingType] }}</view></uni-td>
+ <uni-td align="center">
+ <view class="name">{{ subItem.planMeasure }}</view></uni-td>
+ <uni-td align="center">
+ <view class="name">{{ subItem.realityMeasure }}</view></uni-td>
<uni-td align='right'>
<view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view>
</uni-td>
@@ -97,8 +111,59 @@
聽 <uni-td align="right">
<view>{{ subItem.discount }}</view
></uni-td>
+ <!-- <uni-td align="right">
+ <view>{{ subItem.productQuantity }}</view
+ ></uni-td> -->
+ <uni-td align="right">
+ <view>{{ subItem.productUnit }}</view
+ ></uni-td>
+ </uni-tr>
+ </uni-table>
+
+ <uni-table border
+ id="table-box"
+ v-else
+ 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-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="center">
+ <view class="name">{{ subItem.productGrade }}</view></uni-td>
+ <uni-td align="center">
+ <view class="name">{{ proType[subItem.packingType] }}</view></uni-td>
+ <uni-td align="center">
+ <view class="name">{{ subItem.planMeasure }}</view></uni-td>
+ <uni-td align="center">
+ <view class="name">{{ subItem.realityMeasure }}</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.productQuantity }}</view
+ ></uni-td>
+ <uni-td align="right">
+ <view>{{ subItem.productUnit }}</view
></uni-td>
</uni-tr>
</uni-table>
@@ -118,18 +183,19 @@
</view>
</view>
<view class="origin-info"
- v-if="originInfoVisible">
+ v-if="originInfoVisible && isShowYuanFa">
<view class="origin-info_wrapper">
<view class="origin-info_content">
<!-- 鎶樺彔 -->
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
- <view class="" slot='cont'>
+
<u-form :model="originInfoForm"
:rules="rules"
label-position="top"
label-width="160"
:label-style="{'marginLeft':'9px'}"
ref="originInfoRef">
+
<view v-if="coalDetailsData.isWeight">
<u-form-item prop="coalContactSkin">
<view class="second-line">
@@ -238,7 +304,7 @@
:deletable="!deletable"></u-upload>
</u-form-item>
</u-form>
- </view>
+
</view>
@@ -314,6 +380,7 @@
data() {
return {
swiperList:[],
+ proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
orderPlanId: null,
radioValue:'鍦哄湴',
tmTaskCoalList:[],
@@ -523,9 +590,16 @@
return tempArr[index];
}
-
-
+ },
+ //鍒ゆ柇鏄惁灞曠ず 鍘熷彂淇℃伅
+ isShowYuanFa(){
+ if(this.coalContactClean && !this.coalDetailsData.tmTaskCoalList.length){
+ return false
+ }else{
+ return true
+ }
}
+
},
methods: {
...mapMutations(['changewsgVisiable', 'changeisUploadimg', 'changeglobalIsFirstWeighing']),
@@ -1289,11 +1363,14 @@
.coalName,
.order-type {
width: 45%;
- height: 30rpx;
+ height: 70rpx;
font-size: 30rpx;
font-weight: 300;
color: #515151;
position: relative;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.black-block {
@@ -1387,7 +1464,7 @@
}
.origin-info {
- width: 690rpx;
+ width: 95%;
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);
@@ -1399,7 +1476,7 @@
top: vww(130);
&_wrapper {
- width: 650rpx;
+ width: 100%;
@include flex;
flex-direction: column;
margin-bottom: vww(20);
@@ -1540,6 +1617,7 @@
}
}
}
+
.weigh-ability {
width: 631rpx;
--
Gitblit v1.9.1