From c7b78e553a5f5ccd76edc029d7b62990f18dd758 Mon Sep 17 00:00:00 2001 From: caolc <572275724@qq.com> Date: Tue, 18 Apr 2023 17:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user/oilVehicleOwner.js | 10 +- .../driver/vehicle/OilVehicleOwnerAdd.vue | 15 +-- .../driver/vehicle/OilVehicleOwnerList.vue | 94 +++++++++---------- .../driver/vehicle/OilVehicleOwnerUpdate.vue | 24 ++--- vue.config.js | 2 +- 5 files changed, 73 insertions(+), 72 deletions(-) diff --git a/src/api/user/oilVehicleOwner.js b/src/api/user/oilVehicleOwner.js index 681d384..e033215 100644 --- a/src/api/user/oilVehicleOwner.js +++ b/src/api/user/oilVehicleOwner.js @@ -11,14 +11,14 @@ export default { }, getDispatchPage(page) { // 分页查询 return request({ - url: `/xkhl-user/saasVehicleOwner/getDispatchPage`, + url: `/xkhl-user/saasCustomerPlatenum/getDispatchPage`, method: 'post', data: page }) }, save(oilVehicleOwner) { // 保存 return request({ - url: `/${service_name}/${group_name}/save`, + url: `/xkhl-user/saasCustomerPlatenum/save`, method: 'post', data: oilVehicleOwner }) @@ -39,7 +39,7 @@ export default { }, get(id) { // 根据id查询 return request({ - url: `/xkhl-user/saasVehicleOwner/get/${id}`, + url: `/xkhl-user/saasCustomerPlatenum/getById/${id}`, method: 'get' }) }, @@ -52,7 +52,7 @@ export default { }, updateDispatch(oilVehicleOwner) { // 更新 return request({ - url: `/xkhl-user/saasVehicleOwner/updateDispatch`, + url: `/xkhl-user/saasCustomerPlatenum/save`, method: 'post', data: oilVehicleOwner }) @@ -68,7 +68,7 @@ export default { }, deleteById(id) { // 根据id删除 return request({ - url: `/xkhl-user/saasVehicleOwner/delete`, + url: `/xkhl-user/saasCustomerPlatenum/delete`, method: 'post', data: { id: id } }) diff --git a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue index 3bcd584..b1a4501 100644 --- a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue +++ b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue @@ -20,6 +20,7 @@ @@ -53,7 +54,7 @@ - + - + 取消 @@ -176,9 +177,9 @@ export default { }; }, created() { - oilVehicleOwnerApi.getVehicleType().then((res) => { - this.vehicleTypeList = res.data; - }); + // oilVehicleOwnerApi.getVehicleType().then((res) => { + // this.vehicleTypeList = res.data; + // }); oilVehicleOwnerApi.getOils().then((res) => { this.oilList = res.data; }); diff --git a/src/views/driver/vehicle/OilVehicleOwnerList.vue b/src/views/driver/vehicle/OilVehicleOwnerList.vue index 6520d92..e7dd40d 100644 --- a/src/views/driver/vehicle/OilVehicleOwnerList.vue +++ b/src/views/driver/vehicle/OilVehicleOwnerList.vue @@ -438,54 +438,54 @@ export default { ); }, }, - { - prop: "companyName", - minWidth: 120, - label: "企业信息", - show: true, - render: (row, column, cell) => { - if (row.ownership === "DRIVER") { - return 车辆归属个人，无所属企业; - } - return ( -
-
- {row.userName ? cell : ""}
{" "} - {row.companyId ? "编号：" + row.companyId : ""}{" "} -
-
- ); - // return cell - }, - }, + // { + // prop: "companyName", + // minWidth: 120, + // label: "企业信息", + // show: true, + // render: (row, column, cell) => { + // if (row.ownership === "DRIVER") { + // return 车辆归属个人，无所属企业; + // } + // return ( + //
+ //
+ // {row.userName ? cell : ""}
{" "} + // {row.companyId ? "编号：" + row.companyId : ""}{" "} + //
+ //
+ // ); + // // return cell + // }, + // }, - { - prop: "enableMark", - label: "禁用启用", - show: true, - render: (row, column, cell) => { - var b = true; - if (cell === 0) { - // return '禁用' - b = false; - } - if (cell === 1) { - // return '启用' - b = true; - } - // return cell - return ( - this.enableChange(row, b)} - active-color="#13ce66" - inactive-color="#ff4949" - > - {" "} - - ); - }, - }, + // { + // prop: "enableMark", + // label: "禁用启用", + // show: true, + // render: (row, column, cell) => { + // var b = true; + // if (cell === 0) { + // // return '禁用' + // b = false; + // } + // if (cell === 1) { + // // return '启用' + // b = true; + // } + // // return cell + // return ( + // this.enableChange(row, b)} + // active-color="#13ce66" + // inactive-color="#ff4949" + // > + // {" "} + // + // ); + // }, + // }, { prop: "createTime", diff --git a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue index 1ded8c3..c3be845 100644 --- a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue +++ b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue @@ -54,7 +54,7 @@ - + - + - + 取消 @@ -176,15 +176,15 @@ export default { }; }, created() { - oilVehicleOwnerApi.getVehicleType().then((res) => { - this.vehicleTypeList = res.data; - }); + // oilVehicleOwnerApi.getVehicleType().then((res) => { + // this.vehicleTypeList = res.data; + // }); oilVehicleOwnerApi.getOils().then((res) => { this.oilList = res.data; }); - oilCompanyInfoApi.getLike(this.oilVehicleOwner.companyId).then((res) => { - this.customerList = res.data; - }); + // oilCompanyInfoApi.getLike(this.oilVehicleOwner.companyId).then((res) => { + // this.customerList = res.data; + // }); sysCustomerInfoApi .liekQuery(this.oilVehicleOwner.customerId) .then((res) => { diff --git a/vue.config.js b/vue.config.js index f613ea6..080c65e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,7 +26,7 @@ module.exports = { [process.env.VUE_APP_BASE_API]: { // target: "http://uat.xingoil.com/adminapi", // target: 'https://www.xingoil.com/adminapi', - target: `http://192.168.0.22:38080`, + target: `http://192.168.0.27:38080`, changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: ""