chuangte/ride-lease-vue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
tx 2024-10-30 18:01:10 +08:00
parent 7484c3a1f3
commit 14893091b5
4 changed files with 53 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/utils/config/globalConfig copy.js
View File

File diff suppressed because one or more lines are too long

27
src/utils/config/globalConfig.js
View File

File diff suppressed because one or more lines are too long

53
src/views/system/deliveryOrder/index.vue
View File

@ -132,22 +132,15 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-button--> <el-button
<!-- size="mini"--> size="mini"
<!-- type="text"--> type="text"
<!-- icon="el-icon-edit"--> icon="el-icon-view"
<!-- @click="handleUpdate(scope.row)"--> @click="handleView(scope.row)"
<!-- v-hasPermi="['system:deliveryOrder:edit']"-->
<!-- >修改</el-button>--> >详情</el-button>
<!-- <el-button--> </template>
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:deliveryOrder:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -161,18 +154,22 @@
<!-- 添加或修改配送工单对话框 --> <!-- 添加或修改配送工单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="订单号" prop="orderNo"> <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>
<el-form-item label="代理商" prop="agentId"> <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>
<el-form-item label="配送员" prop="deliverymanId"> <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>
<el-form-item label="配送员类型" prop="deliverymanType"> <el-form-item label="配送员类型" prop="deliverymanType">
<el-select v-model="form.deliverymanType" placeholder="请选择配送员类型"> <!-- <div>{{ form.deliverymanType }}</div> -->
<el-select v-model="form.deliverymanType" placeholder="请选择配送员类型" disabled>
<el-option <el-option
v-for="dict in dict.type.rl_deliveryman_type" v-for="dict in dict.type.rl_deliveryman_type"
:key="dict.value" :key="dict.value"
@ -182,13 +179,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="配送员名称" prop="deliveryman"> <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>
<el-form-item label="配送员电话" prop="deliverymanPhone"> <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>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status" >
<el-select v-model="form.status" placeholder="请选择状态"> <el-select v-model="form.status" placeholder="请选择状态" disabled>
<el-option <el-option
v-for="dict in dict.type.rl_delivery_status" v-for="dict in dict.type.rl_delivery_status"
:key="dict.value" :key="dict.value"
@ -255,6 +254,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
handleView(row) {
this.open= true;
this.form = row;
},
/** 查询配送工单列表 */ /** 查询配送工单列表 */
getList() { getList() {
this.loading = true; this.loading = true;

4
src/views/system/device/index.vue
View File

@ -396,7 +396,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="设备mac：">{{ form.mac }}</el-form-item> <el-form-item label="设备mac：">{{ form.mac }}</el-form-item>
<el-form-item label="设备SN：">{{ form.sn }}</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>
<el-col :span="8"> <el-col :span="8">