diff --git a/src/api/Costmanagementmainlinetrains/index.js b/src/api/Costmanagementmainlinetrains/index.js new file mode 100644 index 00000000..efa24bca --- /dev/null +++ b/src/api/Costmanagementmainlinetrains/index.js @@ -0,0 +1,20 @@ +import request from '@/axios'; +// 列表 +export const $_Maininetrain = data => { + return request({ + url: '/logpm-statisticsdata/trunklineCarCost/page', + method: 'post', + data, + }); +}; + +// 导出 +export const $_Maininetrainexport = data => { + return request({ + url: '/logpm-statisticsdata/trunklineCarCost/export', + method: 'post', + data, + responseType: 'blob', + }); +}; + diff --git a/src/option/Maininetrain/Mainlinetrainfare.js b/src/option/Maininetrain/Mainlinetrainfare.js new file mode 100644 index 00000000..6c2d3349 --- /dev/null +++ b/src/option/Maininetrain/Mainlinetrainfare.js @@ -0,0 +1,507 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'effectTime', + label: '申请时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'plateNumber', + label: '车牌号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'driverName', + label: '司机名称', + type: 1, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'actualReceivablePerson', + label: '实际收款人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'carsNo', + label: '车次号', + type: 1, + values: '', + width: '150', + checkarr: [ + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'carsNoTypeNameS', + label: '车次类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'driverStaff', + label: '调车员', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'vehicleType', + label: '车辆类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'brands', + label: '品牌', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'startStation', + label: '起始站点', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'outStation', + label: '外请网点', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsNum', + label: '货数', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'originalPrice', + label: '总费用', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'actualDriverFee', + // label: '实际驾驶员费用(元)', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'fuelCardFee', + label: '燃油卡费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'bridgeFee', + label: '路桥费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'nowFreightFee', + label: '现付运输费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'returnFreightFee', + label: '回收货运费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'payFreightFee', + label: '到付运输费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trailerInsuranceFee', + label: '整车信息费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trailerInsuranceCost', + label: '整车保险费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'landingFee', + label: '整车落地费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stationLoadingFee', + label: '发站装车费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'otherStationFee', + label: '发站其它费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stationUnloadingFee', + label: '到站卸车费(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'otherFee', + label: '其他费用(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'additionalFee', + label: '额外费用(元)', + type: 1, + values: '', + width: '150', + checkarr: [ + + ], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'platformSettlementFee', + // label: '平台结算fee(元)', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'dingDingNumber', + // label: '钉钉号', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'platformOrderNumber', + // label: '订单号', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'paymentTime', + // label: '付款时间', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'paymentName', + // label: '付款方名称', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'paymentAccount', + // label: '付款方账号', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'receiveName', + // label: '平台名称', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'receiveAccount', + // label: '收款账号', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'routeName', + // label: '线路名称', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'isEnterNameS', + // label: '是否确认', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'isPaymentNameS', + // label: '是否支付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'createUserName', + // label: '操作', + // type: 6, + // values: '', + // width: '200', + // checkarr: [], + // fixed: 'right', + // sortable: false, + // }, + ]; + \ No newline at end of file diff --git a/src/option/storagecost/Traincostbreakdown.js b/src/option/storagecost/Traincostbreakdown.js index 133c1698..7f9af562 100644 --- a/src/option/storagecost/Traincostbreakdown.js +++ b/src/option/storagecost/Traincostbreakdown.js @@ -28,7 +28,7 @@ export const columnList = [ { prop: 'deliveryDriver', label: '配送司机', - type: 1, + type: 2, values: '', width: '150', checkarr: [], diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 57fcef5e..90788ed2 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -924,9 +924,7 @@ const ButtonPermissions = computed(() => { return { add: false, //新增按钮 batchReject: false, //批量打回 - assignment: - UserPermissions.value == Useridentity.Headquarters_Manager || - UserPermissions.value == Useridentity.Headquarters_customer_service, //工单指派 + assignment:false, //工单指派 applyArbitration: UserPermissions.value == Useridentity.Warehouse_customer_service, //客服介入 DingTalkNumber: false, //钉钉号填写 batchFinish: false, //批量完结 diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 83404a38..84ba62ae 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -894,7 +894,7 @@ /> --> - @@ -1280,12 +1280,9 @@ const Completedsubmission = () => { return true; } // // 否则只能总部客服和经理展示 - // if ( - // UserPermissions.value == Useridentity.Headquarters_customer_service || - // UserPermissions.value == Useridentity.Headquarters_Manager - // ) { - // return true; - // } + if ((UserPermissions.value == Useridentity.Headquarters_customer_service || UserPermissions.value == Useridentity.Headquarters_Manager)&& ['30','70'].includes($route.query.workOrderStatus)) { + return true; + } return false; }; diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue index 8dfe78d1..c40f00ce 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue @@ -1343,11 +1343,13 @@ const newlyaddSubmit = () => { data.startDate = Addform.value['daterange'][0]; data.endDate = Addform.value['daterange'][1]; } - + data.provinceCode = Addform.value['addressInfo'][0]; //仓库地区-省 data.cityCode = Addform.value['addressInfo'][1]; //仓库地区-市 data.code = Addform.value['addressInfo'][2]; //仓库地区-区 data.departmentName = department.value.label; //部门 + data.latitude = data.address[0] + data.longitude=data.address[1] if (dialogTitle.value == '编辑') { data.id = dataRwo.value.id; $_Postupdate(data) diff --git a/src/views/cost/Costmanagementmainlinetrains/Mainlinetrainfare.vue b/src/views/cost/Costmanagementmainlinetrains/Mainlinetrainfare.vue new file mode 100644 index 00000000..df76405a --- /dev/null +++ b/src/views/cost/Costmanagementmainlinetrains/Mainlinetrainfare.vue @@ -0,0 +1,386 @@ + + + + + diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue index a7e0bb51..a1c463a9 100644 --- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue +++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue @@ -640,7 +640,7 @@ const getAbnormalrecord = async () => { let submit = { current: details.pageyd.currentPage, size: details.pageyd.pageSize, - detailId: viewAbnormalrecord.value.detailId, + detailId: viewAbnormalrecord.value.id, }; let res = await $_Traincostbreakdownsubmitpage(submit); console.log(res); @@ -658,6 +658,8 @@ const getAbnormalrecord = async () => { }; // 异动记录 const Abnormalrecord = async row => { + console.log(row); + viewAbnormalrecord.value.id = row.id; viewAbnormalrecord.value.dialogVisible = true; nextTick(() => { diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index d945415f..3f296f26 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -71,11 +71,6 @@ : index <= details.active " > - - +
- + - +
- +
- + { // longge // target: 'http://192.168.3.16:13000', // xiaohei - // target: 'http://192.168.3.65:13000', + // target:'http://192.168.3.65:13000', + // target: 'http://192.168.3.65:13000', // lmy // target: 'http://192.168.10.123:8889', // cg