diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue index d9480ffb89..2cbf9053d7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue +++ b/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() diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue index fc8c85b613..f49b1e973a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue @@ -208,7 +208,7 @@ - *合同附件 + 合同附件 diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue index 9ccbb83155..1228720318 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue @@ -65,31 +65,35 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -104,11 +108,13 @@ - + + +
@@ -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)) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo.vue new file mode 100644 index 0000000000..02cd6f2fb0 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue index f1a741d4cf..9231e8f79c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue @@ -110,113 +110,113 @@ - - - - - 日期: - - - - {{ formList.date }} - - - - 合同编号: - - - - {{ formList.contractNo }} - - - - - - 客户名称 - - - - {{ formList.customerName }} - - - - - - 车型名称 - - - - {{ formList.modelName }} - - - - 台数 - - - - {{ formList.num }} - - - - - - 车架号 - - - - {{formList.vinNo}} - - - - - - 出门原因 - - - - {{ formList.reason }} - - - - - - 业务经办人 - - - - {{formList.creatName}} - - - - 财务经办人 - - - - - - - - - - 提车人 - - - - {{ formList.carryCarName }} - - - - 出门签章 - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -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') diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue index 3804dbaa77..dbf6ea4e97 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue +++ b/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({