yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 3 years ago
parent
5aa43c0ee5 676f06f545
commit
60384c1e2b
2 changed files with 97 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js
  2. 130
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

11
anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js
View File

@ -9,6 +9,17 @@ export function pagerList(data) {
headers: { 'Content-Type': 'application/json' }
})
}
// 存放地点根据当前车架号和分公司sid获取存放地点变更记录
export function selectCarTransferListAll(data) {
return request({
url: '/scm/v1/scmvehiclegression/selectCarTransferListAll',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 添加
export function SaveList(data) {
return request({

130
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
View File

@ -65,7 +65,11 @@
<!-- <span>{{ scope.row.engineNo }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="locationName" width="140" label="存放地点" align="center"/>
<el-table-column width="140" label="存放地点" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.locationName }}</span>
</template>
</el-table-column>
<el-table-column prop="vehicleStateValue" width="100" label="库存状态" align="center"/>
<el-table-column prop="priceDate" width="130" label="厂家入库日期" align="center"/>
<el-table-column prop="libraryAge" width="80" label="库龄(天)" align="center"/>
@ -118,6 +122,52 @@
<cheliangtaizhang-mai-info v-show="viewState == 8" ref="divMaiInfo" @doback="resetState"/>
<!-- 车辆配件更换记录列表 -->
<cheliangpeijian v-show="viewState == 9" ref="divPeiJian" @doback="resetState"/>
<el-dialog :visible.sync="dialogVisible" width="80%">
<el-form class="formadd">
<el-table :key="cfddKey" :data="cfdd_list" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column width="220px" prop="applyId" label="申请编号" align="center"/>
<el-table-column width="140px" prop="applyDate" label="申请日期" align="center"/>
<el-table-column width="130px" prop="applyName" label="申请人" align="center"/>
<el-table-column width="180px" prop="vin" label="车架号" align="center"/>
<el-table-column width="160px" prop="location" label="现存放地点" align="center"/>
<el-table-column width="160px" prop="targetLocation" label="目标存放地点" align="center"/>
<el-table-column width="130px" prop="operator" label="经办人" align="center"/>
<el-table-column width="160px" prop="applyPrice" label="申请费用" align="center"/>
<el-table-column width="180px" label="现场照片" align="center">
<template slot-scope="{row}">
<el-button size="mini" type="primary" v-show="row.images.length > 0" @click="handleCheckImg(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="180px" label="保单" align="center">
<template slot-scope="{row}">
<el-button size="mini" type="primary" v-show="row.policyImage.length > 0" @click="handleCheckBao(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="160px" prop="temporaryCard" label="临牌牌照号" align="center"/>
<el-table-column width="120px" label="临时出门证" align="center">
<template slot-scope="{row}">
<!-- <el-button v-show="row.state == '已办结'" size="mini" type="primary" @click="handleExitPermit(row)">打印出门证-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="cfdd_list.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="handleLook"/>
</div>
</el-form>
</el-dialog>
<!-- 照片弹窗 -->
<el-dialog :visible.sync="dialogImgVisible" width="1000px" :close-on-click-modal="false">
<div class="result-cont">
<el-carousel indicator-position="outside" style="height: 500px;">
<el-carousel-item v-for="item in srcList" :key="item" style="height: 500px;">
<img style="width: 100%; height: 500px;" :src="item">
</el-carousel-item>
</el-carousel>
</div>
</el-dialog>
</div>
</template>
@ -127,7 +177,8 @@ import {
deleteBySids,
fetchByUseOrgSid,
getUseOrgByUserSid,
pagerList
pagerList,
selectCarTransferListAll
} from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/cheliang/dictcommons'
import cheliangtaizhangAdd from './cheliangtaizhangAdd'
@ -164,6 +215,8 @@ export default {
return {
viewState: 1,
isSearchShow: false,
dialogVisible: false,
index: 0,
searchxianshitit: '显示查询条件',
btndisabled: false,
// --按钮菜单-------
@ -227,8 +280,13 @@ export default {
],
// 查询 -----------
tableKey: 0,
cfddKey: 1,
// list: null,
list: [],
cfdd_list: [],
imgList: [],
srcList: [],
dialogImgVisible: false,
total: 1,
FormLoading: false,
listLoading: false,
@ -244,6 +302,15 @@ export default {
current: 1,
size: 5
},
queryParams: {
current: 1,
size: 5,
total: 0,
params: {
vin: '',
useOrgSid: ''
}
},
sids: [],
selectDate: undefined,
temp: {}, // 添加和修改
@ -374,6 +441,7 @@ export default {
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
this.listQuery.params.createOrgSid = res.data
this.queryParams.params.useOrgSid = res.data
this.getList()
}
})
@ -453,17 +521,11 @@ export default {
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
// this.$router.push({ path: '/cheliang/cheliangtaizhangAdd/0' })
},
// 打开配置
cheLiangXiangXiPeiZhi(row) {
this.viewState = 5
this.$refs['divPeizhi'].showInfo(row)
// console.log(78988888, row)
// this.$router.push({
// path: '/cheliang/xiangxipeizhi',
// query: { sid: row.sid }
// })
},
// 出库
doChuku() {
@ -549,35 +611,13 @@ export default {
this.viewState = 9
this.$refs['divPeiJian'].init(this.multipleSelection)
},
// 提交添加数据
createData() {
// console.log('提交：' + JSON.stringify(this.temp))
// this.$refs['dataForm'].validate(valid => {
// if (valid) {
// this.FormLoading = true
// addServiceType(this.temp).then(response => {
// // console.log('数据聚聚聚' + JSON.stringify(response))
// this.FormLoading = false
// if (response.code === 20000) {
// this.dialogFormVisible = false
// this.$notify({
// title: '提示',
// message: '添加成功',
// type: 'success',
// duration: 2000
// })
// this.getList()
// } else {
// this.$notify({
// title: '提示',
// message: '添加失败',
// type: 'error',
// duration: 2000
// })
// }
// })
// }
// })
handleCheckImg(row) {
this.dialogImgVisible = true
this.srcList = row.images
},
handleCheckBao(row) {
this.dialogImgVisible = true
this.srcList = row.policyImage
},
// 打开修改
toEdit() {
@ -586,9 +626,6 @@ export default {
this.viewState = 3
const sid = this.sids[0]
this.$refs['divadd'].showEdit(sid)
// this.$router.push({
// path: `/cheliang/cheliangtaizhangAdd/${this.sids[0]}`
// })
} else if (this.sids.length > 1) {
this.$notify({
title: '提示',
@ -609,14 +646,19 @@ export default {
// 打开查看
handleCheck(row) {
console.log('88888888888', row)
// this.$router.push({
// path: '/cheliang/cheliangtaizhangInfo',
// query: { sid: row.sid }
// })
this.viewState = 4
const sid = row.sid
this.$refs['divinfo'].showInfo(sid)
},
handleLook(row) {
this.queryParams.params.vin = row.vinNo
selectCarTransferListAll(this.queryParams).then((res) => {
if (res.success) {
this.dialogVisible = true
this.cfdd_list = res.data.records
}
})
},
// 根据本行ID删除数据
doDel() {
if (this.sids.length > 0) {

Write Preview
Loading…
Cancel
Save