java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

新增预约市配的挑单夹

master
qb 1 year ago
parent
bdc794a30d
commit
09a15725b9
4 changed files with 322 additions and 316 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 212
      src/api/distribution/distributionStockArticle.js
  2. 20
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  3. 401
      src/views/distribution/reservation/reservation.vue
  4. 5
      vite.config.js

212
src/api/distribution/distributionStockArticle.js
Unescape View File

@ -8,9 +8,9 @@ export const getList = (current, size, params) => {
...params, ...params,
current, current,
size, size,
} },
}) });
} };
export const getListStockArticleWhole = (current, size, params) => { export const getListStockArticleWhole = (current, size, params) => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/listWhole', url: '/api/logpm-distribution/distributionStockArticle/listWhole',
@ -19,25 +19,25 @@ export const getListStockArticleWhole = (current, size, params) => {
...params, ...params,
current, current,
size, size,
} },
}) });
} };
/** /**
* 订单数据导出 * 订单数据导出
* @param row * @param row
* @returns {AxiosPromise} * @returns {AxiosPromise}
*/ */
export const stockArticExport = (row) => { export const stockArticExport = row => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/export-distributionStockArticle', url: '/api/logpm-distribution/distributionStockArticle/export-distributionStockArticle',
method: 'get', method: 'get',
params: { params: {
...row ...row,
}, },
responseType: 'blob', responseType: 'blob',
}) });
} };
/** /**
* 查询客户的订单列表 * 查询客户的订单列表
@ -54,13 +54,12 @@ export const getClientList = (current, size, params) => {
...params, ...params,
current, current,
size, size,
} },
}) });
} };
export const getListOne = (current, size, params) => { //查询订单数据 export const getListOne = (current, size, params) => {
//查询订单数据
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/list', url: '/api/logpm-distribution/distributionStockArticle/list',
method: 'get', method: 'get',
@ -68,68 +67,70 @@ export const getListOne = (current, size, params) => { //查询订单数据
...params, ...params,
current, current,
size, size,
} },
}) });
} };
export const getDetail = (id) => { export const getDetail = (current, size, params) => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/detail', url: '/api/logpm-distribution/distributionStockArticle/detail',
method: 'get', method: 'get',
params: { params: {
id ...params,
} current,
}) size,
} },
});
};
export const getQueryQRCode = (params) => { export const getQueryQRCode = params => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/getShowTemplate', url: '/api/logpm-distribution/distributionStockArticle/getShowTemplate',
method: 'get', method: 'get',
responseType: 'blob', responseType: 'blob',
params: { params: {
...params ...params,
} },
}) });
} };
export const showOrderPackgeCode = (params) => { export const showOrderPackgeCode = params => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/showOrderPackgeCode', url: '/api/logpm-distribution/distributionStockArticle/showOrderPackgeCode',
method: 'get', method: 'get',
params: { params: {
...params ...params,
} },
}) });
} };
export const getStockTemplate = (params) => { export const getStockTemplate = params => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/getPrintTemplate', url: '/api/logpm-distribution/distributionStockArticle/getPrintTemplate',
method: 'get', method: 'get',
params:{ params: {
...params ...params,
} },
}) });
} };
export const remove = (ids) => { export const remove = ids => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/remove', url: '/api/logpm-distribution/distributionStockArticle/remove',
method: 'post', method: 'post',
params: { params: {
ids, ids,
} },
}) });
} };
export const add = (row) => { export const add = row => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/submit', url: '/api/logpm-distribution/distributionStockArticle/submit',
method: 'post', method: 'post',
data: row data: row,
}) });
} };
export const addStockRow = params => { export const addStockRow = params => {
return request({ return request({
url: '/api/logpm-distribution/distributionParcelList/packageTransfer', url: '/api/logpm-distribution/distributionParcelList/packageTransfer',
@ -142,72 +143,72 @@ export const addStockRow = params => {
* @param ids * @param ids
* @returns {AxiosPromise} * @returns {AxiosPromise}
*/ */
export const addStock = (ids) => { export const addStock = ids => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/saveStock', url: '/api/logpm-distribution/distributionStockArticle/saveStock',
method: 'post', method: 'post',
params: { params: {
ids, ids,
} },
}) });
} };
export const update = (row) => { export const update = row => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/submit', url: '/api/logpm-distribution/distributionStockArticle/submit',
method: 'post', method: 'post',
data: row data: row,
}) });
} };
/** /**
* 修改客户 * 修改客户
* @param row * @param row
* @returns {AxiosPromise} * @returns {AxiosPromise}
*/ */
export const updateClient = (row) => { export const updateClient = row => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/updateClient', url: '/api/logpm-distribution/distributionStockArticle/updateClient',
method: 'post', method: 'post',
data: row data: row,
}) });
} };
/** /**
* 订单添加增值服务 * 订单添加增值服务
* @param row * @param row
* @returns {AxiosPromise} * @returns {AxiosPromise}
*/ */
export const addIncrement = (row) => { export const addIncrement = row => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/addIncrement', url: '/api/logpm-distribution/distributionStockArticle/addIncrement',
method: 'post', method: 'post',
data: row data: row,
}) });
} };
export const getStockArticleList = ( ids) => { export const getStockArticleList = ids => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/stockArticleInfo', url: '/api/logpm-distribution/distributionStockArticle/stockArticleInfo',
method: 'get', method: 'get',
params: { params: {
ids ids,
} },
}) });
} };
/** /**
* 查询零担订单详情 * 查询零担订单详情
* @param ids * @param ids
* @returns {AxiosPromise} * @returns {AxiosPromise}
*/ */
export const getZeroOrderDetail = ( id) => { export const getZeroOrderDetail = id => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/getZeroOrderDetail', url: '/api/logpm-distribution/distributionStockArticle/getZeroOrderDetail',
method: 'get', method: 'get',
params: { params: {
id id,
} },
}) });
} };
export const selectStockArticleList = (current, size, params) => { export const selectStockArticleList = (current, size, params) => {
return request({ return request({
@ -217,29 +218,29 @@ export const selectStockArticleList = (current, size, params) => {
...params, ...params,
current, current,
size, size,
} },
}) });
} };
export const getStockAddValue = (id) => { export const getStockAddValue = id => {
return request({ return request({
url: '/api/logpm-distribution/distributionAddvalue/getStockAddValue', url: '/api/logpm-distribution/distributionAddvalue/getStockAddValue',
method: 'get', method: 'get',
params: { params: {
id, id,
} },
}) });
} };
export const selectStockArticleAndParcel = (params) => { export const selectStockArticleAndParcel = params => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleAndParcel', url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleAndParcel',
method: 'get', method: 'get',
params: { params: {
...params, ...params,
} },
}) });
} };
export const selectStockArticleInfoList = (current, size, params) => { export const selectStockArticleInfoList = (current, size, params) => {
return request({ return request({
@ -249,10 +250,9 @@ export const selectStockArticleInfoList = (current, size, params) => {
...params, ...params,
current, current,
size, size,
} },
}) });
} };
export const selectStockArticleInfoListByMail = (current, size, params) => { export const selectStockArticleInfoListByMail = (current, size, params) => {
return request({ return request({
@ -262,20 +262,20 @@ export const selectStockArticleInfoListByMail = (current, size, params) => {
...params, ...params,
current, current,
size, size,
} },
}) });
} };
// 在库订单 // 在库订单
export const $_selectStockArticleInfoList = (params) => { export const $_selectStockArticleInfoList = params => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleInfoList', url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleInfoList',
method: 'get', method: 'get',
params params,
}); });
}; };
export const selectDiscussStockArticleInfoList = (current, size, params,deliveryListId) => { export const selectDiscussStockArticleInfoList = (current, size, params, deliveryListId) => {
return request({ return request({
url: '/api/logpm-distribution/deliveryList/selectDiscussStockArticleInfoList', url: '/api/logpm-distribution/deliveryList/selectDiscussStockArticleInfoList',
method: 'get', method: 'get',
@ -283,10 +283,10 @@ export const selectDiscussStockArticleInfoList = (current, size, params,delivery
...params, ...params,
current, current,
size, size,
deliveryListId deliveryListId,
} },
}) });
} };
export const selectUpdateAvailableStockArticle = (current, size, params) => { export const selectUpdateAvailableStockArticle = (current, size, params) => {
return request({ return request({
@ -296,9 +296,9 @@ export const selectUpdateAvailableStockArticle = (current, size, params) => {
...params, ...params,
current, current,
size, size,
} },
}) });
} };
export const getPackageListByStockArticleId = (current, size, orderId) => { export const getPackageListByStockArticleId = (current, size, orderId) => {
return request({ return request({
@ -308,9 +308,9 @@ export const getPackageListByStockArticleId = (current, size, orderId) => {
orderId, orderId,
current, current,
size, size,
} },
}) });
} };
export const $_getPackageListByStockArticleId = params => { export const $_getPackageListByStockArticleId = params => {
return request({ return request({
url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId', url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId',
@ -318,5 +318,3 @@ export const $_getPackageListByStockArticleId = params => {
params, params,
}); });
}; };

20
src/views/distribution/inventory/distributionStockArticleDetails.vue
Unescape View File

@ -1350,16 +1350,18 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
console.log('执行了查询零零零零'); console.log('执行了查询零零零零');
this.query.ids = this.$route.query.id; this.query.id = this.$route.query.id;
getDetail(this.$route.query.id).then(res => { getDetail(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
console.log('返回的数据》》》》', res.data.data); res => {
const data = res.data.data; console.log('返回的数据》》》》', res.data.data);
// this.page.total = data.total; const data = res.data.data;
this.data[0] = data; // this.page.total = data.total;
this.data[0] = data;
this.loading = false; this.loading = false;
this.selectionClear(); this.selectionClear();
}); }
);
}, },
onLoadOwn(page, params = {}) { onLoadOwn(page, params = {}) {
// this.loading = true; // this.loading = true;

401
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -3,22 +3,22 @@
<div class="avue-crud"> <div class="avue-crud">
<el-row v-if="!search"> <el-row v-if="!search">
<!-- 查询模块 --> <!-- 查询模块 -->
<el-form :inline="true" :model="query"> <el-form :inline="true" :model="queryA">
<div class="fo-rl"> <div class="fo-rl">
<el-form-item label="预约单编号:"> <el-form-item label="预约单编号:">
<el-input v-model="query.reservationCode" placeholder="请输入预约单编号"></el-input> <el-input v-model="queryA.reservationCode" placeholder="请输入预约单编号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单自编号:"> <el-form-item label="订单自编号:">
<el-input v-model="query.stockArticleId" placeholder="请输入订单自编号"></el-input> <el-input v-model="queryA.stockArticleId" placeholder="请输入订单自编号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收货人:"> <el-form-item label="收货人:">
<el-input v-model="query.consignee" placeholder="请输入收货人"></el-input> <el-input v-model="queryA.consignee" placeholder="请输入收货人"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收货地址:"> <el-form-item label="收货地址:">
<el-input v-model="query.deliveryAddress" placeholder="请输入收货地址"></el-input> <el-input v-model="queryA.deliveryAddress" placeholder="请输入收货地址"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收件人电话:"> <el-form-item label="收件人电话:">
<el-input v-model="query.deliveryPhone" placeholder="请输入收件人电话"></el-input> <el-input v-model="queryA.deliveryPhone" placeholder="请输入收件人电话"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="顾客姓名:">--> <!-- <el-form-item label="顾客姓名:">-->
@ -45,29 +45,12 @@
>添加预约 >添加预约
</el-button> </el-button>
<el-button <el-button
v-if="this.queryA.reservationStatus === '1'"
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleConfirmReservations" @click="handleConfirmReservations"
plain plain
>批量确认 >批量确认
</el-button> </el-button>
<el-button
v-if="this.queryA.reservationStatus === '2'"
type="danger"
icon="el-icon-delete"
@click="handleStockUp()"
plain
>批量转备货
</el-button>
<el-button
v-if="this.queryA.reservationStatus === '2'"
type="danger"
icon="el-icon-delete"
@click="handleDeliverys"
plain
>批量转配送
</el-button>
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain
>导出 >导出
</el-button> </el-button>
@ -80,114 +63,121 @@
</div> </div>
</div> </div>
</el-row> </el-row>
<el-row> <!-- <template v-if="this.activename === 'nocheck'"> -->
<template v-if="this.activename === 'nocheck'"> <!-- 列表模块 -->
<!-- 列表模块 --> <tablecmt
<tablecmt ref="unconfirmedList"
:columnList="columnList" :columnList="columnList"
:tableData="data" :tableData="data"
:loading="loading" :loading="loading"
@inputTxt="inputscA" @inputTxt="inputscA"
@timeCheck="timescA" @timeCheck="timescA"
@btnCheck="btnsc" @btnCheck="btnsc"
@selectCheck="selectscA" @selectCheck="selectscA"
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<el-text <el-text
size="small" size="small"
type="primary" type="primary"
link link
icon="el-icon-view" icon="el-icon-view"
@click="viewReservation(slotProps.scope)" @click="viewReservation(slotProps.scope)"
>查看 >查看
</el-text> </el-text>
<el-text <el-text
size="small" size="small"
type="primary" type="primary"
link link
icon="el-icon-view" icon="el-icon-view"
@click="editsolt(slotProps.scope)" @click="editsolt(slotProps.scope)"
>编辑 >编辑
</el-text> </el-text>
<el-text <el-text
size="small" size="small"
type="primary" type="primary"
link link
icon="el-icon-view" icon="el-icon-view"
@click="cancelReservation(slotProps.scope)" @click="cancelReservation(slotProps.scope)"
>取消预约 >取消预约
</el-text> </el-text>
<el-text <el-text
v-if="this.queryA.reservationStatus === '1' ? true : false" v-if="this.queryA.reservationStatus === '1' ? true : false"
size="small" size="small"
@click="confirmReservation(slotProps.scope)" @click="confirmReservation(slotProps.scope)"
>确认预约 >确认预约
</el-text> </el-text>
</template>
</tablecmt>
</template> </template>
</el-row> </tablecmt>
<!-- </template> -->
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已确认" name="yescheck"> <el-tab-pane label="已确认" name="yescheck">
<el-row> <div style="display: flex">
<el-button-group> <el-tabs
<!-- <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>--> v-model="orderStatus"
</el-button-group> tab-position="left"
<div class="avue-crud__header"> style="height: 100%; width: fit-content; flex: none"
<!-- 头部左侧按钮模块 --> class="demo-tabs"
<div class="avue-crud__left"> @tab-click="handleClickAll"
<el-button type="primary" icon="el-icon-plus" @click="handleAdd" >
>添加预约 <el-tab-pane name="all" label="全部"></el-tab-pane>
</el-button> <el-tab-pane name="PickerClip" label="调单夹"></el-tab-pane>
<el-button </el-tabs>
v-if="this.queryB.reservationStatus === '1'"
type="danger" <div class="overflow">
icon="el-icon-delete" <el-row>
@click="handleConfirmReservations" <el-button-group>
plain <!-- <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
>批量确认 </el-button-group>
</el-button> <div class="avue-crud__header">
<el-button <!-- 头部左侧按钮模块 -->
v-if="this.queryB.reservationStatus === '2'" <div class="avue-crud__left">
type="danger" <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
icon="el-icon-delete" >添加预约
@click="handleStockUp()" </el-button>
plain <el-button type="danger" icon="el-icon-delete" @click="handleStockUp()" plain
>批量转备货 >批量转备货
</el-button> </el-button>
<el-button <el-button type="danger" icon="el-icon-delete" @click="handleDeliverys" plain
v-if="this.queryB.reservationStatus === '2'" >批量转配送
type="danger" </el-button>
icon="el-icon-delete" <el-button type="danger" icon="el-icon-delete" @click="batchPrintData" plain
@click="handleDeliverys" >批量打印
plain </el-button>
>批量转配送 <el-button
</el-button> type="danger"
<el-button icon="el-icon-download"
v-if="this.queryB.reservationStatus === '2'" @click="handleExportInfo(2)"
type="danger" plain
icon="el-icon-delete" >导出
@click="batchPrintData" </el-button>
plain <el-button
>批量打印 type="primary"
</el-button> icon="Plus"
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo(2)" plain @click="handleAddPickerClipData"
>导出 v-if="orderStatus === 'all'"
</el-button> >加入调单夹
</div> </el-button>
<!-- 头部右侧按钮模块 --> <el-button
<div class="avue-crud__right"> v-else
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button> type="primary"
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> icon="Delete"
<el-button icon="el-icon-search" @click="searchHide" circle></el-button> @click="handleRemovePickerClipData"
</div> >移除调单夹
</div> </el-button>
</el-row> </div>
<el-row> <!-- 头部右侧按钮模块 -->
<template v-if="this.activename === 'yescheck'"> <div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
<!-- 列表模块 --> <!-- 列表模块 -->
<tablecmt <tablecmt
ref="confirmList"
:columnList="columnList" :columnList="columnList"
:tableData="data" :tableData="data"
:loading="loading" :loading="loading"
@ -238,51 +228,8 @@
</el-text> </el-text>
</template> </template>
</tablecmt> </tablecmt>
</template> </div>
<!-- <el-popover :visible="visible" placement="top-start" :width="160">--> </div>
<!-- <p>Are you sure to delete this?</p>-->
<!-- <el-input v-model= 'this.message'-->
<!-- type="textarea"-->
<!-- :rows="1"-->
<!-- placeholder="请输入取消原因"></el-input>-->
<!-- <div style="text-align: right; margin: 10%">-->
<!-- <el-button size="small" text @click="this.message='',visible = false">取消</el-button>-->
<!-- <el-button size="small" type="primary" @click="confirmReservation(slotProps.scope)"-->
<!-- >确认</el-button-->
<!-- >-->
<!-- </div>-->
<!--&lt;!&ndash; <template #reference>&ndash;&gt;-->
<!--&lt;!&ndash; </template>&ndash;&gt;-->
<!-- </el-popover>-->
<!-- <el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55"
align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="80px"
align="center"></el-table-column>
<template v-for="(item,index) in option.column">
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
</template>
</el-table-column>
</el-table> -->
</el-row>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -396,7 +343,7 @@ import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
import { getStockUpArea, stockUp } from '@/api/basicdata/basicdataGoodsArea'; import { getStockUpArea, stockUp } from '@/api/basicdata/basicdataGoodsArea';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import print from '@/utils/print'; import print from '@/utils/print';
import { downloadXls } from '@/utils/util'; import { downloadXls, setNodeHeight, getWinHeight } from '@/utils/util';
export default { export default {
data() { data() {
@ -876,6 +823,10 @@ export default {
option: option, option: option,
// 表单列表 // 表单列表
data: [], data: [],
/** 全部数据 */
allListData: [],
/** 挑单夹内数据 */
pickerClipData: [],
dialogCancelReservation: false, dialogCancelReservation: false,
//配送方式字典列表 //配送方式字典列表
deliveryTypeData: [], deliveryTypeData: [],
@ -895,6 +846,9 @@ export default {
cancelReservationRow: {}, cancelReservationRow: {},
activeName: 'nocheck', activeName: 'nocheck',
activename: 'nocheck', activename: 'nocheck',
orderStatus: 'all',
unconfirmedList: null,
confirmedList: null,
}; };
}, },
watch: { watch: {
@ -984,6 +938,10 @@ export default {
}); });
this.$functions.setStorage(window.location.pathname + 'sortlist', arr); this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
} }
this.setListHeight();
// console.log('bbbb', this.confirmedList);
}, },
computed: { computed: {
...mapGetters(['permission']), ...mapGetters(['permission']),
@ -1145,18 +1103,19 @@ export default {
init() { init() {
this.height = this.setPx(document.body.clientHeight - 340); this.height = this.setPx(document.body.clientHeight - 340);
}, },
handleClick(e) { async handleClick(e) {
console.log('e :>> ', e.props.name); console.log('e :>> ', e.props.name);
// 切换选项卡时, 清空备选中的数组 // 切换选项卡时, 清空备选中的数组
this.selectionList = []; this.selectionList = [];
this.activename = e.props.name; this.activename = e.props.name;
this.onLoad(this.page); await this.onLoad(this.page);
// if (e.props.name === 'yescheck') { this.setListHeight();
// this.bbb(); },
// } else { handleClickAll(e) {
// this.aaa(); console.log('e :>> ', e);
// } const _name = e.props.name;
// console.log('this.activename :>> ', this.activename); if (_name === 'all') this.data = this.allListData;
else this.data = this.pickerClipData;
}, },
cancelReservationConfirm() { cancelReservationConfirm() {
if (!this.cancel.message) { if (!this.cancel.message) {
@ -1505,21 +1464,22 @@ export default {
this.onLoad(this.page); this.onLoad(this.page);
}, },
onLoad(page, params = {}) { async onLoad(page, params = {}) {
this.loading = true; try {
// if (!this.query.reservationStatus) { this.loading = true;
// this.query.reservationStatus = '1'; // if (!this.query.reservationStatus) {
// } // this.query.reservationStatus = '1';
let query = this.queryB; // }
query.reservationStatus = '2'; let query = this.queryB;
console.log('this.activename :>> ', this.activename); query.reservationStatus = '2';
if (this.activename === 'nocheck') { console.log('this.activename :>> ', this.activename);
console.log('123123 :>> ', 123123); if (this.activename === 'nocheck') {
query = this.queryA; console.log('123123 :>> ', 123123);
query.reservationStatus = this.queryA.reservationStatus || '1'; query = this.queryA;
} query.reservationStatus = this.queryA.reservationStatus || '1';
// if (this.queryA.reservationStatus) } else query.excludeId = this.pickerClipData.map(val => val.id).join(',');
getList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => { // if (this.queryA.reservationStatus)
const res = await getList(page.currentPage, page.pageSize, Object.assign(params, query));
const data = res.data.data; const data = res.data.data;
console.log('>>>>>>>', data); console.log('>>>>>>>', data);
if (data.records) { if (data.records) {
@ -1573,10 +1533,23 @@ export default {
}); });
} }
this.page.total = data.total; this.page.total = data.total;
this.data = data.records; if (this.activename === 'nocheck') this.data = data.records;
this.loading = false; else {
this.allListData = data.records;
if (this.orderStatus === 'all') this.data = data.records;
}
this.selectionClear(); this.selectionClear();
}); } catch (error) {
console.log('error :>> ', error);
} finally {
this.loading = false;
return null;
}
},
initPage() {
this.page.currentPage = 1;
this.onLoad(this.page);
}, },
/** /**
@ -1636,6 +1609,34 @@ export default {
const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div'); const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
print(orderNodeList); print(orderNodeList);
}, },
/** 设置列表高度 */
async setListHeight() {
// 等待子组件渲染完毕
await this.$nextTick();
const _nodeArr = [this.$refs.confirmList.$el, this.$refs.unconfirmedList.$el];
const winHeight = getWinHeight();
for (let item of _nodeArr) {
const _height = winHeight - item.getBoundingClientRect().top - 80 + 'px';
console.log('_height :>> ', _height);
setNodeHeight(item, _height);
}
},
/** 挑单夹添加 */
handleAddPickerClipData() {
this.pickerClipData = [...this.pickerClipData, ...this.selectionList];
this.$refs.confirmList.handleCheckSelect([]);
this.initPage();
},
/** 挑单夹移除 */
handleRemovePickerClipData() {
for (let item of this.selectionList) {
const index = this.pickerClipData.indexOf(item);
this.pickerClipData.splice(index, 1);
}
this.initPage();
},
}, },
}; };
</script> </script>
@ -1671,4 +1672,8 @@ export default {
:deep(.el-form-item__label) { :deep(.el-form-item__label) {
padding: 0; padding: 0;
} }
.overflow {
overflow: hidden;
}
</style> </style>

5
vite.config.js
Unescape View File

@ -14,11 +14,12 @@ export default ({ mode, command }) => {
'/api': { '/api': {
// target: 'http://192.168.10.126:8889', // target: 'http://192.168.10.126:8889',
// hy // hy
target: 'http://192.168.10.48:13000', // target: 'http://192.168.10.48:13000',
// tjj // tjj
// target: 'http://192.168.10.25:13000', target: 'http://192.168.10.25:13000',
// cg // cg
// target: 'http://192.168.10.200:13000', // target: 'http://192.168.10.200:13000',
// target: 'http://192.168.6.122:8777',
// target: 'http://test.api.huitongys.com', // target: 'http://test.api.huitongys.com',
changeOrigin: true, changeOrigin: true,

Write Preview
Loading…
Cancel
Save