From 3713f1e122891450d99af7df3bbcd234a3a4da05 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 04 十一月 2024 09:02:20 +0800
Subject: [PATCH] feat:样式修改
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 344 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 291 insertions(+), 53 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 124eff5..74d7349 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -108,7 +108,14 @@
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
+
+ <!-- v-if="item.isWeight === 0 && item.tmTaskCoalList.length >1 && item.packingType !== 1" -->
+ <view class="rightBtn"><u-button type='primary' v-if=" item.tmTaskCoalList.length >1 && !item.tmTaskCoalList.find(item=>item.isWeight !== 0) && item.packingType !== 1" text='涓�閿‘璁�' @click.native.stop="allOkBtn(item)"></u-button></view>
</view>
+ <view class="fourth">
+ <view class="senddate">{{ proType[item.packingType] }}</view>
+ </view>
+
<view class="table">
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
@@ -116,14 +123,15 @@
<uni-th width='120'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='800'>浜у搧</uni-th>
- <uni-th align="center" width='110'>绛夌骇</uni-th>
- <uni-th align="center" width='110'>鍖呰</uni-th>
<!-- <uni-th align="center" width='200'>浠撳簱</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='120'>纭閲�</uni-th>
<uni-th align="center" width='120'>璁″垝閲�</uni-th>
+ <uni-th align="center" width='150'>璁￠噸鏂瑰紡</uni-th>
+
<!-- <uni-th align="center" width='100'>瀹為檯閲�</uni-th> -->
</uni-tr>
@@ -132,15 +140,10 @@
<view class="btnBox">
<!-- -->
<!-- <u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button> -->
- <u-button type='primary' text='纭瑁呭嵏' size='mini' v-if="subItem.flag && isBtnShow(item)" @click.native.stop="enterOk(item,subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' size='mini' v-if="subItem.flag && isBtnShow(item) && !( item.tmTaskCoalList.length >1 && !item.tmTaskCoalList.find(item=>item.isWeight !== 0) && item.packingType !== 1)" @click.native.stop="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="left">
- <view>{{ subItem.productName }}</view></uni-td>
- <uni-td align="center">
- <view>{{ subItem.productGrade }}</view></uni-td>
- <uni-td align="center">
- <view>{{ proType[item.packingType] }}</view>
- </uni-td>
+ <view>{{ subItem.productName + ( subItem.productGrade ? '-' + subItem.productGrade :'') }}</view></uni-td>
<!-- <uni-td>
<view>{{ subItem.bunkerName }}</view>
</uni-td>
@@ -157,7 +160,16 @@
<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 align="right">
+ <u-tag :text="'璁℃暟'" plain v-if="subItem.isWeight==0"></u-tag>
+ <u-tag :text="'绉伴噸'" plain v-else-if="subItem.isWeight==1"></u-tag>
+ <u-tag :text="'绉伴噸璁℃暟'" plain v-else-if="subItem.isWeight==2"></u-tag>
+ <u-tag v-else></u-tag>
</uni-td>
<!-- <uni-td>
<view class="name">{{ subItem.realityMeasure }}</view>
@@ -201,7 +213,7 @@
<view class=""></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.productNames || item.productName }}</view>
+ <view class="coal-name">{{ item.productNames?limitString(item.productNames,20,'...'):'' || ''}}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
<view class="third">
@@ -235,6 +247,9 @@
</view>
<view class="senddate">{{ item.orderCode }}</view>
</view>
+ <view class="fourth">
+ <view class="senddate">{{ proType[item.packingType] }}</view>
+ </view>
<view class="table">
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
@@ -242,33 +257,29 @@
<uni-th width='120'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='800'>浜у搧</uni-th>
- <uni-th align="center" width='90'>绛夌骇</uni-th>
- <uni-th align="center" width='90'>鍖呰</uni-th>
<!-- <uni-th align="center" width='200'>浠撳簱</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-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='150'>璁￠噸鏂瑰紡</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' 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">
- <view>{{ subItem.productName }}</view></uni-td>
- <uni-td align="center">
- <view>{{ subItem.productGrade }}</view></uni-td>
- <uni-td>
- <view>{{ proType[item.packingType] }}</view>
- </uni-td>
+ <uni-td align="left">
+ <view>{{ subItem.productName + ( subItem.productGrade ? '-' + subItem.productGrade :'') }}</view></uni-td>
<!-- <uni-td>
<view>{{ subItem.bunkerName }}</view>
- </uni-td>
+ </uni-td>
<uni-td>
<view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
</uni-td>
@@ -281,12 +292,21 @@
<uni-td>
<view class="name">{{ subItem.productQuantity }}</view>
</uni-td> -->
- <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 align="center">
- <view>{{ subItem.bunkerName }}</view></uni-td> -->
+ <uni-td align="right">
+ <u-tag :text="'璁℃暟'" plain v-if="subItem.isWeight==0"></u-tag>
+ <u-tag :text="'绉伴噸'" plain v-else-if="subItem.isWeight==1"></u-tag>
+ <u-tag :text="'绉伴噸璁℃暟'" plain v-else-if="subItem.isWeight==2"></u-tag>
+ <u-tag v-else></u-tag>
+ </uni-td>
+
+ <!-- 聽 <uni-td align="center">
+ <view>{{ subItem.bunkerName }}</view></uni-td> -->
<!-- <uni-td align="center">
<view class="name">{{ subItem.statusView }}</view></uni-td> -->
@@ -319,27 +339,32 @@
:closeOnClickOverlay="true"
:showCancelButton="true">
<view class="slot-content">
- <view v-if="isNumOk || isClean||isFlagNum">
+
+
+ <view v-if="isNumOk || isClean||isFlagNum || blend">
<view>浜у搧鍚嶇О锛歿{activeObj.productName}}</view>
<view>浠撳簱锛歿{activeObj.bunkerName}}</view>
- <view v-if="activeObj.isWeight === 1">
+ <view v-if="activeObj.isWeight === 1 || activeObj.isWeight === 2">
<view v-if="activeObj.skin">鐨噸锛歿{activeObj.skin.toFixed(2) || ''}}</view>
<view v-if="activeObj.hair">姣涢噸锛歿{activeObj.hair.toFixed(2) || ''}}</view>
</view>
- <view v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)">
+ <!-- <view v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)">
<view>璁″垝閲忥細{{Number(activeObj.planMeasure)}}</view>
- <view >瀹為檯閲忥細{{ Number(activeObj.realityMeasure)}}</view>
- </view>
+ <view >瀹為檯閲忥細{{ Number(activeObj.productQuantity)}}</view>
+ </view> -->
<view class="queren" v-show="isCleanFlag === '1'">
- <text>璇疯緭鍏�</text>锛�
+ <text v-if="isNumOk">纭閲忥細</text>
+ <text v-if="isNumOk || isFlagNum || blend">璇疯緭鍏ワ細</text>
<u--input
type='digit'
+ :disabled="yelvFlag"
border="bottom"
- :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '鏁伴噺' :'鎶樺惃'"
+ :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '纭鏁伴噺' : blend ? '纭鏁伴噺' : '鎶樺惃'"
v-model="checkNum"
>
</u--input>
- <text> {{isNumOk ? activeObj.productUnit : '鍚�' }}</text>
+ <text v-if="isNumOk || isFlagNum || blend"> {{isNumOk ? activeObj.productUnit : '浠�' }}</text>
+ <text v-if="isClean"> {{'鍚�' }}</text>
</view>
<!-- 鏄惁杈撳叆鎶樺惃 -->
<view style="display:flex;margin-top:20rpx" v-if="isClean">鏄惁闇�瑕佹姌鍚細 <u-radio-group
@@ -374,7 +399,7 @@
<view class="pvcBig" v-if="activeObj.productName === '鑱氭隘涔欑儻鏍戣剛' && activeObj.packingType === 5">
</view>
- <view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}{{ activeObj.productUnit || '浠�' }}</view>
+ <view v-if=" activeObj.planMeasure">璁″垝閲忥細{{activeObj.planMeasure}}{{ activeObj.productUnit || '浠�' }}</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
</view>
@@ -405,7 +430,58 @@
>
</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>
+ <!-- 淇敼寮圭獥 -->
+ <u-modal :show="enterXg"
+ :title="'淇敼纭淇℃伅'"
+ @close="closeModaledit"
+ :width='740'
+ @cancel="cancelModaledit"
+ @confirm="confirmModaledit"
+ :closeOnClickOverlay="true"
+ :showCancelButton="true">
+ <view class="slot-content">
+ <view>
+ <view>浜у搧鍚嶇О锛歿{activeObjedit.productName}}</view>
+ <view class="queren">
+ <text>淇敼鏁伴噺</text>锛�
+ <u--input
+ type='digit'
+ border="bottom"
+ :placeholder="'鏁伴噺'"
+ v-model="checkNumEdit"
+ >
+ </u--input>
+ </view>
+ <view >鍘熺‘璁ゆ暟閲忥細{{activeObjedit.productQuantity}}浠�</view>
+
+ </view>
+
+ </view>
+ </u-modal>
+ <u-modal :show="showConfim" @confirm="confirmEnter" :showCancelButton="true" @cancel="showConfim = false;isOkNum = ''" ref="uModal" :asyncClose="true">
+ <view class="modalBody">
+ <view style="text-align: center;"> 鏄惁纭畾涓�閿鍗革紵</view>
+ <view style="display: flex;align-items: center;"><text> 鍒拌揣:</text> <u--input
+ style="display: inline-block;width: 200rpx;border-bottom: solid 1px #ccc;"
+ type="digit"
+ :placeholder="'鏁伴噺'"
+ v-model="isOkNum"
+ >
+ </u--input> 浠�</view>
+ </view>
+
</u-modal>
<!-- 浠撳簱 -->
<!-- <u-action-sheet :actions="secondClassActionsList"
@@ -426,6 +502,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: {
@@ -457,7 +534,7 @@
if(!item){
return false
}else{
- if( !item.orderType === '澶栭攢' || item.status === 6){
+ if( item.status === 6){
return false
}else{
return true;
@@ -513,19 +590,28 @@
},
data() {
return {
+ enterXg:false,
+ isOkNum:'',
+ fileList1:[],
+ activeObjedit:{},
+ discountJpg:'',
proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ヤ粨搴�', '鍑轰粨搴�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑','琛ユ墦','鍏ュ満妫�鏌�','璐ㄦ涓�',
'绂诲満妫�鏌�','宸叉墦鍗�','瑁呭嵏','杩斿洖鍔犲噺鍚ㄧ‘璁や腑'
],
isCleanFlag:'1',
+ checkNumEdit:'',
+ showConfim:false,
+ remarkContent:'',
dataForm: {
firstClass: "",
secondClass: "",
orderType: '',
bunkerIds:""
},
- historyData:[],
+ historyData:[],
+ paramsItem:{},
messageObj:{
carNo:'',
},
@@ -538,6 +624,7 @@
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
isNumOk:false, //璁′欢
isClean:false, // 鎶樺惃
+ yelvFlag:false,
isFlagNum:false,// PVCV
// 鍦哄湴鎿嶄綔鑿滃崟
firstClassActionsList: [],
@@ -547,6 +634,7 @@
secondClassShow: false,
coalList: [],
checkedCoal: [],
+ blend:false,
checkNum:'',
activeObj:{},
userInfo: {},
@@ -643,6 +731,10 @@
})
},
+ deletePic(event) {
+ this.changeisUploadimg(true);
+ this[`fileList${event.name}`].splice(event.index, 1);
+ },
firstClassSelect() {
this.firstClassShow = true
},
@@ -705,6 +797,67 @@
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('璇疯緭鍏ヨ淇敼鍚庣殑鏁伴噺')
+ this.enterXg = false;
+ }else{
+ this.$reqPost('confirmLoadAndUnloadModify',{
+ id: this.activeObjedit.id,
+ productQuantity:this.checkNumEdit,
+ },'json').then((res) => {
+ this.$u.toast('鎿嶄綔鎴愬姛')
+ this.enterXg = false;
+ this.getDetailData();
+ this.getTodayOrder();
+ })
+ }
+ console.log('123')
+
+
+ },
isCleanChange(val){
console.log(val,'瑙﹀彂')
if(val === '0'){
@@ -712,8 +865,29 @@
}
},
+ editOrder(item){
+
+ 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`,
@@ -730,10 +904,35 @@
// })
// 璁′欢锛� 0 鑱氭隘涔欑儻鏍戣剛 type
// 鎶樺惃:
+ this.fileList1 = [];
this.activeObj = item;
+ if(item.isWeight === 1){
+ this.isNumOk = false;
+ this.isClean = true;
+ this.blend = false;
+ this.isCleanFlag = '0';
+ this.isFlagNum = false;
+ } else if(item.isWeight ===2 ){
+ this.blend = true;
+ this.isNumOk = false;
+ this.isClean = false;
+ this.checkNum = item.productQuantity;
+ // this.isCleanFlag = '0';
+ this.isFlagNum = false;
+ }
+ else {
+ this.isNumOk = true;
+ this.isCleanFlag = '1';
+ this.blend = false;
+ this.isClean = false;
+ this.checkNum = item.productQuantity;
+ this.isFlagNum = false;
+ }
if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
this.isNumOk = true;
this.isClean = false;
+ this.checkNum = item.productQuantity;
+ this.blend = false;
this.isFlagNum = false;
this.isCleanFlag = '1';
//鍥炴樉璁℃暟閲�
@@ -742,6 +941,7 @@
this.isClean = true;
this.isCleanFlag = '0';
this.isNumOk = false;
+ this.blend = false;
this.isFlagNum = false;
}
@@ -750,14 +950,18 @@
this.isNumOk = false;
this.isClean = false;
this.isCleanFlag = '1';
+ this.blend = false;
this.isFlagNum = true;;
- this.checkNum = item.planMeasure;
+ this.checkNum = item.productQuantity;
}
//鐡惰娑叉隘鏉′欢
//EDC 璐ㄦ瀹屾垚鏂瑰彲纭
if(item.packingType === 1){
this.isNumOk = true;
this.isClean = false;
+ this.yelvFlag = true;
+ this.checkNum = item.productQuantity;
+ this.blend = false;
this.isCleanFlag = '1';
this.isFlagNum = false;
}
@@ -769,26 +973,19 @@
}else if(parintItem.orderType === '澶栭攢' || parintItem.orderType === '澶栬喘閫�'){
this.isEmptyCar = '0';
}
- if(item.isWeight === 1){
- this.isNumOk = false;
- this.isClean = true;
- this.isCleanFlag = '0';
- this.isFlagNum = false;
- }else{
- this.isNumOk = true;
- this.isCleanFlag = '1';
- this.isClean = false;
- this.isFlagNum = false;
- }
+
if((/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && item.packingType === 5){
this.isNumOk = false;
this.isClean = false;
+ this.blend = false;
+ this.checkNum = item.productQuantity;
this.isFlagNum = true;
this.isCleanFlag = '1';
}
//澶栭攢涓嶇敤 杈撳叆鎶樺惃
// if(parintItem.orderType ==='澶栭攢'){
// this.isClean = false;
+ // this.blend = false;
// }
this.enterZx = true;
@@ -799,33 +996,42 @@
this.checkNum = '';
this.isEmptyCar = null;
},
+ closeModaledit(){
+ this.enterXg = false;
+ },
cancelModal(){
this.enterZx = false;
this.checkNum = '';
this.isEmptyCar = null;
},
+ cancelModaledit(){
+ this.enterXg = false;
+ },
confirmModal(){
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')
@@ -857,6 +1063,26 @@
},
+ //纭
+ confirmEnter(){
+ this.$reqPost('oneClickLoading',{tmId:this.paramsItem.id,kgNum:this.isOkNum},'params').then((res) => {
+ if(res.code == 0){
+ console.log(res,'res')
+ this.$u.toast('涓�閿‘璁ゆ垚鍔�')
+ this.showConfim = false;
+ setTimeout(() => {
+ this.getDetailData();
+ }, 500);
+ }else{
+ this.showConfim = false;
+ this.$u.toast(res.msg ? res.msg : '涓�閿‘璁ゅけ璐�');
+ }
+
+ }).catch(err=>{
+ this.$u.toast(err ? err : '鎿嶄綔寮傚父')
+ })
+
+ },
//鏌ョ湅鏈�杩戜竴娆＄殑鍘熺洂閽欓晛
todoDetail(){
console.log()
@@ -868,7 +1094,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}`
})
}
@@ -897,6 +1123,11 @@
<style lang="scss"
scoped>
+ .modalBody{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ }
::-webkit-scrollbar{
display: none;
}
@@ -908,6 +1139,11 @@
width: auto;
}
+}
+.rightBtn{
+ position: absolute;
+ right: 100rpx;
+ bottom: 5rpx;
}
.notice-bar{
margin-left: vww(10);
@@ -1065,6 +1301,7 @@
}
}
.history-information {
+ position: relative;
margin-bottom:30rpx;
margin-top: 10rpx;
background: #ffffff;
@@ -1142,6 +1379,7 @@
font-size: 30rpx;
font-weight: 300;
color: #515151;
+ position: relative;
margin: vww(10) vww(10) 0;
@include flex;
--
Gitblit v1.9.1