Merge remote-tracking branch 'origin/tx' into tx
This commit is contained in:
commit
bd4720e7bf
|
@ -6,7 +6,7 @@ ENV = 'development'
|
|||
|
||||
# 电动车租赁系统/开发环境
|
||||
# VUE_APP_BASE_API = '/dev-api'
|
||||
VUE_APP_BASE_API = 'http://192.168.2.11:8090'
|
||||
VUE_APP_BASE_API = 'http://192.168.2.42:8090'
|
||||
# VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
|
||||
# VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
|
||||
|
||||
|
|
|
@ -42,3 +42,12 @@ export function delDeliveryOrder(deliveryId) {
|
|||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 查询配送工单详细
|
||||
export function getDeliveryList(deliveryId) {
|
||||
return request({
|
||||
url: '/system/deliveryOrderOper/listByDeliveryId?deliveryId=' + deliveryId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -124,22 +124,15 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-edit"-->
|
||||
<!-- @click="handleUpdate(scope.row)"-->
|
||||
<!-- v-hasPermi="['system:deliveryOrder:edit']"-->
|
||||
<!-- >修改</el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- v-hasPermi="['system:deliveryOrder:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </template>-->
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-view"
|
||||
@click="handleView(scope.row)"
|
||||
|
||||
>详情</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
@ -152,43 +145,64 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改配送工单对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="订单号" prop="orderNo">
|
||||
<el-input v-model="form.orderNo" placeholder="请输入订单号" />
|
||||
<!-- <el-input v-model="form.orderNo" placeholder="请输入订单号" /> -->
|
||||
<div>{{ form.orderNo }}</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="代理商" prop="agentId">
|
||||
<el-input v-model="form.agentId" placeholder="请输入代理商" />
|
||||
<div>{{ form.agentName }}</div>
|
||||
<!-- <el-input v-model="form.agentId" placeholder="请输入代理商" /> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="配送员" prop="deliverymanId">
|
||||
<el-input v-model="form.deliverymanId" placeholder="请输入配送员" />
|
||||
<!-- <el-input v-model="form.deliverymanId" placeholder="请输入配送员" /> -->
|
||||
<div>{{ form.deliveryman }}</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="配送员类型" prop="deliverymanType">
|
||||
<el-select v-model="form.deliverymanType" placeholder="请选择配送员类型">
|
||||
<!-- <div>{{ form.deliverymanType }}</div> -->
|
||||
<dict-tag :options="dict.type.rl_deliveryman_type" :value="form.deliverymanType"/>
|
||||
<!-- <el-select v-model="form.deliverymanType" placeholder="请选择配送员类型" disabled>
|
||||
<el-option
|
||||
v-for="dict in dict.type.rl_deliveryman_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="配送员名称" prop="deliveryman">
|
||||
<el-input v-model="form.deliveryman" placeholder="请输入配送员名称" />
|
||||
<div>{{ form.deliveryman }}</div>
|
||||
<!-- <el-input v-model="form.deliveryman" placeholder="请输入配送员名称" /> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="配送员电话" prop="deliverymanPhone">
|
||||
<el-input v-model="form.deliverymanPhone" placeholder="请输入配送员电话" />
|
||||
<div>{{ form.deliverymanPhone }}</div>
|
||||
<!-- <el-input v-model="form.deliverymanPhone" placeholder="请输入配送员电话" /> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="form.status" placeholder="请选择状态">
|
||||
<el-option
|
||||
v-for="dict in dict.type.rl_delivery_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
<el-form-item label="状态" prop="status" >
|
||||
<dict-tag :options="dict.type.rl_delivery_status" :value="form.status"/>
|
||||
|
||||
</el-form-item>
|
||||
<el-table :data="deliveryOrderOperList">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column label="操作id" align="center" prop="operId" />
|
||||
<!-- <el-table-column label="配送工单id" align="center" prop="deliveryId" /> -->
|
||||
<el-table-column label="配送类型" align="center" prop="type">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.rl_delivery_type" :value="scope.row.type"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作人" align="center" prop="operUserid" />
|
||||
<el-table-column label="操作人电话" align="center" prop="operPhone" />
|
||||
<el-table-column label="操作人名称" align="center" prop="operName" />
|
||||
<el-table-column label="操作时间" align="center" prop="operTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
|
@ -199,11 +213,11 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { listDeliveryOrder, getDeliveryOrder, delDeliveryOrder, addDeliveryOrder, updateDeliveryOrder } from "@/api/rl/deliveryOrder";
|
||||
import { listDeliveryOrder, getDeliveryOrder, delDeliveryOrder, addDeliveryOrder, updateDeliveryOrder,getDeliveryList } from "@/api/rl/deliveryOrder";
|
||||
|
||||
export default {
|
||||
name: "DeliveryOrder",
|
||||
dicts: ['rl_deliveryman_type', 'rl_delivery_status'],
|
||||
dicts: ['rl_deliveryman_type', 'rl_delivery_status','rl_delivery_type'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
@ -239,6 +253,7 @@ export default {
|
|||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
deliveryOrderOperList:[],
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
|
@ -248,6 +263,16 @@ export default {
|
|||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
handleView(row) {
|
||||
this.open= true;
|
||||
this.form = row;
|
||||
|
||||
getDeliveryList(this.form.deliveryId).then(response => {
|
||||
this.deliveryOrderOperList = response.data;
|
||||
// this.total = response.total;
|
||||
// this.loading = false;
|
||||
});
|
||||
},
|
||||
/** 查询配送工单列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
|
|
@ -440,7 +440,9 @@
|
|||
<el-col :span="8">
|
||||
<el-form-item label="设备mac:">{{ form.mac }}</el-form-item>
|
||||
<el-form-item label="设备SN:">{{ form.sn }}</el-form-item>
|
||||
<el-form-item label="车辆状态:" style="color: #12d2ac;font-weight: 700"> <dict-tag :options="dict.type.rl_device_status" :value="form.status"/></el-form-item>
|
||||
<el-form-item label="车辆状态:" style="color: #12d2ac;font-weight: 700">
|
||||
<dict-tag :options="dict.type.rl_device_status" :value="form.status"/>
|
||||
</el-form-item>
|
||||
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
Loading…
Reference in New Issue
Block a user