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
pull/1/head
xk_jiangfeng 3 years ago
parent 8b7c72c536 c7b78e553a
commit 1c9c736bee
5 changed files with 73 additions and 72 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. 10
      src/api/user/oilVehicleOwner.js
  2. 15
      src/views/driver/vehicle/OilVehicleOwnerAdd.vue
  3. 94
      src/views/driver/vehicle/OilVehicleOwnerList.vue
  4. 24
      src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
  5. 2
      vue.config.js

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

@ -11,14 +11,14 @@ export default {
}, },
getDispatchPage(page) { // 分页查询 getDispatchPage(page) { // 分页查询
return request({ return request({
url: `/xkhl-user/saasVehicleOwner/getDispatchPage`, url: `/xkhl-user/saasCustomerPlatenum/getDispatchPage`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
save(oilVehicleOwner) { // 保存 save(oilVehicleOwner) { // 保存
return request({ return request({
url: `/${service_name}/${group_name}/save`, url: `/xkhl-user/saasCustomerPlatenum/save`,
method: 'post', method: 'post',
data: oilVehicleOwner data: oilVehicleOwner
}) })
@ -39,7 +39,7 @@ export default {
}, },
get(id) { // 根据id查询 get(id) { // 根据id查询
return request({ return request({
url: `/xkhl-user/saasVehicleOwner/get/${id}`, url: `/xkhl-user/saasCustomerPlatenum/getById/${id}`,
method: 'get' method: 'get'
}) })
}, },
@ -52,7 +52,7 @@ export default {
}, },
updateDispatch(oilVehicleOwner) { // 更新 updateDispatch(oilVehicleOwner) { // 更新
return request({ return request({
url: `/xkhl-user/saasVehicleOwner/updateDispatch`, url: `/xkhl-user/saasCustomerPlatenum/save`,
method: 'post', method: 'post',
data: oilVehicleOwner data: oilVehicleOwner
}) })
@ -68,7 +68,7 @@ export default {
}, },
deleteById(id) { // 根据id删除 deleteById(id) { // 根据id删除
return request({ return request({
url: `/xkhl-user/saasVehicleOwner/delete`, url: `/xkhl-user/saasCustomerPlatenum/delete`,
method: 'post', method: 'post',
data: { id: id } data: { id: id }
}) })

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

@ -20,6 +20,7 @@
<el-col> <el-col>
<el-form-item label="车辆所属" prop="ownership"> <el-form-item label="车辆所属" prop="ownership">
<el-select <el-select
disabled
v-model="oilVehicleOwner.ownership" v-model="oilVehicleOwner.ownership"
style="width: 100%" style="width: 100%"
> >
@ -53,7 +54,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col> <!-- <el-col>
<el-form-item label="常用油品" prop="normsOilNumber"> <el-form-item label="常用油品" prop="normsOilNumber">
<el-select <el-select
v-model="oilVehicleOwner.normsOilNumber" v-model="oilVehicleOwner.normsOilNumber"
@ -69,9 +70,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row type="flex"> <!-- <el-row type="flex">
<el-col> <el-col>
<el-form-item label="车牌颜色" prop="plateColor"> <el-form-item label="车牌颜色" prop="plateColor">
<el-select <el-select
@ -133,7 +134,7 @@
</el-col> </el-col>
<el-col /> <el-col />
<el-col /> <el-col />
</el-row> </el-row> -->
</el-card> </el-card>
<el-col :span="24" style="text-align: right"> <el-col :span="24" style="text-align: right">
<el-button @click="close">取消</el-button> <el-button @click="close">取消</el-button>
@ -176,9 +177,9 @@ export default {
}; };
}, },
created() { created() {
oilVehicleOwnerApi.getVehicleType().then((res) => { // oilVehicleOwnerApi.getVehicleType().then((res) => {
this.vehicleTypeList = res.data; // this.vehicleTypeList = res.data;
}); // });
oilVehicleOwnerApi.getOils().then((res) => { oilVehicleOwnerApi.getOils().then((res) => {
this.oilList = res.data; this.oilList = res.data;
}); });

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

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

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

@ -54,7 +54,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col> <!-- <el-col>
<el-form-item label="常用油品" prop="normsOilNumber"> <el-form-item label="常用油品" prop="normsOilNumber">
<el-select <el-select
v-model="oilVehicleOwner.normsOilNumber" v-model="oilVehicleOwner.normsOilNumber"
@ -70,9 +70,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row type="flex"> <!-- <el-row type="flex">
<el-col> <el-col>
<el-form-item label="车牌颜色" prop="plateColor"> <el-form-item label="车牌颜色" prop="plateColor">
<el-select <el-select
@ -118,9 +118,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row type="flex"> <!-- <el-row type="flex">
<el-col> <el-col>
<el-form-item label="禁用标识" prop="enableMark"> <el-form-item label="禁用标识" prop="enableMark">
<el-switch <el-switch
@ -134,7 +134,7 @@
</el-col> </el-col>
<el-col /> <el-col />
<el-col /> <el-col />
</el-row> </el-row> -->
</el-card> </el-card>
<el-col :span="24" style="text-align: right"> <el-col :span="24" style="text-align: right">
<el-button @click="close">取消</el-button> <el-button @click="close">取消</el-button>
@ -176,15 +176,15 @@ export default {
}; };
}, },
created() { created() {
oilVehicleOwnerApi.getVehicleType().then((res) => { // oilVehicleOwnerApi.getVehicleType().then((res) => {
this.vehicleTypeList = res.data; // this.vehicleTypeList = res.data;
}); // });
oilVehicleOwnerApi.getOils().then((res) => { oilVehicleOwnerApi.getOils().then((res) => {
this.oilList = res.data; this.oilList = res.data;
}); });
oilCompanyInfoApi.getLike(this.oilVehicleOwner.companyId).then((res) => { // oilCompanyInfoApi.getLike(this.oilVehicleOwner.companyId).then((res) => {
this.customerList = res.data; // this.customerList = res.data;
}); // });
sysCustomerInfoApi sysCustomerInfoApi
.liekQuery(this.oilVehicleOwner.customerId) .liekQuery(this.oilVehicleOwner.customerId)
.then((res) => { .then((res) => {

2
vue.config.js
Unescape View File

@ -26,7 +26,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: "http://uat.xingoil.com/adminapi", // target: "http://uat.xingoil.com/adminapi",
// target: 'https://www.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, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "" ["^" + process.env.VUE_APP_BASE_API]: ""

Write Preview
Loading…
Cancel
Save