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

添加统计，修复已知bug，新增仓库配置

dev-xx
马远东 7 months ago
parent
4bb9ce7ec9
commit
08d2a160ad
10 changed files with 357 additions and 189 deletions
Split View
  1. 181
      public/css/loadinge.css
  2. 16
      src/api/basicdata/basicdataWarehouse.js
  3. 2
      src/option/basicdata/basicdataWarehouseTemp.js
  4. 23
      src/utils/util.js
  5. 183
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  6. 26
      src/views/distribution/checkInventoryTask/createTask.vue
  7. 4
      src/views/mail/inventory/list.vue
  8. 7
      src/views/mail/order/list.vue
  9. 5
      src/views/mail/reservation/list.vue
  10. 5
      src/views/mail/signfor/list.vue

181
public/css/loadinge.css
Unescape View File

@ -41,47 +41,58 @@ body {
background: -moz-linear-gradient(left, rgba(30, 252, 200, 1) 0%, rgba(29, 211, 214, 1) 100%);
background: -webkit-linear-gradient(left, #172e60 0%, #172e60 100%);
background: linear-gradient(to right, #b9c0cf36 0%, #000000 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1efcc8', endColorstr='#1dd3d6',GradientType=1 );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1efcc8', endColorstr='#1dd3d6', GradientType=1);
color: white;
padding-top: 8px;
padding-bottom: 18px;
animation: bg 3s linear infinite;
}
@keyframes truckMove {
0% {
transform: translateX(-250px);
/* 卡车从屏幕左侧外部开始 */
}
50% {
transform: translateX(calc(10px));
/* 卡车移出到屏幕右侧外部 */
}
100% {
transform: translateX(150px);
/* 卡车从左侧再次进入 */
}
}
.truck {
height: 110px;
width: 150px;
position: absolute;
bottom: 48px;
left: calc(50% + 10px);
transform: translateX(-50%);
animation: truckMove 2s linear infinite;
}
.truck > .truck-container {
.truck>.truck-container {
background: rgb(175, 189, 195);
background: -moz-linear-gradient(
-45deg,
background: -moz-linear-gradient(-45deg,
rgba(175, 189, 195, 1) 0%,
rgba(175, 189, 195, 1) 50%,
rgba(143, 163, 173, 1) 51%,
rgba(143, 163, 173, 1) 100%
);
background: -webkit-linear-gradient(
-45deg,
rgba(143, 163, 173, 1) 100%);
background: -webkit-linear-gradient(-45deg,
rgba(175, 189, 195, 1) 0%,
rgba(175, 189, 195, 1) 50%,
rgba(143, 163, 173, 1) 51%,
rgba(143, 163, 173, 1) 100%
);
background: linear-gradient(
135deg,
rgba(143, 163, 173, 1) 100%);
background: linear-gradient(135deg,
rgba(175, 189, 195, 1) 0%,
rgba(175, 189, 195, 1) 50%,
rgba(143, 163, 173, 1) 51%,
rgba(143, 163, 173, 1) 100%
);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afbdc3', endColorstr='#8fa3ad',GradientType=1 );
rgba(143, 163, 173, 1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#afbdc3', endColorstr='#8fa3ad', GradientType=1);
height: 60px;
width: 60px;
position: absolute;
@ -91,30 +102,24 @@ body {
background: url('../img/Clogo.png') no-repeat !important;
}
.truck > .glases {
.truck>.glases {
background: rgb(40, 181, 245);
background: -moz-linear-gradient(
-45deg,
background: -moz-linear-gradient(-45deg,
rgba(40, 181, 245, 1) 0%,
rgba(40, 181, 245, 1) 50%,
rgba(2, 153, 227, 1) 52%,
rgba(2, 153, 227, 1) 100%
);
background: -webkit-linear-gradient(
-45deg,
rgba(2, 153, 227, 1) 100%);
background: -webkit-linear-gradient(-45deg,
rgba(40, 181, 245, 1) 0%,
rgba(40, 181, 245, 1) 50%,
rgba(2, 153, 227, 1) 52%,
rgba(2, 153, 227, 1) 100%
);
background: linear-gradient(
135deg,
rgba(2, 153, 227, 1) 100%);
background: linear-gradient(135deg,
rgba(40, 181, 245, 1) 0%,
rgba(40, 181, 245, 1) 50%,
rgba(2, 153, 227, 1) 52%,
rgba(2, 153, 227, 1) 100%
);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#28b5f5', endColorstr='#0299e3',GradientType=1 );
rgba(2, 153, 227, 1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#28b5f5', endColorstr='#0299e3', GradientType=1);
position: absolute;
height: 25px;
width: 25px;
@ -125,7 +130,8 @@ body {
border-top-right-radius: 6px;
animation: updown-half 0.4s linear infinite;
}
.truck > .glases:after {
.truck>.glases:after {
content: '';
display: block;
background-color: #fbd734;
@ -140,7 +146,7 @@ body {
border-top-left-radius: 0px;
}
.truck > .glases:before {
.truck>.glases:before {
content: '';
display: block;
background-color: #f9bf2c;
@ -152,7 +158,7 @@ body {
border-top-right-radius: 4px;
}
.truck > .bonet {
.truck>.bonet {
background-color: #f9bf2c;
position: absolute;
width: 124px;
@ -163,32 +169,26 @@ body {
animation: updown 0.4s linear infinite;
}
.truck > .bonet:after {
.truck>.bonet:after {
content: '';
display: block;
background: rgb(255, 255, 255);
background: -moz-linear-gradient(
-45deg,
background: -moz-linear-gradient(-45deg,
rgba(255, 255, 255, 1) 0%,
rgba(241, 241, 241, 1) 50%,
rgba(225, 225, 225, 1) 51%,
rgba(246, 246, 246, 1) 100%
);
background: -webkit-linear-gradient(
-45deg,
rgba(246, 246, 246, 1) 100%);
background: -webkit-linear-gradient(-45deg,
rgba(255, 255, 255, 1) 0%,
rgba(241, 241, 241, 1) 50%,
rgba(225, 225, 225, 1) 51%,
rgba(246, 246, 246, 1) 100%
);
background: linear-gradient(
135deg,
rgba(246, 246, 246, 1) 100%);
background: linear-gradient(135deg,
rgba(255, 255, 255, 1) 0%,
rgba(241, 241, 241, 1) 50%,
rgba(225, 225, 225, 1) 51%,
rgba(246, 246, 246, 1) 100%
);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f6f6f6',GradientType=1 );
rgba(246, 246, 246, 1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6', GradientType=1);
height: 10px;
width: 6px;
position: absolute;
@ -197,7 +197,7 @@ body {
border-top-left-radius: 4px;
}
.truck > .base {
.truck>.base {
position: absolute;
background-color: #445a64;
width: 106px;
@ -208,7 +208,7 @@ body {
animation: updown 0.4s linear infinite;
}
.truck > .base:before {
.truck>.base:before {
content: '';
display: block;
background-color: #e54a18;
@ -220,7 +220,7 @@ body {
border-bottom-left-radius: 4px;
}
.truck > .base:after {
.truck>.base:after {
content: '';
display: block;
background-color: RGB(84, 110, 122);
@ -233,7 +233,7 @@ body {
z-index: -1;
}
.truck > .base-aux {
.truck>.base-aux {
width: 82px;
height: 8px;
background-color: #f9bf2c;
@ -243,77 +243,66 @@ body {
border-bottom-right-radius: 4px;
animation: updown 0.4s linear infinite;
}
.truck > .wheel-back {
.truck>.wheel-back {
left: 20px;
}
.truck > .wheel-front {
.truck>.wheel-front {
left: 95px;
}
.truck > .wheel-back,
.truck > .wheel-front {
.truck>.wheel-back,
.truck>.wheel-front {
border-radius: 100%;
position: absolute;
background: rgb(84, 110, 122);
background: -moz-linear-gradient(
-45deg,
background: -moz-linear-gradient(-45deg,
rgba(84, 110, 122, 1) 0%,
rgba(84, 110, 122, 1) 49%,
rgba(68, 90, 100, 1) 52%,
rgba(68, 90, 100, 1) 100%
);
background: -webkit-linear-gradient(
-45deg,
rgba(68, 90, 100, 1) 100%);
background: -webkit-linear-gradient(-45deg,
rgba(84, 110, 122, 1) 0%,
rgba(84, 110, 122, 1) 49%,
rgba(68, 90, 100, 1) 52%,
rgba(68, 90, 100, 1) 100%
);
background: linear-gradient(
135deg,
rgba(68, 90, 100, 1) 100%);
background: linear-gradient(135deg,
rgba(84, 110, 122, 1) 0%,
rgba(84, 110, 122, 1) 49%,
rgba(68, 90, 100, 1) 52%,
rgba(68, 90, 100, 1) 100%
);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#546e7a', endColorstr='#445a64',GradientType=1 );
rgba(68, 90, 100, 1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#546e7a', endColorstr='#445a64', GradientType=1);
top: 80px;
height: 22px;
width: 22px;
animation: spin 0.6s linear infinite;
}
.truck > .wheel-back:before,
.truck > .wheel-front:before {
.truck>.wheel-back:before,
.truck>.wheel-front:before {
content: '';
border-radius: 100%;
left: 5px;
top: 5px;
position: absolute;
background: rgb(175, 189, 195);
background: -moz-linear-gradient(
-45deg,
background: -moz-linear-gradient(-45deg,
rgba(175, 189, 195, 1) 0%,
rgba(175, 189, 195, 1) 50%,
rgba(143, 163, 173, 1) 51%,
rgba(143, 163, 173, 1) 100%
);
background: -webkit-linear-gradient(
-45deg,
rgba(143, 163, 173, 1) 100%);
background: -webkit-linear-gradient(-45deg,
rgba(175, 189, 195, 1) 0%,
rgba(175, 189, 195, 1) 50%,
rgba(143, 163, 173, 1) 51%,
rgba(143, 163, 173, 1) 100%
);
background: linear-gradient(
135deg,
rgba(143, 163, 173, 1) 100%);
background: linear-gradient(135deg,
rgba(175, 189, 195, 1) 0%,
rgba(175, 189, 195, 1) 50%,
rgba(143, 163, 173, 1) 51%,
rgba(143, 163, 173, 1) 100%
);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afbdc3', endColorstr='#8fa3ad',GradientType=1 );
rgba(143, 163, 173, 1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#afbdc3', endColorstr='#8fa3ad', GradientType=1);
height: 12px;
width: 12px;
}
@ -322,6 +311,7 @@ body {
50% {
top: 81px;
}
100% {
transform: rotate(360deg);
}
@ -331,6 +321,7 @@ body {
30% {
transform: rotate(1deg);
}
50% {
top: 11px;
}
@ -340,24 +331,9 @@ body {
transform: rotate(-1deg);
}
}
@keyframes truckMove {
0% {
transform: translateX(-250px); /* 卡车从屏幕左侧外部开始 */
}
50% {
transform: translateX(calc(10px)); /* 卡车移出到屏幕右侧外部 */
}
100% {
transform: translateX(150px); /* 卡车从左侧再次进入 */
}
}
.truck {
animation: truckMove 1s linear infinite;
}
.truck > .smoke {
.truck>.smoke {
position: absolute;
background-color: #afbdc3;
border-radius: 100%;
@ -369,7 +345,7 @@ body {
opacity: 0;
}
.truck > .smoke:after {
.truck>.smoke:after {
content: '';
position: absolute;
background-color: RGB(143, 163, 173);
@ -380,7 +356,7 @@ body {
left: 4px;
}
.truck > .smoke:before {
.truck>.smoke:before {
content: '';
position: absolute;
background-color: RGB(143, 163, 173);
@ -391,11 +367,13 @@ body {
left: 0px;
}
@keyframes fade {
30% {
opacity: 0.3;
left: 7px;
}
50% {
opacity: 0.5;
left: 6px;
@ -416,6 +394,7 @@ body {
from {
background-position-x: 0px;
}
to {
background-position-x: -400px;
}

16
src/api/basicdata/basicdataWarehouse.js
Unescape View File

@ -204,3 +204,19 @@ export const $_basicdataWarehousedetail = params => {
params,
});
};
// 扩展配置
export const $_warehouseConfig = params => {
return request({
url: '/api/logpm-warehouse/warehouseConfig/detail',
method: 'get',
params,
});
};
// 扩展配置更新
export const $_warehouseConfigupdate = data => {
return request({
url: '/api/logpm-warehouse/warehouseConfig/update',
method: 'post',
data,
});
};

2
src/option/basicdata/basicdataWarehouseTemp.js
Unescape View File

@ -337,7 +337,7 @@ export const columnList = [
label: '操作',
type: 6,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: 'right',
sortable: false,

23
src/utils/util.js
Unescape View File

@ -547,13 +547,11 @@ const updateDetailQuery = (index, propName, detailsQuery) => {
} else {
if (detailsQuery.hasOwnProperty(propName)) {
delete detailsQuery[propName]; // 确保删除属性
} else {
}
}
};
// 处理 row 属性并更新 details.query
// 处理 row 属性并更新 details.query（不可移除）
export const processRowProperty = (index, row, details) => {
console.log(`Processing: ${row.prop}`);
if (typeof row.prop === 'string') {
const nameRegex = /([a-zA-Z0-9_]+)NameS$/;
const match = row.prop.match(nameRegex);
@ -569,10 +567,27 @@ export const processRowProperty = (index, row, details) => {
} else {
updateDetailQuery(index, row.prop, details.query);
}
} else {
}
};
// 处理 row 属性并更新 details.query新版支持多个，
export const processRowPropertyName = (index, row, details) => {
if (typeof row.prop === 'string') {
const nameRegex = /([a-zA-Z0-9_]+)NameS$/;
const match = row.prop.match(nameRegex);
if (match) {
const basePropName = match[1];
const fullPropNameS = basePropName + 'NameS';
if (details.hasOwnProperty(fullPropNameS)) {
delete details[fullPropNameS];
} else {
}
updateDetailQuery(index, basePropName, details);
} else {
updateDetailQuery(index, row.prop, details);
}
}
};
/**
* 数字运算（主要用于小数点精度问题）
* [see](https://juejin.im/post/6844904066418491406#heading-12)

183
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
Unescape View File

@ -1,8 +1,7 @@
<template>
<basic-container>
<el-row v-if="details.search">
<el-form :inline="true" :model="Topquery" class="el-fr-d">
</el-form>
<el-form :inline="true" :model="Topquery" class="el-fr-d"> </el-form>
</el-row>
<!-- 头部右侧按钮模块 -->
<div class="el_top_btn">
@ -35,9 +34,10 @@
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass">
<el-button @click="view(slotProps.scope)">查看</el-button>
<el-button @click="edit(slotProps.scope)">编辑</el-button>
<el-button @click="DeleteInformation(slotProps.scope)">删除</el-button>
<el-text @click="Expandconfiguration(slotProps.scope.row)">扩展配置</el-text>
<el-text @click="view(slotProps.scope)">查看</el-text>
<el-text @click="edit(slotProps.scope)">编辑</el-text>
<el-text @click="DeleteInformation(slotProps.scope)">删除</el-text>
</div>
</template>
</template>
@ -374,6 +374,59 @@
</div>
</template>
</el-dialog>
<!-- 扩展配置 -->
<el-dialog
v-model="dialogExpandconfiguration"
width="50%"
:fullscreen="Isitfullscreen"
:show-close="false"
class="el_Inventorydialog"
>
<template #header>
<div class="el_dialog__header">
<div>
<span>扩展配置</span>
</div>
<div>
<el-icon @click="Isfullscreen"><FullScreen /></el-icon>
<el-icon @click="dialogExpandconfiguration=false"><Close /></el-icon>
</div>
</div>
</template>
<el-form
v-loading="Expandconfigurationloading"
element-loading-text="Loading..."
:model="Expandconfigurationform"
label-width="200px"
class="el_Expandconfiguration"
>
<el-form-item label="是否强制装车">
<el-select
v-model="Expandconfigurationform.isStrictLoading"
placeholder="请选择是否强制装车"
>
<el-option
v-for="item in Compulsoryoptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogExpandconfiguration = false">取消</el-button>
<el-button
type="primary"
@click="Expandconfigurationsubmit"
:disabled="Expandconfigurationloading"
>确定
</el-button>
</div>
</template>
</el-dialog>
</basic-container>
<!-- 列表配置显示 -->
<edittablehead
@ -408,6 +461,8 @@ import {
$_basicdataWarehousesave,
$_basicdataWarehouse,
$_basicdataWarehousedetail,
$_warehouseConfig,
$_warehouseConfigupdate,
} from '@/api/basicdata/basicdataWarehouse';
import { processRowProperty, deepClone } from '@/utils/util';
@ -417,22 +472,35 @@ import dayjs from 'dayjs';
import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
import { add } from '@/api/distribution/distributionParcelNumber';
const dataRwo = ref({}); //当前行数据
const props = { multiple: true };
const options = ref([]); //职能类型
const Compulsoryoptions = [
{
value: 1,
label: '是',
},
{
value: 0,
label: '否',
},
];
const Expandconfigurationform = ref({});
const selectAll = ref([]);
const formdisabled = ref(false);
const search = ref(false); //搜索展开
const warehouseID = ref('');
const Manageregionalconfiguration = {
multiple: true,
checkStrictly: true,
};
const dialogDetail = ref(false); //查看详情弹窗
const dialogImageUrl = ref('');
const dialogVisible = ref(false);
const TCloading = ref(false);
const disabled = ref(false);
const dialogExpandconfiguration = ref(false);
const Expandconfigurationloading = ref(false);
const Isitfullscreen = ref(false);
const dialogTitle = ref('新增');
const handleRemove = file => {
console.log(file);
@ -456,7 +524,6 @@ const rules = reactive({
department: [{ required: true, message: '请选择所属部门', trigger: 'change' }],
address: [{ required: true, message: '请选择仓库地址', trigger: 'change' }],
daterange: [{ required: true, message: '请选日期范围', trigger: 'change' }],
});
const Topquery = ref({}); //顶部搜索参数
const newlyaddload = ref(false); //新增弹窗
@ -663,7 +730,6 @@ const showdrawer = _flag => {
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType).then(res => {
res.data.data.forEach(item => {
console.log(item);
targetArray.push({
dictKey: item.dictKey,
dictValue: item.dictValue,
@ -671,6 +737,15 @@ function updateDictionary(targetArray, dictionaryType) {
});
});
}
// 获取当前仓库ID
const getwarehouse = () => {
// 获取本地存储的值
const my_data = JSON.parse(localStorage.getItem('my_data'));
warehouseID.value = my_data.id;
console.log(warehouseID.value, '仓库ID');
};
getwarehouse();
const dictionary = () => {
updateDictionary(options.value, 'warehouse_function_type'); //职能类型
updateDictionary(WarehouseType.value, 'warehouse_type'); //仓库类型
@ -788,9 +863,7 @@ const onLoad = val => {
});
};
onLoad();
const searchHide = () => {
};
const searchHide = () => {};
// 每页多少条
const sizeChange = val => {
@ -915,7 +988,10 @@ const edit = value => {
newlyaddload.value = true; //展开弹窗
GetDetails(value); //获取详情
};
// 是否全屏
const Isfullscreen = () => {
Isitfullscreen.value = !Isitfullscreen.value;
};
// 查看详情
const view = value => {
dialogTitle.value = '查看详情';
@ -940,6 +1016,57 @@ const beforeAvatarUpload = async rawFile => {
const res = await compressImageBlob(rawFile);
return res;
};
// 扩展配置
const Expandconfiguration = async row => {
if (!row.id) {
ElMessage({
message: '当前仓库数据错误',
type: 'warning',
});
return;
}
console.log('扩展配置');
try {
let data = {
warehouseId: row.id,
};
let _res = await $_warehouseConfig(data);
if (_res.data.code == 200) {
const { id, isStrictLoading } = _res.data.data;
dialogExpandconfiguration.value = true;
Expandconfigurationform.value.id = id; //id
Expandconfigurationform.value.isStrictLoading = isStrictLoading; //是否强制装车
}
console.log(_res, '_res');
} catch (err) {
console.log(err);
} finally {
}
};
// 扩展配置提交
const Expandconfigurationsubmit = async () => {
try {
let data = {
...Expandconfigurationform.value,
};
Expandconfigurationloading.value = true;
let _res = await $_warehouseConfigupdate(data);
if (_res.data.code == 200) {
dialogExpandconfiguration.value = false; //关闭弹窗
ElMessage({
message: _res.data.msg,
type: 'success',
});
}
console.log(_res);
} catch (error) {
console.log(error, 'error');
} finally {
Expandconfigurationloading.value = false;
}
};
// 删除
const DeleteInformation = val => {
ElMessageBox.confirm('是否删除该条数据?确定此操作后不可撤销！', '删除提示', {
@ -1004,16 +1131,16 @@ const newlyaddSubmit = () => {
return;
}
data.paymentCodeUrl = imgURl.join(',');
}else{
delete data.paymentCodeUrl
} else {
delete data.paymentCodeUrl;
}
data.warehouseAddress = Addform.value.address[2]; //地址
console.log(Addform.value, 'Addform.value');
if (data.daterange?.length) {
data.daterange[0] = dayjs(data.daterange[0]).format('YYYY-MM-DD');
data.daterange[1] = dayjs(data.daterange[1]).format('YYYY-MM-DD');
}else{
delete data.daterange
} else {
delete data.daterange;
}
data.administrativeAreas = data.administrativeAreas.join(',');
if (Addform.value.daterange?.length) {
@ -1111,4 +1238,26 @@ const newlyaddSubmit = () => {
color: white;
background-color: #8f8f8f;
}
.el_dialog__header {
display: flex;
justify-content: space-between;
align-items: center;
i {
margin: 0 8px;
}
}
:deep(.el_Inventorydialog) {
.el-tab-pane {
display: none;
}
.el-tabs__content {
padding: 0 10px;
}
}
.el_Expandconfiguration {
.el-form-item {
flex-direction: column;
width: 20%;
}
}
</style>

26
src/views/distribution/checkInventoryTask/createTask.vue
Unescape View File

@ -46,7 +46,6 @@
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
@ -252,8 +251,8 @@
</template>
<el-tabs type="border-card" v-model="eltabs" @tab-click="tabclick">
<el-tab-pane label="未盘点明细" :name="0"></el-tab-pane>
<el-tab-pane label="已盘点明细" :name="1"></el-tab-pane>
<el-tab-pane label="未盘点明细" :name="0"></el-tab-pane>
<div class="el_top_button">
<div class="el_top_button_left">
<el-button type="primary" icon="Download" @click="ExportDataInventory"
@ -284,7 +283,6 @@
:loading="loadingObj.inventorylist"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
@ -301,7 +299,7 @@
cancel-button-text="取消"
icon="Download"
icon-color="#626AEF"
title="是否导出数据?"
title="是否导出该条数据?"
@confirm="ExportDataIndexRwo(slotProps.scope.row)"
>
<template #reference>
@ -347,7 +345,6 @@
:loading="loadingObj.comparativelist"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
@ -397,7 +394,7 @@ import {
} from '@/option/distribution/createTask.js';
import { processRowProperty, setNodeHeight } from '@/utils/util';
import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls, handleClearTableQuery } from '@/utils/util';
import { downloadXls, handleClearTableQuery,processRowPropertyName } from '@/utils/util';
import {
getTaskQuestPage,
getAllDataWithPackage,
@ -436,7 +433,7 @@ const popupnotInventoryloading = ref(false);
const popupnotiInventory = ref(false);
const Inventorydialog = ref(false);
const DataRow = ref({});
const eltabs = ref(0);
const eltabs = ref(1);
const comparativedialog = ref(false);
const Inventorydetailsstatus = ref(false);
const rules = reactive({
@ -561,10 +558,7 @@ const showdrawer = _flag => {
/** 表格表头输入框搜索 */
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
// Inventorydetailsstatus:表示是盘点明细弹窗 否则就是首页搜索
const queryField = Inventorydetailsstatus.value ? details.queryInventory : details.query;
queryField[row.prop] = index;
processRowProperty(index, row, details);
processRowPropertyName(index, row, Inventorydetailsstatus.value ? details.queryInventory: details.query);
Inventorydetailsstatus.value ? InventoriedData() : onLoad();
};
/** 表格表头时间选择 */
@ -580,15 +574,9 @@ const timesc = (index, row) => {
onLoad();
};
/** 表格表头输入框搜索 */
const btnsc = val => {
console.log(val);
};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
const queryField = Inventorydetailsstatus.value ? details.queryInventory : details.query;
queryField[row.prop] = index;
processRowProperty(index, row, details);
processRowPropertyName(index, row,Inventorydetailsstatus.value ? details.queryInventory: details.query);
Inventorydetailsstatus.value ? InventoriedData() : onLoad();
};
/** 表格表头复选框选择 */
@ -1029,7 +1017,7 @@ const tabclick = async value => {
if (value) {
eltabs.value = value.props.name;
} else {
eltabs.value = 0; //默认获取未盘点数据
eltabs.value = 1; //默认获取已盘点数据
}
details.inventorypage.currentPage = 1; //重置页码
details.queryInventory = {}; //清空搜索条件

4
src/views/mail/inventory/list.vue
Unescape View File

@ -417,6 +417,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'quantityOccupied',
@ -427,6 +428,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'outboundQuantity',
@ -437,6 +439,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
/* {
prop: 'despatch',
@ -528,6 +531,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'unpack',

7
src/views/mail/order/list.vue
Unescape View File

@ -496,6 +496,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'handQuantity',
@ -506,6 +507,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
// {
// prop: 'availableQuantity',
@ -526,6 +528,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'sortingQuantity',
@ -536,6 +539,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'deliveryQuantity',
@ -546,6 +550,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'transferQuantity',
@ -556,6 +561,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'signinQuantity',
@ -566,6 +572,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'groundingStatusName',

5
src/views/mail/reservation/list.vue
Unescape View File

@ -520,6 +520,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'reservationStockListNum',
@ -530,6 +531,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'collectionFee',
@ -540,6 +542,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'otherFee',
@ -550,6 +553,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'replaceFee',
@ -560,6 +564,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
// {
// prop: 'fee',

5
src/views/mail/signfor/list.vue
Unescape View File

@ -444,6 +444,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'loadedNumber',
@ -454,6 +455,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'receivedQuantity',
@ -464,6 +466,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'withoutScanning',
@ -474,6 +477,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'unsigneds',
@ -484,6 +488,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
// {
// prop: 'deliveryDriverName',

Write Preview
Loading…
Cancel
Save