kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build' into union

Browse Source
This commit is contained in:
aixianling
2022-12-01 09:38:35 +08:00
parent 883ec09a0e 0314be9515
commit 35ee47189f
2 changed files with 79 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/pidu/app/AppGoods/components/List.vue
View File

@@ -59,8 +59,8 @@
<el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }">
<div class="table-options">
<el-button type="text" @click="operation(row.id, row.status)" v-if="row.status === '0' || row.status === '2'">下架</el-button>
<el-button type="text" @click="operation(row.id, row.status)" v-if="row.status === '1'">上架</el-button>
<el-button type="text" @click="operation(row.id, 0)" v-if="row.status === '0' || row.status === '2'">下架</el-button>
<el-button type="text" @click="operation(row.id, 1)" v-if="row.status === '1'">上架</el-button>
<el-button type="text" @click="toAdd(row.id)">编辑</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button>
</div>
@@ -175,7 +175,7 @@
operation (id, status) {
this.$confirm(status === '1' ? '确定上架该商品？' : '确定下架该商品？').then(() => {
this.instance.post(`/app/appintegralmerchandise/takeOnOffById?id=${id}&opType=${status === '0' ? 0 : 1}`).then(res => {
this.instance.post(`/app/appintegralmerchandise/takeOnOffById?id=${id}&opType=${status}`).then(res => {
if (res.code == 0) {
this.$message.success(status === '1' ? '上架成功' : '下架成功')
this.getList()

81
project/pingchang/apps/AppHomeReport/components/Detail.vue
View File

@@ -24,12 +24,15 @@
</template>
</ai-card>
<ai-card title="行程信息">
<template #right>
<el-button type="primary" @click="(form = {...info}, isShow = true)">编辑</el-button>
</template>
<template #content>
<ai-wrapper
label-width="120px">
<ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
<ai-info-item label="出发地" >
<span :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
<span :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
</ai-info-item>
<ai-info-item label="出发地详址" isLine :value="info.startAddress"></ai-info-item>
<ai-info-item label="出行方式" :value="info.travelTypeNames"></ai-info-item>
@@ -123,14 +126,66 @@
</div>
<ai-dialog
:visible.sync="isShow"
width="590px"
width="890px"
title="编辑"
@close="form.idNumber = ''"
@onConfirm="onConfirm">
<el-form ref="form" :model="form" label-width="110px" label-position="right">
<el-form-item label="身份证" prop="idNumber" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">
<el-form class="ai-form" ref="form" :model="form" label-width="110px" label-position="right">
<el-form-item label="身份证" prop="idNumber" style="width: 100%" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">
<el-input size="small" placeholder="请输入身份证" v-model="form.idNumber"></el-input>
</el-form-item>
<el-form-item label="出发时间" prop="startTime" style="width: 100%" :rules="[{required: true, message: '请选择出发时间', trigger: 'change'}]">
<el-date-picker
v-model="form.startTime"
type="datetime"
size="small"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择出发时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出发地" prop="startAreaId" style="width: 100%" :rules="[{required: true, message: '请选择出发地', trigger: 'change'}]">
<ai-area-select clearable always-show :instance="instance" v-model="form.startAreaId"></ai-area-select>
</el-form-item>
<el-form-item label="出发地详址" prop="startAddress" style="width: 100%" :rules="[{required: true, message: '请输入出发地详址', trigger: 'blur'}]">
<el-input size="small" placeholder="请输入出发地详址" v-model="form.startAddress"></el-input>
</el-form-item>
<el-form-item label="出行方式" prop="travelType" style="width: 100%" :rules="[{required: true, message: '请选择出行方式', trigger: 'change'}]">
<ai-select
v-model="form.travelType"
clearable
placeholder="请选择出行方式"
:selectList="dict.getDict('EP_travelType')">
</ai-select>
</el-form-item>
<el-form-item label="车次/航班" prop="trainNo" style="width: 100%" :rules="[{required: true, message: '请输入车次', trigger: 'blur'}]">
<el-input size="small" placeholder="请输入车次/航班" v-model="form.trainNo"></el-input>
</el-form-item>
<el-form-item label="行程描述" prop="description" style="width: 100%" :rules="[{required: true, message: '请输入行程描述', trigger: 'blur'}]">
<el-input size="small" placeholder="请输入行程描述" v-model="form.description"></el-input>
</el-form-item>
<el-form-item label="抵平卡口" prop="arriveGatewayId" style="width: 100%" :rules="[{required: true, message: '请选择抵平卡口', trigger: 'change'}]">
<ai-select
v-model="form.arriveGatewayId"
clearable
placeholder="请选择抵平卡口"
:selectList="dictList">
</ai-select>
</el-form-item>
<el-form-item label="抵平时间" prop="arriveTime" style="width: 100%" :rules="[{required: true, message: '请选择抵平时间', trigger: 'change'}]">
<el-date-picker
v-model="form.arriveTime"
type="datetime"
size="small"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择抵平时间">
</el-date-picker>
</el-form-item>
<el-form-item label="目的地" prop="arriveAreaId" style="width: 100%" :rules="[{required: true, message: '请选择目的地', trigger: 'change'}]">
<ai-area-select clearable always-show :instance="instance" v-model="form.arriveAreaId"></ai-area-select>
</el-form-item>
<el-form-item label="目的地详址" prop="arriveAddress" style="width: 100%" :rules="[{required: true, message: '请输入目的地详址', trigger: 'blur'}]">
<el-input size="small" placeholder="请输入目的地详址" v-model="form.arriveAddress"></el-input>
</el-form-item>
</el-form>
</ai-dialog>
</template>
@@ -162,7 +217,8 @@
{prop: 'createTime', label: '创建时间', align: 'center'},
{prop: 'createUserName', label: '记录人', align: 'center' }
],
tabList: ['基本信息', '风险处置']
tabList: ['基本信息', '风险处置'],
dictList: []
}
},
@@ -174,9 +230,24 @@
this.getInfo(this.params.id)
})
}
this.getDictList()
},
methods: {
getDictList () {
this.instance.post(`/app/appepidemicpreventiongateway/list?size=10000&current=1`).then(res => {
if (res.code == 0) {
this.dictList = res.data.records.map(v => {
return {
dictName: v.name,
dictValue: v.id
}
})
}
})
},
getInfo (id) {
this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
if (res.code === 0) {