diff --git a/src/api/distribution/VehicleStowage.js b/src/api/distribution/VehicleStowage.js index 43cd0c52..cce9b802 100644 --- a/src/api/distribution/VehicleStowage.js +++ b/src/api/distribution/VehicleStowage.js @@ -109,7 +109,7 @@ export const postUpdateLoadScanFinalNodeIdById = data => { */ export const postFindNextNodeList = data => { return request({ - url: '/api/logpm-trunkline/carsLoad/findNextNodeList ', + url: '/api/logpm-trunkline/carsLoad/findNextNodeList', method: 'post', data, }); @@ -120,7 +120,18 @@ export const postFindNextNodeList = data => { */ export const postRemoveCarsLoadScan = data => { return request({ - url: 'logpm-trunkline/api/carsLoad/removeCarsLoadScan ', + url: '/api/logpm-trunkline/api/carsLoad/removeCarsLoadScan', + method: 'post', + data, + }); +}; + +/** + * 手动装车 + */ +export const postManualLoadingloadId = data => { + return request({ + url: '/api/logpm-trunkline/carsLoad/manualLoading', method: 'post', data, }); diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js index 19a57808..dfbd1c22 100644 --- a/src/option/distribution/VehicleStowage.js +++ b/src/option/distribution/VehicleStowage.js @@ -378,7 +378,7 @@ export const columnList = [ label: '操作', type: 6, values: '', - width: '400', + width: '250', checkarr: [], fixed: 'right', sortable: false, diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js index fe97781c..2576f496 100644 --- a/src/option/distribution/addVehicleStowage.js +++ b/src/option/distribution/addVehicleStowage.js @@ -195,7 +195,7 @@ export const columnList = [ { prop: 'destination', label: '到站', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -206,7 +206,7 @@ export const columnList = [ { prop: 'destinationWarehouseName', label: '目的站', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -217,7 +217,7 @@ export const columnList = [ { prop: 'shipper', label: '发货单位', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -248,7 +248,7 @@ export const columnList = [ { prop: 'productName', label: '品类名称', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -323,7 +323,7 @@ export const columnList = [ { prop: 'customerTrain', label: '客户车次', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -333,7 +333,7 @@ export const columnList = [ { prop: 'remark', label: '运单备注', - type: 1, + type: 2, values: '', width: '130', checkarr: [], diff --git a/src/option/supervise/supervise.js b/src/option/supervise/supervise.js index 4aed071f..9b509ee1 100644 --- a/src/option/supervise/supervise.js +++ b/src/option/supervise/supervise.js @@ -72,8 +72,6 @@ export const classificationColumnList = [ }, ]; - - export const managementColumnList = [ { prop: '', @@ -124,8 +122,17 @@ export const managementColumnList = [ sortable: true, head: false, }, - - + { + prop: 'createDeptName', + label: '考核归属部门', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'createTime', label: '创建时间', @@ -149,8 +156,6 @@ export const managementColumnList = [ }, ]; - - // 指标列表 export const IndicatorColumnList = [ { @@ -213,6 +218,17 @@ export const IndicatorColumnList = [ sortable: true, head: false, }, + { + prop: 'createDeptName', + label: '考核归属部门', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'objectionRemark', label: '描述', @@ -257,10 +273,10 @@ export const IndicatorColumnList = [ sortable: true, head: false, }, - + { prop: 'isObjection', - label: '是否存在异议',//1 表示提交 2 表示审核 通过 3 表示审核失败 + label: '是否存在异议', //1 表示提交 2 表示审核 通过 3 表示审核失败 type: 1, values: '', width: '130', diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index 69111362..0667d10f 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -1,65 +1,59 @@ @@ -368,6 +369,7 @@ import { postFindNextNodeList, postUpdateLoadScanFinalNodeIdById, postRemoveCarsLoadScan, + postManualLoadingloadId, } from '@/api/distribution/VehicleStowage'; import { useStore } from 'vuex'; import { useRouter, useRoute } from 'vue-router'; @@ -432,6 +434,8 @@ const details = reactive({ list: false, /** 配置装车目的地详情 */ truckLoadingDetailPopUpLoading: false, + /** 页面laoding */ + pageLoading: false, }, /** 列表复选框选中的数据 */ selectionList: [], @@ -615,7 +619,12 @@ const onLoad = async (params = {}) => { } }; -onLoad(); +const initOnload = () => { + details.page.pageNum = 1; + onLoad(); +}; + +initOnload(); /** 初始化请求数据 */ const init = async item => { const res = await postFindNextNodeList({ loadId: item.id }); @@ -635,7 +644,7 @@ const init = async item => { /** 搜索 */ const searchChange = () => { - onLoad(details.page); + initOnload(); }; /** 清空表单 */ @@ -643,7 +652,7 @@ const searchReset = () => { details.query = {}; details.stockupDate = []; details.page.pageNum = 1; - onLoad(details.page); + initOnload(); }; /** 展开列表控件 */ @@ -653,29 +662,15 @@ const showdrawer = (_flag?: boolean) => { /** 是否开启搜索区 */ const searchHide = () => { - function getWinHight() { - var windowHight = 0; - if (document.body.clientHeight && document.documentElement.clientHeight) { - windowHight = - document.body.clientHeight < document.documentElement.clientHeight - ? document.body.clientHeight - : document.documentElement.clientHeight; - } else { - } - return document.documentElement.clientHeight; - } details.search = !details.search; - const timer = setTimeout(() => { - details.listNode.style.height = - getWinHight() - details.listNode.getBoundingClientRect().top - 70 + 'px'; - clearTimeout(timer); - }, 10); + + setNodeHeight(details.listNode, '', true); }; /** 表格表头输入框搜索 */ const inputsc = (index, row) => { details.query[row.prop] = index; - onLoad(details.page); + initOnload(); }; /** 表格表头时间选择 */ @@ -688,7 +683,7 @@ const timesc = (index, row) => { if (!index) { delete details.query[row.prop]; } - onLoad(details.page); + initOnload(); }; /** 表格表头输入框搜索 */ @@ -702,7 +697,7 @@ const selectsc = (index, row) => { details.query['certificateType'] = index; if (!index) delete details.query['certificateType']; } - onLoad(details.page); + initOnload(); }; /** 表格表头复选框选择 */ @@ -713,7 +708,7 @@ const selectionChange = (list: any) => { /** 每页数量改变执行的回调 */ const sizeChange = (pageSize: number) => { details.page.pageSize = pageSize; - onLoad(details.page); + initOnload(); }; /** 页码改变执行的回调 */ @@ -939,7 +934,7 @@ const handleStartCar = async () => { message: '发车成功', }); - onLoad(); + initOnload(); }); } }; @@ -1067,7 +1062,7 @@ const handleCancelStartCar = () => { type: 'success', message: '取消发车成功', }); - onLoad(); + initOnload(); }); }; @@ -1116,9 +1111,32 @@ const handleCancelCarsLoad = () => { type: 'success', message: '取消配载成功', }); - onLoad(); + initOnload(); }); }; + +/** 手动装车 */ +const handleManualLoading = ({ row }) => { + console.log('row :>> ', row); + ElMessageBox.confirm(`是否进行手动装车?`) + .then(async () => { + try { + details.loadingObj.pageLoading = true; + + const response = await postManualLoadingloadId({ loadId: row.id }); + if (response.data.code !== 200) return; + ElMessage.success(response.data.msg); + initOnload(); + } catch (error) { + console.log('error :>> ', error); + } finally { + details.loadingObj.pageLoading = false; + } + }) + .catch(() => { + // catch error + }); +};