Browse Source

验车、入库、存放地点

master
Zhao Qiqi 3 years ago
parent
commit
cd194e7bf9
  1. 3
      anrui-scm/anrui-scm-ui/src/api/portal/Upload_chexing.js
  2. 65
      anrui-scm/anrui-scm-ui/src/api/supplychain/cunfangdidianbiangeng.js
  3. 47
      anrui-scm/anrui-scm-ui/src/api/supplychain/rukuguanli.js
  4. 52
      anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js
  5. 242
      anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_cunfang.vue
  6. 65
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
  7. 321
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
  8. 109
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue
  9. 154
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
  10. 71
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
  11. 71
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
  12. 93
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
  13. 119
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  14. 67
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

3
anrui-scm/anrui-scm-ui/src/api/portal/Upload_chexing.js

@ -6,6 +6,9 @@ const base = process.env.VUE_APP_URL
// 文件上传接口
export const uploadFile = '/api/base/v1/basevehiclemodel/pictureUpload'
//文件上传接口(仅存放地点变更页面使用接口)
export const uploadImgFile = '/api/scm/v1/scmvehiclegression/pictureUpload'
// 上传图片
// export function imageUpload(data) {
// return request({

65
anrui-scm/anrui-scm-ui/src/api/supplychain/cunfangdidianbiangeng.js

@ -0,0 +1,65 @@
import request from '@/utils/request'
// 存放地点变更申请
// 获取变更申请列表
export function selectCarTransferList(data) {
return request({
url: '/scm/v1/scmvehiclegression/selectCarTransferList',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 保存变更申请信息
export function saveCarTransferInfo(data) {
return request({
url: '/scm/v1/scmvehiclegression/saveCarTransferInfo',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 变更申请 新增初始化
export function getCarTransferInfo(data) {
return request({
url: '/scm/v1/scmvehiclegression/getCarTransferInfo/'+ data.sid + '/' + data.userSid,
method: 'get'
})
}
// 变更申请 详情回显
export function getCarTransfer(data) {
return request({
url: '/scm/v1/scmvehiclegression/getCarTransfer/'+ data,
method: 'get'
})
}
// 删除车辆存放地点变更申请
export function deleteCarTransfer(data) {
return request({
url: '/scm/v1/scmvehiclegression/deleteCarTransfer/'+ data,
method: 'DELETE'
})
}
// 获取仓库接口
export function selectWarehouseByUserSid(data) {
return request({
url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid/'+ data,
method: 'get'
})
}
// 根据仓库sid 获取车架号
export function getVinByWarehouseSid(data) {
return request({
url: '/terminal/autoservice/v1/virtualOrders/getVinByWarehouseSid/{warehouseSid}/{userSid}'+ data,
method: 'get'
})
}

47
anrui-scm/anrui-scm-ui/src/api/supplychain/rukuguanli.js

@ -0,0 +1,47 @@
import request from '@/utils/request'
// 入库管理
// 获取入库管理列表
export function selectCarWarehousingList(data) {
return request({
url: '/scm/v1/scmvehicleenterlibrary/selectCarWarehousingList',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 入库管理 新增初始化
export function getCarWarehousingInfo(data) {
return request({
url: '/scm/v1/scmvehicleenterlibrary/getCarWarehousingInfo/'+ data.warehousingSid + '/' + data.userSid,
method: 'get'
})
}
// 库位下拉框
export function selectWarehouseByUserSid(data) {
return request({
url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid/' + data,
method: 'get'
})
}
// 保存 入库
export function saveCarWarehousingInfo(data) {
return request({
url: '/scm/v1/scmvehicleenterlibrary/saveCarWarehousingInfo',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 入库 详情
export function selectWarehouseByUserSid(data) {
return request({
url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid/' + data,
method: 'get'
})
}

52
anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js

@ -1,10 +1,56 @@
import request from '@/utils/request'
import qs from 'qs'
// 验车管理
// 获取验车管理列表
export function selectCarInspectedList(data) {
return request({
url: '/scm/v1/scmvehicleexamine/selectCarInspectedList',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 保存 验车单
export function saveCarInspectedInfo(data) {
return request({
url: '/scm/v1/scmvehicleexamine/saveCarInspectedInfo',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 验车管理 新增初始化
export function getCarInspectedInfo(data) {
return request({
url: '/terminal/supplychain/v1/carInspected/getCarInspectedInfo/'+ data.inspectedSid + '/' + data.userSid,
method: 'get'
})
}
// 验车管理详情回显
export function getCarInspected(data) {
return request({
url: '/terminal/supplychain/v1/carInspected/getCarInspected/{inspectedSid}' + data,
method: 'get'
})
}
// 通过 验车单
export function submitCarInspectedInfo(data) {
return request({
url: '/scm/v1/scmvehicleexamine/submitCarInspectedInfo',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
export function selectModelName(data) {
// 数据字典
export function typeValues(data) {
return request({
url: '/base/v1/basevehiclemodel/selectDownPlusByModelName',
url: '/portal/v1/dictcommons/typeValues',
method: 'get',
params: data
})

242
anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_cunfang.vue

@ -0,0 +1,242 @@
<template>
<div><!---->
<el-upload class="upload-demo" :headers="accessToken" :action="uploadFile" :accept="accept" :data="uploadData"
:on-success="uploadImgSuccess_FuJian" :on-remove="handleRemove" :file-list="fileList_FuJian"
:on-preview="handlePictureCardPreview" :show-file-list="false">
<el-button size="mini" type="primary">点击上传</el-button>
</el-upload>
</div>
</template>
<script>
import { uploadImgFile } from '@/api/portal/Upload_chexing.js'
import { getStorage } from '@/utils/auth.js' //token
import {
SaveList
} from '@/api/cheliang/basevehiclemodel'
import { mapGetters } from 'vuex'
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
type: String,
default: 'abc'
},
//
width: {
type: String,
default: '270px'
},
limit: {
type: Number,
default: 1
},
accept: {
type: String,
default:
'.jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx'
},
//
name: {
type: Array,
required: true
},
uploadData: {
type: Object,
default: {}
}
},
data() {
return {
dialogImageUrl: '',
dialogVisible: false,
accessToken: null,
uploadFile: uploadImgFile,
fileList_FuJian: [],
enclosure: '',
file_add: '',
file_catch: '',
files: [],
files_list: [],
filedUrl: '',
// fileUrl: fileUrl,
// showpicture:false,
isview: false,
nameArr: '',
loadding: false,
stateName: '',
/* uploadData: { modelSid: '' },*/
sid: ''
}
},
computed: {
...mapGetters([
'id',
'departmentCode',
'departmentLevel',
'departmentType',
'token'
])
},
watch: {
name: {
deep: true,
immediate: true,
handler(newVal, oldVal) {
console.log('aaaa1', newVal)
this.files = newVal
console.log('aaaa2', this.files)
}
}
},
mounted() {
this.$nextTick(() => {
this.Init()
})
},
created() {
this.uploadFile = uploadImgFile //
this.accessToken = {
token: getStorage()
}
},
methods: {
view() {
// window.open(this.filedUrl)
},
showImg(sid) {
// this.uploadData.sid = sid
},
//
Init() {
if (this.name !== undefined) {
this.files = []
for (var i = 0; i < this.name.length; i++) {
this.files.push({
name: this.name[i],
url: this.name[i]
})
}
}
},
// --
uploadImgSuccess_FuJian(response, file, fileList) {
let _this = this
console.log('您选择的file:', file)
// console.log('data:', _this.uploadData)
if (file.response.code === '200') {
this.loadding = false
//
this.filedUrl = this.fileUrl + file.response.data
// var uid = file.response.data
this.files.push({
name: file.response.data.sourceFileName,
url: file.response.data.fullUrl,
size: file.response.data.size
})
this.$emit('change', this.files)
this.$emit('eett', this.files)
// this.getUrl()
// SaveList(this.tempInfo).then(response => {
// if (response.success) {
// }
// })
}
},
removeImage(file, ImageFileList) {
this.files.splice(this.files.indexOf(file), 1)
const imgFiles = []
this.files.forEach((o) => {
imgFiles.push(o.url)
})
this.$emit('fileChange', this.files)
},
handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file))
console.log('fileList:' + JSON.stringify(fileList))
this.enclosure = ''
// 1. id(this.file_add)
this.getNewFileId(fileList)
// 2. id(this.file_catch)
this.getCatchFileId(file)
// 3. id
this.getFileId()
// 4. id
this.$emit('change', this.enclosure)
},
// this.file_add(id)
getNewFileId(fileList) {
// debugger
this.file_add = ''
for (var i = 0; i < fileList.length; i++) {
if (fileList[i].response && fileList[i].response.code === '200') {
this.file_add = this.file_add + fileList[i].response.data + ','
}
}
if (this.file_add !== '') {
this.file_add = this.file_add.substring(0, this.file_add.length - 1)
}
// console.log('1. this.file_add: ' + this.file_add)
},
// this.file_catchid
getCatchFileId(file) {
for (var i = 0; i < this.files_list.length; i++) {
if (this.file_catch !== '') {
// 1. id
if (this.files_list[i].name === file.name) {
// 2. file_catchfils_arry
var fils_arry = this.file_catch.split(',')
// 3. fils_arry this.files_list[i].id
var arry = []
fils_arry.forEach((element) => {
//
if (element !== this.files_list[i].id) {
arry.push(element)
}
})
// 4. file_catch
this.file_catch = arry.join(',')
}
}
}
// console.log('2. this.file_catch:' + this.file_catch)
},
// id
getFileId() {
// console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
if (this.file_catch !== '') {
if (this.file_add !== '') {
this.enclosure = this.file_catch + ',' + this.file_add
} else {
this.enclosure = this.file_catch
}
} else {
this.enclosure = this.file_add
}
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
},
//
uploadError() {
this.loadding = false
},
uploadProgrees(event, file, fileList) {
if (Number(event.percent) > 0) {
this.loadding = true
}
}
}
}
</script>
<style lang="scss" scoped></style>

65
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@ -25,7 +25,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入名称" clearable/>
<el-input v-model="listQuery.params.vin" placeholder="请输入名称" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -53,20 +53,20 @@
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="120px" prop="" label="状态" align="center"/>
<el-table-column width="160px" prop="" label="申请编号" align="center"/>
<el-table-column width="140px" prop="" label="申请日期" align="center"/>
<el-table-column width="130px" prop="" label="申请人" align="center"/>
<el-table-column width="180px" prop="vinNo" label="车架号" align="center"/>
<el-table-column width="160px" prop="" label="现存放地点" align="center"/>
<el-table-column width="160px" prop="" label="目标存放地点" align="center"/>
<el-table-column width="130px" prop="" label="经办人" align="center"/>
<el-table-column width="160px" prop="" label="申请费用" align="center"/>
<el-table-column width="180px" prop="" label="现场照片" align="center">
<el-table-column width="120px" prop="state" label="状态" align="center"/>
<el-table-column width="160px" 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}">
<div class="upload_img">
<upload ref="uploadMoreImg" v-model="imgList" :limit="1" bucket="map" @eett="getList"
:upload-data="{type:'0001',modelSid: row.sid}"/>
<upload ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="getList"
:upload-data="{type:'0001',sid: row.sid}"/>
</div>
<!-- <el-button size="mini" type="primary" @click="handleUpload(row)">上传</el-button>-->
<el-button size="mini" type="primary" @click="handleCheckImg(row)">查看</el-button>
@ -101,14 +101,14 @@
</template>
<script>
import req from '@/api/anruiscm/scmwarehouse'
import { deleteCarTransfer, selectCarTransferList } from '@/api/supplychain/cunfangdidianbiangeng'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import cunfangdidianbiangengAdd from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd'
import cunfangdidianbiangengInfo from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo'
import upload from '../../../components/uploadFile/upload_chexing'
import upload from '../../../components/uploadFile/upload_cunfang'
export default {
name: 'cunfangdidianbiangeng',
@ -143,9 +143,10 @@ export default {
size: 10,
total: 0,
params: {
vinNo: '',
modelName: '',
slowMachineKey: ''
applyDateStart: '',
applyDateEnd: '',
vin: '',
userSid: window.sessionStorage.getItem('userSid')
}
},
btnList: [
@ -254,8 +255,9 @@ export default {
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.delBySids(this.sids).then(resp => {
if (resp.success){
const sids = this.sids.join()
deleteCarTransfer(sids).then(resp => {
if (resp.success) {
loading.close()
_this.$message({ type: 'success', message: resp.msg, showClose: true })
_this.loadList()
@ -280,22 +282,23 @@ export default {
this.loadList()
},
resetQuery() {
this.listQuery.params = {
useOrg: this.useOrg,
useOrgSid: this.useOrgSid,
vinNo: '',
applyDateStart: '',
applyDateEnd: ''
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
applyDateStart: '',
applyDateEnd: '',
vin: '',
userSid: window.sessionStorage.getItem('userSid')
}
}
this.listQuery.params.sid = '' // sid
this.listQuery.params.name = '' //
this.getList()
},
loadList() {
const _this = this
this.tableLoading = true
req
.listPage(this.listQuery)
selectCarTransferList(this.listQuery)
.then(resp => {
_this.tableLoading = false
const data = resp.data
@ -320,7 +323,7 @@ export default {
},
handleCheckImg(row){
this.dialogImgVisible = true
// this.srcList = row.vehicleModelUrls
// this.srcList = row.image
},
//
getModelName() {

321
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

@ -14,11 +14,11 @@
<div class="times">
<div>
<span>申请日期</span>
<span>{{ temp.createDate }}</span>
<span>{{ temp.applicantDate }}</span>
</div>
<div>
<span>申请人</span>
<span>{{ temp.staffName }}</span>
<span>{{ temp.applicantName }}</span>
</div>
</div>
</div>
@ -27,16 +27,20 @@
<span>现存放地点</span>
</el-col>
<el-col :span="9">
<el-select v-model="temp.xian" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in xian_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="temp.location" placeholder="请选择" clearable class="addinputw"
@change="locationChange">
<el-option v-for="item in warehouwarehouse_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue"/>
</el-select>
</el-col>
<el-col :span="3">
<span>目标存放地点</span>
</el-col>
<el-col :span="9">
<el-select v-model="temp.mu" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in mu_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="temp.targetLocation" placeholder="请选择" clearable class="addinputw"
@change="targetLocationChange">
<el-option v-for="item in warehouwarehouse_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue"/>
</el-select>
</el-col>
</el-row>
@ -45,8 +49,8 @@
<span>车架号</span>
</el-col>
<el-col :span="21">
<el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in vinNo_list" :key="item.sid" :label="item.vinNo" :value="item.sid"/>
<el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>
</el-select>
</el-col>
</el-row>
@ -55,7 +59,7 @@
<span>变更原因</span>
</el-col>
<el-col :span="21">
<el-input v-model="temp.carModel" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.changeReason" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-col>
</el-row>
<el-row>
@ -63,37 +67,64 @@
<span>申请费用</span>
</el-col>
<el-col :span="21">
<el-input v-model="temp.carModel" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.applicantFunds" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span><span class="icon">*</span>经办人</span>
<el-col :span="3"> <!--<span class="icon">*</span>-->
<span>经办人</span>
</el-col>
<el-col :span="9">
<el-input v-model="temp.carModel" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.operator" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-col>
<el-col :span="3">
<span>保险状态</span>
</el-col>
<el-col :span="9">
<el-form-item>
<el-radio v-model="temp.isTerminal" :label="0"></el-radio>
<el-radio v-model="temp.isTerminal" :label="1"></el-radio>
<el-radio-group v-model="temp.InsuranceStateKey">
<el-radio v-for="item in InsuranceState_list" :key="item.key" :label="item.key"
@change="InsuranceStateChange(item.key)">{{ item.value }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="temp.InsuranceStateKey == '1'">
<el-col :span="3">
<span>保单</span>
</el-col>
<el-col :span="21">
<upload ref="uploadImg" v-model="imgList" :limit="1" bucket="map" :upload-data="{type:'0001'}"/>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>临牌</span>
</el-col>
<el-col :span="21">
<el-input v-model="temp.temporaryCard" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { namesDown } from '@/api/cheliang/basevehicle'
import {
getCarTransferInfo,
getVinByWarehouseSid,
saveCarTransferInfo,
selectWarehouseByUserSid
} from '@/api/supplychain/cunfangdidianbiangeng'
import Upload from '@/components/uploadFile/uploadImg.vue'
export default {
name: "cunfangdidianbiangengAdd",
name: 'cunfangdidianbiangengAdd',
components: {
Upload
},
data() {
return {
viewTitle: '',
@ -103,12 +134,40 @@ name: "cunfangdidianbiangengAdd",
stateId: 0,
FormLoading: false,
listLoading: false,
xian_list:[],
mu_list:[],
location_list: [],
targetLocation_list: [],
imgList: [], //
vinNo_list:[], //
vinNo_list: [], //
InsuranceState_list: [{
key: '0',
value: '否'
}, {
key: '1',
value: '是'
}],
warehouwarehouse_list: [], //
temp: {
orderType: '01'
sid: '',
// taskId: '',
// procInsId: '',
userSid: window.sessionStorage.getItem('userSid'),
// applyId: '',
applicantName: '',
applicantDate: '',
location: '',
locationKey: '',
locationSid: '',
vinNo: '',
targetLocation: '',
targetLocationKey: '',
targetLocationSid: '',
changeReason: '',
applicantFunds: '',
operator: '',
InsuranceState: '',
InsuranceStateKey: '',
temporaryCard: '',
policyImage: []
}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
@ -119,50 +178,62 @@ name: "cunfangdidianbiangengAdd",
}
},
methods: {
getType(){
//
// typeValues({
// type: ''
// }).then((res) => {
// if (res.code === '200') {
// this.kuwei_list = res.data
// console.log('', this.kuwei_list)
// }
// })
//
// typeValues({
// type: ''
// }).then((res) => {
// if (res.code === '200') {
// this.kuwei_list = res.data
// console.log('', this.kuwei_list)
// }
// })
getType() {
//
const userSid = window.sessionStorage.getItem('userSid')
selectWarehouseByUserSid(userSid).then((res) => {
if (res.code === '200') {
this.warehouwarehouse_list = res.data
console.log('存放地点', this.warehouwarehouse_list)
}
})
},
//
getCheJia() {
namesDown({ vinNo: '' }).then((response) => {
if (response.code === '200') {
this.vinNo_list = response.data
getVin(sid) {
const data = {
warehouseSid: sid,
userSid: window.sessionStorage.getItem('userSid')
}
getVinByWarehouseSid(data).then((res) => {
if (res.code === '200') {
this.vinNo_list = res.data
console.log('车架号', this.vinNo_list)
}
})
},
// kuweiChange(val) {
// const choosetItem = this.kuwei_list.filter((item) => item.dictKey == val)
// this.temp.dictValue = choosetItem[0].kuwei
// console.log('name:', , 'key:', )
// },
// kuweiChange(val) {
// const choosetItem = this.kuwei_list.filter((item) => item.dictKey == val)
// this.temp.dictValue = choosetItem[0].kuwei
// console.log('name:', , 'key:', )
// },
locationChange(val) {
const choosetItem = this.warehouwarehouse_list.filter((item) => item.dictValue == val)
this.temp.locationKey = choosetItem[0].dictKey
this.temp.locationSid = choosetItem[0].sid
this.getVin(this.temp.locationSid)
console.log('name:', this.temp.location, 'key:', this.temp.locationKey, 'sid:', this.temp.locationSid)
},
targetLocationChange(val) {
const choosetItem = this.warehouwarehouse_list.filter((item) => item.dictValue == val)
this.temp.targetLocationKey = choosetItem[0].dictKey
this.temp.targetLocationSid = choosetItem[0].sid
console.log('name:', this.temp.targetLocation, 'key:', this.temp.targetLocationKey, 'sid:', this.temp.targetLocationSid)
},
InsuranceStateChange(val) {
const choosetItem = this.InsuranceState_list.filter((item) => item.key == val)
this.temp.InsuranceState = choosetItem[0].value
console.log('name:', this.temp.InsuranceState, 'key:', this.temp.InsuranceStateKey)
},
showAdd() {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'add'
this.viewTitle = '【新增】车辆存放地点变更申请'
this.temp.applicantName = window.sessionStorage.getItem('name')
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
this.temp.applicantDate = dayDate
this.getType()
},
showEdit(sid) {
this.$nextTick(() => {
@ -170,98 +241,102 @@ name: "cunfangdidianbiangengAdd",
})
this.dialogStatus = 'update'
this.viewTitle = '【修改】车辆存放地点变更申请'
// this.temp.sid = sid
// console.log('sid', this.temp.sid)
// details(sid).then((response) => {
// if (response.code === '200') {
// if (response.data.createOrg) {
// console.log('1', response.data.useOrg)
// this.useOrgArry = response.data.createOrg
// console.log('2', this.useOrgArry)
// }
// this.temp = response.data
// this.getLocation()
// this.getModelConfig(this.temp.modelSid)
// }
// })
// this.getType()
// this.getZuZhi()
// this.getUseOrg()
},
// 使
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({ userSid: userSid }).then((res) => {
this.temp.sid = sid
const data = {
userSid: window.sessionStorage.getItem('userSid'),
sid: sid
}
getCarTransferInfo(data).then((res) => {
if (res.success) {
this.temp.useOrgName = res.data.name
this.temp.useOrg = res.data.sid
this.temp.createOrg = res.data.sid
this.temp.createOrgName = res.data.name
this.org_list = res.data
}
})
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.code === '200') {
this.listQuery.params.createOrgSId = res.data
this.useOrg = res.data
this.temp = res.data
this.temp.InsuranceStateKey = res.data.insuranceStateKey
this.temp.InsuranceState = res.data.insuranceState
if (this.temp.policyImage.length > 0) {
for (var i = 0; i < this.temp.policyImage.length; i++) {
const imgName01 = this.temp.policyImage[i].split('/')
// const imgName02 = imgName01[imgName01.length - 1]
// const a = imgName02.lastIndexOf('_')
// const b = imgName02.lastIndexOf('.')
// const imgName03 = imgName02.slice(a, b)
// var imgName = imgName02.replace(imgName03, '')
this.imgList.push({
name: imgName01[imgName01.length - 1],
url: this.temp.policyImage[i]
})
}
}
}
})
this.getType()
},
getUrl() {
if (this.imgList.length > 0) {
console.log('imgList', this.imgList)
if (this.temp.InsuranceStateKey == '1') {
if (this.imgList.length > 0) {
console.log('imgList', this.imgList)
for (var i = 0; i < this.imgList.length; i++) {
this.temp.policyImage.push(this.imgList[i].url)
}
} else {
this.temp.policyImage = []
}
} else {
this.temp.policyImage = []
}
},
// ------------------------------------------------------
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {
orderType: '01'
sid: '',
// taskId: '',
// procInsId: '',
userSid: window.sessionStorage.getItem('userSid'),
// applyId: '',
applicantName: '',
applicantDate: '',
location: '',
locationKey: '',
locationSid: '',
vinNo: '',
targetLocation: '',
targetLocationKey: '',
targetLocationSid: '',
changeReason: '',
applicantFunds: '',
operator: '',
InsuranceState: '',
InsuranceStateKey: '',
temporaryCard: '',
policyImage: []
}
this.imgList = []
this.vinNo_list = []
this.$emit('doback')
},
//
handleCreate() {
console.log('this.temp.useOrg', this.useOrgArry)
this.getUrl()
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.FormLoading = true
//
// SaveList(this.temp).then((response) => {
// this.FormLoading = false
// if (response.code === '200') {
// setChe(response.data)
// this.dialogFormVisible = false
// this.handleReturn('true')
// } else {
// this.$notify({
// title: '',
// message: '',
// type: 'error',
// duration: 2000
// })
// }
// })
saveCarTransferInfo(this.temp).then((response) => {
this.FormLoading = false
if (response.code === '200') {
this.dialogFormVisible = false
this.handleReturn('true')
} else {
this.$message({
showClose: true,
message: '保存失败!',
type: 'error'
})
}
})
}
})
}
//
// this.temp.vehiclePhoto = []
// if (this.vehiclePhoto_Images.length > 0) {
// for (var i = 0; i < this.vehiclePhoto_Images.length; i++) {
// var image_start = this.vehiclePhoto_Images.indexOf('/upload') + 8
// var image_url = this.vehiclePhoto_Images.substring(image_start)
// this.temp.vehiclePhoto.push(image_url)
// }
// }
}
}
</script>

109
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue

@ -8,16 +8,16 @@
</div>
<div class="listconadd">
<div class="title">车辆存放地点变更申请</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="tit">
<div class="times">
<div>
<span>申请日期</span>
<span>{{ temp.createDate }}</span>
<span>{{ temp.applicantDate }}</span>
</div>
<div>
<span>申请人</span>
<span>{{ temp.staffName }}</span>
<span>{{ temp.applicantName }}</span>
</div>
</div>
</div>
@ -26,13 +26,17 @@
<span>现存放地点</span>
</el-col>
<el-col :span="9">
<span>{{temp.xian}}</span>
<el-form-item>
<span>{{ temp.location }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>目标存放地点</span>
</el-col>
<el-col :span="9">
<span>{{temp.mu}}</span>
<el-form-item>
<span>{{ temp.targetLocation }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -40,7 +44,9 @@
<span>车架号</span>
</el-col>
<el-col :span="21">
<span>{{temp.vinNo}}</span>
<el-form-item>
<span>{{ temp.vinNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -48,7 +54,9 @@
<span>变更原因</span>
</el-col>
<el-col :span="21">
<span>{{temp.carModel}}</span>
<el-form-item>
<span>{{ temp.changeReason }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -56,47 +64,83 @@
<span>申请费用</span>
</el-col>
<el-col :span="21">
<span>{{temp.carModel}}</span>
<el-form-item>
<span>{{ temp.applicantFunds }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span><span class="icon">*</span>经办人</span>
<span>经办人</span>
</el-col>
<el-col :span="9">
<span>{{temp.carModel}}</span>
<el-form-item>
<span>{{ temp.operator }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>保险状态</span>
</el-col>
<el-col :span="9">
<span>{{temp.isTerminal}}</span>
<el-form-item>
<span>{{ temp.insuranceState }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="temp.insuranceStateKey == '1'">
<el-col :span="3">
<span>保单</span>
</el-col>
<el-col :span="21">
<img v-for="item in temp.policyImage"
style="cursor:pointer;width: 178px;height: 178px;"
:src="item" @click="open(temp.policyImage)">
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>临牌</span>
</el-col>
<el-col :span="21">
<el-form-item>
<el-form-item>
<span>{{ temp.temporaryCard }}</span>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<el-dialog :visible.sync="dialogVisible" 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 dialogUrl" :key="item" style="height: 500px;">
<img style="width: 100%; height: 500px;" :src="item">
</el-carousel-item>
</el-carousel>
</div>
</el-dialog>
</div>
</template>
<script>
import { getCarTransfer } from '@/api/supplychain/cunfangdidianbiangeng'
export default {
name: 'cunfangdidianbiangengInfo',
data() {
return {
viewTitle: '',
dialogVisible:false,
dialogUrl:[],
// ---------
sid: '',
datas: null,
stateId: 0,
FormLoading: false,
listLoading: false,
xian_list:[],
mu_list:[],
imgList: [], //
vinNo_list:[], //
temp: {
orderType: '01'
}, //
temp: {}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
dialogStatus: '', //
@ -110,26 +154,23 @@ export default {
this.temp = {}
this.$emit('doback')
},
showInfo(sid, row) {
showInfo(row) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'edit'
this.viewTitle = '存放地点变更申请详情'
// req.fetchBySid(sid).then((resp) => {
// const data = resp.data
// this.sid = sid
// this.temp = data
// if (this.temp.personType === '') {
// this.isQuit = false
// } else {
// this.isQuit = true
// }
// data.isHaveAged = this.temp.isHaveAged
// console.log('', this.temp)
// }).catch((e) => {
// this.temp = row
// })
getCarTransfer(row.sid).then((resp) => {
if (resp.success) {
const data = resp.data
this.temp = data
}
}).catch((e) => {
this.$message({
showClose: true,
message: '操作失败!',
type: 'error'
})
})
},
open(val) {
this.dialogVisible = true

154
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue

@ -9,20 +9,23 @@
</div>
<div class="listconadd">
<div class="title">车辆入库</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
<span>入库日期</span>
</el-col>
<el-col :span="9">
<el-date-picker v-model="temp.priceDate" type="date" format="yyyy-MM-dd" class="addinputw"
value-format="yyyy-MM-dd" placeholder="选择日期时间"/>
<el-form-item>
<span>{{ temp.date }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>入库人</span>
</el-col>
<el-col :span="9">
<span>{{temp.person}}</span>
<el-form-item>
<span>{{ temp.name }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -30,15 +33,21 @@
<span>车架号</span>
</el-col>
<el-col :span="9">
<span>{{temp.vinNo}}</span>
<el-form-item>
<span>{{ temp.vin }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>库位</span>
<span>存放地点</span>
</el-col>
<el-col :span="9">
<el-select v-model="temp.kuwei" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in kuwei_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
<el-form-item>
<el-select v-model="temp.warehouseKey" placeholder="请选择" filterable clearable class="addinputw"
@change="warehouseChange">
<el-option v-for="item in warehouse_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -55,8 +64,9 @@
</template>
<script>
import { getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons.js'
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
import Upload from '@/components/uploadFile/uploadImg.vue'
import { getCarWarehousingInfo, saveCarWarehousingInfo, selectWarehouseByUserSid } from '@/api/supplychain/rukuguanli'
export default {
name: 'rukuguanliAdd',
@ -72,10 +82,19 @@ export default {
stateId: 0,
FormLoading: false,
listLoading: false,
kuwei_list:[],
warehouse_list: [],
imgList: [], //
temp: {
orderType: '01'
warehousingSid: '',
userSid: window.sessionStorage.getItem('userSid'),
date: '',
name: '',
vin: '',
warehouseKey: '',
warehouse: '',
address: '',
location: '',
warehouseImage: []
}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
@ -86,27 +105,39 @@ export default {
}
},
methods: {
getType(){
// typeValues({
// type: ''
// }).then((res) => {
// if (res.code === '200') {
// this.kuwei_list = res.data
// console.log('', this.kuwei_list)
// }
// })
getType() {
const userSid = window.sessionStorage.getItem('userSid')
selectWarehouseByUserSid(userSid).then((res) => {
if (res.code === '200') {
this.warehouse_list = res.data
console.log('库位', this.warehouse_list)
}
})
},
// kuweiChange(val) {
// const choosetItem = this.kuwei_list.filter((item) => item.dictKey == val)
// this.temp.dictValue = choosetItem[0].kuwei
// console.log('name:', , 'key:', )
// },
showAdd() {
warehouseChange(val) {
const choosetItem = this.warehouse_list.filter((item) => item.dictKey == val)
this.temp.warehouse = choosetItem[0].dictValue
console.log('name:',this.temp.warehouse, 'key:',this.temp.warehouseKey)
},
showAdd(row) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'add'
this.viewTitle = '【新增】车辆入库'
const data = {
warehousingSid: row.warehousingSid,
userSid: window.sessionStorage.getItem('userSid')
}
getCarWarehousingInfo(data).then((res) => {
if (res.success) {
this.temp.name = res.data.name
this.temp.warehousingSid = res.data.warehousingSid
this.temp.vin = res.data.vin
this.temp.date = res.data.date
}
})
this.getType()
},
// showEdit(sid) {
// this.$nextTick(() => {
@ -132,33 +163,13 @@ export default {
// this.getZuZhi()
// this.getUseOrg()
// },
// 使
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.temp.useOrgName = res.data.name
this.temp.useOrg = res.data.sid
this.temp.createOrg = res.data.sid
this.temp.createOrgName = res.data.name
this.org_list = res.data
}
})
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.code === '200') {
this.listQuery.params.createOrgSId = res.data
this.useOrg = res.data
}
})
},
getUrl() {
if (this.imgList.length > 0) {
console.log('imgList', this.imgList)
for (var i = 0; i < this.imgList.length; i++) {
this.temp.warehouseImage.push(this.imgList[i].url)
}
} else {
this.temp.warehouseImage = []
}
},
@ -167,32 +178,39 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {
orderType: '01'
warehousingSid: '',
userSid: window.sessionStorage.getItem('userSid'),
date: '',
name: '',
vin: '',
warehouseKey: '',
warehouse: '',
address: '',
location: '',
warehouseImage: []
}
this.$emit('doback')
},
//
handleCreate() {
console.log('this.temp.useOrg', this.useOrgArry)
this.getUrl()
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.FormLoading = true
//
// SaveList(this.temp).then((response) => {
// this.FormLoading = false
// if (response.code === '200') {
// setChe(response.data)
// this.dialogFormVisible = false
// this.handleReturn('true')
// } else {
// this.$notify({
// title: '',
// message: '',
// type: 'error',
// duration: 2000
// })
// }
// })
saveCarWarehousingInfo(this.temp).then((response) => {
this.FormLoading = false
if (response.code === '200') {
this.dialogFormVisible = false
this.handleReturn('true')
} else {
this.$message({
showClose: true,
message: '保存失败!',
type: 'error'
})
}
})
}
})
}

71
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue

@ -14,18 +14,17 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入名称" clearable/>
<el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="车型">
<el-select v-model="listQuery.params.modelName" placeholder="请选择" filterable clearable
class="addinputw">
<el-select v-model="listQuery.params.model" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in modelName_list" :key="item.sid" :label="item.modelName" :value="item.sid"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseAttribute" placeholder="请输入存放地点属性" clearable/>-->
</el-form-item>
<el-form-item label="订单类型">
<el-select v-model="listQuery.params.slowMachineKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue"
<el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
@ -49,15 +48,15 @@
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<!-- <el-table-column width="50px" type="selection" align="center"/>-->
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="180px" prop="vinNo" label="车架号" align="center"/>
<el-table-column prop="modelName" label="车型" align="center"/>
<el-table-column width="160px" prop="" label="订单类型" align="center"/>
<el-table-column width="140px" prop="" label="发车日期" align="center"/>
<el-table-column width="140px" prop="" label="验车日期" align="center"/>
<el-table-column width="140px" prop="" label="验车人" align="center"/>
<el-table-column width="140px" prop="" label="仓库" align="center"/>
<el-table-column width="140px" prop="" label="仓库管理员" align="center"/>
<el-table-column width="140px" prop="" label="实际入库日期" align="center"/>
<el-table-column width="180px" prop="vin" label="车架号" align="center"/>
<el-table-column prop="model" label="车型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="订单类型" align="center"/>
<el-table-column width="140px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>
<el-table-column width="140px" prop="address" label="存放地点" align="center"/>
<el-table-column width="140px" prop="name" label="仓库管理员" align="center"/>
<el-table-column width="140px" prop="warehousingDate" label="实际入库日期" align="center"/>
</el-table>
</div>
<!--End 项目列表-->
@ -82,8 +81,9 @@
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import req from '@/api/anruiscm/scmwarehouse'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/supplychain/yancheguanli'
import { selectCarWarehousingList } from '@/api/supplychain/rukuguanli'
export default {
name: 'rukuguanli',
@ -103,6 +103,7 @@ export default {
useOrg_list: [],
modelName_list: [],
slowMachine_list: [],
purchaseType_list:[],
useOrg: '', // 使
useOrgSid: '', // 使sid
listQuery: {
@ -110,9 +111,11 @@ export default {
size: 10,
total: 0,
params: {
vinNo: '',
modelName: '',
slowMachineKey: ''
vin: '',
model: '',
purchaseType: '',
type:'1',
userSid: window.sessionStorage.getItem('userSid')
}
},
btnList: [
@ -131,11 +134,21 @@ export default {
this.getList()
// this.getUseOrg()
this.getModelName()
this.getType()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
getType() {
typeValues({
type: 'purchaseOrderType '
}).then((response) => {
if (response.code === '200' && response.data) {
this.purchaseType_list = response.data
}
})
},
resetState() {
this.viewState = 1
},
@ -163,22 +176,24 @@ export default {
this.loadList()
},
resetQuery() {
this.listQuery.params = {
useOrg: this.useOrg,
useOrgSid: this.useOrgSid,
vinNo: '',
modelName: '',
slowMachineKey: ''
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
vin: '',
model: '',
purchaseType: '',
type:'1',
userSid: window.sessionStorage.getItem('userSid')
}
}
this.listQuery.params.sid = '' // sid
this.listQuery.params.name = '' //
this.getList()
},
loadList() {
const _this = this
this.tableLoading = true
req
.listPage(this.listQuery)
selectCarWarehousingList(this.listQuery)
.then(resp => {
_this.tableLoading = false
const data = resp.data

71
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue

@ -14,18 +14,17 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入名称" clearable/>
<el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="车型">
<el-select v-model="listQuery.params.modelName" placeholder="请选择" filterable clearable
class="addinputw">
<el-select v-model="listQuery.params.model" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in modelName_list" :key="item.sid" :label="item.modelName" :value="item.sid"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseAttribute" placeholder="请输入存放地点属性" clearable/>-->
</el-form-item>
<el-form-item label="订单类型">
<el-select v-model="listQuery.params.slowMachineKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue"
<el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
@ -51,17 +50,17 @@
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="90px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!--v-show="!row.result"-->
<el-button size="mini" type="primary" @click="handleRuku(row)">入库</el-button>
<el-button size="mini" v-show="row.showWarehousingBtn" type="primary" @click="handleRuku(row)">入库</el-button>
</template>
</el-table-column>
<el-table-column width="180px" prop="vinNo" label="车架号" align="center"/>
<el-table-column prop="modelName" label="车型" align="center"/>
<el-table-column width="160px" prop="" label="订单类型" align="center"/>
<el-table-column width="140px" prop="" label="发车日期" align="center"/>
<el-table-column width="140px" prop="" label="验车日期" align="center"/>
<el-table-column width="140px" prop="" label="验车人" align="center"/>
<el-table-column width="140px" prop="" label="仓库" align="center"/>
<el-table-column width="140px" prop="" label="仓库管理员" align="center"/>
<el-table-column width="180px" prop="vin" label="车架号" align="center"/>
<el-table-column prop="model" label="车型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="订单类型" align="center"/>
<el-table-column width="140px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>
<el-table-column width="140px" prop="address" label="存放地点" align="center"/>
<el-table-column width="140px" prop="name" label="仓库管理员" align="center"/>
</el-table>
</div>
<!--End 项目列表-->
@ -88,10 +87,11 @@
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import req from '@/api/anruiscm/scmwarehouse'
import { selectCarWarehousingList } from '@/api/supplychain/rukuguanli'
import rukuguanliAdd from '@/views/supplychain/rukuguanli/rukuguanliAdd'
import rukuguanli from '@/views/supplychain/rukuguanli/rukuguanliAlready'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/supplychain/yancheguanli'
export default {
name: 'rukuguanliawait',
@ -112,6 +112,7 @@ export default {
useOrg_list: [],
modelName_list: [],
slowMachine_list: [],
purchaseType_list: [],
useOrg: '', // 使
useOrgSid: '', // 使sid
listQuery: {
@ -119,9 +120,11 @@ export default {
size: 10,
total: 0,
params: {
vinNo: '',
modelName: '',
slowMachineKey: ''
vin: '',
model: '',
purchaseType: '',
type: '1',
userSid: window.sessionStorage.getItem('userSid')
}
},
btnList: [
@ -140,11 +143,21 @@ export default {
this.getList()
// this.getUseOrg()
this.getModelName()
this.getType()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
getType() {
typeValues({
type: 'purchaseOrderType '
}).then((response) => {
if (response.code === '200' && response.data) {
this.purchaseType_list = response.data
}
})
},
resetState() {
this.viewState = 1
},
@ -176,22 +189,24 @@ export default {
this.loadList()
},
resetQuery() {
this.listQuery.params = {
useOrg: this.useOrg,
useOrgSid: this.useOrgSid,
vinNo: '',
modelName: '',
slowMachineKey: ''
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
vin: '',
model: '',
purchaseType: '',
type: '1',
userSid: window.sessionStorage.getItem('userSid')
}
}
this.listQuery.params.sid = '' // sid
this.listQuery.params.name = '' //
this.getList()
},
loadList() {
const _this = this
this.tableLoading = true
req
.listPage(this.listQuery)
selectCarWarehousingList(this.listQuery)
.then(resp => {
_this.tableLoading = false
const data = resp.data

93
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue

@ -13,19 +13,20 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入名称" clearable/>
<el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="车型">
<el-select v-model="listQuery.params.modelName" placeholder="请选择" filterable clearable class="addinputw">
<el-select v-model="listQuery.params.model" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in modelName_list" :key="item.sid" :label="item.modelName" :value="item.sid"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseAttribute" placeholder="请输入存放地点属性" clearable/>-->
</el-form-item>
<el-form-item label="订单类型">
<el-select v-model="listQuery.params.slowMachineKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
<!-- <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -44,21 +45,22 @@
<!--Start 项目列表-->
<div class=""> <!--@selection-change="handleSelectionChange"-->
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<!-- <el-table-column width="50px" type="selection" align="center"/>-->
<!-- <el-table-column width="50px" type="selection" align="center"/>-->
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="160px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!--v-show="!row.result"-->
<el-button size="mini" type="primary" @click="handleYanche(row)">验车</el-button>
<el-button size="mini" type="primary" v-show="row.showInspectedBtn" @click="handleYanche(row)">验车
</el-button>
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="200px" prop="vinNo" label="车架号" align="center"/>
<el-table-column prop="modelName" label="车型" align="center"/>
<el-table-column width="160px" prop="" label="订单类型" align="center"/>
<el-table-column width="200px" prop="" label="发车日期" align="center"/>
<el-table-column width="140px" prop="" label="验车日期" align="center"/>
<el-table-column width="140px" prop="" label="验车人" align="center"/>
<el-table-column width="140px" prop="result" label="验车结果" align="center"/>
<el-table-column width="200px" prop="vin" label="车架号" align="center"/>
<el-table-column prop="model" label="车型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="订单类型" align="center"/>
<el-table-column width="200px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>
<el-table-column width="140px" prop="inspectedType" label="验车结果" align="center"/>
</el-table>
</div>
<!--End 项目列表-->
@ -86,7 +88,7 @@
</template>
<script>
import req from '@/api/anruiscm/scmwarehouse'
import { selectCarInspectedList, typeValues } from '@/api/supplychain/yancheguanli'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
@ -100,7 +102,6 @@ export default {
ButtonBar,
Pagination,
pageye,
yancheguanliAlready,
yancheguanliAdd,
yancheguanliInfo
},
@ -111,9 +112,9 @@ export default {
isSearchShow: false,
tableLoading: false,
dataList: [],
useOrg_list:[],
modelName_list:[],
slowMachine_list:[],
useOrg_list: [],
modelName_list: [],
purchaseType_list: [],
useOrg: '', // 使
useOrgSid: '', // 使sid
listQuery: {
@ -121,9 +122,10 @@ export default {
size: 10,
total: 0,
params: {
vinNo:'',
modelName:'',
slowMachineKey:'',
vin: '',
model: '',
purchaseType: '',
userSid: window.sessionStorage.getItem('userSid')
}
},
btnList: [
@ -140,6 +142,7 @@ export default {
},
created() {
this.getList()
this.getType()
// this.getUseOrg()
this.getModelName()
},
@ -170,46 +173,56 @@ export default {
console.log('详情回显', row)
this.viewState = 4
},
// handleInvoiceList() {
// this.viewState = 5
// },
getList() {
this.listQuery.current = 1
this.loadList()
},
resetQuery() {
this.listQuery.params = {
useOrg: this.useOrg,
useOrgSid: this.useOrgSid,
vinNo:'',
modelName:'',
slowMachineKey:''
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
vin: '',
model: '',
purchaseType: '',
userSid: window.sessionStorage.getItem('userSid')
}
}
this.listQuery.params.sid = '' // sid
this.listQuery.params.name = '' //
this.getList()
},
loadList() {
const _this = this
this.tableLoading = true
req
.listPage(this.listQuery)
selectCarInspectedList(this.listQuery)
.then(resp => {
_this.tableLoading = false
const data = resp.data
_this.listQuery.total = data.total
_this.dataList = data.records
for (var i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].inspectedType == '1') {
this.dataList[i].inspectedType = '待验车'
} else {
this.dataList[i].inspectedType = '未验车'
}
}
})
.catch(() => {
_this.tableLoading = false
})
},
// handleSelectionChange(val) {
// this.multipleSelection = val
// console.log('', this.multipleSelection)
// },
getType() {
typeValues({
type: 'purchaseOrderType '
}).then((response) => {
if (response.code === '200' && response.data) {
this.purchaseType_list = response.data
}
})
},
//
getModelName(){
getModelName() {
selectModelName({ name: '' }).then((response) => {
if (response.code === '200') {
this.modelName_list = response.data

119
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -4,6 +4,7 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="success" size="small" @click="handlePass()">通过</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
@ -13,43 +14,44 @@
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="reason" label="车架号:">
<el-form-item prop="vin" label="车架号:">
<el-input
v-model="temp.reason"
v-model="temp.vin"
:disabled="temp.orderType == '01'"
placeholder="请输入车架号"
class="addinputw"
clearable
readonly
/>
</el-form-item>
</el-col>
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="money" label="车型:">
<el-form-item prop="model" label="车型:">
<el-input
v-model="temp.money"
v-model="temp.model"
placeholder="请输入车型"
class="addinputw"
clearable
readonly
/>
</el-form-item>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="money" label="配置:">
<el-form-item prop="config" label="配置:">
<el-input
v-model="temp.money"
v-model="temp.config"
type="textarea"
placeholder="请输入配置"
class="addinputw"
clearable/>
readonly/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="money" label="洗车费:">
<el-form-item prop="price" label="洗车费:">
<el-input
v-model="temp.money"
v-model="temp.price"
placeholder="请输入洗车费"
class="addinputw"
clearable
@ -92,6 +94,8 @@
<script>
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
import { getCarInspectedInfo, saveCarInspectedInfo, submitCarInspectedInfo } from '@/api/supplychain/yancheguanli'
import { getUseOrgByUserSid } from '@/api/cheliang/basevehicle'
import Upload from '@/components/uploadFile/uploadImg.vue'
export default {
@ -111,7 +115,13 @@ export default {
imgList01: [], //
imgList02: [], //
temp: {
orderType: '01'
factoryImage: [],
carInspectedImage: [],
userSid: window.sessionStorage.getItem('userSid'),
vin: '',
config: '',
model: '',
inspectedSid:''
}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
@ -122,12 +132,24 @@ export default {
}
},
methods: {
showAdd() {
showAdd(row) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'add'
this.viewTitle = '验车单'
const data = {
inspectedSid: row.inspectedSid,
userSid: window.sessionStorage.getItem('userSid')
}
getCarInspectedInfo(data).then((res) => {
if (res.success) {
this.temp.vin = res.data.vin
this.temp.config = res.data.config
this.temp.model = res.data.model
this.temp.inspectedSid = res.data.inspectedSid
}
})
},
// showEdit(sid) {
// this.$nextTick(() => {
@ -137,7 +159,7 @@ export default {
// this.viewTitle = ''
// this.temp.sid = sid
// console.log('sid', this.temp.sid)
// details(sid).then((response) => {
// getCarInspected(sid).then((response) => {
// if (response.code === '200') {
// if (response.data.createOrg) {
// console.log('1', response.data.useOrg)
@ -178,14 +200,19 @@ export default {
getUrl() {
if (this.imgList01.length > 0) {
console.log('imgList01', this.imgList01)
for (var i = 0; i < this.imgList01.length; i++) {
this.temp.carInspectedImage.push(this.imgList01[i].url)
}
} else {
this.temp.carInspectedImage = []
}
if (this.imgList02.length > 0) {
console.log('imgList02', this.imgList02)
for (var i = 0; i < this.imgList02.length; i++) {
this.temp.factoryImage.push(this.imgList02[i].url)
}
} else {
this.temp.factoryImage = []
}
},
@ -194,32 +221,56 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {
orderType: '01'
factoryImage: [],
carInspectedImage: [],
userSid: window.sessionStorage.getItem('userSid'),
vin: '',
config: '',
model: '',
inspectedSid:''
}
this.$emit('doback')
},
//
handleCreate() {
console.log('this.temp.useOrg', this.useOrgArry)
this.getUrl()
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.FormLoading = true
//
// SaveList(this.temp).then((response) => {
// this.FormLoading = false
// if (response.code === '200') {
// setChe(response.data)
// this.dialogFormVisible = false
// this.handleReturn('true')
// } else {
// this.$notify({
// title: '',
// message: '',
// type: 'error',
// duration: 2000
// })
// }
// })
saveCarInspectedInfo(this.temp).then((response) => {
this.FormLoading = false
if (response.code === '200') {
this.dialogFormVisible = false
this.handleReturn('true')
} else {
this.$notify({
title: '提示',
message: '添加失败',
type: 'error',
duration: 2000
})
}
})
}
})
},
handlePass() {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
submitCarInspectedInfo(this.temp).then((response) => {
this.FormLoading = false
if (response.code === '200') {
this.dialogFormVisible = false
this.handleReturn('true')
} else {
this.$message({
showClose: true,
message: '操作失败!',
type: 'error'
})
}
})
}
})
}

67
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@ -9,31 +9,31 @@
</div>
<div class="listconadd">
<div class="title">验车单</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="reason" label="车架号:">
<span>{{ temp.reason }}</span>
<el-form-item prop="vin" label="车架号:">
<span>{{ temp.vin }}</span>
</el-form-item>
</el-col>
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="money" label="车型:">
<span>{{ temp.money }}</span>
<el-form-item prop="model" label="车型:">
<span>{{ temp.model }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="money" label="配置:">
{{ temp.money }}
<el-form-item prop="config" label="配置:">
{{ temp.config }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="money" label="洗车费:">
<span>{{ temp.money }}</span>
<el-form-item prop="price" label="洗车费:">
<span>{{ temp.price }}</span>
</el-form-item>
</el-col>
</el-row>
@ -41,8 +41,9 @@
<div class="title">验车相关照片</div>
<el-row>
<el-col :span="24"> <!-- v-for="item in imgList01" :src="item" @click="open(item)-->
<img v-show="temp.degreeCertificate !=='' ? true : false" style="cursor:pointer;width: 178px;height: 178px;"
:src="temp.degreeCertificate" @click="open(temp.degreeCertificate)">
<img v-show="temp.carInspectedImage ? true : false" v-for="item in temp.carInspectedImage"
style="cursor:pointer;width: 178px;height: 178px;"
:src="item" @click="open(temp.carInspectedImage)">
</el-col>
</el-row>
<el-row>
@ -50,8 +51,9 @@
<span>厂家验车单照片</span>
</el-col>
<el-col :span="21">
<img v-show="temp.degreeCertificate !=='' ? true : false" style="cursor:pointer;width: 178px;height: 178px;"
:src="temp.degreeCertificate" @click="open(temp.degreeCertificate)">
<img v-show="temp.factoryImage ? true : false" v-for="item in temp.factoryImage"
style="cursor:pointer;width: 178px;height: 178px;"
:src="item" @click="open(temp.factoryImage)">
</el-col>
</el-row>
<el-row>
@ -59,19 +61,29 @@
<span>验车情况说明</span>
</el-col>
<el-col :span="21">
<span>{{temp.remarks}}</span>
<el-form-item>
<span>{{ temp.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogUrl" alt="">
<el-dialog :visible.sync="dialogVisible" 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 dialogUrl" :key="item" style="height: 500px;">
<img style="width: 100%; height: 500px;" :src="item">
</el-carousel-item>
</el-carousel>
</div>
</el-dialog>
</div>
</template>
<script>
import { getCarInspected } from '@/api/supplychain/yancheguanli'
export default {
name: 'yancheguanliInfo',
@ -89,7 +101,7 @@ export default {
imgList01: [], //
imgList02: [], //
temp: {
orderType: '01'
}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
@ -104,26 +116,17 @@ export default {
this.temp = {}
this.$emit('doback')
},
showInfo(sid, row) {
showInfo(row) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'edit'
this.viewTitle = '验车单详情'
// req.fetchBySid(sid).then((resp) => {
// const data = resp.data
// this.sid = sid
// this.temp = data
// if (this.temp.personType === '') {
// this.isQuit = false
// } else {
// this.isQuit = true
// }
// data.isHaveAged = this.temp.isHaveAged
// console.log('', this.temp)
// }).catch((e) => {
// this.temp = row
// })
getCarInspected(row.inspectedSid).then((res) => {
if (res.success) {
this.temp = res.data
}
})
},
open(val) {
this.dialogVisible = true

Loading…
Cancel
Save