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; 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; } }); }, // 放空弹窗取消 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();
