Browse Source

完善验车、收车--与切换机构功能相关修改

master
yunuo970428 2 years ago
parent
commit
a86c98c04b
  1. 7
      anrui-scm/anrui-scm-ui/src/api/cheliang/busvehicleorder.js
  2. 6
      anrui-scm/anrui-scm-ui/src/api/supplychain/rukuguanli.js
  3. 42
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
  4. 70
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
  5. 58
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
  6. 72
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklistInfo.vue
  7. 35
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
  8. 70
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

7
anrui-scm/anrui-scm-ui/src/api/cheliang/busvehicleorder.js

@ -26,12 +26,5 @@ export default {
url: '/base/v1/busvehicleorder/fetchBySid/' + sid,
method: 'get'
})
},
pullDown: function (data) {
return request({
url: '/portal/v1/dictcommons/typeValues',
method: 'get',
params: data
})
}
}

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

@ -14,7 +14,7 @@ export function selectCarWarehousingList(data) {
// 入库管理 新增初始化
export function getCarWarehousingInfo(data) {
return request({
url: '/scm/v1/scmvehicleenterlibrary/getCarWarehousingInfo/'+ data.warehousingSid + '/' + data.userSid,
url: '/scm/v1/scmvehicleenterlibrary/getCarWarehousingInfo/' + data.warehousingSid + '/' + data.userSid,
method: 'get'
})
}
@ -22,12 +22,12 @@ export function getCarWarehousingInfo(data) {
// 库位下拉框
export function selectWarehouseByUserSid(data) {
return request({
url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid/' + data,
url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid',
params: data,
method: 'get'
})
}
// 保存 入库
export function saveCarWarehousingInfo(data) {
return request({

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

@ -105,8 +105,7 @@ export default {
},
methods: {
getType() {
const userSid = window.sessionStorage.getItem('userSid')
selectWarehouseByUserSid(userSid).then((res) => {
selectWarehouseByUserSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.code === '200') {
this.warehouse_list = res.data
console.log('库位', this.warehouse_list)
@ -138,30 +137,6 @@ export default {
})
this.getType()
},
// showEdit(sid) {
// this.$nextTick(() => {
// this.$refs['dataForm'].clearValidate()
// })
// 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()
// },
getUrl() {
if (this.imgList.length > 0) {
for (var i = 0; i < this.imgList.length; i++) {
@ -213,16 +188,6 @@ export default {
}
})
}
//
// 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>
@ -232,11 +197,6 @@ export default {
width: 80%;
}
/*.listconadd {*/
/* width: 100%;*/
/* padding: 0 240px !important;*/
/*}*/
/deep/ .el-col-3 {
text-align: right;
float: left;

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

@ -49,12 +49,11 @@
</div>
<!--End 项目列表头部-->
<!--Start 项目列表-->
<div class=""> <!--@selection-change="handleSelectionChange"-->
<div class="">
<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 label="操作" align="center" width="90px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!--v-show="!row.result"-->
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="handleInfo(row)">查看</el-button>
</template>
</el-table-column>
@ -93,8 +92,8 @@ import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import rukuguanliInfo from '@/views/supplychain/rukuguanli/rukuguanliInfo'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/supplychain/yancheguanli'
import { selectModelName } from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/cheliang/dictcommons'
import { selectCarWarehousingList } from '@/api/supplychain/rukuguanli'
export default {
@ -112,12 +111,8 @@ export default {
isSearchShow: false,
tableLoading: false,
dataList: [],
useOrg_list: [],
modelName_list: [],
slowMachine_list: [],
purchaseType_list: [],
useOrg: '', // 使
useOrgSid: '', // 使sid
listQuery: {
current: 1,
size: 10,
@ -129,7 +124,8 @@ export default {
type: '2',
inboundStartDate: '',
inboundEndDate: '',
userSid: window.sessionStorage.getItem('userSid')
userSid: '',
orgPath: ''
}
},
btnList: [
@ -146,7 +142,6 @@ export default {
},
created() {
this.getList()
// this.getUseOrg()
this.getModelName()
this.getType()
},
@ -155,9 +150,7 @@ export default {
},
methods: {
getType() {
typeValues({
type: 'purchaseOrderType '
}).then((response) => {
typeValues({ type: 'purchaseOrderType ' }).then((response) => {
if (response.code === '200' && response.data) {
this.purchaseType_list = response.data
}
@ -176,12 +169,6 @@ export default {
break
}
},
// handleCheck(row) {
// this.$refs['divinfo'].showInfo(row)
// console.log('', row)
// this.viewState = 4
// },
handleInvoiceList() {
this.$parent.viewState = 1
this.$parent.getList()
@ -202,7 +189,8 @@ export default {
type: '2',
inboundStartDate: '',
inboundEndDate: '',
userSid: window.sessionStorage.getItem('userSid')
userSid: '',
orgPath: ''
}
}
this.getList()
@ -213,23 +201,23 @@ export default {
this.viewState = 6
},
loadList() {
const _this = this
this.tableLoading = true
selectCarWarehousingList(this.listQuery)
.then(resp => {
_this.tableLoading = false
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
selectCarWarehousingList(this.listQuery).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
_this.listQuery.total = data.total
_this.dataList = data.records
})
.catch(() => {
_this.tableLoading = false
})
this.listQuery.total = data.total
this.dataList = data.records
} else {
this.listQuery.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
},
// handleSelectionChange(val) {
// this.multipleSelection = val
// console.log('', this.multipleSelection)
// },
//
getModelName() {
selectModelName({ name: '' }).then((response) => {
@ -238,18 +226,6 @@ export default {
}
})
},
// sid
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.useOrg = res.data.name // 使
this.useOrgSid = res.data.sid // 使sid
this.listQuery.params.useOrgSid = res.data.sid
this.loadList()
}
})
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size

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

@ -40,12 +40,11 @@
</div>
<!--End 项目列表头部-->
<!--Start 项目列表-->
<div class=""> <!--@selection-change="handleSelectionChange"-->
<div class="">
<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 label="操作" align="center" width="90px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!--v-show="!row.result"-->
<template slot-scope="{row}">
<el-button size="mini" v-show="row.showWarehousingBtn" type="primary" @click="handleRuku(row)">收车</el-button>
</template>
</el-table-column>
@ -55,8 +54,6 @@
<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 项目列表-->
@ -84,10 +81,10 @@ import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { selectCarWarehousingList } from '@/api/supplychain/rukuguanli'
import { selectModelName } from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/cheliang/dictcommons'
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',
@ -120,7 +117,8 @@ export default {
model: '',
purchaseType: '',
type: '1',
userSid: window.sessionStorage.getItem('userSid')
userSid: '',
orgPath: ''
}
},
btnList: [
@ -137,7 +135,6 @@ export default {
},
created() {
this.getList()
// this.getUseOrg()
this.getModelName()
this.getType()
},
@ -195,29 +192,30 @@ export default {
model: '',
purchaseType: '',
type: '1',
userSid: window.sessionStorage.getItem('userSid')
userSid: '',
orgPath: ''
}
}
this.getList()
},
loadList() {
const _this = this
this.tableLoading = true
selectCarWarehousingList(this.listQuery)
.then(resp => {
_this.tableLoading = false
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
selectCarWarehousingList(this.listQuery).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
_this.listQuery.total = data.total
_this.dataList = data.records
})
.catch(() => {
_this.tableLoading = false
})
this.listQuery.total = data.total
this.dataList = data.records
} else {
this.listQuery.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
},
// handleSelectionChange(val) {
// this.multipleSelection = val
// console.log('', this.multipleSelection)
// },
//
getModelName() {
selectModelName({ name: '' }).then((response) => {
@ -226,18 +224,6 @@ export default {
}
})
},
// sid
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.useOrg = res.data.name // 使
this.useOrgSid = res.data.sid // 使sid
this.listQuery.params.useOrgSid = res.data.sid
this.loadList()
}
})
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size

72
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklistInfo.vue

@ -46,19 +46,8 @@
<span>{{ item.imgTitle }}</span>
</div>
<div>
<el-button type="primary" size="small"
@click="handleLookImg(scope.row.itemImgVoList[index].imgUrlList)">查看
</el-button>
<!-- <div class="upload_img"> &lt;!&ndash; @change="getUrl($event, index,scope.$index)" &ndash;&gt;-->
<!-- <upload_jianchabiao ref="uploadMoreImg"-->
<!-- v-model="scope.row.itemImgVoList[index].imgUrlList"-->
<!-- :limit="1" bucket="map"-->
<!-- :upload-data="{type:'0001'}"/>-->
<!-- </div>-->
<!-- <el-button type="primary" size="small" @click="handleUpload">上传</el-button>-->
<el-button type="primary" size="small"
@click="handleExample(scope.row.itemImgVoList[index].imgPathList)">图片示例
</el-button>
<el-button type="primary" size="small" @click="handleLookImg(scope.row.itemImgVoList[index].imgUrlList)">查看</el-button>
<el-button type="primary" size="small" @click="handleExample(scope.row.itemImgVoList[index].imgPathList)">图片示例</el-button>
</div>
</div>
</div>
@ -95,20 +84,14 @@
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { getVehinspectItemInfo } from '@/api/supplychain/yancheguanli'
import upload_jianchabiao from '@/components/uploadFile/upload_jianchabiao'
export default {
name: 'cheliangjianchabiao',
components: {
upload_jianchabiao
},
data() {
return {
temp: {
@ -120,35 +103,10 @@ export default {
dialogVisible: false,
dialogUrl: [], //
dialogVisiblePath: false,
dialogimgPathList: [], //
aa: [1, 3, 0, 0]
dialogimgPathList: [] //
}
},
created() {
// this.showEdit()
},
methods: {
// handleCreate() {
// this.temp.scmResultImageDtos = this.scmResultImageDtos
// // this.$refs['dataForm'].validate((valid) => {
// // if (valid) {
// this.disable = true
// //
// saveResultImage(this.temp).then((response) => {
// this.disable = false
// if (response.code === '200') {
// this.handleReturn()
// } else {
// this.$message({
// showClose: true,
// message: '',
// type: 'error'
// })
// }
// })
// // }
// // })
// },
handleReturn() {
this.$emit('doback')
},
@ -180,29 +138,7 @@ export default {
console.log('图片示例', val)
this.dialogVisiblePath = true
this.dialogimgPathList = val
},
// handleDel(index) {
// this.dialogUrl.splice(index, 1)
// // this.dialogUrl.forEach((item, index) => {
// // if (item === val) {
// // this.dialogUrl.splice(index, 1)
// // }
// // })
// }
// getUrl(){
// }
// arraySpanMethod({ row, column, rowIndex, columnIndex }) {
// console.log(rowIndex, columnIndex)
// if (columnIndex === 0 || columnIndex === 1 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5) {
// const _row = this.aa[rowIndex]
// const _col = _row > 0 ? 1 : 0
// console.log('row', _row, 'col', _col)
// return {
// rowspan: _row,
// colspan: _col
// }
// }
// }
}
}
}
</script>

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

@ -82,8 +82,8 @@
</template>
<script>
import { selectCarInspectedList, typeValues } from '@/api/supplychain/yancheguanli'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import { selectCarInspectedList } from '@/api/supplychain/yancheguanli'
import { selectModelName, typeValues } from '@/api/cheliang/dictcommons'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@ -118,7 +118,8 @@ export default {
purchaseType: '',
inspectedStartDate: '',
inspectedEndDate: '',
userSid: window.sessionStorage.getItem('userSid')
userSid: '',
orgPath: ''
}
},
btnList: [
@ -180,18 +181,26 @@ export default {
purchaseType: '',
inspectedStartDate: '',
inspectedEndDate: '',
userSid: window.sessionStorage.getItem('userSid')
userSid: '',
orgPath: ''
}
}
this.getList()
},
loadList() {
this.tableLoading = true
selectCarInspectedList(this.listQuery).then(resp => {
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
selectCarInspectedList(this.listQuery).then((resp) => {
this.tableLoading = false
const data = resp.data
this.listQuery.total = data.total
this.dataList = data.records
if (resp.success) {
const data = resp.data
this.listQuery.total = data.total
this.dataList = data.records
} else {
this.listQuery.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
@ -211,16 +220,6 @@ export default {
}
})
},
// sid
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.listQuery.params.useOrgSid = res.data.sid
this.loadList()
}
})
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size

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

@ -103,9 +103,8 @@
</template>
<script>
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
import { getOrgSidByPath } 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'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
@ -137,7 +136,8 @@ export default {
inspectedSid: '',
modelDifferenceExplain: '',
guaranteeCardNo: '',
engineNo: ''
engineNo: '',
orgPath: ''
}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
@ -200,11 +200,11 @@ export default {
console.log('imgList01', this.imgList01)
}
if (this.temp.factoryImage.length > 0) {
for (var i = 0; i < this.temp.factoryImage.length; i++) {
const imgName = this.temp.factoryImage[i].split('/')
for (var k = 0; k < this.temp.factoryImage.length; k++) {
const imgName = this.temp.factoryImage[k].split('/')
this.imgList02.push({
name: imgName[imgName.length - 1],
url: this.temp.factoryImage[i]
url: this.temp.factoryImage[k]
})
}
console.log('imgList02', this.imgList02)
@ -212,30 +212,6 @@ export default {
}
})
},
// showEdit(sid) {
// this.$nextTick(() => {
// this.$refs['dataForm'].clearValidate()
// })
// this.dialogStatus = 'update'
// this.viewTitle = ''
// this.temp.sid = sid
// console.log('sid', this.temp.sid)
// getCarInspected(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()
// },
handleChecklist() {
this.isCheck = false
this.$refs['divchecklist'].showCheck(this.temp.inspectedSid)
@ -243,23 +219,9 @@ export default {
resetState() {
this.isCheck = true
},
// 使
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') {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSId = res.data
this.useOrg = res.data
}
@ -279,8 +241,8 @@ export default {
if (this.imgList02.length > 0) {
console.log('imgList02', this.imgList02)
const img02_list = []
for (var i = 0; i < this.imgList02.length; i++) {
img02_list.push(this.imgList02[i].url)
for (var k = 0; k < this.imgList02.length; k++) {
img02_list.push(this.imgList02[k].url)
this.temp.factoryImage = img02_list
}
} else {
@ -310,6 +272,7 @@ export default {
//
handleCreate() {
this.getUrl()
this.temp.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.FormLoading = true
@ -342,6 +305,7 @@ export default {
},
handlePass() {
this.getUrl()
this.temp.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.$refs['dataForm'].validate((valid) => {
if (valid) {
submitCarInspectedInfo(this.temp).then((response) => {
@ -377,16 +341,6 @@ export default {
}
})
}
//
// 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>

Loading…
Cancel
Save