Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 8 months ago
parent
commit
9486083042
  1. 127
      src/api/basicdata/basicdataTray.js
  2. 17
      src/components/pric/tablePric.vue
  3. 115
      src/option/basicdata/basicdataTray1.js
  4. 1347
      src/views/basicdata/warehouse/tray/basicdataTray.vue
  5. 560
      src/views/basicdata/warehouse/tray/basicdataTray2.vue
  6. 279
      src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
  7. 4
      src/views/distribution/artery/abnormalList.vue
  8. 2
      src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
  9. 8
      src/views/reportforms/DeliveryDetails.vue

127
src/api/basicdata/basicdataTray.js

@ -1,6 +1,5 @@
import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/api/logpm-basicdata/tray/list',
@ -11,7 +10,7 @@ export const getList = (current, size, params) => {
...params,
},
});
}
};
export const getpackList = (current, size, params) => {
return request({
url: '/api/logpm-basicdata/tray/packageList',
@ -20,9 +19,9 @@ export const getpackList = (current, size, params) => {
...params,
current,
size,
}
})
}
},
});
};
export const getinventoryList = (current, size, params) => {
return request({
url: '/api/logpm-basicdata/tray/inventoryList',
@ -31,9 +30,9 @@ export const getinventoryList = (current, size, params) => {
...params,
current,
size,
}
})
}
},
});
};
export const getlclList = (current, size, params) => {
return request({
url: '/api/logpm-basicdata/tray/lclList',
@ -42,9 +41,9 @@ export const getlclList = (current, size, params) => {
...params,
current,
size,
}
})
}
},
});
};
export const getpackListhistory = (current, size, params) => {
return request({
url: '/api/logpm-basicdata/tray/packageListhistory',
@ -53,9 +52,9 @@ export const getpackListhistory = (current, size, params) => {
...params,
current,
size,
}
})
}
},
});
};
export const getinventoryListhistory = (current, size, params) => {
return request({
url: '/api/logpm-basicdata/tray/inventoryListhistory',
@ -64,19 +63,19 @@ export const getinventoryListhistory = (current, size, params) => {
...params,
current,
size,
}
})
}
},
});
};
export const getPrintTemplate = (ids) => {
export const getPrintTemplate = ids => {
return request({
url: '/api/logpm-basicdata/tray/barCode',
method: 'post',
params:{
ids
}
})
}
params: {
ids,
},
});
};
export const getlclListhistory = (current, size, params) => {
return request({
@ -86,76 +85,84 @@ export const getlclListhistory = (current, size, params) => {
...params,
current,
size,
}
})
}
},
});
};
export const getDetail = (id) => {
export const getDetail = id => {
return request({
url: '/api/logpm-basicdata/tray/detail',
method: 'get',
params: {
id
}
})
}
id,
},
});
};
export const remove = (ids) => {
export const remove = ids => {
return request({
url: '/api/logpm-basicdata/tray/remove',
method: 'post',
params: {
ids,
}
})
}
export const disable = (ids) => {
},
});
};
export const disable = ids => {
return request({
url: '/api/logpm-basicdata/tray/disable',
method: 'post',
params: {
ids,
}
})
}
export const addable = (ids) => {
},
});
};
export const addable = ids => {
return request({
url: '/api/logpm-basicdata/tray/addable',
method: 'post',
params: {
ids,
}
})
}
},
});
};
export const add = (row) => {
export const add = row => {
return request({
url: '/api/logpm-basicdata/tray/save',
method: 'post',
data: row
})
}
data: row,
});
};
export const update = (row) => {
export const update = row => {
return request({
url: '/api/logpm-basicdata/tray/update',
method: 'post',
data: row
})
}
export const vacant = (row) => {
data: row,
});
};
export const vacant = row => {
return request({
url: '/api/logpm-basicdata/tray/vacant',
method: 'post',
data: row
})
}
export const vacants = (row) => {
data: row,
});
};
export const vacants = row => {
return request({
url: '/api/logpm-basicdata/tray/vacants',
method: 'post',
data: row
})
}
data: row,
});
};
/**
* 获取仓库信息
*/
export const getWarehouseListqx = () => {
return request({
url: '/api/logpm-basicdata/warehouse/warehouseListqx',
method: 'get',
});
};

17
src/components/pric/tablePric.vue

@ -1,5 +1,10 @@
<template>
<el-table :data="SurchargeData" border style="width: 100%" class="el_row_table">
<el-table
:data="SurchargeData"
border
:style="{ width: '100%', maxHeight: height + 'px' }"
class="el_row_table"
>
<template v-for="column in Surcharge" :key="column.prop">
<el-table-column
v-if="column.disabled"
@ -89,6 +94,9 @@ function selectChange(data) {
emit('change', data);
}
const props = defineProps({
height: {
type: Number,
},
SurchargeData: {
type: Array,
required: true,
@ -102,6 +110,11 @@ const props = defineProps({
default: () => [],
},
});
console.log(props.height,'props');
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.el_row_table {
overflow: scroll;
}
</style>

115
src/option/basicdata/basicdataTray1.js

@ -0,0 +1,115 @@
export const columnList = [
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
fixed: true,
},
{
prop: 'palletName',
label: '托盘名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'trayTypeName',
label: '打托方式',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseName',
label: '仓库',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'typeName',
label: '托盘类型',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'trayStatusName',
label: '托盘状态',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'palletCode',
label: '托盘码',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'oldQrCode',
label: '旧托盘码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'disableTypeName',
label: '禁用状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '200',
checkarr: [],
fixed: 'right',
head: false,
},
];

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

File diff suppressed because it is too large Load Diff

560
src/views/basicdata/warehouse/tray/basicdataTray2.vue

@ -0,0 +1,560 @@
<template>
<basic-container v-loading="loadingObj.pageLoading">
<avue-crud
:option="option"
v-model:search="search"
v-model:page="page"
v-model="form"
:table-loading="loading"
:data="data"
:permission="permissionList"
:before-open="beforeOpen"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left>
<!-- <el-button type="danger"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- v-if="permission.BasicdataTray_delete"-->
<!-- @click="handleDelete"> -->
<!-- </el-button>-->
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"> -->
<!-- </el-button>-->
<el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
>查看二维码
</el-button>
<el-button type="warning" plain icon="el-icon-edit" @click="lossess"> </el-button>
<el-button type="warning" plain icon="el-icon-circle-close" @click="disable"
>
</el-button>
<el-button type="warning" plain icon="el-icon-check" @click="addable"> </el-button>
<el-button type="warning" plain icon="el-icon-refresh" @click="vacants"
>
</el-button>
</template>
<template #menu="{ size, row, index }">
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)"> </el-button>-->
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)"> </el-button>-->
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)"> </el-button>-->
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)"> </el-button>-->
<el-button
type="primary"
text
icon="el-icon-view"
v-if="row.trayStatus !== '3'"
@click="Details(row)"
> </el-button
>
<el-button type="primary" text icon="el-icon-view" @click="historys(row)"
> </el-button
>
</template>
</avue-crud>
<el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
<div class="print_QRCode">
<div v-html="html"></div>
</div>
<div class="dialog-footer mt10">
<!-- <el-button type="primary" @click="ddd"> </el-button>-->
<el-button @click="dialogVisible = false"> </el-button>
<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">
</avue-form>
<div style="bottom: 7%; margin-left: 500px; width: 50%">
<div style="width: 100%">
<el-button type="primary" @click="submitForm" style="margin-right: 20%">确定</el-button>
<el-button type="primary" @click="cancellation">取消</el-button>
</div>
</div>
</el-dialog>
</basic-container>
</template>
<script>
import {
getList,
getDetail,
add,
update,
remove,
vacant,
getPrintTemplate,
disable,
addable,
vacants,
} from '@/api/basicdata/basicdataTray';
import option from '@/option/basicdata/basicdataTray';
import { mapGetters } from 'vuex';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import { downloadXls } from '@/utils/util';
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() {
return {
form: {},
query: {},
//
damagedBox: false,
search: {},
loading: true,
page: {
pageSize: 30,
currentPage: 1,
total: 0,
},
//
damagedform: {},
//
damageddata: [],
//
damagedoption: {
height: 'auto',
width: '40px',
calcHeight: 30,
tip: false,
searchShow: false,
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
dialogClickModal: false,
emptyBtn: false, //
submitBtn: false, //
column: [
{
label: '破损图片',
prop: 'damagedPhotos',
labelWidth: '150',
type: 'upload',
listType: 'picture-card',
width: '150px',
span: 15,
multiple: true,
align: 'left',
action: '/blade-resource/oss/endpoint/put-file',
limit: 5,
propsHttp: {
res: 'data',
url: 'link',
},
disabled: false,
},
{
label: '备注',
prop: 'damagedNote',
labelWidth: '150',
span: 15,
type: 'input',
width: '150px',
align: 'center',
},
],
},
damagedId: null,
selectionList: [],
option: option,
data: [],
html: null, //
dialogVisible: false,
loadingObj: {
pageLoading: false,
},
};
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.BasicdataTray_add, false),
viewBtn: this.validData(this.permission.BasicdataTray_view, false),
delBtn: this.validData(this.permission.BasicdataTray_delete, false),
editBtn: this.validData(this.permission.BasicdataTray_edit, false),
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(',');
},
},
methods: {
//
cancellation() {
this.damagedBox = false;
},
historys(row) {
this.$router.push({
path: '/basicdata/warehouse/tray/basicdataTrayhistory',
query: {
data: encodeURIComponent(JSON.stringify(row)),
name: row.palletCode + '-查看历史记录',
},
});
},
submitForm() {
let row = {};
row.id = this.damagedform.id;
row.trayStatus = 3;
row.damagedPhotos = this.damagedform.damagedPhotos.join(',');
row.damagedNote = this.damagedform.damagedNote;
console.log('更新参数>>>>>>>>', row);
update(row).then(
() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.damagedBox = false;
this.onLoad(this.page, this.query);
},
error => {
loading();
console.log(error);
}
);
},
losses(row) {
this.damagedform = row;
this.damagedBox = true;
},
lossess() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择一条数据');
return;
}
if (this.selectionList.length > 1) {
this.$message.warning('只能选一条数据');
return;
}
console.log('this.selectionList>>>>>>', this.selectionList);
this.damagedform.id = this.selectionList[0].id;
this.damagedBox = true;
},
vacant(row) {
this.$confirm('确认空置?')
.then(_ => {
console.log('row>>>>>>>>>>>>>>>>空置', row);
vacant(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
},
error => {
loading();
console.log(error);
}
);
})
.catch(_ => {});
},
vacants() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据空置?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
console.log('this.selectionList>>>>>>>>>>>>>>>>>>', this.selectionList);
const newList = this.selectionList.map(item => item.palletCode);
return vacants(newList);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
disable() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据禁用?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return disable(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
addable() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据启用?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return addable(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
//
printTemplate() {
const printNode = document.querySelectorAll('.print_QRCode>div>div');
console.log('printNode :>> ', printNode);
print(printNode, 'titlePrint');
},
async handleqr() {
try {
this.loadingObj.pageLoading = true;
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
let checkcode = [];
this.selectionList.map(item => {
checkcode.push(item.id);
});
let qr = checkcode.join(',');
console.log(qr);
this.html = '';
const res = await getPrintTemplate(qr);
console.log(res.data);
const { code, data } = res.data;
if (code !== 200) return;
this.html = this.getHtmls(data.dataList, data.templateHtml);
this.dialogVisible = true;
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
},
Details(row) {
this.$router.push({
path: '/basicdata/warehouse/tray/basicdataTrayedt',
query: {
data: encodeURIComponent(JSON.stringify(row)),
name: row.palletCode + '-查看在托情况',
},
});
},
rowSave(row, done, loading) {
console.log('this.form>>>>>>>>>>>>', this.form);
// this.form.trayStatus("1");
add(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
},
error => {
loading();
window.console.log(error);
}
);
},
rowUpdate(row, index, done, loading) {
update(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
},
error => {
loading();
console.log(error);
}
);
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
this.$refs.crud.toggleSelection();
});
},
handleExport() {
let downloadUrl = `/api/logpm-basicdata/material/export-BasicdataTray?${
this.website.tokenHeader
}=${getToken()}`;
const {} = this.query;
let values = {};
this.$confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `托盘${dateNow()}.xlsx`);
NProgress.done();
});
});
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
console.log('123123123');
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
console.log(this.query, 'query');
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
const { warehouseId, trayStatus, type, palletCode, palletName } = this.query;
let values = {
warehouseId: warehouseId,
trayStatus: trayStatus,
type: type,
palletCode: palletCode,
palletName: palletName,
};
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
},
},
};
</script>
<style scoped lang="scss">
:deep(.avue-form__row) {
margin-left: 10px;
max-width: 300px !important;
}
:deep(.no-print) {
margin-left: auto;
}
:deep(.el-form-item__label) {
width: auto !important;
}
:deep(.avue-form__row) {
margin-left: 0;
}
:deep(.no-print) {
.el-button {
margin-right: 0;
}
}
</style>

279
src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue

@ -168,6 +168,7 @@
:Surcharge="Categorybyitembilling"
@focus="handleRowFocus"
@search="search"
:height="150"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
@ -178,10 +179,11 @@
<div class="el_category">
<span class="title">品类按方计费</span>
<SurchargeTable
:SurchargeData="form.Categorybyitembilling"
:Surcharge="Categorybyitembilling"
:SurchargeData="form.Categorybasedbillingbyparty"
:Surcharge="Categorybasedbillingbyparty"
@focus="handleRowFocus"
@search="search"
:height="150"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
@ -190,12 +192,13 @@
</div>
<div class="el_category">
<span class="title">品类按计费</span>
<span class="title">品类按重量计费</span>
<SurchargeTable
:SurchargeData="form.Categorybyitembilling"
:Surcharge="Categorybyitembilling"
:SurchargeData="form.Categorychargesbyweight"
:Surcharge="Categorychargesbyweight"
@focus="handleRowFocus"
@search="search"
:height="150"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
@ -204,12 +207,13 @@
</div>
<div class="el_category">
<span class="title">品类按计费</span>
<span class="title">品类按计费</span>
<SurchargeTable
:SurchargeData="form.Categorybyitembilling"
:Surcharge="Categorybyitembilling"
:SurchargeData="form.Categorybilledbyton"
:Surcharge="Categorybilledbyton"
@focus="handleRowFocus"
@search="search"
:height="150"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
@ -275,11 +279,68 @@
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<el-text class="el_text_del">删除</el-text>
<div class="el_btn_txt">
<el-text class="el_text_del" @click="Oversizedbillingdel(slotProps)">删除</el-text>
<el-text class="el_text_add" @click="Oversizedbillingadd">新增</el-text>
</div>
</template>
</template>
</SurchargeTable>
</div>
<div class="el_Super">
<div class="el_Super_box">
<span class="title">统一超区公里数(km)</span>
<el-input-number
v-model="form.numc"
:min="0"
:controls="false"
:precision="2"
:value-on-clear="0"
/>
</div>
<div class="el_Super_box">
<span class="title">统一超区后单价(/km)</span>
<el-input-number
v-model="form.numc"
:min="0"
:controls="false"
:precision="2"
:value-on-clear="0"
/>
</div>
<div class="el_Super_box">
<span class="title">点位补贴单价(/)</span>
<el-input-number
v-model="form.numc"
:min="0"
:controls="false"
:precision="2"
:value-on-clear="0"
/>
</div>
<div class="el_Super_box">
<span class="title">保底费()</span>
<el-input-number
v-model="form.numc"
:min="0"
:controls="false"
:precision="2"
:value-on-clear="0"
/>
</div>
<div class="el_Super_box">
<span class="title">油费(/km)</span>
<el-input-number
v-model="form.numc"
:min="0"
:controls="false"
:precision="2"
:value-on-clear="0"
/>
</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="form.dialogVisible = false">取消</el-button>
@ -319,6 +380,107 @@ const form = ref({
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
],
//
Categorybasedbillingbyparty: [
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
],
//
Categorychargesbyweight: [
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
],
//
Categorybilledbyton: [
{
index: 1,
Costsettlementcategory: '', //
UnitPrice: '', //(/)
options: [],
loading: false,
},
],
asurcharge: [
{
@ -402,7 +564,60 @@ const Categorybyitembilling = ref([
disabled: true,
},
]);
//
const Categorybasedbillingbyparty = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '成本结算品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{
label: '单价(元/件)',
prop: 'UnitPrice',
type: 'number',
width: 'auto',
disabled: true,
},
]);
//
const Categorychargesbyweight = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '成本结算品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{
label: '单价(元/件)',
prop: 'UnitPrice',
type: 'number',
width: 'auto',
disabled: true,
},
]);
//
const Categorybilledbyton = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '成本结算品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{
label: '单价(元/件)',
prop: 'UnitPrice',
type: 'number',
width: 'auto',
disabled: true,
},
]);
//
const asurcharge = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
@ -495,6 +710,14 @@ const newlyadded = row => {
const Pricingrules = () => {
console.log(form.value);
};
//
const Oversizedbillingadd=()=>{
}
//
const Oversizedbillingdel=(row)=>{
console.log(row,'删除超区费');
}
</script>
<style scoped lang="scss">
@ -645,5 +868,41 @@ const Pricingrules = () => {
color: #ff5722;
cursor: pointer;
}
.el_text_add{
margin-left: 10px;
color: #0045c4;
cursor: pointer;
}
}
.el_Super {
display: flex;
justify-content: space-between;
.el_Super_box {
width: 18%;
display: flex;
flex-direction: column;
.el-input-number {
width: 100%;
}
.title {
position: relative;
padding: 0 10px;
display: block;
margin-top: 20px;
margin-bottom: 10px;
}
.title::after {
content: '';
position: absolute;
left: 0;
top: 0;
width: 4px;
height: 100%;
background-color: #172e60;
}
}
}
.SuperAdd {
display: flex;
}
</style>

4
src/views/distribution/artery/abnormalList.vue

@ -129,7 +129,7 @@
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:current-page="page.pageNum"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
@ -365,7 +365,7 @@ const searchChange = () => {
const searchReset = () => {
details.query = {};
details.stockupDate = [];
details.page.currentPage = 1;
details.page.pageNum = 1;
handleClearTableQuery(details.columnList);
onLoad(details.page);
};

2
src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@ -727,7 +727,7 @@ export default {
for (let i = 0; i < this.data.length; i++) {
const value = this.data[i];
value.scanNum = value.scanNum || 0;
value.realNum = isNumber(value.realNum) ? Number(value.realNum) : 0;
value.totalPlanNum = isNumber(value.totalPlanNum) ? Number(value.totalPlanNum) : 0;
value.realVolume = isNumber(value.realVolume) ? Number(value.realVolume) : 0;

8
src/views/reportforms/DeliveryDetails.vue

@ -384,11 +384,11 @@ const searchChange = () => {
//
if (TopQuery.value.Signfor?.length) {
queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.startSjsigningTime = dayjs(TopQuery.value.Signfor[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endSjsigningTime = dayjs(TopQuery.value.Signfor[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else {
delete queryCarn.value.startTaskTime;
delete queryCarn.value.endTaskTime;
delete queryCarn.value.startSjsigningTime;
delete queryCarn.value.endSjsigningTime;
}
//
if (TopQuery.value.warehouseNameRange?.length) {

Loading…
Cancel
Save