diff --git a/src/api/distribution/VehicleStowage.js b/src/api/distribution/VehicleStowage.js
index d2c4512b..f0ee2aaf 100644
--- a/src/api/distribution/VehicleStowage.js
+++ b/src/api/distribution/VehicleStowage.js
@@ -81,3 +81,36 @@ export const postCancelCarsLoadByLoadId = data => {
data,
});
};
+
+/**
+ * 判断是否有未有终点的装车数据
+ */
+export const postDetermineHasNoFinalNode = data => {
+ return request({
+ url: '/api/logpm-trunkline/carsLoad/determineHasNoFinalNode',
+ method: 'post',
+ data,
+ });
+};
+
+/**
+ * 更新节点数据的最终目的仓id
+ */
+export const postUpdateLoadScanFinalNodeIdById = data => {
+ return request({
+ url: '/api/logpm-trunkline/carsLoad/updateLoadScanFinalNodeIdById',
+ method: 'post',
+ data,
+ });
+};
+
+/**
+ * 查询当前节点以后的节点id
+ */
+export const postFindNextNodeList = data => {
+ return request({
+ url: '/api/logpm-trunkline/carsLoad/findNextNodeList ',
+ method: 'post',
+ data,
+ });
+};
diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js
index 089c6199..ef3a1d47 100644
--- a/src/option/distribution/VehicleStowage.js
+++ b/src/option/distribution/VehicleStowage.js
@@ -743,3 +743,61 @@ export const truckLoadingColumnList = [
sortable: false,
},
];
+
+/** 对比报表 -- 仓库节点 */
+export const packageColumnList = [
+ {
+ prop: '',
+ label: '复选框',
+ type: 0,
+ values: '',
+ width: 55,
+ fixed: true,
+ },
+ {
+ prop: '',
+ label: '序号',
+ type: 12,
+ values: '',
+ width: 55,
+ fixed: true,
+ },
+ {
+ prop: 'orderCode',
+ label: '合同号',
+ type: 2,
+ values: '',
+ checkarr: [],
+ fixed: true,
+ sortable: false,
+ head: false,
+ },
+ {
+ prop: 'scanCode',
+ label: '包条码',
+ type: 2,
+ values: '',
+ checkarr: [],
+ fixed: true,
+ sortable: false,
+ head: false,
+ },
+ {
+ prop: 'waybillNo',
+ label: '运单号',
+ type: 2,
+ values: '',
+ checkarr: [],
+ fixed: false,
+ sortable: false,
+ },
+ {
+ prop: '',
+ label: '操作',
+ type: 6,
+ values: '',
+ checkarr: [],
+ fixed: 'right',
+ sortable: false,
+ },
+];
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 7eaaed35..308cb55d 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -245,6 +245,17 @@ export default [
/* webpackChunkName: "views" */ '@/views/distribution/artery/VehicleStowageDetails.vue'
),
},
+ {
+ path: 'handleLoadingDestination',
+ name: '配置装车目的地',
+ meta: {
+ i18n: 'data',
+ },
+ component: () =>
+ import(
+ /* webpackChunkName: "views" */ '@/views/distribution/artery/handleLoadingDestination.vue'
+ ),
+ },
],
},
// {
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 7915ae5f..42d84a42 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -67,26 +67,24 @@
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增配载 </el-button>
- <el-button type="primary" icon="el-icon-printer" @click="searchReset()"
- >打 印</el-button
- >
- <el-button type="primary" icon="el-icon-printer" @click="searchReset()"
+ <el-button type="primary" icon="el-icon-printer" @click="searchReset">打 印</el-button>
+ <el-button type="primary" icon="el-icon-printer" @click="searchReset"
>装载清单</el-button
>
- <el-button type="primary" icon="el-icon-printer" @click="searchReset()"
+ <el-button type="primary" icon="el-icon-printer" @click="searchReset"
>装载卸车清单(财务)</el-button
>
- <el-button type="primary" icon="el-icon-van" @click="handleStartCar()">发 车</el-button>
- <el-button type="primary" icon="el-icon-delete" @click="handleCancelStartCar()"
+ <el-button type="primary" icon="el-icon-van" @click="handleStartCar">发 车</el-button>
+ <el-button type="primary" icon="el-icon-delete" @click="handleCancelStartCar"
>取消发车</el-button
>
- <el-button type="primary" icon="el-icon-delete" @click="handleCancelCarsLoad()"
+ <el-button type="primary" icon="el-icon-delete" @click="handleCancelCarsLoad"
>取消配载</el-button
>
- <el-button type="primary" icon="el-icon-document" @click="handleComparativeStatement()"
+ <el-button type="primary" icon="el-icon-document" @click="handleComparativeStatement"
>对比报表</el-button
>
- <el-button type="primary" icon="el-icon-document" @click="searchReset()"
+ <el-button type="primary" icon="el-icon-document" @click="searchReset"
>卸车报告</el-button
>
</div>
@@ -218,9 +216,9 @@
</div>
</basic-container>
- <!-- 编辑弹窗 -->
+ <!-- 配置装车目的地 -->
<el-dialog
- title="装车明细"
+ title="配置装车目的地"
v-model="details.popUpShow.truckLoadingDetailVisited"
width="80%"
:before-close="beforeClose"
@@ -231,7 +229,7 @@
>
<template #header="{ close, titleId, titleClass }">
<div class="my-header flex-c-sb">
- <h4 :id="titleId" :class="titleClass">装车明细</h4>
+ <h4 :id="titleId" :class="titleClass">配置装车目的地</h4>
<div class="flex-c-c">
<!-- 全屏显示按钮 -->
<el-button type="text" v-if="!details.fullscreenObj.truckLoadingDetailPopUp">
@@ -252,41 +250,7 @@
</div>
</div>
</template>
- <el-form :inline="true" :model="query" class="el-fr-d">
- <div class="fo-fl">
- <el-form-item label="预计发车:" class="el-times">
- <!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
- <el-date-picker
- v-model="stockupDate"
- type="daterange"
- unlink-panels
- range-separator="-"
- start-placeholder="开始时间"
- end-placeholder="结束时间"
- :shortcuts="shortcuts"
- clearable
- />
- </el-form-item>
- <el-form-item label="实际发车:" class="el-times">
- <!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
- <el-date-picker
- v-model="stockupDate"
- type="daterange"
- unlink-panels
- range-separator="-"
- start-placeholder="开始时间"
- end-placeholder="结束时间"
- :shortcuts="shortcuts"
- clearable
- />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-van" @click="searchChange">批量卸车</el-button>
- <el-button type="primary" icon="el-icon-search" @click="searchReset()">搜 索</el-button>
- <el-button icon="el-icon-printer" @click="searchReset()">二维码</el-button>
- </el-form-item>
- </div>
- </el-form>
+
<tablecmt
:columnList="details.detailsColumnList"
:tableData="data"
@@ -325,104 +289,6 @@
</template> -->
</el-dialog>
- <!-- 对比报表 (暂时无用) -->
- <el-dialog
- title="对比报表"
- v-model="details.popUpShow.comparativeStatementPopUp"
- width="80%"
- :before-close="beforeClose"
- append-to-body
- :fullscreen="details.fullscreenObj.comparativeStatementPopUp"
- :show-close="false"
- class="comparativeStatementPopUp"
- >
- <template #header="{ close, titleId, titleClass }">
- <div class="my-header flex-c-sb">
- <div :id="titleId" :class="titleClass">对比报表</div>
- <div class="flex-c-c">
- <!-- 全屏显示按钮 -->
- <el-button type="text" v-if="!details.fullscreenObj.comparativeStatementPopUp">
- <el-icon class="" @click="handleFullScrean('open', 'comparativeStatementPopUp')"
- ><FullScreen
- /></el-icon>
- </el-button>
- <el-button type="text" v-else>
- <el-icon class="" @click="handleFullScrean('close', 'comparativeStatementPopUp')"
- ><CopyDocument
- /></el-icon>
- </el-button>
-
- <!-- 弹窗关闭按钮 -->
- <el-button type="text">
- <el-icon class="" @click="close"><Close /></el-icon>
- </el-button>
- </div>
- </div>
- </template>
-
- <!-- 仓库节点 -->
- <div class="popUp_title">
- 车次号: LQFX231127001; 开单总数: <span class="red">21</span>; 发车时间: 2021-11-27 15:25:28
- </div>
- <el-divider content-position="left"> 仓库节点 </el-divider>
- <tablecmt
- :columnList="details.warehouseNodeColumnList"
- :tableData="data"
- :loading="loadingObj.list"
- >
- </tablecmt>
-
- <!-- 总装车 -->
- <div class="popUp_title">
- 总装车数: <span class="red">22</span>; (零担装车数据: <span class="red">0</span>;)
- (已匹配配载运单件数: <span class="red">21</span>;) 未匹配配载运单件数:
- <span class="red">1</span>;
- </div>
- <el-divider content-position="left"> 总装车数 <span class="red">(22)</span> </el-divider>
- <tablecmt
- :columnList="details.truckLoadingColumnList"
- :tableData="data"
- :loading="loadingObj.list"
- >
- </tablecmt>
-
- <!-- 零担 -->
- <el-divider content-position="left">
- 已匹配配载运单 <b>零担</b>: <span class="red">21</span>;
- </el-divider>
- <div class="red">描述：已匹配配载运单指该车次配载的运单和装车零担数据能匹配上</div>
- <tablecmt
- :columnList="details.truckLoadingColumnList"
- :tableData="data"
- :loading="loadingObj.list"
- >
- </tablecmt>
-
- <!-- 包件 -->
- <el-divider content-position="left">
- 已匹配配载运单 <b>包件</b>: <span class="red">21</span>;
- </el-divider>
- <div class="red">描述：已匹配配载运单指该车次配载的运单和装车包条码能匹配上</div>
- <tablecmt
- :columnList="details.truckLoadingColumnList"
- :tableData="data"
- :loading="loadingObj.list"
- >
- </tablecmt>
-
- <!-- 未匹配配载运单 -->
- <el-divider content-position="left"> 未匹配配载运单 : <span class="red">1</span>; </el-divider>
- <div class="red">
- 描述：未匹配配载运单指该车次配载的运单和装车包条码尚未匹配上，可能配载的运单和装车的货物有错误
- </div>
- <tablecmt
- :columnList="details.truckLoadingColumnList"
- :tableData="data"
- :loading="loadingObj.list"
- >
- </tablecmt>
- </el-dialog>
-
<!-- 列表配置显示 -->
<edittablehead
@setcolum="setnewcolum"
@@ -440,17 +306,13 @@ import { mapGetters } from 'vuex';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
-import {
- columnList,
- detailsColumnList,
- warehouseNodeColumnList,
- truckLoadingColumnList,
-} from '@/option/distribution/VehicleStowage';
+import { columnList, detailsColumnList } from '@/option/distribution/VehicleStowage';
import {
postloadCarsPageList,
postStartCarByLoadId,
postCancelStartCarByLoadId,
postCancelCarsLoadByLoadId,
+ postDetermineHasNoFinalNode,
} from '@/api/distribution/VehicleStowage';
import { useStore } from 'vuex';
import { useRouter } from 'vue-router';
@@ -507,8 +369,6 @@ const details = reactive<any>({
/** 列表 */
columnList,
detailsColumnList,
- warehouseNodeColumnList,
- truckLoadingColumnList,
/** 列表数据 */
data: [],
/** 页面loading */
@@ -914,7 +774,7 @@ const handleGoWaybill = ({ row }) => {
};
/** 发车 */
-const handleStartCar = () => {
+const handleStartCar = async () => {
if (details.selectionList.length === 0) {
return ElMessage({
message: '请选择发车数据',
@@ -926,28 +786,45 @@ const handleStartCar = () => {
type: 'warning',
});
}
- ElMessageBox.confirm('确认发车吗?', 'Warning', {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- type: 'warning',
- }).then(async () => {
- const submitData = {
- loadId: details.selectionList.map(val => val.id).join(','),
- startCarType: '1',
- };
- const res = await postStartCarByLoadId(submitData);
- const { code } = res.data;
- if (code !== 200) {
- return;
- }
- ElMessage({
- type: 'success',
- message: '发车成功',
- });
+ // 判断是否有未有终点的装车数据
+ const res = await postDetermineHasNoFinalNode({ loadId: details.selectionList[0].id });
+
+ const { code, data } = res.data;
+ if (code !== 200) return;
+ // 根据data是否返值判断能否发车
+ if (data) {
+ details.popUpShow.truckLoadingDetailVisited = true;
+ // $router.push({
+ // path: '/distribution/artery/handleLoadingDestination',
+ // query: {
+ // loadId: details.selectionList[0].id,
+ // },
+ // });
+ } else {
+ ElMessageBox.confirm('确认发车吗?', '', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }).then(async () => {
+ const submitData = {
+ loadId: details.selectionList.map(val => val.id).join(','),
+ startCarType: '1',
+ };
+
+ const res = await postStartCarByLoadId(submitData);
+ const { code } = res.data;
+ if (code !== 200) {
+ return;
+ }
+ ElMessage({
+ type: 'success',
+ message: '发车成功',
+ });
- onLoad();
- });
+ onLoad();
+ });
+ }
};
/** 取消发车 */
diff --git a/src/views/distribution/artery/handleLoadingDestination.vue b/src/views/distribution/artery/handleLoadingDestination.vue
new file mode 100644
index 00000000..bdbb2fe3
--- /dev/null
+++ b/src/views/distribution/artery/handleLoadingDestination.vue
@@ -0,0 +1,329 @@
+<template>
+ <basic-container>
+ <div class="avue-crud">
+ <!-- 搜索模块 -->
+ <el-row v-if="!details.search"> </el-row>
+
+ <!-- 控件模块 -->
+ <el-row>
+ <div class="avue-crud__header">
+ <!-- 头部左侧按钮模块 -->
+ <div class="avue-crud__left">
+ <el-button type="primary" icon="Edit" @click="handleBratchConfiguration"
+ >批量配置
+ </el-button>
+ </div>
+ <!-- 头部右侧按钮模块 -->
+ <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
+ :columnList="details.packageColumnList"
+ :tableData="details.renderData"
+ :loading="details.loadingObj.list"
+ @inputTxt="inputsc"
+ @timeCheck="timesc"
+ @selectCheck="selectsc"
+ @selection="selectionChange"
+ >
+ <template #default="slotProps">
+ <el-text @click="handleConfiguration(slotProps.scope)">配置包条码</el-text>
+ </template>
+ </tablecmt>
+
+ <!-- 提交按钮 -->
+ <div class="submitBtn-container">
+ <el-button type="primary" icon="Position" @click="handleBratchConfiguration">
+ 提交配置
+ </el-button>
+ </div>
+ </div>
+
+ <!-- 配置装车目的地 -->
+ <el-dialog
+ title="配置装车目的地"
+ v-model="details.popUpShow.truckLoadingDetailVisited"
+ width="40%"
+ append-to-body
+ class="truckLoadingDetailPopUp"
+ >
+ <el-form
+ ref="ruleFormRef"
+ :model="ruleForm"
+ :rules="rules"
+ label-width="120px"
+ class="demo-ruleForm"
+ status-icon
+ >
+ <el-form-item label="Activity name" prop="name">
+ <el-input v-model="ruleForm.name" />
+ </el-form-item>
+ <el-form-item label="Activity zone" prop="region">
+ <el-select v-model="ruleForm.region" placeholder="Activity zone">
+ <el-option label="Zone one" value="shanghai" />
+ <el-option label="Zone two" value="beijing" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+
+ <!-- 表单按钮 -->
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit(ruleFormRef)"
+ >提 交</el-button
+ >
+ <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </basic-container>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
+import functions from '@/utils/functions';
+import dayjs from 'dayjs';
+import { mapGetters } from 'vuex';
+/** 获取字典 */
+import { getDictionaryBiz } from '@/api/system/dict';
+import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { packageColumnList } from '@/option/distribution/VehicleStowage';
+import {
+ postDetermineHasNoFinalNode,
+ postUpdateLoadScanFinalNodeIdById,
+ postFindNextNodeList,
+} from '@/api/distribution/VehicleStowage';
+import { useStore } from 'vuex';
+import { useRouter, useRoute } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+
+// 获取路由实例
+const $router = useRouter();
+const $route = useRoute();
+
+const $store = useStore();
+const details = reactive<any>({
+ /** 是否显示搜索控件去 */
+ search: false,
+ /** 表格数据 */
+ data: [{}],
+ /** 渲染数据 */
+ renderData: [],
+ /** loading */
+ loadingObj: {
+ list: false,
+ },
+ /** 弹窗 */
+ popUpShow: {
+ truckLoadingDetailVisited: true,
+ },
+ /** 搜索 */
+ query: {},
+ /** 时间快捷选择设置 */
+ shortcuts: [
+ {
+ text: '最近一周',
+ value: () => {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ return [start, end];
+ },
+ },
+ {
+ text: '最近一个月',
+ value: () => {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ return [start, end];
+ },
+ },
+ {
+ text: '最近三个月',
+ value: () => {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ return [start, end];
+ },
+ },
+ ],
+ packageColumnList,
+ /** 复选框选中数据 */
+ selectionList: [],
+ /** 后续节点数据 */
+ nextNodeData: [],
+});
+
+/** 初始化请求数据 */
+const onLoad = async (params = {}) => {
+ try {
+ details.loadingObj.list = true;
+
+ const res1 = postDetermineHasNoFinalNode({ loadId: $route.query.loadId });
+ const res2 = postFindNextNodeList({ loadId: $route.query.loadId });
+
+ const responseArr = await Promise.all([res1, res2]);
+ // postFindNextNodeList
+
+ // 包条数据
+ const { code, data } = responseArr[0].data;
+
+ if (code !== 200) return;
+
+ details.data = data || [];
+ details.renderData = [...details.data];
+
+ // 下一步节点数据
+ const { code: code1, data: data1 } = responseArr[1].data;
+ if (code1 !== 200) return;
+ details.nextNodeData = data1 || [];
+ } catch (error) {
+ console.log('error :>> ', error);
+ } finally {
+ details.loadingObj.list = false;
+ }
+};
+
+onLoad();
+
+/** 搜索 */
+const searchChange = () => {
+ onLoad();
+};
+
+/** 清空表单 */
+const searchReset = () => {
+ details.query = {};
+ details.stockupDate = [];
+ details.page.pageNum = 1;
+ onLoad();
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+ details.drawerShow = _flag;
+};
+
+/** 是否展开搜索控件区 */
+const searchHide = () => {
+ details.search = !details.search;
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (value, row) => {
+ // 动态设置正则
+ const reg = new RegExp(value, 'i');
+
+ details.query[row.prop] = reg;
+
+ if (value === '') delete details.query[row.prop];
+
+ if (Object.keys(details.query).length === 0) return (details.renderData = details.data);
+
+ const _data = details.data.filter(item => {
+ let _flag = true;
+ for (let key in details.query) {
+ if (!details.query[key].test(item[key])) _flag = false;
+ if (!_flag) break;
+ }
+
+ return _flag;
+ });
+
+ details.renderData = _data;
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+ console.log(index, row);
+ if (!!index) {
+ index = dayjs(index).format('YYYY-MM-DD');
+ }
+ details.query[row.prop] = index;
+ if (!index) {
+ delete details.query[row.prop];
+ }
+ onLoad();
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+ details.query[row.prop] = index;
+ if (!index) delete details.query[row.prop];
+ onLoad();
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+ details.selectionList = list;
+};
+
+/** 批量配置 */
+const handleBratchConfiguration = () => {
+ details.popUpShow.truckLoadingDetailVisited = true;
+};
+
+/** 单独配置 */
+const handleConfiguration = ({ row }) => {
+ details.popUpShow.truckLoadingDetailVisited = true;
+};
+</script>
+
+<style scoped lang="scss">
+.fo-fl {
+ display: flex;
+ flex-wrap: wrap;
+ zoom: 0.9;
+}
+
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+ height: 100% !important;
+ width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+ height: 100% !important;
+}
+
+// 提交按钮
+.submitBtn-container {
+ position: fixed;
+ bottom: 20px;
+ left: 50%;
+ transform: translateX(-50%);
+}
+
+// 弹出层标题
+.popUp_title {
+ font-size: 18px;
+ font-weight: bold;
+ padding: 5px 20px;
+ position: relative;
+ margin: 20px 0;
+
+ &:first-child {
+ margin-top: 0;
+ }
+
+ &::before {
+ width: 4px;
+ height: 100%;
+ background: #172e60;
+ content: '';
+ display: inline-block;
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+}
+</style>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 4df73b58..c7222286 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -519,7 +519,7 @@
<!-- 顶部开始 -->
<div class="el-Cart-button">
<!-- 表格顶部左侧按钮 -->
- <div class="el-Cart-button-left">
+ <div class="el-Cart-button-left" style="justify-content: start">
<el-button type="primary" @click="SoInput"
><el-icon><Search /></el-icon>搜索</el-button
>
@@ -2036,52 +2036,6 @@ const SearchFu = () => {
}
return;
- if (multifunctional.value) {
- document.getElementById(multifunctional.value).scrollIntoView();
- }
- return;
- console.log(soInpuState.value, '当前搜索状态');
- if (!multifunctional.value && !dataInfoTemp.value.length) {
- soInpuState.value = false; //重置搜索状态
- ElMessage({
- showClose: true,
- message: '请输入搜索内容',
- type: 'warning',
- });
- return;
- }
- if (!multifunctional.value && dataInfoTemp.value.length) {
- //这里是回复初始内容
- soInpuState.value = false; //重置搜索状态
- dataInfo.value = JSON.parse(JSON.stringify(dataInfoTemp.value));
- dataInfoTemp.value = [];
- }
- if (soInpuState.value) {
- ElMessage({
- showClose: true,
- message: '请先重置数据',
- type: 'warning',
- });
- return;
- } else {
- //当前状态默认为假，如果是假可以搜索
- console.log('多功能搜索功能');
- console.log(dataInfo.value, '当前订单');
- dataInfoTemp.value = dataInfo.value; //先存储一个完整的值
- let temp = dataInfo.value.filter(item => {
- return Object.values(item).some(val => {
- if (typeof val === 'string') {
- return val.includes(multifunctional.value);
- }
- return false;
- });
- });
-
- console.log(temp, '搜索结果');
- console.log(dataInfoTemp.value, '临时存储的值');
- dataInfo.value = temp; //如果搜索到了值才赋值
- soInpuState.value = false; //表示当前已经搜索过了
- }
// console.log(dataInfo.value, '搜索结果');
};
@@ -2265,66 +2219,6 @@ const ViewEvent = val => {
// 编辑信息弹窗状态
PackageFn();
return;
- if (RouteId.value) {
- console.log(wrapLoading.value, '当前为编辑状态');
- $_getPackageListByDeliveryIdAndOrderId({
- waybillNumber: '', //运单号
- orderPackageCode: '', //包条码
- current: 1,
- size: 100,
- deliveryId: RouteId.value,
- id: val.id,
- }).then(res => {
- console.log(res, '订单包件信息');
- if (res.data.code == 200) {
- wrapData.value = res.data.data.data.packageList;
- let IdTmp = []; //订单ID暂存
- dataInfo.value[dataId.value].packageListInfo = wrapTemp.value[dataId.value];
- //查看当前订单下面包件是缓存值,如果有就读取缓存值,否则就是第一次加载,使用API返回值
- if (dataInfo.value[dataId.value].packageListInfo) {
- dataInfo.value[dataId.value].packageListInfo.forEach(item => {
- IdTmp.push(item.id);
- });
- }
- toggleSelection({
- val: false,
- data: IdTmp.length ? IdTmp : res.data.data.data.packageListIds.split(','),
- index: kind.value ? 0 : 1,
- }); //编辑的时候选中已有的数据
- }
- // AddLalog.value = false; //关闭弹窗
- console.log(wrapData.value, '包件表格信息');
- console.log(res);
- });
- } else {
- // 运单号
- // 包条码
- $_getPackageListByStockArticleId({
- waybillNumber: '', //运单号
- orderPackageCode: '', //包条码
- id: val.id,
- current: 1,
- size: 100,
- }).then(res => {
- wrapData.value = res.data.data.records;
- console.log(res, '订单包件');
- if (kind.value) {
- toggleSelection({ index: 0 }); //自主配送下面包件全选
- } else {
- toggleSelection({ index: 1 }); //外协下面包件全选
- }
- console.log(tableRefs, 'tableRefs');
- console.log(res.data.data.records, '查看下面的包件');
- });
- // 新增 查看订单流程
- console.log('当前为新增状态');
- console.log(val, val.id, '查看包件事件');
- //临时存储下标用于查询包件对应的下标
- console.log(dataId.value, 'dataId.value下标');
- console.log(wrapDataInfo.value[dataId.value], '当前订单下面的包件信息');
- console.log(wrapDataInfo, '订单');
- }
- editLoading.value = false; //关闭加载效果
};
// 输入框值切换
@@ -2970,9 +2864,10 @@ const SubmitCommercial = async () => {
.el-Cart-button-left,
.el-Cart-button-right {
display: flex;
- margin: 0 0px;
justify-content: space-between;
+ margin: 0 0px;
}
+
.el-Cart-button-left {
width: 100%;
:deep(button) {
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 099b36f3..7d55c87f 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -84,7 +84,9 @@
</tablecmt>
</el-row>
<el-row class="el-fy">
- <div class="avue-crud__pagination" style="width: 100%">
+ <div class="flex-c-sb" style="width: 100%">
+ <div>勾选数量：{{ selectionList.length }}</div>
+
<!-- 分页模块 -->
<el-pagination
align="right"
@@ -617,7 +619,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- isshowSummary: true,
+ isshowSummary: false,
},
{
prop: '',
@@ -626,9 +628,9 @@ export default {
values: '',
width: '130',
checkarr: [],
- fixed: false,
+ fixed: 'right',
sortable: true,
- isshowSummary: true,
+ isshowSummary: false,
},
],
drawerShow: false,