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

Merge branch 'pre-production'

master
pref_mail@163.com 4 months ago
parent
13cf2b5a0a b9b4ee98d8
commit
ffe678a1fb
6 changed files with 114 additions and 78 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. 12
      src/option/finance/WaybillAudit.js
  2. 58
      src/option/reportforms/DeliveryDetailsReport.js
  3. 8
      src/option/waybill/TemporaryStorageList.js
  4. 88
      src/views/distribution/inventory/CreateOrder.vue
  5. 6
      src/views/finance/ReconciliationDepositSlip.vue
  6. 2
      src/views/finance/SettlementInformation.vue

12
src/option/finance/WaybillAudit.js
Unescape View File

@ -879,13 +879,13 @@ export const columnList = [
{ {
prop: 'payStatusName', prop: 'payStatusName',
label: '收款状态', label: '收款状态',
type: 1, type: 3,
values: '', values: '',
width: '150', width: '150',
checkarr: [ checkarr: [
{label: '未收款', value: '10'}, { label: '未收款', value: '10' },
// {label: '部分收款', value: '20'}, // {label: '部分收款', value: '20'},
{label: '已收款', value: '30'}, { label: '已收款', value: '30' },
], ],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -894,13 +894,13 @@ export const columnList = [
{ {
prop: 'settlementStatusName', prop: 'settlementStatusName',
label: '结算状态', label: '结算状态',
type: 1, type: 3,
values: '', values: '',
width: '150', width: '150',
checkarr: [ checkarr: [
{label: '未结算', value: '10'}, { label: '未结算', value: '10' },
// {label: '部分结算', value: '20'}, // {label: '部分结算', value: '20'},
{label: '已结算', value: '30'}, { label: '已结算', value: '30' },
], ],
fixed: false, fixed: false,
sortable: true, sortable: true,

58
src/option/reportforms/DeliveryDetailsReport.js
Unescape View File

@ -34,12 +34,16 @@ export const columnList = [
checkarr: [ checkarr: [
{ {
label: '商配', label: '商配',
value: '商配' value: '商配',
}, },
{ {
label: '市配', label: '市配',
value: '市配' value: '市配',
} },
{
label: '自提',
value: '自提',
},
], ],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -54,12 +58,12 @@ export const columnList = [
checkarr: [ checkarr: [
{ {
label: '已复核', label: '已复核',
value: '已复核' value: '已复核',
}, },
{ {
label: '未复核', label: '未复核',
value: '未复核' value: '未复核',
} },
], ],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -165,7 +169,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
{ {
prop: 'loadNum', prop: 'loadNum',
@ -177,7 +181,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
{ {
prop: 'signNum', prop: 'signNum',
@ -189,7 +193,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
{ {
prop: 'planStockNum', prop: 'planStockNum',
@ -201,7 +205,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
{ {
prop: 'loadStockNum', prop: 'loadStockNum',
@ -213,7 +217,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
{ {
prop: 'signStockNum', prop: 'signStockNum',
@ -225,19 +229,19 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
// { // {
// prop: 'signStatus', // prop: 'signStatus',
// label: '签收状态', // label: '签收状态',
// type: 1, // type: 1,
// values: '', // values: '',
// width: '150', // width: '150',
// checkarr: [], // checkarr: [],
// fixed: false, // fixed: false,
// sortable: true, // sortable: true,
// head: false, // head: false,
// }, // },
{ {
prop: 'signTime', prop: 'signTime',
label: '签收时间', label: '签收时间',
@ -293,7 +297,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
{ {
prop: 'exceptionSignNum', prop: 'exceptionSignNum',
@ -305,7 +309,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
{ {
prop: 'deliveryMode', prop: 'deliveryMode',
@ -350,7 +354,7 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
isshowSummary: true,//开启统计 isshowSummary: true, //开启统计
}, },
// { // {
// prop: 'createUserName', // prop: 'createUserName',

8
src/option/waybill/TemporaryStorageList.js
Unescape View File

@ -670,9 +670,9 @@ export const packageColumnList = [
head: false, head: false,
}, },
{ {
prop: 'volume', prop: 'confirmVolume',
label: '方数', label: '方数',
type: 2, type: 13,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -681,9 +681,9 @@ export const packageColumnList = [
head: false, head: false,
}, },
{ {
prop: 'weight', prop: 'confirmWeight',
label: '重量', label: '重量',
type: 2, type: 13,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],

88
src/views/distribution/inventory/CreateOrder.vue
Unescape View File

@ -1165,7 +1165,25 @@
:isShowRefresh="false" :isShowRefresh="false"
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '是否维护'"> <template v-if="slotProps.scope.column.label === '方数'">
<el-input-number
:controls="false"
v-model="slotProps.scope.row.confirmVolume"
:precision="4"
:value-on-clear="0"
/>
</template>
<template v-else-if="slotProps.scope.column.label === '重量'">
<el-input-number
:controls="false"
v-model="slotProps.scope.row.confirmWeight"
:precision="3"
:value-on-clear="0"
/>
</template>
<template v-else-if="slotProps.scope.column.label === '是否维护'">
<el-tag <el-tag
:class="{ :class="{
red: slotProps.scope.row.MaintenanceOrNot === '否', red: slotProps.scope.row.MaintenanceOrNot === '否',
@ -2091,6 +2109,33 @@ getList({}).then(res => {
}); });
}); });
/** 初始化包件数据 */
const initPackage = element => {
element.MaintenanceOrNot = element.incomeCategoryId ? '是' : '否';
// 收入结算
element.confirmIncomeCategoryName = element.incomeCategoryName || '其它';
element.confirmIncomeCategoryId = element.incomeCategoryId || '';
element.incomeCategoryName = element.incomeCategoryName || '其它';
element.incomeCategory = element.incomeCategoryName || '其它';
element.incomeCategoryId = element.incomeCategoryId || '';
// 成本结算
element.confirmCostCategoryName = element.costCategoryName || '其它';
element.confirmCostCategoryId = element.costCategoryId || '';
element.costCategoryName = element.costCategoryName || '其它';
element.costCategory = element.costCategoryName || '其它';
element.costCategoryId = element.costCategoryId || '';
element.volume = isNumber(element.volume) ? Number(element.volume) : 0;
element.confirmVolume = element.volume; // 配置包条提交时再反写体积
element.initVolume = element.volume; // 编辑提交时对比是否编辑
element.weight = isNumber(element.weight) ? Number(element.weight) : 0;
element.confirmWeight = element.weight; // 配置包条提交时再反写重量
element.initWeight = element.weight; // 编辑提交时对比是否编辑
};
/** 初始化获取暂存单转运单信息 */ /** 初始化获取暂存单转运单信息 */
const onLoad = async (idsArr = []) => { const onLoad = async (idsArr = []) => {
try { try {
@ -2191,6 +2236,8 @@ const onLoad = async (idsArr = []) => {
val.chargeType = val.chargeType || 1; val.chargeType = val.chargeType || 1;
val.goodsListOptions = []; val.goodsListOptions = [];
val.goodsId = val.goodsId || '';
// 计算运费小计 // 计算运费小计
handleComputed(val); handleComputed(val);
// 计算件数最大值 // 计算件数最大值
@ -2228,21 +2275,7 @@ const onLoad = async (idsArr = []) => {
for (let i = 0; i < details.package.data.length; i++) { for (let i = 0; i < details.package.data.length; i++) {
const element = details.package.data[i]; const element = details.package.data[i];
element.MaintenanceOrNot = element.incomeCategoryId ? '是' : '否'; initPackage(element);
// 收入结算
element.confirmIncomeCategoryName = element.incomeCategoryName || '其它';
element.confirmIncomeCategoryId = element.incomeCategoryId || '';
element.incomeCategoryName = element.incomeCategoryName || '其它';
element.incomeCategory = element.incomeCategoryName || '其它';
element.incomeCategoryId = element.incomeCategoryId || '';
// 成本结算
element.confirmCostCategoryName = element.costCategoryName || '其它';
element.confirmCostCategoryId = element.costCategoryId || '';
element.costCategoryName = element.costCategoryName || '其它';
element.costCategory = element.costCategoryName || '其它';
element.costCategoryId = element.costCategoryId || '';
!element.incomeCategoryId && (_flag = true); !element.incomeCategoryId && (_flag = true);
} }
@ -2402,23 +2435,13 @@ const onEditLoad = async () => {
for (let i = 0; i < details.package.data.length; i++) { for (let i = 0; i < details.package.data.length; i++) {
const element = details.package.data[i]; const element = details.package.data[i];
element.MaintenanceOrNot = element.incomeCategoryId ? '是' : '否'; initPackage(element);
// 收入结算 // 收入结算
element.confirmIncomeCategoryName = element.incomeCategoryName || '其它';
element.confirmIncomeCategoryId = element.incomeCategoryId || '';
element.cloneIncomeCategoryId = element.incomeCategoryId || ''; // 编辑提交时, 跟据confirmIncomeCategoryId判断是否修改 element.cloneIncomeCategoryId = element.incomeCategoryId || ''; // 编辑提交时, 跟据confirmIncomeCategoryId判断是否修改
element.incomeCategoryName = element.incomeCategoryName || '其它';
element.incomeCategory = element.incomeCategoryName || '其它';
element.incomeCategoryId = element.incomeCategoryId || '';
// 成本结算 // 成本结算
element.confirmCostCategoryName = element.costCategoryName || '其它';
element.confirmCostCategoryId = element.costCategoryId || '';
element.cloneCostCategoryId = element.costCategoryId || ''; // 编辑提交时, 跟据confirmCostCategoryId判断是否修改 element.cloneCostCategoryId = element.costCategoryId || ''; // 编辑提交时, 跟据confirmCostCategoryId判断是否修改
element.costCategoryName = element.costCategoryName || '其它';
element.costCategory = element.costCategoryName || '其它';
element.costCategoryId = element.costCategoryId || '';
!element.incomeCategoryId && (_flag = true); !element.incomeCategoryId && (_flag = true);
} }
@ -3902,7 +3925,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
if ( if (
value.cloneCostCategoryId === value.confirmCostCategoryId && value.cloneCostCategoryId === value.confirmCostCategoryId &&
value.cloneIncomeCategoryId === value.confirmIncomeCategoryId value.cloneIncomeCategoryId === value.confirmIncomeCategoryId &&
value.initVolume === value.volume &&
value.initWeight === value.weight
) )
continue; continue;
@ -3912,6 +3937,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
incomeCategoryName: value.confirmIncomeCategoryName, incomeCategoryName: value.confirmIncomeCategoryName,
costCategoryId: value.confirmCostCategoryId, costCategoryId: value.confirmCostCategoryId,
costCategoryName: value.confirmCostCategoryName, costCategoryName: value.confirmCostCategoryName,
weight: value.weight,
volume: value.volume,
}; };
submitData.updateAdvanceDetailList.push(_obj); submitData.updateAdvanceDetailList.push(_obj);
@ -4750,10 +4777,15 @@ const handleClearPackageQuery = () => {
/** 确认包件结算品类弹窗 */ /** 确认包件结算品类弹窗 */
const handleSubmitPackage = () => { const handleSubmitPackage = () => {
console.log('details.goodsList :>> ', details.goodsList);
const _goodsArr = []; const _goodsArr = [];
for (let i = 0; i < details.package.data.length; i++) { for (let i = 0; i < details.package.data.length; i++) {
const value = details.package.data[i]; const value = details.package.data[i];
console.log('value :>> ', value);
value.weight = value.confirmWeight;
value.volume = value.confirmVolume;
// if (!value.incomeCategoryId) return ElMessage.error('请选择包件结算品类'); // if (!value.incomeCategoryId) return ElMessage.error('请选择包件结算品类');
value.confirmCostCategoryId = value.costCategoryId; value.confirmCostCategoryId = value.costCategoryId;

6
src/views/finance/ReconciliationDepositSlip.vue
Unescape View File

@ -109,7 +109,7 @@
icon="Stamp" icon="Stamp"
@click="handleBatchSettle" @click="handleBatchSettle"
> >
批量结算 批量确认收款
</el-button> </el-button>
<!-- 导出 --> <!-- 导出 -->
@ -615,9 +615,9 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
/** 批量结算 */ /** 批量结算 */
const handleBatchSettle = () => { const handleBatchSettle = () => {
try { try {
if (details.selectionList.length === 0) return ElMessage.warning('请选择需要结算的数据'); if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据');
ElMessageBox.confirm('是否批量结算?', '提示', { ElMessageBox.confirm('是否批量确认收款?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',

2
src/views/finance/SettlementInformation.vue
Unescape View File

@ -239,7 +239,7 @@ const details = reactive({
}, },
{ {
prop: 'createTime', prop: 'createTime',
label: '异动操作时间', label: '结算操作时间',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',

Write Preview
Loading…
Cancel
Save