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

修复已知bug

dev-xx
马远东 5 months ago
parent
2e180ca31b
commit
043681d6d7
5 changed files with 398 additions and 324 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. 648
      src/option/aftersales/vueTvemp.js
  2. 2
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  3. 24
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  4. 24
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  5. 24
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

648
src/option/aftersales/vueTvemp.js
Unescape View File

@ -50,17 +50,17 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// { {
// prop: 'packageCode', prop: 'packageCode',
// label: '包条码', label: '包条码',
// type: 2, type: 2,
// values: '', values: '',
// width: '150', width: '150',
// checkarr: [], checkarr: [],
// fixed: false, fixed: false,
// sortable: true, sortable: true,
// head: false, head: false,
// }, },
{ {
prop: 'waybillNumber', prop: 'waybillNumber',
label: '运单号', label: '运单号',
@ -416,17 +416,17 @@ export const columnList8 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// { {
// prop: 'packageCode', prop: 'packageCode',
// label: '包条码', label: '包条码',
// type: 2, type: 2,
// values: '', values: '',
// width: '150', width: '150',
// checkarr: [], checkarr: [],
// fixed: false, fixed: false,
// sortable: true, sortable: true,
// head: false, head: false,
// }, },
{ {
prop: 'waybillNumber', prop: 'waybillNumber',
label: '运单号', label: '运单号',
@ -782,17 +782,17 @@ export const columnList3 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// { {
// prop: 'packageCode', prop: 'packageCode',
// label: '包条码', label: '包条码',
// type: 2, type: 2,
// values: '', values: '',
// width: '150', width: '150',
// checkarr: [], checkarr: [],
// fixed: false, fixed: false,
// sortable: true, sortable: true,
// head: false, head: false,
// }, },
{ {
prop: 'waybillNumber', prop: 'waybillNumber',
label: '运单号', label: '运单号',
@ -851,7 +851,7 @@ export const columnList3 = [
{ {
prop: 'workOrderStatusNameS', //workOrderStatus prop: 'workOrderStatusNameS', //workOrderStatus
label: '工单状态', label: '工单状态',
type: 3, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -881,39 +881,39 @@ export const columnList3 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{ // {
prop: 'totalAmount', // prop: 'totalAmount',
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: 'entryTime', // prop: 'entryTime',
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: 'operator', // prop: 'operator',
label: '操作人', // label: '操作人',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ {
prop: 'deliverGoodsTime', prop: 'deliverGoodsTime',
label: '送货时间', label: '送货时间',
@ -995,17 +995,17 @@ export const columnList3 = [
head: false, head: false,
}, },
{ // {
prop: 'overTime', // prop: 'overTime',
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: 'investigationProcess', prop: 'investigationProcess',
label: '调查经过', label: '调查经过',
@ -1028,39 +1028,39 @@ export const columnList3 = [
// sortable: true, // sortable: true,
// head: false, // head: false,
// }, // },
{ // {
prop: 'processNumber', // prop: 'processNumber',
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: 'reviewedBy', // prop: 'reviewedBy',
label: '审核人', // label: '审核人',
type: 2, // type: 1,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'auditTime', // prop: 'auditTime',
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: 'createTime', prop: 'createTime',
label: '录入时间', label: '录入时间',
@ -1148,17 +1148,17 @@ export const columnList1 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// { {
// prop: 'packageCode', prop: 'packageCode',
// label: '包条码', label: '包条码',
// type: 2, type: 2,
// values: '', values: '',
// width: '150', width: '150',
// checkarr: [], checkarr: [],
// fixed: false, fixed: false,
// sortable: true, sortable: true,
// head: false, head: false,
// }, },
{ {
prop: 'waybillNumber', prop: 'waybillNumber',
label: '运单号', label: '运单号',
@ -1217,7 +1217,7 @@ export const columnList1 = [
{ {
prop: 'workOrderStatusNameS', //workOrderStatus prop: 'workOrderStatusNameS', //workOrderStatus
label: '工单状态', label: '工单状态',
type: 3, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1247,39 +1247,39 @@ export const columnList1 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{ // {
prop: 'totalAmount', // prop: 'totalAmount',
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: 'entryTime', // prop: 'entryTime',
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: 'operator', // prop: 'operator',
label: '操作人', // label: '操作人',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ {
prop: 'deliverGoodsTime', prop: 'deliverGoodsTime',
label: '送货时间', label: '送货时间',
@ -1361,64 +1361,20 @@ export const columnList1 = [
head: false, head: false,
}, },
{
prop: 'overTime',
label: '完结时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'investigationProcess',
label: '调查经过',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// { // {
// prop: 'personResponsible', // prop: 'overTime',
// label: '责任人(库内作业环节)', // label: '完结时间',
// type: 2, // type: 1,
// values: '', // values: '',
// width: '170', // width: '150',
// checkarr: [], // checkarr: [],
// fixed: false, // fixed: false,
// sortable: true, // sortable: true,
// head: false, // head: false,
// }, // },
{ {
prop: 'processNumber', prop: 'investigationProcess',
label: '钉钉流程号', label: '调查经过',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reviewedBy',
label: '审核人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'auditTime',
label: '审核时间',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
@ -1427,6 +1383,50 @@ export const columnList1 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// {
// prop: 'personResponsible',
// label: '责任人(库内作业环节)',
// type: 2,
// values: '',
// width: '170',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'processNumber',
// label: '钉钉流程号',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'reviewedBy',
// label: '审核人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'auditTime',
// label: '审核时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{ {
prop: 'createTime', prop: 'createTime',
label: '录入时间', label: '录入时间',
@ -1492,12 +1492,23 @@ export const columnList4 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'workOrderStatusName',
label: '工单状态',
type: 1,
values: '',
width: '120',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'businessName', prop: 'businessName',
label: '营业部', label: '营业部',
type: 3, type: 2,
values: '', values: '',
width: '100', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1520,7 +1531,7 @@ export const columnList4 = [
label: '商场名称', label: '商场名称',
type: 2, type: 2,
values: '', values: '',
width: '110', width: '120',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1531,7 +1542,7 @@ export const columnList4 = [
label: '运单号', label: '运单号',
type: 2, type: 2,
values: '', values: '',
width: '100', width: '120',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1540,10 +1551,10 @@ export const columnList4 = [
{ {
prop: 'workOrderTypeName', prop: 'workOrderTypeName',
label: '异常类型名称', label: '异常类型',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '140',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1554,9 +1565,9 @@ export const columnList4 = [
{ {
prop: 'resultTypeName', prop: 'resultTypeName',
label: '处理结果名称', label: '处理结果名称',
type: 3, type: 1,
values: '', values: '',
width: '130', width: '140',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1568,7 +1579,7 @@ export const columnList4 = [
label: '发现环节', label: '发现环节',
type: 3, type: 3,
values: '', values: '',
width: '120', width: '140',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1590,7 +1601,7 @@ export const columnList4 = [
label: '车辆路线', label: '车辆路线',
type: 2, type: 2,
values: '', values: '',
width: '110', width: '180',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1599,9 +1610,9 @@ export const columnList4 = [
{ {
prop: 'indemnitor', prop: 'indemnitor',
label: '赔款方', label: '赔款方',
type: 3, type: 1,
values: '', values: '',
width: '100', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1610,9 +1621,9 @@ export const columnList4 = [
{ {
prop: 'reason', prop: 'reason',
label: '判责原因', label: '判责原因',
type: 2, type: 1,
values: '', values: '',
width: '110', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1621,7 +1632,7 @@ export const columnList4 = [
{ {
prop: 'money', prop: 'money',
label: '金额', label: '金额',
type: 2, type: 1,
values: '', values: '',
width: '100', width: '100',
checkarr: [], checkarr: [],
@ -1630,29 +1641,19 @@ export const columnList4 = [
head: false, head: false,
}, },
{ // {
prop: 'processNumber', // prop: 'processNumber',
label: '钉钉流程号', // label: '钉钉流程号',
type: 2, // type: 2,
values: '', // values: '',
width: '120', // width: '120',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{
prop: 'workOrderStatusName',
label: '工单状态',
type: 1,
values: '',
width: '120',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'createUserName', prop: 'createUserName',
label: '操作', label: '操作',
@ -1785,7 +1786,7 @@ export const columnList2 = [
{ {
prop: 'workOrderStatusNameS', //workOrderStatus prop: 'workOrderStatusNameS', //workOrderStatus
label: '工单状态', label: '工单状态',
type: 3, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1826,17 +1827,17 @@ export const columnList2 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{ // {
prop: 'entryTime', // prop: 'entryTime',
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: 'operator', prop: 'operator',
label: '操作人', label: '操作人',
@ -1920,18 +1921,6 @@ export const columnList2 = [
{ {
prop: 'vehicleRoute', prop: 'vehicleRoute',
label: '车辆线路', label: '车辆线路',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'overTime',
label: '完结时间',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
@ -1940,6 +1929,18 @@ export const columnList2 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// {
// prop: 'overTime',
// label: '完结时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{ {
prop: 'investigationProcess', prop: 'investigationProcess',
label: '调查经过', label: '调查经过',
@ -1962,39 +1963,39 @@ export const columnList2 = [
// sortable: true, // sortable: true,
// head: false, // head: false,
// }, // },
{ // {
prop: 'processNumber', // prop: 'processNumber',
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: 'reviewedBy', // prop: 'reviewedBy',
label: '审核人', // label: '审核人',
type: 2, // type: 1,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
head: false, // head: false,
}, // },
{ // {
prop: 'auditTime', // prop: 'auditTime',
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: 'createTime', prop: 'createTime',
label: '录入时间', label: '录入时间',
@ -2151,7 +2152,7 @@ export const columnList5 = [
{ {
prop: 'workOrderStatusNameS', //workOrderStatus prop: 'workOrderStatusNameS', //workOrderStatus
label: '工单状态', label: '工单状态',
type: 3, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -2814,17 +2815,28 @@ export const columnList6 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// { {
// prop: 'packageCode', prop: 'workOrderStatusNameS', //workOrderStatus
// label: '包条码', label: '工单状态',
// type: 2, type: 1,
// values: '', values: '',
// width: '150', width: '150',
// checkarr: [], checkarr: [],
// fixed: false, fixed: false,
// sortable: true, sortable: true,
// head: false, head: false,
// }, },
{
prop: 'packageCode',
label: '包条码',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'waybillNumber', prop: 'waybillNumber',
label: '运单号', label: '运单号',
@ -2880,17 +2892,7 @@ export const columnList6 = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'workOrderStatusNameS', //workOrderStatus
label: '工单状态',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'brandName', prop: 'brandName',
label: '品牌', label: '品牌',

2
src/views/distribution/inventory/delivery/distributionStockArticle.vue
Unescape View File

@ -143,7 +143,7 @@
<template v-if="slotProps.scope.column.label === '未入库数量'"> <template v-if="slotProps.scope.column.label === '未入库数量'">
<el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)"> <el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
{{ {{
slotProps.scope.column.label === '未入库数量' ? slotProps.scope.row.notReceived : '' slotProps.scope.row.notReceived
}} }}
</el-text> </el-text>
</template> </template>

24
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
Unescape View File

@ -96,6 +96,13 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '未入库数量'">
<el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
{{
slotProps.scope.row.notReceived
}}
</el-text>
</template>
<template v-if="slotProps.scope.column.label === '货位信息'"> <template v-if="slotProps.scope.column.label === '货位信息'">
<div style="width: 100%"> <div style="width: 100%">
<el-tag <el-tag
@ -1042,6 +1049,20 @@ export default {
handleClearTableQuery(this.columnList); handleClearTableQuery(this.columnList);
this.onLoad(this.page); this.onLoad(this.page);
}, },
InformationViewing(row) {
if(!row.notReceived || Number(row.isZero)) {
return
}
this.$router.push({
path: '/distribution/inventory/delivery/Unstoreddetails',
query: {
id: row.id,
orderCode: row.orderCode,
name: '未入库订单详情 - ' + row.orderCode,
isZero: row.isZero,
},
});
},
handleSubmit() { handleSubmit() {
if (!this.form.id) { if (!this.form.id) {
add(this.form).then(() => { add(this.form).then(() => {
@ -1439,4 +1460,7 @@ export default {
color: #009688; color: #009688;
} }
} }
.el_textBtn {
font-weight: bold;
}
</style> </style>

24
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
Unescape View File

@ -125,6 +125,13 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '未入库数量'">
<el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
{{
slotProps.scope.row.notReceived
}}
</el-text>
</template>
<template v-if="slotProps.scope.column.label === '货位信息'"> <template v-if="slotProps.scope.column.label === '货位信息'">
<div style="width: 100%"> <div style="width: 100%">
<el-tag <el-tag
@ -914,6 +921,20 @@ export default {
this.dialogFormCustomer = true; this.dialogFormCustomer = true;
this.dialogFormCustomerOwn = true; this.dialogFormCustomerOwn = true;
}, },
InformationViewing(row) {
if(!row.notReceived || Number(row.isZero)) {
return
}
this.$router.push({
path: '/distribution/inventory/delivery/Unstoreddetails',
query: {
id: row.id,
orderCode: row.orderCode,
name: '未入库订单详情 - ' + row.orderCode,
isZero: row.isZero,
},
});
},
//通知提货 //通知提货
handleCallDelivery(ind) { handleCallDelivery(ind) {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {
@ -1402,4 +1423,7 @@ export default {
color: #009688; color: #009688;
} }
} }
.el_textBtn {
font-weight: bold;
}
</style> </style>

24
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -108,6 +108,13 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '未入库数量'">
<el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
{{
slotProps.scope.row.notReceived
}}
</el-text>
</template>
<template v-if="slotProps.scope.column.label === '货位信息'"> <template v-if="slotProps.scope.column.label === '货位信息'">
<div style="width: 100%"> <div style="width: 100%">
<el-tag <el-tag
@ -901,6 +908,20 @@ export default {
this.query[row.prop] = index; this.query[row.prop] = index;
this.onLoad(this.page); this.onLoad(this.page);
}, },
InformationViewing(row) {
if(!row.notReceived || Number(row.isZero)) {
return
}
this.$router.push({
path: '/distribution/inventory/delivery/Unstoreddetails',
query: {
id: row.id,
orderCode: row.orderCode,
name: '未入库订单详情 - ' + row.orderCode,
isZero: row.isZero,
},
});
},
handleMoke() { handleMoke() {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据'); this.$message.warning('请选择至少一条数据');
@ -1765,4 +1786,7 @@ export default {
margin-right: 4px; margin-right: 4px;
} }
} }
.el_textBtn {
font-weight: bold;
}
</style> </style>

Write Preview
Loading…
Cancel
Save