caoliancun/dispacth_zhongpin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into it_s

Browse Source
This commit is contained in:
xk_jiangfeng
2023-04-18 19:50:32 +08:00
parent 8b7c72c536 c7b78e553a
commit 1c9c736bee
5 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/user/oilVehicleOwner.js
View File

@@ -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 }
})

15
src/views/driver/vehicle/OilVehicleOwnerAdd.vue
View File

@@ -20,6 +20,7 @@
<el-col>
<el-form-item label="车辆所属" prop="ownership">
<el-select
disabled
v-model="oilVehicleOwner.ownership"
style="width: 100%"
>
@@ -53,7 +54,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col>
<!-- <el-col>
<el-form-item label="常用油品" prop="normsOilNumber">
<el-select
v-model="oilVehicleOwner.normsOilNumber"
@@ -69,9 +70,9 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row type="flex">
<!-- <el-row type="flex">
<el-col>
<el-form-item label="车牌颜色" prop="plateColor">
<el-select
@@ -133,7 +134,7 @@
</el-col>
<el-col />
<el-col />
</el-row>
</el-row> -->
</el-card>
<el-col :span="24" style="text-align: right">
<el-button @click="close">取消</el-button>
@@ -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;
});

94
src/views/driver/vehicle/OilVehicleOwnerList.vue
View File

@@ -438,54 +438,54 @@ export default {
);
},
},
{
prop: "companyName",
minWidth: 120,
label: "企业信息",
show: true,
render: (row, column, cell) => {
if (row.ownership === "DRIVER") {
return <el-tag type="info">车辆归属个人，无所属企业</el-tag>;
}
return (
<div>
<div>
{row.userName ? cell : ""} <br />{" "}
{row.companyId ? "编号：" + row.companyId : ""}{" "}
</div>
</div>
);
// return cell
},
},
// {
// prop: "companyName",
// minWidth: 120,
// label: "企业信息",
// show: true,
// render: (row, column, cell) => {
// if (row.ownership === "DRIVER") {
// return <el-tag type="info">车辆归属个人，无所属企业</el-tag>;
// }
// return (
// <div>
// <div>
// {row.userName ? cell : ""} <br />{" "}
// {row.companyId ? "编号：" + row.companyId : ""}{" "}
// </div>
// </div>
// );
// // 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 (
<el-switch
v-model={b}
on-change={() => this.enableChange(row, b)}
active-color="#13ce66"
inactive-color="#ff4949"
>
{" "}
</el-switch>
);
},
},
// {
// 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 (
// <el-switch
// v-model={b}
// on-change={() => this.enableChange(row, b)}
// active-color="#13ce66"
// inactive-color="#ff4949"
// >
// {" "}
// </el-switch>
// );
// },
// },
{
prop: "createTime",

24
src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
View File

@@ -54,7 +54,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col>
<!-- <el-col>
<el-form-item label="常用油品" prop="normsOilNumber">
<el-select
v-model="oilVehicleOwner.normsOilNumber"
@@ -70,9 +70,9 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row type="flex">
<!-- <el-row type="flex">
<el-col>
<el-form-item label="车牌颜色" prop="plateColor">
<el-select
@@ -118,9 +118,9 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row type="flex">
<!-- <el-row type="flex">
<el-col>
<el-form-item label="禁用标识" prop="enableMark">
<el-switch
@@ -134,7 +134,7 @@
</el-col>
<el-col />
<el-col />
</el-row>
</el-row> -->
</el-card>
<el-col :span="24" style="text-align: right">
<el-button @click="close">取消</el-button>
@@ -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) => {

2
vue.config.js
View File

@@ -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]: ""