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

修复部分bug，关闭开单设置成本品类，修复按车次入库显示问题，关闭备货列表库位和托盘字段

dev-xx
qb 6 months ago
parent
6b462209e9
commit
c8a1a2c6fb
12 changed files with 116 additions and 105 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. 2
      src/mixins/index.js
  2. 1
      src/option/waybill/WarehousingByTrainNumber.js
  3. 2
      src/views/basicdata/ConfigureBillingAndWarehousing/list.vue
  4. 15
      src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
  5. 2
      src/views/distribution/artery/VehicleStowage.vue
  6. 17
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  7. 40
      src/views/distribution/inventory/CreateOrder.vue
  8. 40
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  9. 42
      src/views/distribution/stockup/distributionStockupMarket.vue
  10. 40
      src/views/distribution/stockup/distributionStockupSelf.vue
  11. 2
      src/views/waybill/WarehousingByTrainNumber.vue
  12. 18
      vite.config.js

2
src/mixins/index.js
Unescape View File

@ -45,7 +45,7 @@ export default {
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
that.$route.push('/login'); that.$router.push({ path: '/login' });
clearInterval(this.refreshTime); clearInterval(this.refreshTime);
this.refreshLock = false; this.refreshLock = false;
}); });

1
src/option/waybill/WarehousingByTrainNumber.js
Unescape View File

@ -58,6 +58,7 @@ export const columnList = [
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
isshowSummary: true,
}, },
{ {
prop: 'warehouseName', prop: 'warehouseName',

2
src/views/basicdata/ConfigureBillingAndWarehousing/list.vue
Unescape View File

@ -382,7 +382,7 @@ const sizeChange = (pageSize: number) => {
/** 页码改变执行的回调 */ /** 页码改变执行的回调 */
const currentChange = current => { const currentChange = current => {
details.pageNum = current; details.page.pageNum = current;
onLoad(); onLoad();
}; };

15
src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
Unescape View File

@ -292,13 +292,26 @@ export default {
{ {
label: '承运商', label: '承运商',
prop: 'carrierId', prop: 'carrierId',
filterable: true,
type: 'select', type: 'select',
filterable: true, filterable: true,
dicUrl: '/api/logpm-basicdata/carrier/dictionary', dicUrl: '/api/logpm-basicdata/carrier/dictionary',
options: [], options: [],
rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }], rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],
}, },
{
label: '结算渠道',
prop: 'settlementChannel',
type: 'select',
filterable: true,
dicUrl: '/api/logpm-basicdata/carrier/dictionary',
options: [],
rules: [{ required: true, message: '请选择结算渠道!', trigger: 'blur' }],
},
{
label: '结算账号',
prop: 'roadOperationLicenseNub',
type: 'input',
},
{ {
label: '运输协议', label: '运输协议',
prop: 'transportationAgreement', prop: 'transportationAgreement',

2
src/views/distribution/artery/VehicleStowage.vue
Unescape View File

@ -941,7 +941,7 @@ const sizeChange = (pageSize: number) => {
/** 页码改变执行的回调 */ /** 页码改变执行的回调 */
const currentChange = current => { const currentChange = current => {
details.pageNum = current; details.page.pageNum = current;
onLoad(); onLoad();
}; };

17
src/views/distribution/deliverylist/distributionDeliveryList.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <div class="avue-crud">
<div v-h5uShow="!search"> <div v-h5uShow="search">
<!-- 查询模块 --> <!-- 查询模块 -->
<el-form class="header_search" :model="query"> <el-form class="header_search" :model="query">
<el-form-item label="配送车次:"> <el-form-item label="配送车次:">
@ -1009,17 +1009,16 @@ export default {
this.title = '查看'; this.title = '查看';
this.view = true; this.view = true;
this.box = true; this.box = true;
if(row.id){ if (row.id) {
getDetail(row.id).then(res => { getDetail(row.id).then(res => {
this.form = res.data.data; this.form = res.data.data;
}); });
}else{ } else {
ElMessage({ ElMessage({
message: '数据错误，刷新页面重新尝试', message: '数据错误，刷新页面重新尝试',
type: 'warning', type: 'warning',
}) });
} }
}, },
handleViewBlank(row) { handleViewBlank(row) {
this.$router.push({ this.$router.push({

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

@ -2335,15 +2335,15 @@ const onLoad = async (idsArr = []) => {
element.incomeCategoryName = element.incomeCategoryName || '其它'; element.incomeCategoryName = element.incomeCategoryName || '其它';
element.incomeCategory = element.incomeCategoryName || '其它'; element.incomeCategory = element.incomeCategoryName || '其它';
element.incomeCategoryId = element.incomeCategoryId || ''; element.incomeCategoryId = element.incomeCategoryId || '';
// 成本结算 // 成本结算
element.confirmCostCategoryName = element.costCategoryName || '其它'; element.confirmCostCategoryName = element.costCategoryName || '其它';
element.confirmCostCategoryId = element.costCategoryId || ''; element.confirmCostCategoryId = element.costCategoryId || '';
element.costCategoryName = element.costCategoryName || '其它'; element.costCategoryName = element.costCategoryName || '其它';
element.costCategory = element.costCategoryName || '其它'; element.costCategory = element.costCategoryName || '其它';
element.costCategoryId = element.costCategoryId || ''; element.costCategoryId = element.costCategoryId || '';
(!element.incomeCategoryId) && (_flag = true); !element.incomeCategoryId && (_flag = true);
} }
details.package.renderData = handleFilterData( details.package.renderData = handleFilterData(
@ -2512,7 +2512,7 @@ const onEditLoad = async () => {
element.incomeCategoryName = element.incomeCategoryName || '其它'; element.incomeCategoryName = element.incomeCategoryName || '其它';
element.incomeCategory = element.incomeCategoryName || '其它'; element.incomeCategory = element.incomeCategoryName || '其它';
element.incomeCategoryId = element.incomeCategoryId || ''; element.incomeCategoryId = element.incomeCategoryId || '';
// 成本结算 // 成本结算
element.confirmCostCategoryName = element.costCategoryName || '其它'; element.confirmCostCategoryName = element.costCategoryName || '其它';
element.confirmCostCategoryId = element.costCategoryId || ''; element.confirmCostCategoryId = element.costCategoryId || '';
@ -2521,7 +2521,7 @@ const onEditLoad = async () => {
element.costCategory = element.costCategoryName || '其它'; element.costCategory = element.costCategoryName || '其它';
element.costCategoryId = element.costCategoryId || ''; element.costCategoryId = element.costCategoryId || '';
(!element.incomeCategoryId) && (_flag = true); !element.incomeCategoryId && (_flag = true);
} }
details.package.renderData = handleFilterData( details.package.renderData = handleFilterData(
@ -4395,14 +4395,14 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
// 提货 // 提货
if (pickup && template) { if (pickup && template) {
handleAssignmentItemPricePickUp(value, pickup, template); handleAssignmentItemPricePickUp(value, pickup, template);
} else{ } else {
value.pickupPrice = 0; value.pickupPrice = 0;
value.systemPickupChargeType = 1; value.systemPickupChargeType = 1;
} }
// 配送 // 配送
if (dispatch && template) handleAssignmentItemPriceDispatch(value, dispatch, template); if (dispatch && template) handleAssignmentItemPriceDispatch(value, dispatch, template);
else{ else {
value.deliveryPrice = 0; value.deliveryPrice = 0;
value.systemDeliveryChargeType = 1; value.systemDeliveryChargeType = 1;
} }
@ -4609,7 +4609,7 @@ const handleShow = async () => {
const handleBatchEdit = () => { const handleBatchEdit = () => {
ElMessageBox.confirm('此操作将批量修改结算品类, 是否继续?', '提示', { ElMessageBox.confirm('此操作将批量修改结算品类, 是否继续?', '提示', {
confirmButtonText: '修改收入品类', confirmButtonText: '修改收入品类',
cancelButtonText: '修改成本品类', cancelButtonText: '取消',
}) })
.then(() => { .then(() => {
for (let i = 0; i < details.package.selectionList.length; i++) { for (let i = 0; i < details.package.selectionList.length; i++) {
@ -4623,16 +4623,14 @@ const handleBatchEdit = () => {
} }
}) })
.catch(() => { .catch(() => {
for (let i = 0; i < details.package.selectionList.length; i++) { // for (let i = 0; i < details.package.selectionList.length; i++) {
const value = details.package.selectionList[i]; // const value = details.package.selectionList[i];
// // 成本
// 成本 // value.costCategoryId = details.package.incomeCategoryId || '';
value.costCategoryId = details.package.incomeCategoryId || ''; // value.costCategoryName = details.package.incomeCategoryName || '其它';
value.costCategoryName = details.package.incomeCategoryName || '其它'; // value.costCategory = details.package.incomeCategoryName || '其它';
value.costCategory = details.package.incomeCategoryName || '其它'; // value.MaintenanceOrNot = value.incomeCategoryId && value.costCategoryId ? '是' : '否';
// }
value.MaintenanceOrNot = value.incomeCategoryId && value.costCategoryId ? '是' : '否';
}
}); });
}; };

40
src/views/distribution/stockup/distributionStockupDiscuss.vue
Unescape View File

@ -451,16 +451,16 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'stockipAllocation', // prop: 'stockipAllocation',
label: '所在库位', // label: '所在库位',
type: 2, // type: 2,
values: '', // values: '',
width: '130', // width: '130',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
// { // {
// prop: 'goodsAreaId', // prop: 'goodsAreaId',
// label: '备货区编号', // label: '备货区编号',
@ -492,16 +492,16 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
},*/ },*/
{ // {
prop: 'pallet', // prop: 'pallet',
label: '所在托盘', // label: '所在托盘',
type: 2, // type: 2,
values: '', // values: '',
width: '130', // width: '130',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ {
prop: 'fixTime', prop: 'fixTime',
label: '确认完成备货时间', label: '确认完成备货时间',

42
src/views/distribution/stockup/distributionStockupMarket.vue
Unescape View File

@ -23,7 +23,7 @@
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
:shortcuts="shortcuts" :shortcuts="shortcuts"
:default-time="defaultTime2" :default-time="defaultTime2"
/> />
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 24px" label="客户名称"> <el-form-item style="margin-left: 24px" label="客户名称">
@ -459,16 +459,16 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'stockipAllocation', // prop: 'stockipAllocation',
label: '所在库位', // label: '所在库位',
type: 2, // type: 2,
values: '', // values: '',
width: '130', // width: '130',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
// { // {
// prop: 'goodsAreaId', // prop: 'goodsAreaId',
// label: '备货区编号', // label: '备货区编号',
@ -500,16 +500,16 @@ export default {
// fixed: false, // fixed: false,
// sortable: true, // sortable: true,
// }, // },
{ // {
prop: 'pallet', // prop: 'pallet',
label: '所在托盘', // label: '所在托盘',
type: 2, // type: 2,
values: '', // values: '',
width: '130', // width: '130',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ {
prop: 'fixTime', prop: 'fixTime',
label: '确认完成备货时间', label: '确认完成备货时间',

40
src/views/distribution/stockup/distributionStockupSelf.vue
Unescape View File

@ -447,16 +447,16 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'stockipAllocation', // prop: 'stockipAllocation',
label: '所在库位', // label: '所在库位',
type: 2, // type: 2,
values: '', // values: '',
width: '130', // width: '130',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
// { // {
// prop: 'goodsAreaId', // prop: 'goodsAreaId',
// label: '备货区编号', // label: '备货区编号',
@ -488,16 +488,16 @@ export default {
// fixed: false, // fixed: false,
// sortable: true, // sortable: true,
// }, // },
{ // {
prop: 'pallet', // prop: 'pallet',
label: '所在托盘', // label: '所在托盘',
type: 2, // type: 2,
values: '', // values: '',
width: '130', // width: '130',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ {
prop: 'fixTime', prop: 'fixTime',
label: '确认完成备货时间', label: '确认完成备货时间',

2
src/views/waybill/WarehousingByTrainNumber.vue
Unescape View File

@ -405,7 +405,7 @@ const handleGoDetails = ({ row }) => {
}; };
const handleIsSelect = val => { const handleIsSelect = val => {
if (Number(val.isIncoming) === 1) { if (Number(val.isIncoming) !== 0) {
return true; return true;
} else { } else {
return false; return false;

18
vite.config.js
Unescape View File

@ -16,30 +16,30 @@ export default ({ mode, command }) => {
// hy // hy
// target: 'http://192.168.3.12:13000', // target: 'http://192.168.3.12:13000',
// xiaohei // xiaohei
// target: 'http://192.168.3.65:13000', // target: 'http://192.168.3.65:13000',
// lmy // lmy
// target: 'http://192.168.10.123:8889', // target: 'http://192.168.10.123:8889',
// cg // cg
// target: 'http://192.168.3.2:13000', // target: 'http://192.168.3.2:13000',
// target: 'http://192.168.10.101:8888', // target: 'http://192.168.10.101:8888',
// 老zyc // 老zyc
// target: 'http://192.168.10.75:8777', // target: 'http://192.168.10.75:8777',
// 新zyc // 新zyc
// target: 'http://192.168.6.116:8777', // target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122:8777', // target: 'http://192.168.6.122:8777',
// target: 'http://192.168.3.14:13000', // target: 'http://192.168.3.14:13000',
// target: 'http://192.168.10.25:2888', // target: 'http://192.168.10.25:2888',
// target: 'http://192.168.6.161:9777',//CY // target: 'http://192.168.6.161:9777',//CY
// target: 'http://192.168.10.57:13000', // target: 'http://192.168.10.57:13000',
// target: 'http://192.168.10.200:13000', // target: 'http://192.168.10.200:13000',
// target: 'http://192.168.10.29:13000', // target: 'http://192.168.3.16:13000',
// target: 'http://192.168.3.5:13000',//？ target: 'http://192.168.3.73:13000', //？
// target: 'http://h5uapi.huitongys.com', // target: 'http://h5uapi.huitongys.com',
target: 'http://test.api.huo5you.com', // target: 'http://test.api.huo5u.com',
changeOrigin: true, changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''), rewrite: path => path.replace(/^\/api/, ''),
}, },
'/imgapi': { '/imgapi': {
target: 'http://127.0.0.1:38088', target: 'http://127.0.0.1:38088',
changeOrigin: true, changeOrigin: true,
rewrite: path => path.replace(/^\/imgapi/, ''), rewrite: path => path.replace(/^\/imgapi/, ''),

Write Preview
Loading…
Cancel
Save