From 036831ad52733ca354e65b0274b7be9b75973651 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期五, 18 十月 2024 16:10:54 +0800
Subject: [PATCH] feat:车牌号
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 154 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 138 insertions(+), 16 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 98e8fb3..1806d0c 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -108,6 +108,7 @@
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
+ <view class="rightBtn"><u-button type='primary' text='涓�閿‘璁�' v-if="item.isWeight === 0 && item.tmTaskCoalList.length >1 && item.packingType !== 1" @click.native.stop="allOkBtn(item)"></u-button></view>
</view>
<view class="table">
<uni-table border stripe
@@ -123,7 +124,9 @@
<uni-th align="center" width='100'>姣涢噸</uni-th>
<uni-th align="center" width='100'>鍑�閲�</uni-th>
<uni-th align="center" width='100'>鏁伴噺</uni-th> -->
+ <uni-th align="center" width='120'>纭閲�</uni-th>
<uni-th align="center" width='120'>璁″垝閲�</uni-th>
+
<!-- <uni-th align="center" width='100'>瀹為檯閲�</uni-th> -->
</uni-tr>
@@ -157,8 +160,12 @@
<view class="name">{{ subItem.productQuantity }}</view>
</uni-td> -->
<uni-td align="right">
+ <view class="name">{{ subItem.productQuantity }}</view>
+ </uni-td>
+ <uni-td align="right">
<view class="name">{{ subItem.planMeasure }}</view>
</uni-td>
+
<!-- <uni-td>
<view class="name">{{ subItem.realityMeasure }}</view>
</uni-td> -->
@@ -249,15 +256,16 @@
<uni-th align="center" width='100'>姣涢噸</uni-th>
<uni-th align="center" width='100'>鍑�閲�</uni-th>
<uni-th align="center" width='100'>鏁伴噺</uni-th> -->
+ <uni-th align="center" width='100'>纭閲�</uni-th>
<uni-th align="center" width='100'>璁″垝閲�</uni-th>
- <!-- <uni-th align="center" width='100'>瀹為檯閲�</uni-th> -->
+
</uni-tr>
<uni-tr v-for="(subItem, index) in item.tmTaskCoalList" :key="index">
<uni-td align="center">
<view class="btnBox">
<!-- -->
- <u-button type='primary' text='淇敼' size='mini' @click="editOrder(subItem)"></u-button>
+ <!-- <u-button type='primary' text='淇敼' size='mini' v-if="subItem.isWeight === 0 || subItem.isWeight === 2 " @click="editOrder(subItem)"></u-button> -->
<u-button type='primary' text='鎷煎崟' size='mini' v-if="isPinShow(item)" @click="pinDan(subItem)"></u-button>
</view></uni-td>
<uni-td w align="center">
@@ -283,11 +291,14 @@
<view class="name">{{ subItem.productQuantity }}</view>
</uni-td> -->
<uni-td>
+ <view class="name">{{ subItem.productQuantity }}</view>
+ </uni-td>
+ <uni-td>
<view class="name">{{ subItem.planMeasure }}</view>
</uni-td>
-<!--
- 聽 <uni-td align="center">
- <view>{{ subItem.bunkerName }}</view></uni-td> -->
+
+ <!-- 聽 <uni-td align="center">
+ <view>{{ subItem.bunkerName }}</view></uni-td> -->
<!-- <uni-td align="center">
<view class="name">{{ subItem.statusView }}</view></uni-td> -->
@@ -320,6 +331,8 @@
:closeOnClickOverlay="true"
:showCancelButton="true">
<view class="slot-content">
+
+
<view v-if="isNumOk || isClean||isFlagNum || blend">
<view>浜у搧鍚嶇О锛歿{activeObj.productName}}</view>
<view>浠撳簱锛歿{activeObj.bunkerName}}</view>
@@ -335,6 +348,7 @@
<text>璇疯緭鍏�</text>锛�
<u--input
type='digit'
+ :disabled="yelvFlag"
border="bottom"
:placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '鏁伴噺' : blend ? '鏁伴噺' : '鎶樺惃'"
v-model="checkNum"
@@ -406,6 +420,16 @@
>
</u-radio>
</u-radio-group></view>
+ <view v-if="isClean && isCleanFlag === '1'"><text>鎶樺惃鐓х墖:</text><u-upload :fileList="fileList1"
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="1"
+ multiple
+ :maxCount="2"
+ width="250"
+ height="150"
+ :previewFullImage="true"></u-upload></view>
+
</view>
</u-modal>
<!-- 淇敼寮圭獥 -->
@@ -436,6 +460,9 @@
</view>
</u-modal>
+ <u-modal :show="showConfim" @confirm="confirmEnter" :showCancelButton="true" @cancel="showConfim = false" ref="uModal" :asyncClose="true">
+ 鏄惁纭涓�閿鍗革紵
+ </u-modal>
<!-- 浠撳簱 -->
<!-- <u-action-sheet :actions="secondClassActionsList"
:show="secondClassShow"
@@ -455,6 +482,7 @@
<script>
import { mapState, mapMutations, mapGetters } from 'vuex';
+ import { BaseUrl } from '@/api/publicInterface.js'
import combinedTitle from '@/components/combined-title/combined-title.vue';
export default {
props: {
@@ -486,7 +514,7 @@
if(!item){
return false
}else{
- if( !item.orderType === '澶栭攢' || item.status === 6){
+ if( item.status === 6){
return false
}else{
return true;
@@ -543,7 +571,9 @@
data() {
return {
enterXg:false,
+ fileList1:[],
activeObjedit:{},
+ discountJpg:'',
proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ヤ粨搴�', '鍑轰粨搴�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑','琛ユ墦','鍏ュ満妫�鏌�','璐ㄦ涓�',
@@ -551,13 +581,15 @@
],
isCleanFlag:'1',
checkNumEdit:'',
+ showConfim:false,
dataForm: {
firstClass: "",
secondClass: "",
orderType: '',
bunkerIds:""
},
- historyData:[],
+ historyData:[],
+ paramsItem:{},
messageObj:{
carNo:'',
},
@@ -570,6 +602,7 @@
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
isNumOk:false, //璁′欢
isClean:false, // 鎶樺惃
+ yelvFlag:false,
isFlagNum:false,// PVCV
// 鍦哄湴鎿嶄綔鑿滃崟
firstClassActionsList: [],
@@ -676,6 +709,10 @@
})
},
+ deletePic(event) {
+ this.changeisUploadimg(true);
+ this[`fileList${event.name}`].splice(event.index, 1);
+ },
firstClassSelect() {
this.firstClassShow = true
},
@@ -738,6 +775,48 @@
close(){
},
+ uploadFilePromise(url, num) {
+ return new Promise((resolve, reject) => {
+ let a = uni.uploadFile({
+ url: '/admin/sys-file/uploadUnToken',
+ filePath: url,
+ name: 'file',
+ success: res => {
+ if (num == 1) {
+ this.discountJpg = JSON.parse(res.data)
+ .data.url;
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ }
+ }
+ });
+ });
+ },
+ 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++;
+ }
+ },
confirmModaledit(){
if(!this.checkNumEdit){
this.$u.toast('璇疯緭鍏ヨ淇敼鍚庣殑鏁伴噺')
@@ -749,6 +828,8 @@
},'json').then((res) => {
this.$u.toast('鎿嶄綔鎴愬姛')
this.enterXg = false;
+ this.getDetailData();
+ this.getTodayOrder();
})
}
console.log('123')
@@ -763,19 +844,28 @@
},
editOrder(item){
- this.enterXg = true;
+
console.log(item,'item')
this.activeObjedit = item;
if(item.isWeight === 1){
this.$u.toast('绉伴噸浜у搧涓嶆敮鎸佷慨鏀癸紒')
}else{
//寮圭獥鏀寔淇敼
+ this.enterXg = true;
}
},
open(){},
+ allOkBtn(item){
+ //鐐瑰嚮涓�閿‘璁�
+ this.paramsItem = item;
+
+ this.showConfim = true;
+
+ },
enterOk(parintItem,item){
+ this.yelvFlag = false;
console.log(parintItem,'priintItem')
// uni.request({
// url: `${BaseUrl}/admin/dict/type/tray_weight`,
@@ -792,6 +882,7 @@
// })
// 璁′欢锛� 0 鑱氭隘涔欑儻鏍戣剛 type
// 鎶樺惃:
+ this.fileList1 = [];
this.activeObj = item;
if(item.isWeight === 1){
this.isNumOk = false;
@@ -843,6 +934,8 @@
if(item.packingType === 1){
this.isNumOk = true;
this.isClean = false;
+ this.yelvFlag = true;
+ this.checkNum = item.planMeasure;
this.blend = false;
this.isCleanFlag = '1';
this.isFlagNum = false;
@@ -864,11 +957,11 @@
this.isCleanFlag = '1';
}
//澶栭攢涓嶇敤 杈撳叆鎶樺惃
- if(parintItem.orderType ==='澶栭攢'){
- this.isClean = false;
- this.blend = false;
+ // if(parintItem.orderType ==='澶栭攢'){
+ // this.isClean = false;
+ // this.blend = false;
- }
+ // }
this.enterZx = true;
},
@@ -892,24 +985,27 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
+ console.log(this.activeObj,(this.activeObj.isWeight === 2 || this.activeObj.packingType === 1) && (this.activeObj.skin || this.activeObj.hair),'activeObj')
console.log(this.activeObj,this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7,'12313')
if(this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7){
-
this.enterZx = false;
this.$u.toast(`璇锋鏌ュ綋鍓嶄簩姘箼鐑�(EDC)DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
- }else{
+ //瑁呭嵏 涓� 2 锛屼絾鏄繀椤诲緱绉伴噸
+ }
+ else{
this.enterZx = false;
this.$reqPost('confirmLoadAndUnload',{
id: this.activeObj.id,
- productQuantity:this.isNumOk ? this.checkNum : '',
+ productQuantity:(this.isNumOk || this.blend) ? this.checkNum : '',
discount:this.isClean ? this.checkNum : null,
isEmptyCar:this.isEmptyCar,
isPretendDischar:this.activeObj.isPretendDischar,
realityMeasure:this.isFlagNum ? this.checkNum : null,
productId:this.isFlagNum ? this.activeObj.productId : null,
+ discountJpg:this.discountJpg,
},'json').then(res=>{
uni.hideLoading();
console.log(res,'rez')
@@ -941,6 +1037,25 @@
},
+ //纭
+ confirmEnter(){
+ this.$reqPost('oneClickLoading',{tmId:this.paramsItem.id},'params').then((res) => {
+ if(res.code == 0){
+ console.log(res,'res')
+ this.$u.toast('涓�閿‘璁ゆ垚鍔�')
+ this.showConfim = false;
+ setTimeout(() => {
+ this.getDetailData();
+ }, 500);
+ }else{
+ this.$u.toast(res.msg ? res.msg : '涓�閿‘璁ゅけ璐�');
+ }
+
+ }).catch(err=>{
+ this.$u.toast(err ? err : '鎿嶄綔寮傚父')
+ })
+
+ },
//鏌ョ湅鏈�杩戜竴娆＄殑鍘熺洂閽欓晛
todoDetail(){
console.log()
@@ -952,7 +1067,7 @@
pinDan(item){
console.log('pindan')
uni.navigateTo({
- url: `/subPages/splicingOrders/index?taskCoalId=${item.id}`
+ url: `/subPages/splicingOrders/index?taskCoalId=${item.id}&orderType=${item.orderType}`
})
}
@@ -992,6 +1107,11 @@
width: auto;
}
+}
+.rightBtn{
+ position: absolute;
+ right: 100rpx;
+ bottom: 5rpx;
}
.notice-bar{
margin-left: vww(10);
@@ -1149,6 +1269,7 @@
}
}
.history-information {
+ position: relative;
margin-bottom:30rpx;
margin-top: 10rpx;
background: #ffffff;
@@ -1226,6 +1347,7 @@
font-size: 30rpx;
font-weight: 300;
color: #515151;
+ position: relative;
margin: vww(10) vww(10) 0;
@include flex;
--
Gitblit v1.9.1