Browse Source

外采、车辆台账、存放地点变更

master
Zhao Qiqi 3 years ago
parent
commit
0820b7ec7d
  1. 7
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
  2. 2
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
  3. 96
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  4. 112
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo.vue
  5. 236
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
  6. 1
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

7
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue

@ -258,6 +258,9 @@ export default {
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()
break
default:
break
}
@ -398,6 +401,10 @@ export default {
})
.catch(() => {})
},
doClose(){
this.$store.dispatch('tagsView/delView', this.$route);
this.$router.go(-1)
},
dosearch() {
this.queryParams.current = 1
this.loadList()

2
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@ -208,7 +208,7 @@
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>合同附件</span>
<span>合同附件</span>
</el-col>
<el-col :span="21">
<el-form-item>

96
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -65,31 +65,35 @@
<!-- </el-table-column>-->
<el-table-column prop="locationName" width="140" label="存放地点" align="center"/>
<el-table-column prop="vehicleStateValue" width="100" label="库存状态" align="center"/>
<el-table-column prop="priceDate" width="130" label="厂家入库日期" align="center" />
<el-table-column prop="priceDate" width="130" label="厂家入库日期" align="center"/>
<el-table-column prop="arrivalDate" width="130" label="到货日期" align="center"/>
<el-table-column prop="configName" width="460" label="常用配置名称" align="left" header-align="center" />
<el-table-column prop="contractPrice" width="130" label="厂家合同价" align="center" />
<el-table-column prop="costPrice" width="130" label="厂家结算价" align="center" />
<el-table-column prop="createOrgName" width="130" label="创建组织名称" align="center" />
<el-table-column prop="departureDate" width="130" label="发车日期" align="center" />
<el-table-column prop="freight" width="130" label="运费" align="center" />
<el-table-column prop="guidedPrice" width="130" label="销售指导价" align="center" />
<el-table-column prop="insideCode" width="160" label="内部编码" align="center" />
<el-table-column prop="lockedStateValue" width="130" label="锁定状态" align="center" />
<el-table-column prop="manPurOrderTypeValue" width="160" label="厂家采购订单类型" align="center" />
<el-table-column prop="orderingNo" width="160" label="厂家订单编号" align="center" />
<!-- <el-table-column prop="rebate1" width="130" label="返利1" align="center" />-->
<!-- <el-table-column prop="rebate2" width="130" label="返利2" align="center" />-->
<!-- <el-table-column prop="rebate3" width="130" label="返利3" align="center" />-->
<el-table-column prop="returnDate" width="130" label="退库日期" align="center" />
<el-table-column prop="salePrice" width="130" label="成交价" align="center" />
<el-table-column prop="salesDate" width="130" label="销售日期" align="center" />
<el-table-column prop="settlementStatus" width="110" label="买断状态" align="center" />
<el-table-column prop="solidDate" width="130" label="买断日期" align="center" />
<!-- <el-table-column prop="specialInstructions" width="150" label="特殊或差异说明" align="left" header-align="center" />-->
<!-- <el-table-column prop="useOrgName" width="130" label="使用组织名称" align="center" />-->
<el-table-column prop="witPinStateValue" width="100" label="调车状态" align="center" />
<el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center" />
<el-table-column prop="configName" width="460" label="常用配置名称" align="left" header-align="center"/>
<el-table-column prop="contractPrice" width="130" label="厂家合同价" align="center"/>
<el-table-column prop="costPrice" width="130" label="厂家结算价" align="center"/>
<el-table-column prop="createOrgName" width="130" label="创建组织名称" align="center"/>
<el-table-column prop="departureDate" width="130" label="发车日期" align="center"/>
<el-table-column prop="freight" width="130" label="运费" align="center"/>
<el-table-column prop="guidedPrice" width="130" label="销售指导价" align="center"/>
<el-table-column prop="insideCode" width="160" label="内部编码" align="center"/>
<el-table-column prop="lockedStateValue" width="130" label="锁定状态" align="center"/>
<el-table-column prop="manPurOrderTypeValue" width="160" label="厂家采购订单类型" align="center"/>
<el-table-column prop="orderingNo" width="160" label="厂家订单编号" align="center"/>
<!-- <el-table-column prop="rebate1" width="130" label="返利1" align="center" />-->
<!-- <el-table-column prop="rebate2" width="130" label="返利2" align="center" />-->
<!-- <el-table-column prop="rebate3" width="130" label="返利3" align="center" />-->
<el-table-column prop="returnDate" width="130" label="退库日期" align="center"/>
<el-table-column prop="salePrice" width="130" label="成交价" align="center"/>
<el-table-column prop="salesDate" width="130" label="销售日期" align="center"/>
<el-table-column prop="settlementStatus" width="110" label="买断状态" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleCheckMai(scope.row)">{{ scope.row.settlementStatus }}</span>
</template>
</el-table-column>
<el-table-column prop="solidDate" width="130" label="买断日期" align="center"/>
<!-- <el-table-column prop="specialInstructions" width="150" label="特殊或差异说明" align="left" header-align="center" />-->
<!-- <el-table-column prop="useOrgName" width="130" label="使用组织名称" align="center" />-->
<el-table-column prop="witPinStateValue" width="100" label="调车状态" align="center"/>
<el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
</el-table>
</div>
<div class="pages">
@ -104,11 +108,13 @@
<cheliangtaizhang-info v-show="viewState == 4" ref="divinfo" @doback="resetState"></cheliangtaizhang-info>
<!-- 车型配置标准页面 -->
<vehicleconfiguration v-show="viewState == 5" ref="divPeizhi" @doback="resetState"/>
<!-- <changyongpeizhi-info v-show="viewState == 5" ref="divPeizhi" @doback="resetState"></changyongpeizhi-info>-->
<!-- <changyongpeizhi-info v-show="viewState == 5" ref="divPeizhi" @doback="resetState"></changyongpeizhi-info>-->
<!-- 出库 -->
<cheliangtaizhang-chu v-show="viewState == 6" ref="divChu" @doback="resetState"/>
<!-- 买断 -->
<cheliangtaizhang-mai v-show="viewState == 7" ref="divMai" @doback="resetState"/>
<!-- 买断详情 -->
<cheliangtaizhang-mai-info v-show="viewState == 8" ref="divMaiInfo" @doback="resetState"/>
</div>
</template>
@ -133,6 +139,7 @@ import Vehicle from '@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/ve
import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import cheliangtaizhangChu from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu'
import cheliangtaizhangMai from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai'
import cheliangtaizhangMaiInfo from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo'
export default {
name: 'cheliangtaizhang',
@ -146,7 +153,8 @@ export default {
CheliangtaizhangInfo,
vehicleconfiguration,
cheliangtaizhangChu,
cheliangtaizhangMai
cheliangtaizhangMai,
cheliangtaizhangMaiInfo
},
data() {
return {
@ -381,7 +389,7 @@ export default {
this.list[i].settlementStatus = '预买断'
}
if (this.list[i].settlementStatus == '2'){
this.list[i].settlementStatus = '买断'
this.list[i].settlementStatus = '买断'
}
}
} else {
@ -468,14 +476,29 @@ export default {
}
},
//
doMaiduan(){
doMaiduan() { // salesDate settlementStatus
if (this.sids.length > 0) {
this.viewState = 7
const bb = []
this.multipleSelection.forEach((element) => {
bb.push(element.vinNo)
})
this.$refs['divMai'].showMai(this.sids, bb)
for (var i = 0; i < this.multipleSelection.length; i++) {
console.log(this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate == '')
console.log()
if ((this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate == '') && this.multipleSelection[i].settlementStatus !== '预买断') {
this.$message({
showClose: true,
message: '请选择销售日期不为空或买断状态为预买断的车辆!',
type: 'error'
})
return
}
if ((this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate == '') || this.multipleSelection[i].settlementStatus == '预买断') {
console.log('满足条件了?', this.multipleSelection[i].salesDate, this.multipleSelection[i].settlementStatus)
this.viewState = 7
const bb = []
this.multipleSelection.forEach((element) => {
bb.push(element.vinNo)
})
this.$refs['divMai'].showMai(this.sids, bb)
}
}
} else {
this.$message({
showClose: true,
@ -485,6 +508,11 @@ export default {
return
}
},
//
handleCheckMai(row) {
this.viewState = 8
this.$refs['divMaiInfo'].showMaiInfo(row)
},
//
createData() {
// console.log('' + JSON.stringify(this.temp))

112
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo.vue

@ -0,0 +1,112 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>车辆买断</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
<div class="listconadd">
<div class="titwu">车辆买断</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<el-row class="first_row">
<el-col :span="4">
<el-form-item>
<span>车架号</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item>
<span>{{ temp.vinNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item>
<span>买断日期</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item prop="solidDate">
<span>{{ temp.solidDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item>
<span>上传买断证明</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item>
<el-image
style="width: 178px;height: 178px;"
v-for="(item,index) in temp.commonAppendix"
:key="index"
:src="item"
:preview-src-list="temp.commonAppendix">
</el-image>
<!-- <upload ref="uploadImg" v-model="imgList" :limit="1" bucket="map" :upload-data="{type:'0001'}"/>-->
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import Upload from '@/components/uploadFile/upload_maiduan.vue'
export default {
name: 'cheliangtaizhangMai',
components: {
Upload
},
data() {
return {
temp: {
commonAppendix: {},
solidDate: '',
vehicleSid: [],
vinNo: ''
},
dialogFormVisible: false,
imgList: [],
rules: {}
}
},
methods: {
showMaiInfo(row) {
// details(row.sid).then((response) => {
// console.log('', response)
// if (response.code === '200') {
// this.temp = response.data
// }
// })
},
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {
vinNo: '',
commonAppendix: []
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
</style>

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

@ -110,113 +110,113 @@
</div>
</el-dialog>
<!-- 临时出门证 -->
<el-dialog :visible.sync="isExitPermit" :title="formList.orgName + '出门证'" center width="1000px"
:close-on-click-modal="false">
<el-form ref="dataForm" :model="formList" label-position="right" class="formadd">
<el-row class="dialogRow">
<el-col :span="3">
<span>日期:</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.date }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>合同编号:</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.contractNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>客户名称</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ formList.customerName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>车型名称</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.modelName }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>台数</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.num }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>车架号</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{formList.vinNo}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>出门原因</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ formList.reason }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3"> <!--<span class="icon">*</span>-->
<span>业务经办人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{formList.creatName}}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>财务经办人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span></span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3"> <!--<span class="icon">*</span>-->
<span>提车人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.carryCarName }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>出门签章</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span></span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<!-- <el-dialog :visible.sync="isExitPermit" :title="formList.orgName + '出门证'" center width="1000px"-->
<!-- :close-on-click-modal="false">-->
<!-- <el-form ref="dataForm" :model="formList" label-position="right" class="formadd">-->
<!-- <el-row class="dialogRow">-->
<!-- <el-col :span="3">-->
<!-- <span>日期:</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span>{{ formList.date }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <span>合同编号:</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span>{{ formList.contractNo }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="3">-->
<!-- <span>客户名称</span>-->
<!-- </el-col>-->
<!-- <el-col :span="21">-->
<!-- <el-form-item>-->
<!-- <span>{{ formList.customerName }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="3">-->
<!-- <span>车型名称</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span>{{ formList.modelName }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <span>台数</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span>{{ formList.num }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="3">-->
<!-- <span>车架号</span>-->
<!-- </el-col>-->
<!-- <el-col :span="21">-->
<!-- <el-form-item>-->
<!-- <span>{{formList.vinNo}}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="3">-->
<!-- <span>出门原因</span>-->
<!-- </el-col>-->
<!-- <el-col :span="21">-->
<!-- <el-form-item>-->
<!-- <span>{{ formList.reason }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="3"> &lt;!&ndash;<span class="icon">*</span>&ndash;&gt;-->
<!-- <span>业务经办人</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span>{{formList.creatName}}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <span>财务经办人</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span></span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="3"> &lt;!&ndash;<span class="icon">*</span>&ndash;&gt;-->
<!-- <span>提车人</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span>{{ formList.carryCarName }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <span>出门签章</span>-->
<!-- </el-col>-->
<!-- <el-col :span="9">-->
<!-- <el-form-item>-->
<!-- <span></span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </el-dialog>-->
<!-- <el-dialog title="查看" :visible.sync="dialogImgVisible">-->
<!-- <el-image v-for="item in srcList" :key="item" style="width: 100px; height: 100px" :src="item"-->
@ -241,6 +241,7 @@ 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_cunfang'
import { getStorage } from '@/utils/auth'
export default {
name: 'cunfangdidianbiangeng',
@ -452,6 +453,27 @@ export default {
handleExitPermit(row) {
this.isExitPermit = true
this.getExitPermitInfo(row.sid)
// console.log(row)
// var xhr = new XMLHttpRequest()
// // xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + row.filePath + '&outFileName=' + row.name, true)
// xhr.setRequestHeader('token', getStorage())
// xhr.responseType = 'blob'
// xhr.onload = function(e) {
// //
// var blob = this.response
// var filename = row.fileName
// var a = document.createElement('a')
// //blob.type="application/octet-stream";
// //url
// var url = URL.createObjectURL(blob)
// a.href = url
// a.download = filename
// a.click()
// //URL
// window.URL.revokeObjectURL(url)
// }
// //
// xhr.send()
},
getExitPermitInfo(sid){
const userSid = window.sessionStorage.getItem('userSid')

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

@ -412,6 +412,7 @@ export default {
}
if (this.vinNoChoice.length > 0) {
this.temp.vinNo = this.vinNoChoice[0].vin
this.temp.vehicleSid = this.vinNoChoice[0].carSid
this.vinNoVisible = false
}else {
this.$message({

Loading…
Cancel
Save