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/loadUnload-page/selectTarget/selectTarget.vue | 157 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 124 insertions(+), 33 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 5ab8c60..8fa831c 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -65,7 +65,7 @@
<view class=""></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.productName || '' }}</view>
+ <view class="coal-name">{{ item.productNames || item.productName }}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
<view class="third">
@@ -73,11 +73,7 @@
<view class="third-line_text">瀹㈡埛鍚嶇О:</view>
<view>{{ item.customerName }}</view>
</view>
- <view class="third-line">
- <view class="third-line_text">浠撳簱:</view>
- <view >{{ item.bunkerName }}</view>
- </view>
- <view class="third-line">
+ <view class="third-line" v-if="item.productName === 'EDC'">
<view class="third-line_text">璐ㄦ鐘舵��:</view>
<view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
</view>
@@ -105,8 +101,7 @@
<uni-th width='140'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='120'>浜у搧</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>
@@ -120,14 +115,12 @@
<view class="btnBox">
<!-- -->
<u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button>
- <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag" @click="enterOk(subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag" @click="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="center">
<view>{{ subItem.productName }}</view></uni-td>
- <uni-td align="center">
- <view style="width:150rpx">{{ subItem.carNo }}</view></uni-td>
<uni-td>
- <view class="name">{{ subItem.orderType }}</view>
+ <view class="name">{{ subItem.bunkerName }}</view>
</uni-td>
<uni-td>
<view class="name">{{ subItem.skin }}</view>
@@ -171,12 +164,11 @@
鏄惁纭瑁呭嵏锛�
<view v-if="isNumOk || isClean">
<text>浜у搧鍚嶇О锛歿{activeObj.productName}}</text>
-
<view class="queren">
<text>璇疯緭鍏�</text>锛�
<u--input
+ type='digit'
border="bottom"
- :disabled="activeObj.productName === 'PVC' && activeObj.packingType === 5"
:placeholder="isNumOk ? '鏁伴噺' :'鎶樺惃'"
v-model="checkNum"
>
@@ -189,8 +181,35 @@
</view>
<view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}浠�</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
+
</view>
-
+ <view>鏄惁绌鸿溅鍑哄巶: <u-radio-group
+ v-model="isEmptyCar"
+ placement="row"
+ iconPlacement="right"
+ style="justify-content: space-evenly"
+ >
+ <u-radio
+ :key="1"
+ :label="'鏄�'"
+ :name="'1'"
+ shape="circle"
+ iconSize="32"
+ label-size="32"
+ size="40"
+ >
+ </u-radio>
+ <u-radio
+ :key="0"
+ :label="'鍚�'"
+ :name="'0'"
+ shape="circle"
+ iconSize="32"
+ label-size="32"
+ size="40"
+ >
+ </u-radio>
+ </u-radio-group></view>
</view>
</u-modal>
<!-- 鐓や粨 -->
@@ -211,6 +230,7 @@
</template>
<script>
+ import { BaseUrl } from '@/api/publicInterface.js'
export default {
props: {
loadUnloadData: {
@@ -236,8 +256,9 @@
orderType: '',
bunkerId:""
},
+ isEmptyCar:null, //鏄惁绌鸿溅鍑哄巶
checkStatusList:[
- '寰呭彇鏍�','宸插彇鏍�','鍚堟牸','涓嶅悎鏍�'
+ '寰呭彇鏍�','宸插彇鏍�','璐ㄦ涓�','寰呭鏍�','澶嶆牳涓�','寰呭瀹�','瀹″畾涓�','宸插畬鎴�'
],
index: '',
enterZx:false,
@@ -259,6 +280,7 @@
filedId: "",
selectedCoal: [],
orderTypeShow: false,
+ pvcWeight:'',
orderTypeList: [{
name: '澶栭攢',
id: Math.floor(Math.random() * 100) + 1,
@@ -274,6 +296,9 @@
};
},
methods: {
+ getPVCWeight(){
+
+ },
viewDetail(item){
//鏌ョ湅鏀跺彂鍗曡鎯�
uni.navigateTo({
@@ -287,6 +312,7 @@
this.userInfo.password = null
})
},
+
// 鑾峰彇鐓ゅ満
getDeptIdFiled() {
uni.showLoading({
@@ -321,6 +347,7 @@
title:'鍔犺浇涓�'
})
this.$reqGet('getTaskCoalListByBunkerId', { bunkerId:this.dataForm.bunkerId }).then(res => {
+ uni.hideLoading();
if (res.code === 0) {
this.detailData = res.data.map(item=>{
item.tmTaskCoalList.map(el=>{
@@ -330,8 +357,13 @@
return item;
});
console.log(this.detailData,'detailData')
- uni.hideLoading();
+ }else if(res.code === 1){
+ this.detailData = [];
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛侊紒')
}
+ }).catch(err=>{
+ this.detailData = [];
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛侊紒')
})
},
@@ -357,24 +389,62 @@
close(){
},
+
+
+
+
open(){},
- enterOk(item){
- console.log('123',item)
+ enterOk(parintItem,item){
+ console.log(parintItem,'priintItem')
+ uni.request({
+ url: `${BaseUrl}/admin/dict/type/tray_weight`,
+ method: 'GET',
+ header: {
+ Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
+ clientToc: 'Y',
+ 'CLIENT_TOC': 'Y',
+ },
+ success: (res) => {
+ this.pvcWeight = res.data.data.find(item=>item.label === '5') ? Number(res.data.data.find(item=>item.label == '5').value) : '';
+
+ }
+ })
+ // 璁′欢锛� 0 pvc type
+ // 鎶樺惃:
this.activeObj = item;
- if(item.productQuantity){
+ if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
this.isNumOk = true;
this.isClean = false;
- }else if(item.isWeight === 1){
+ //鍥炴樉璁℃暟閲�
+ this.checkNum = item.productQuantity ? item.productQuantity : '';
+ }else if( parintItem.orderType ==='澶栬喘' && item.isWeight === 1){
this.isClean = true;
this.isNumOk = false;
}else{
this.isNumOk = false;
this.isClean = false;
}
+ //pvc
+ if(parintItem.orderType ==='澶栭攢' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ //鐡惰娑叉隘鏉′欢
+ //EDC 璐ㄦ瀹屾垚鏂瑰彲纭
+ if(item.packingType === 1){
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ //
//pvc澶у寘鑷姩璁＄畻鎶樺惃
if(item.productName === 'PVC' && item.packingType === 5){
- this.checkNum = (Number(item.productQuantity) * 60)
-
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ if(parintItem.orderType === '澶栬喘'){
+ this.isEmptyCar = '1';
+ }else if(parintItem.orderType === '澶栭攢' || parintItem.orderType === '澶栬喘閫�'){
+ this.isEmptyCar = '0';
}
this.enterZx = true;
@@ -382,22 +452,36 @@
closeModal(){
this.enterZx = false;
this.checkNum = '';
+ this.isEmptyCar = null;
},
cancelModal(){
this.enterZx = false;
this.checkNum = '';
+ this.isEmptyCar = null;
},
confirmModal(){
- this.enterZx = false;
uni.showLoading({
title:'鍔犺浇涓�'
- })
- this.$reqPost('confirmLoadAndUnload',{
+ });
+ if(this.activeObj.productName ==='EDC'){
+ if( this.activeObj.checkStatus !== 7){
+ this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+ return
+ }
+
+ }else if( this.isEmptyCar === null){
+ this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
+ return
+ }else{
+ this.enterZx = false;
+ this.$reqPost('confirmLoadAndUnload',{
id: this.activeObj.id,
- productQuantity:this.isNumOk ? this.checkNum :this.activeObj.skin,
+ productQuantity:this.isNumOk ? this.checkNum : '',
discount:this.isClean ? this.checkNum : null,
+ isEmptyCar:this.isEmptyCar,
isPretendDischar:this.activeObj.isPretendDischar
},'json').then(res=>{
+ uni.hideLoading();
console.log(res,'rez')
this.checkNum = '';
if(res.code === 1){
@@ -414,9 +498,12 @@
}).catch((err) => {
this.$u.toast(err.msg || '澶辫触');
}).finally(() => {
-
+ uni.hideLoading();
})
+ }
+
+
},
//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
judgeTypeFun(name){
@@ -431,8 +518,6 @@
})
}
-
-
},
onShow(){
@@ -453,14 +538,20 @@
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
+
this.getUserInfo()
- })
- }
+ });
+
+
+ },
}
</script>
<style lang="scss"
scoped>
+::-webkit-scrollbar{
+ display: none;
+ }
.table{
width: 100%;
/deep/ .uni-table{
@@ -655,7 +746,7 @@
.third {
width: 96%;
- height: 120rpx;
+ height: auto;
font-size: 30rpx;
font-weight: 300;
color: #515151;
--
Gitblit v1.9.1