From 1fdf41cc692eb7b208fe647259d4295164280a41 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 21 四月 2023 14:12:09 +0800
Subject: [PATCH] 修改历史提煤单
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 59 ++++++++++++++++++++---------
pages/customer-page/customer-index/customer-index.vue | 27 ++++++++-----
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 24 ++++++++---
3 files changed, 74 insertions(+), 36 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 2f2a50b..fbceba9 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -60,13 +60,13 @@
<uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in historyCoalData" :key="index">
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate }}</uni-td>
- <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate || '' }}</uni-td>
+ <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount || '' }}</uni-td>
</uni-tr>
</uni-table>
<view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
@@ -157,14 +157,12 @@
this.total = res.data.total;
if (this.pageCurrent > 1) {
this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
this.loading = false;
} else {
this.historyCoalData = res.data.records;
this.loading = false;
}
- // this.historyCoalData = [...this.historyCoalData, ...res.data.records];
- // this.total = res.data.total;
- // this.loading = false;
}
});
},
@@ -174,6 +172,15 @@
this.pageCurrent++;
this.getJhOrderPlanDataPage();
},
+ //fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+ ArrSet(Arr, id) {
+ var obj = {};
+ const arrays = Arr.reduce((setArr, item) => {
+ obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
+ return setArr;
+ }, []);
+ return arrays;
+ },
popupDetermineClick() {
if (this.receiveNum) {
this.getOrderNum.num = this.receiveNum;
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index a68ff45..f3a19fa 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -41,12 +41,12 @@
</view>
<view class="three">
<!-- 鏀剧┖ -->
- <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></u-button>
+ <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="!isEvacuation"></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button
type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
@@ -64,6 +64,14 @@
@confirm="evacuationConfirm"
@cancel="evacuationCancel"
></u-modal>
+ </view>
+ <view class="">
+ <u-modal :show="firstHairCustomernameShow" title="濉啓閲嶉噺" @confirm="OutsourcingConfirm">
+ <view class="">
+ <view class=""><u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="CoalContactHair" type="digit"></u--input></view>
+ <view class=""><u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="CoalContactSkin" type="digit"></u--input></view>
+ </view>
+ </u-modal>
</view>
</view>
</template>
@@ -104,17 +112,6 @@
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: '',
weighList: {},
- webSocket: null, // webSocket瀹炰緥
- // lockReconnect: false, // 閲嶈繛閿侊紝閬垮厤澶氭閲嶈繛
- // maxReconnect: 6, // 鏈�澶ч噸杩炴鏁帮紝 -1 鏍囪瘑鏃犻檺閲嶈繛
- // reconnectTime: 0, // 閲嶈繛灏濊瘯娆℃暟
- // heartbeat: {
- // interval: 30 * 1000, // 蹇冭烦闂撮殧鏃堕棿
- // timeout: 10 * 1000, // 鍝嶅簲瓒呮椂鏃堕棿
- // pingTimeoutObj: null, // 寤舵椂鍙戦�佸績璺崇殑瀹氭椂鍣�
- // pongTimeoutObj: null, // 鎺ユ敹蹇冭烦鍝嶅簲鐨勫畾鏃跺櫒
- // pingMessage: JSON.stringify({ type: 'ping' }) // 蹇冭烦璇锋眰淇℃伅
- // }
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
skin: 0,
@@ -129,7 +126,13 @@
// 鑾峰彇鍘熷彂淇℃伅
primarySkin: null,
primaryHair: null,
- primaryClean: null
+ primaryClean: null,
+ // 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
+ isweigh: false,
+ // 澶栬喘绫诲瀷绉伴噸鍑虹幇寮圭獥濉啓姣涳紝鐨紝
+ firstHairCustomernameShow: false,
+ CoalContactHair: '',
+ CoalContactSkin: ''
};
},
watch: {
@@ -142,6 +145,7 @@
// this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
+ this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus;
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆') {
if (this.weighList.hair == 0) {
@@ -151,6 +155,7 @@
// this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
+ this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus;
}
}
},
@@ -185,10 +190,11 @@
},
// 鏄惁鏀剧┖鎸夐挳绂佺敤
isEvacuation() {
- if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
- return false;
- } else {
- return true;
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
+ return this.weighList.skin == this.temporaryWeighObj.hair || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
+ }
+ if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆') {
+ return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
}
}
},
@@ -204,8 +210,17 @@
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
+ if (this.weighList.orderType == '澶栭攢' && this.weighList.hair == 0) {
+ this.firstHairCustomernameShow = true;
+ }
}
});
+ },
+ OutsourcingConfirm() {
+ this.weighData.CoalContactSkin = Number(this.CoalContactSkin);
+ this.weighData.CoalContactHair = Number(this.CoalContactHair);
+ this.weighData.CoalContactclean = Number(this.CoalContactHair) - Number(this.CoalContactSkin);
+ this.saveWeigh();
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -316,7 +331,13 @@
evacuationConfirm() {
this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
console.log(res, '绗簩娆℃斁绌�');
- this.evacuationModalShow = false;
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.evacuationModalShow = false;
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
+ this.evacuationModalShow = true;
+ }
});
},
// 鏀剧┖寮圭獥鍙栨秷
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 9e48a5c..ce38fc7 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -43,13 +43,13 @@
<uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in historyCoalData" :key="index">
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate }}</uni-td>
- <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate || '' }}</uni-td>
+ <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus || '' }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount || '' }}</uni-td>
</uni-tr>
</uni-table>
<view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
@@ -123,6 +123,7 @@
if (res.data.records) {
if (this.pageCurrent > 1) {
this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
this.loading = false;
} else {
this.historyCoalData = res.data.records;
@@ -137,6 +138,15 @@
this.pageCurrent++;
this.getJhOrderPlanDataPage();
},
+ //fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+ ArrSet(Arr, id) {
+ var obj = {};
+ const arrays = Arr.reduce((setArr, item) => {
+ obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
+ return setArr;
+ }, []);
+ return arrays;
+ },
init() {
this.huoDaiList();
this.getJhOrderPlanDataPage();
--
Gitblit v1.9.1