Browse Source

修复库位打印和托盘打印

dev-xx
qb 12 months ago
parent
commit
1366a0739f
  1. 35
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  2. 55
      src/views/basicdata/warehouse/tray/basicdataTray.vue
  3. 6
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  4. 577
      src/views/distribution/turndelivery/deliveryMarket.vue

35
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@ -70,7 +70,7 @@
</template>
</avue-crud>
<el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
<div>
<div class="print_QRCode">
<!-- <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
<!-- <el-divider></el-divider>-->
@ -115,6 +115,7 @@ import { downloadXls } from '@/utils/util';
import { dateNow } from '@/utils/date';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import print from '@/utils/print';
import { getLodop } from '@/utils/LodopFuncs';
import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
@ -397,35 +398,9 @@ export default {
},
//
printTemplate() {
let that = this;
this.selectionList.map(item => {
let ids = item.id;
console.log(ids);
getPrintTemplate(ids).then(res => {
let pri_html = '';
pri_html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
// console.log(pri_html);
that.w_print(pri_html);
});
// checkcode.push(item.orderPackageCode)
});
},
//
w_print(templateData) {
let LODOP = getLodop();
// let templateData = "res.data.data";
// console.log(templateData);
LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //
// //
LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
// //
LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
// // datahtml
LODOP.ADD_PRINT_HTM('20', '0%', '100%', '100%', templateData);
// LODOP.PREVIEW(); //()
LODOP.PRINT(); //
const printNode = document.querySelectorAll('.print_QRCode>div>div');
print(printNode);
},
async handleqr() {
try {

55
src/views/basicdata/warehouse/tray/basicdataTray.vue

@ -64,26 +64,14 @@
</template>
</avue-crud>
<el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
<div>
<!-- <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
<!-- <el-divider></el-divider>-->
<!-- <el-row>-->
<!-- <el-col :span="24" >-->
<!-- <el-image width="10" height="10" w-full :key="index" :src="item " alt="Preview Image"/>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
<!--startprint1-->
<div class="print_QRCode">
<div v-html="html"></div>
<!--endprint1-->
</div>
<span slot="footer" class="dialog-footer">
<div class="dialog-footer mt10">
<!-- <el-button type="primary" @click="ddd"> </el-button>-->
<el-button type="primary" @click="printTemplate"> </el-button>
<el-button type="primary" @click="dialogVisible = false"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</span>
<el-button type="primary" icon="Printer" @click="printTemplate"> </el-button>
</div>
</el-dialog>
<el-dialog :title="'确认破损'" v-model="damagedBox" width="45%" append-to-body>
<avue-form :option="damagedoption" v-model="damagedform" :data="damageddata" ref="signform">
@ -120,6 +108,7 @@ import { dateNow } from '@/utils/date';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import { getLodop } from '@/utils/LodopFuncs';
import print from '@/utils/print';
export default {
data() {
@ -354,36 +343,10 @@ export default {
},
//
printTemplate() {
let that = this;
this.selectionList.map(item => {
let ids = item.id;
console.log(ids);
getPrintTemplate(ids).then(res => {
let pri_html = '';
pri_html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
// console.log(pri_html);
console.log(123123);
that.w_print(pri_html);
});
// checkcode.push(item.orderPackageCode)
});
},
//
w_print(templateData) {
let LODOP = getLodop();
// let templateData = "res.data.data";
// console.log(templateData);
LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //
// //
LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
// //
LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
// // datahtml
LODOP.ADD_PRINT_HTM('45', '0%', '100%', '100%', templateData);
// LODOP.PREVIEW(); //()
LODOP.PRINT(); //
const printNode = document.querySelectorAll('.print_QRCode>div>div');
console.log('printNode :>> ', printNode);
print(printNode);
},
async handleqr() {
try {

6
src/views/distribution/inventory/distributionStockArticleDetails.vue

@ -308,12 +308,12 @@
</el-dialog>
<el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
<div>
<div class="print_QRCode">
<div v-html="html"></div>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="printTemplate"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" icon="Printer" @click="printTemplate"> </el-button>
</span>
</el-dialog>
</div>
@ -842,7 +842,7 @@ export default {
this.onLoadOwn(this.page);
},
printTemplate() {
const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
const orderNodeList = document.querySelectorAll('.print_QRCode>div>div');
print(orderNodeList);
},
//

577
src/views/distribution/turndelivery/deliveryMarket.vue

@ -1,306 +1,231 @@
<template>
<div class="head_top">
<div @click="ccc" :class="aaa ? 'buts check' : 'buts'">自主配送</div>
<div @click="ddd" :class="bbb ? 'buts check' : 'buts'">外协</div>
</div>
<div style="margin: 10px; background-color: #ffffff; box-sizing: border-box" v-if="aaa">
<el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
<el-row>
<el-col :span="6">
<el-form-item label="配送司机信息:" prop="goodsShelfId">
<!-- @change="changeSlaveDriver"-->
<el-select
v-model="deliveryDriver"
multiple
filterable
@change="changeDriver"
placeholder="请选择司机"
>
<el-option
v-for="item in driverData"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送车辆信息:" prop="vehicleIds">
<el-select
filterable
multiple
v-model="vehicleIds"
placeholder="请选择车辆"
@change="changeVehicle"
>
<el-option
v-for="item in vehicleData"
:key="item.id"
:label="item.vehicleNub"
:value="item.id"
<basic-container>
<div class="avue-crud">
<div class="head_top">
<div @click="ccc" :class="aaa ? 'buts check' : 'buts'">自主配送</div>
<div @click="ddd" :class="bbb ? 'buts check' : 'buts'">外协</div>
</div>
<!-- 自主配送 -->
<div v-if="aaa">
<el-form ref="form" :model="driverForm" label-width="100px">
<el-row>
<el-col :span="6">
<el-form-item label="配送司机信息:" prop="goodsShelfId">
<el-select
v-model="deliveryDriver"
multiple
filterable
@change="changeDriver"
placeholder="请选择司机"
>
<el-option
v-for="item in driverData"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送车辆信息:" prop="vehicleIds">
<el-select
filterable
multiple
v-model="vehicleIds"
placeholder="请选择车辆"
@change="changeVehicle"
>
<el-option
v-for="item in vehicleData"
:key="item.id"
:label="item.vehicleNub"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<span>
<el-form-item label="主司机:" prop="forklift">
<el-input v-model="driverForm.masterDriverName" :disabled="true"> </el-input>
</el-form-item>
<el-form-item label="主车辆:" prop="forklift">
<el-input v-model="driverForm.masterVehicleNub" :disabled="true"> </el-input>
</el-form-item>
</span>
</el-col>
<el-col :span="6">
<el-button round @click="viewDriverInfo" style="margin-left: 10%"
>查看司机配置</el-button
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
</div>
<el-col :span="6">
<span>
<el-form-item label="主司机:" prop="forklift">
<el-input v-model="driverForm.masterDriverName" :disabled="true"> </el-input>
<!-- 外协 -->
<div v-if="bbb">
<el-form ref="form" :model="waixieForm" label-width="100px" style="margin: 3px">
<el-row>
<el-col :span="6">
<el-form-item label="外协来源:" prop="goodsShelfId">
<el-select
filterable
v-model="waixieForm.tripartiteSource"
placeholder="请选择来源"
>
<el-option
v-for="item in tripartiteSourceData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="司机名称:" prop="goodsShelfId">
<el-input v-model="waixieForm.driverName" placeholder="请输入司机名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="司机电话:" prop="goodsShelfId">
<el-input v-model="waixieForm.driverPhone" placeholder="请输入司机电话"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车辆车牌:" prop="goodsShelfId">
<el-input
v-model="waixieForm.vehicleNum"
placeholdeonSubmitOrderr="请输入本次费用"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送费用:" prop="goodsShelfId">
<el-input v-model="waixieForm.deliveryFee" placeholder="请输入本次费用"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- <div style="margin: 10px; background-color: #ffffff; box-sizing: border-box"> -->
<el-form ref="form" :model="stockUpForm" label-width="100px" style="margin: 3px">
<el-row>
<el-col :span="6">
<el-form-item label="装车班组:" prop="loader">
<el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
<el-option
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
:disabled="isDisable"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="主车辆:" prop="forklift">
<el-input v-model="driverForm.masterVehicleNub" :disabled="true"> </el-input>
</el-col>
<el-col :span="6">
<el-form-item label="卸车班组:" prop="loader">
<el-select filterable v-model="stockUpForm.unloader" placeholder="请选择装卸班组">
<el-option
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
:disabled="isDisable"
>
</el-option>
</el-select>
</el-form-item>
</span>
</el-col>
<el-col :span="6">
<el-button round @click="viewDriverInfo" style="margin-left: 10%">查看司机配置</el-button>
</el-col>
</el-row>
</el-form>
</div>
<div style="margin: 10px; background-color: #ffffff; box-sizing: border-box" v-if="bbb">
<el-form ref="form" :model="waixieForm" label-width="100px" style="margin: 3px">
<el-row>
<el-col :span="6">
<el-form-item label="外协来源:" prop="goodsShelfId">
<el-select filterable v-model="waixieForm.tripartiteSource" placeholder="请选择来源">
<el-option
v-for="item in tripartiteSourceData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
</el-col>
<el-col :span="6">
<el-form-item label="配送时间:" prop="taskTime" label-width="100px">
<el-date-picker
v-model="stockUpForm.taskTime"
type="data"
placeholder="请选择配车时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="司机名称:" prop="goodsShelfId">
<el-input v-model="waixieForm.driverName" placeholder="请输入司机名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="司机电话:" prop="goodsShelfId">
<el-input v-model="waixieForm.driverPhone" placeholder="请输入司机电话"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车辆车牌:" prop="goodsShelfId">
<el-input
v-model="waixieForm.vehicleNum"
placeholdeonSubmitOrderr="请输入本次费用"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送费用:" prop="goodsShelfId">
<el-input v-model="waixieForm.deliveryFee" placeholder="请输入本次费用"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div style="margin: 10px; background-color: #ffffff; box-sizing: border-box">
<el-form ref="form" :model="stockUpForm" label-width="100px" style="margin: 3px">
<el-row>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="备货人员:" prop="forklift">-->
<!-- <el-select filterable v-model="stockUpForm.forklift" placeholder="请选择备货人员">-->
<!-- <el-option-->
<!-- v-for="item in this.forkliftData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey"-->
<!-- :disabled="isDisable"-->
<!-- >-->
<!-- </el-option>-->
<!-- &lt;!&ndash; {{this.forkliftData}}&ndash;&gt;-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label="装车班组:" prop="loader">
<el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
<el-option
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
:disabled="isDisable"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="卸车班组:" prop="loader">
<el-select filterable v-model="stockUpForm.unloader" placeholder="请选择装卸班组">
<el-option
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
:disabled="isDisable"
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送类型:" prop="goodsAreaId">
<el-radio-group v-model="stockUpForm.deliveryType">
<el-radio :label="'2'" :value="'2'">市配&emsp;</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注:" prop="remarks">
<el-input
type="textarea"
:rows="1"
placeholder="请输入内容"
v-model="stockUpForm.remarks"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="班组职能:" prop="goodsAreaId">-->
<!-- <el-checkbox-group v-model="loadAndUnload">-->
<!-- <el-checkbox-->
<!-- v-for="item in loadAndUnloadData"-->
<!-- :label="item.dictKey"-->
<!-- :value="item.dictKey"-->
<!-- :disabled="isDisable"-->
<!-- >-->
<!-- <span>{{ item.dictValue }}</span>-->
<!-- </el-checkbox>-->
<!-- </el-checkbox-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label="配送时间:" prop="taskTime" label-width="100px">
<!-- <el-date-picker v-model="form.taskTime"-->
<!-- type="datetime"-->
<!-- placeholder="请选择配车时间"-->
<!-- value-format="YYYY-MM-DD HH:mm:ss"-->
<!-- >-->
<!-- </el-date-picker>-->
<el-date-picker
v-model="stockUpForm.taskTime"
type="data"
placeholder="请选择配车时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送类型:" prop="goodsAreaId">
<el-radio-group v-model="stockUpForm.deliveryType">
<el-radio :label="'2'" :value="'2'">市配&emsp;</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="备货区域:" prop="goodsAreaId">-->
<!-- <el-select filterable v-model="stockUpForm.goodsAreaId" placeholder="请选择备货区域">-->
<!-- <el-option-->
<!-- v-for="item in goodsAreaData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey"-->
<!-- :disabled="isDisable"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="备货时间:" prop="goodsShelfId">-->
<!-- <el-date-picker v-model="stockUpForm.stockupDate"-->
<!-- type="datetime"-->
<!-- placeholder="请选择备货时间"-->
<!-- :disabled="isDisable"-->
<!-- format="YYYY-MM-DD HH:mm:ss"-->
<!-- value-format="YYYY-MM-DD HH:mm:ss"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="出库时间:" prop="outboundDate" label-width="100px">-->
<!-- &lt;!&ndash; <el-date-picker v-model="form.taskTime"&ndash;&gt;-->
<!-- &lt;!&ndash; type="datetime"&ndash;&gt;-->
<!-- &lt;!&ndash; placeholder="请选择配车时间"&ndash;&gt;-->
<!-- &lt;!&ndash; value-format="YYYY-MM-DD HH:mm:ss"&ndash;&gt;-->
<!-- &lt;!&ndash; >&ndash;&gt;-->
<!-- &lt;!&ndash; </el-date-picker>&ndash;&gt;-->
<!-- <el-date-picker v-model="stockUpForm.outboundDate"-->
<!-- type="datetime"-->
<!-- placeholder="请选择配车时间"-->
<!-- format="YYYY-MM-DD HH:mm:ss"-->
<!-- value-format="YYYY-MM-DD HH:mm:ss"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="其他费用:" prop="collectFee" label-width="100px">-->
<!-- <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="备注:" prop="remarks">
<el-input
type="textarea"
:rows="1"
placeholder="请输入内容"
v-model="stockUpForm.remarks"
>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- </div> -->
<!-- 标题 -->
<el-divider content-position="left">预约列表</el-divider>
<!-- 标题 -->
<el-divider content-position="left">预约列表</el-divider>
<div class="tableBox">
<el-button type="primary" @click="addReservation"> </el-button>
<div class="mt10">
<!-- 表格 -->
<tablecmt
ref="tableBox"
:columnList="columnList"
:tableData="reservationData"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
v-if="isoperation"
type="primary"
link
icon="el-icon-edit"
@click="removeStockArticle(slotProps.scope.row)"
>移除</el-text
<div class="tableBox">
<el-button type="primary" @click="addReservation"> </el-button>
<div class="mt10">
<!-- 表格 -->
<tablecmt
ref="tableBox"
:columnList="columnList"
:tableData="reservationData"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
</template>
</tablecmt>
<template #default="slotProps">
<el-text
v-if="isoperation"
type="primary"
link
icon="el-icon-edit"
@click="removeStockArticle(slotProps.scope.row)"
>移除</el-text
>
</template>
</tablecmt>
<div class="footer"></div>
<div class="button-container">
<el-button icon="el-icon-circle-close" @click="back"> </el-button>
<el-button
type="primary"
icon="Position"
:loading="loadingObj.submitBtnLoading"
@click="onSubmitOrder"
>提交(配送内容)</el-button
>
<div class="footer"></div>
<div class="button-container">
<el-button icon="el-icon-circle-close" @click="back"> </el-button>
<el-button
type="primary"
icon="Position"
:loading="loadingObj.submitBtnLoading"
@click="onSubmitOrder"
>提交(配送内容)</el-button
>
</div>
</div>
</div>
</div>
</div>
</basic-container>
<el-dialog title="司机配置" v-model="isDriverShow" width="50%">
<div style="display: flex">
@ -435,13 +360,6 @@
<el-dialog title="提示" v-model="dialogVisibleLoading" width="30%">
<h4>检测到已装车包件,是否继续移除?</h4>
<!-- <div>-->
<!-- <el-table :data="gridData">-->
<!-- <el-table-column property="date" label="日期" width="150"></el-table-column>-->
<!-- <el-table-column property="name" label="姓名" width="200"></el-table-column>-->
<!-- <el-table-column property="address" label="地址"></el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="ooo"> </el-button>
@ -1590,9 +1508,12 @@ export default {
});
this.dialogVisible = false;
},
/** 车辆改变 */
changeVehicle(params) {
console.log(params);
this.vehticleList = params;
if (params.length === 0) this.driverForm.masterVehicleNub = '';
let b = [];
if (params) {
this.vehicleData.forEach(item => {
@ -1609,21 +1530,65 @@ export default {
this.vehticleInfo = b;
}
},
/** 司机改变 */
changeDriver(params) {
console.log('params :>> ', params);
this.driverList = params;
let a = [];
//
if (params.length === 0) this.driverForm.masterDriverName = '';
if (params) {
this.driverData.forEach(item => {
this.driverList.forEach(p => {
if (p == item.id) {
a.push(item);
console.log(this.driverInfo);
console.log('params :>> ', params);
for (let i = 0; i < params.length; i++) {
const value = params[i];
for (let index = 0; index < this.driverData.length; index++) {
const item = this.driverData[index];
if (item.id !== value) continue;
console.log('item :>> ', item);
// , 退
a.push(item);
//
if (i === 0) this.driverForm.masterDriverName = item.name;
// , ,
if (i === params.length - 1) {
if (
this.driverList.length > this.vehticleList.length &&
item.vehicleVOList &&
item.vehicleVOList.length > 0
) {
const id = item.vehicleVOList[0].id;
if (!this.vehicleIds.includes(id)) {
this.vehticleList.push(id);
this.vehicleIds.push(id);
}
}
}
});
if (params[0] === item.id) {
this.driverForm.masterDriverName = item.name;
console.log('this.vehticleList :>> ', this.vehticleList);
break;
}
});
}
// this.driverData.forEach(item => {
// this.driverList.forEach(p => {
// if (p == item.id) {
// a.push(item);
// }
// });
// if (params[0] === item.id) {
// this.driverForm.masterDriverName = item.name;
// }
// });
// ,
if (this.driverList.length > this.vehticleList.length) {
console.log('this.vehticleList :>> ', this.vehticleList);
}
this.driverInfo = a;
}
},

Loading…
Cancel
Save