|
|
@@ -97,6 +97,7 @@
|
|
|
>出车</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
+ v-else
|
|
|
size="btc"
|
|
|
type="text"
|
|
|
@click="singles(scope.row)"
|
|
|
@@ -162,9 +163,9 @@
|
|
|
</el-form-item>
|
|
|
<div class="box3">
|
|
|
<el-form v-for="(item1, e) in checkShop" :key="e">
|
|
|
- <el-form-item label="" prop="onshenpirenid">
|
|
|
+ <el-form-item label="" prop="bdglThebusId">
|
|
|
<el-select
|
|
|
- v-model="item1.vehiclemodel"
|
|
|
+ v-model="item1.bdglThebusId"
|
|
|
placeholder="请选择车辆车牌"
|
|
|
filterable
|
|
|
>
|
|
|
@@ -188,7 +189,7 @@
|
|
|
v-for="(item, i) in driverList"
|
|
|
:key="i"
|
|
|
:label="item.peopleName"
|
|
|
- :value="item.peopleId"
|
|
|
+ :value="item.id"
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -258,7 +259,7 @@
|
|
|
<div class="box4">
|
|
|
<table border="1">
|
|
|
<tr align="center" class="tr">
|
|
|
- <td width="220" height="40">厂牌型号</td>
|
|
|
+ <td width="220" height="40">车牌型号</td>
|
|
|
<td width="220" height="40">号牌号码</td>
|
|
|
<td width="220" height="40">司机</td>
|
|
|
<td width="220" height="40">司机联系方式</td>
|
|
|
@@ -269,26 +270,17 @@
|
|
|
v-for="(item, i) in chaCarLists"
|
|
|
:key="i"
|
|
|
>
|
|
|
- <td width="220" height="40">{{ item.vehiclemodel }}</td>
|
|
|
+ <td width="220" height="40">
|
|
|
+ <template>
|
|
|
+ {{ names }}
|
|
|
+ </template>
|
|
|
+ </td>
|
|
|
<td width="220" height="40">{{ item.vehiclenumber }}</td>
|
|
|
- <td width="220" height="40">{{ item.driverId }}</td>
|
|
|
+ <td width="220" height="40">{{ item.driverName }}</td>
|
|
|
<td width="220" height="40">{{ item.driverPhone }}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
|
-
|
|
|
- <!-- <el-form-item label="型号" prop="cause">
|
|
|
- <el-input v-model="forms.cause" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="号牌号码" prop="cause">
|
|
|
- <el-input v-model="forms.cause" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="司机" prop="cause">
|
|
|
- <el-input v-model="forms.cause" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="司机联系方式" prop="cause">
|
|
|
- <el-input v-model="forms.cause" />
|
|
|
- </el-form-item> -->
|
|
|
</el-form>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -302,13 +294,13 @@ import {
|
|
|
exportThebusApply,
|
|
|
exportThebusCar,
|
|
|
exportThebusCha,
|
|
|
- chuCarList,
|
|
|
+ zaiweiCar,
|
|
|
} from "@/api/militaryvehicleManagement/thebusApply";
|
|
|
// 查询字典
|
|
|
import { getDicts } from "@/api/system/dict/data";
|
|
|
import { listDriver } from "@/api/militaryvehicleManagement/driver";
|
|
|
import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
|
|
|
-import { listThebus } from "@/api/militaryvehicleManagement/thebus";
|
|
|
+// import {} from "@/api/militaryvehicleManagement/thebus";
|
|
|
export default {
|
|
|
name: "ThebusApply",
|
|
|
data() {
|
|
|
@@ -365,13 +357,29 @@ export default {
|
|
|
chaCarLists: [],
|
|
|
// 出车获取车辆列表
|
|
|
chucarlist: [],
|
|
|
+ // 车牌型号的保存
|
|
|
+ names: "",
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
this.getSuo();
|
|
|
+ getDicts("brand").then((response) => {
|
|
|
+ this.brand = response.data;
|
|
|
+ });
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 翻译车牌型号
|
|
|
+ car(value) {
|
|
|
+ console.log(value, 1);
|
|
|
+ this.brand.map((item) => {
|
|
|
+ if (item.dictValue == value) {
|
|
|
+ this.names = item.dictLabel;
|
|
|
+ }
|
|
|
+ console.log(this.names);
|
|
|
+ // return this.names;
|
|
|
+ });
|
|
|
+ },
|
|
|
chuche(data) {
|
|
|
console.log(data);
|
|
|
},
|
|
|
@@ -387,9 +395,8 @@ export default {
|
|
|
exportThebusCha(this.form).then((res) => {
|
|
|
this.forms = res.data;
|
|
|
this.opens = true;
|
|
|
- console.log(res.data);
|
|
|
-
|
|
|
this.chaCarLists = res.data.bdglDepartureInfos;
|
|
|
+ this.car(this.chaCarLists[0].vehiclemodel);
|
|
|
});
|
|
|
},
|
|
|
// 获取司机
|
|
|
@@ -400,13 +407,10 @@ export default {
|
|
|
},
|
|
|
// 获取车辆型号
|
|
|
getCar() {
|
|
|
- listThebus().then((res) => {
|
|
|
+ zaiweiCar().then((res) => {
|
|
|
this.chucarlist = res.rows;
|
|
|
console.log(res);
|
|
|
});
|
|
|
- // getDicts("brand").then((response) => {
|
|
|
- // this.brand = response.data;
|
|
|
- // });
|
|
|
},
|
|
|
|
|
|
// 删除对话框查铺
|
|
|
@@ -425,7 +429,6 @@ export default {
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
listThebusApply(this.queryParams).then((response) => {
|
|
|
- console.log(response);
|
|
|
this.thebusApplyList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -460,7 +463,6 @@ export default {
|
|
|
},
|
|
|
/** 出车按钮操作 */
|
|
|
handleAdd(row) {
|
|
|
- console.log(row);
|
|
|
this.form.id = row.id;
|
|
|
this.form = row;
|
|
|
this.getCar();
|
|
|
@@ -484,8 +486,6 @@ export default {
|
|
|
submitForm() {
|
|
|
this.form.bdglDepartureInfos = this.checkShop;
|
|
|
this.form.outstatus = "1";
|
|
|
- console.log(this.form);
|
|
|
- console.log(this.form.checkShop);
|
|
|
exportThebusCar(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
@@ -496,7 +496,7 @@ export default {
|
|
|
handleDelete(row) {
|
|
|
const ids = row.id || this.ids;
|
|
|
this.$modal
|
|
|
- .confirm('是否确认删除用车申请编号为"' + ids + '"的数据项？')
|
|
|
+ .confirm("是否确认删除用车申请的数据项？")
|
|
|
.then(function () {
|
|
|
return delThebusApply(ids);
|
|
|
})
|
sunyanqiang