Browse Source

修复已知bug

pre-production
马远东 4 months ago
parent
commit
5b477110d9
  1. 27
      src/option/distribution/Unstoreddetails.js
  2. 36
      src/views/distribution/inventory/delivery/Unstoreddetails.vue

27
src/option/distribution/Unstoreddetails.js

@ -12,7 +12,7 @@ export const columnList = [
{
prop: 'waybillNumber',
label: '运单号',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -23,7 +23,7 @@ export const columnList = [
{
prop: 'orderCode',
label: '订单自编号',
type: 1,
type:2,
values: '',
width: '150',
checkarr: [],
@ -34,7 +34,7 @@ export const columnList = [
{
prop: 'warehouse',
label: '仓库',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -56,7 +56,7 @@ export const columnList = [
{
prop: 'orderPackageCode',
label: '包条码',
type: 1,
type: 2,
values: '',
width: '180',
checkarr: [],
@ -66,7 +66,7 @@ export const columnList = [
{
prop: 'goodsAllocation',
label: '货位信息',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -76,7 +76,7 @@ export const columnList = [
{
prop: 'pallet',
label: '所在托盘',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -86,7 +86,7 @@ export const columnList = [
{
prop: 'firsts',
label: '一级品',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -96,7 +96,7 @@ export const columnList = [
{
prop: 'second',
label: '二级品',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -106,7 +106,7 @@ export const columnList = [
{
prop: 'thirdProduct',
label: '三级品',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -116,7 +116,7 @@ export const columnList = [
{
prop: 'materialName',
label: '物料名称',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -126,7 +126,7 @@ export const columnList = [
{
prop: 'materialCode',
label: '物料编码',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -143,6 +143,7 @@ export const columnList = [
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,//开启统计
},
{
prop: 'warehouseEntryTimeEnd',
@ -157,7 +158,7 @@ export const columnList = [
{
prop: 'trainNumber',
label: '客户车次号',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -167,7 +168,7 @@ export const columnList = [
{
prop: 'sendWarehouseName',
label: '发站仓',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],

36
src/views/distribution/inventory/delivery/Unstoreddetails.vue

@ -166,7 +166,7 @@
<script setup>
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
import { columnList } from '@/option/distribution/Unstoreddetails.js';
import { processRowPropertyName, setNodeHeight, getObjType } from '@/utils/util';
import { processRowPropertyName, setNodeHeight, getObjType, deepClone } from '@/utils/util';
import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls, handleClearTableQuery } from '@/utils/util';
import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
@ -182,6 +182,7 @@ const $router = useRouter(); //跳转
const $useStore = useStore(); //
const $route = useRoute(); //
const activeName = ref('1');
const dataCopy = ref([]); //
const dialogVisible = ref(false);
const from = ref({
unWarehouse: [],
@ -193,8 +194,6 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {
inputQuery: {},
selectQuery: {},
},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
@ -292,9 +291,32 @@ const {
const showdrawer = _flag => {
details.drawerShow = _flag;
};
const filterAst = (ast, data) => {
// `data` `values`
const allValuesEmpty = data.every(item => !item.values);
// `values` `ast`
if (allValuesEmpty) {
// tabclaick();
return dataCopy.value;
}
// `values`
const filteredData = data.filter(item => item.values);
// `ast`
return ast.filter(item => {
return filteredData.every(sub => {
const prop = sub.prop;
const value = sub.values;
return item[prop] === value;
});
});
};
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
let _query = filterAst(dataCopy.value, columnList);
details.data = _query;
};
/** 表格表头时间选择 */
@ -375,10 +397,12 @@ const onLoad = async () => {
if (code !== 200 || !data) {
return;
}
console.log(_res, '基础信息');
from.value.warehouse = data.warehouse; //
from.value.unWarehouse = data.unWarehouse; //
details.data = data.warehouse;
dataCopy.value = deepClone(from.value.warehouse);
details.loadingObj.list = false;
};
@ -402,8 +426,10 @@ initPage();
const tabclaick = () => {
if (activeName.value == 1) {
details.data = from.value.warehouse; //
dataCopy.value = deepClone(from.value.warehouse);
} else {
details.data = from.value.unWarehouse; //
details.data = from.value.unWarehouse; //
dataCopy.value = deepClone(from.value.unWarehouse);
}
};

Loading…
Cancel
Save