1.调整
This commit is contained in:
parent
9eadcec906
commit
c3904cf7d0
|
@ -460,7 +460,7 @@ export default {
|
|||
],
|
||||
deductionAmount: [
|
||||
{ required: true, message: "扣款金额不能为空", trigger: "blur" },
|
||||
{ pattern: /^\d+$/, message: '扣款金额必须为正整数', trigger: 'blur' }
|
||||
// { pattern: /^\d+$/, message: '扣款金额必须为正整数', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
};
|
||||
|
@ -542,7 +542,7 @@ export default {
|
|||
if (valid) {
|
||||
console.log("------66666---")
|
||||
if (this.form5.orderId != null) {
|
||||
this.form5.status = "6";
|
||||
this.form5.status = "5";
|
||||
updateOrder({orderId:this.form5.orderId,status:this.form5.status}).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.open5 = false;
|
||||
|
|
|
@ -61,8 +61,13 @@
|
|||
<el-table v-loading="loading" :data="commandLogList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="主键" align="center" prop="id" />
|
||||
<el-table-column label="请求url" align="center" prop="url" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="命令" align="center" prop="command" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="请求url" align="center" prop="url" :show-overflow-tooltip="true"/>-->
|
||||
<!-- <el-table-column label="命令" align="center" prop="command" />-->
|
||||
<el-table-column label="类型" align="center" prop="type" />
|
||||
<el-table-column label="mac" align="center" prop="mac" />
|
||||
<el-table-column label="sn" align="center" prop="sn" />
|
||||
|
@ -74,11 +79,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作人" align="center" prop="createBy" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
|
@ -106,9 +107,15 @@
|
|||
<el-col :span="24">
|
||||
<el-form-item label="请求url">{{ form.url }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="命令">{{ form.command }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="经度">{{ form.longitude }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="纬度">{{ form.latitude }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item style="color: #12d2ac;font-weight: 700" label="类型">{{ form.type }}</el-form-item>
|
||||
</el-col>
|
||||
|
|
Loading…
Reference in New Issue
Block a user