Skip to content

H
hls-xcmg-vue-app
Commit bd6801eb authored by 邹骏's avatar 邹骏
Browse files
Options

修改BUG

parent 7fd35740
Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 30 deletions
config/uat.env.js
View file @ bd6801eb
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"2.6.2"'
currentVersion: '"2.6.6"'
}
src/pages/contractCreate/creat-rent-info.vue
View file @ bd6801eb
......@@ -10,7 +10,7 @@
</div>
<div class="down-content">
<span>请上传照片</span>
<div class="photo" v-if="!isReadOnly" @click="ocrShow()">
<div class="photo" v-if="!isReadOnly" @click="pickMethod()">
<img v-if="vehicleImg" :src="vehicleImg" alt="">
</div>
<div class="photo" v-if="isReadOnly">
......@@ -48,13 +48,21 @@
placeholder="自动识别合格证编号"
>
</item>
<item class="date-check" @click.native="showTime1('YYYY-MM-DD')">
<item v-if="isReadOnly" class="date-check">
<div slot="name" class="required">发车日期</div>
<input slot="content" v-model="rentInfo.departure_date" readonly placeholder="请选择发车日期" >
</item>
<item v-if="!isReadOnly" class="date-check" @click.native="showTime1('YYYY-MM-DD')">
<div slot="name" class="required">发车日期</div>
<input slot="content" v-model="rentInfo.p_departure_date" :readonly="isReadOnly" placeholder="请选择发车日期" >
<input slot="content" v-model="rentInfo.departure_date" :readonly="isReadOnly" placeholder="请选择发车日期" >
</item>
<item class="date-check" @click.native="showTime2('YYYY-MM-DD')">
<item v-if="isReadOnly" class="date-check">
<div slot="name" class="required">开票日期</div>
<input slot="content" v-model="rentInfo.p_invoice_date" :readonly="isReadOnly" placeholder="请选择开票日期" >
<input slot="content" v-model="rentInfo.invoice_date" readonly placeholder="请选择开票日期" >
</item>
<item v-if="!isReadOnly" class="date-check" @click.native="showTime2('YYYY-MM-DD')">
<div slot="name" class="required">开票日期</div>
<input slot="content" v-model="rentInfo.invoice_date" :readonly="isReadOnly" placeholder="请选择开票日期" >
</item>
<button v-if="!isReadOnly" class="type-save" @click="saveRent()">保存</button>
</list-item>
......@@ -123,14 +131,19 @@
<div slot="name" class="required">产品数量</div>
<input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
</item>
<!-- <item class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
<item v-if="isReadOnly" class="check">
<div slot="name" class="required">是否已发车</div>
<img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!saveInfo.if_sent_car" slot="content" />
</item> -->
</item>
<item v-if="!isReadOnly" class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
<div slot="name" class="required">是否已发车</div>
<img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!saveInfo.if_sent_car" slot="content" />
</item>
</list-item>
<!-- <div v-if="saveInfo.if_sent_car">
<div class="userInfo" v-if="saveInfo.if_sent_car">租赁物信息<img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
<div>
<div class="userInfo">租赁物信息<img v-if="!isReadOnly" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
<item-option v-for="(item,index) in leaseList" ref="underTake" :key="index" class="mySlider">
<list-item :item-height="68" @click.native="downNum=true;getRent(item.project_lease_item_id)">
<item>
......@@ -148,7 +161,7 @@
<option-button type="delete" text @click.native="delete_release(item.project_lease_item_id,index)"></option-button>
</div>
</item-option>
</div> -->
</div>
<div class="userInfo">融资信息</div>
<div class="hint-info">
<img src="@/assets/contractCreate/hint.png">提示 以下为单个设备商务政策
......@@ -248,6 +261,14 @@
<div slot="name" class="required">保险押金</div>
<span slot="content">{{ saveInfo.insurance_fee|currency }}</span>
</item>
<item v-if="!isReadOnly">
<div slot="name" class="required">管理费</div>
<CurrencyInput slot="content" v-model="saveInfo.management_money" placeholder="请输入管理费"/>
</item>
<item v-if="isReadOnly">
<div slot="name" class="required">管理费</div>
<span slot="content">{{ saveInfo.management_money|currency }}</span>
</item>
<item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')">
<div slot="name" class="required">预计付款日</div>
<input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 ">
......@@ -437,14 +458,15 @@ export default {
divisionLists: [],
productLine: [], // 产品线
factory_ocr_type: '',
certificationType: '',
rentInfo: {
project_lease_item_id: '',
frame_number: '',
engine: '',
vehicle_model: '',
certificate_number: '',
p_departure_date: '',
p_invoice_date: '',
departure_date: '',
invoice_date: '',
},
vehicleImg: '',
/* productInfo: {
......@@ -483,6 +505,7 @@ export default {
lease_start_date: '',
gps_fee: '',
insurance_fee: '',
management_money: '',
pay_type: '',
pay_type_n: '',
residual_value: '',
......@@ -574,6 +597,8 @@ export default {
vm.fromList = false
vm.isReadOnly = false
vm.leaseList = []
vm.rentInfoQuery()
vm.rentList()
} else if (vm.fromPage === 'list') {
if (window.localStorage.contractReadonly === 'true') {
vm.isReadOnly = true
......@@ -627,6 +652,44 @@ export default {
},
})
},
// 图片保存
save_picture (list) {
let vm = this
if (list.length) {
// hlsPopup.showLoading('图片上传请稍候')
var alreadyUploadNum = 0
var attLength = 0
var recordUploadInterval = setInterval(function () {
if (alreadyUploadNum === attLength) {
clearInterval(recordUploadInterval)
hlsPopup.hideLoading()
// hlsPopup.showLongCenter('图片上传成功')
}
}, 500)
for (var i = 0; i < list.length; i++) {
let uploadSuccess = function (res) {
if (res.result === 'S') {
alreadyUploadNum++
for (var j = 0; j < list.length; j++) {
if (list[j].filePath === res.response.filePath) {
list[j].attachment_id = res.response.attachment_id
vm.upload_list.push(list[j])
break
}
}
} else {
hlsPopup.hideLoading()
}
}
if (!list[i].attachment_id) {
attLength++
hlsUtil.fileUploadSvc(list[i], uploadSuccess)
}
}
} else {
hlsPopup.hideLoading()
}
},
// 查看大图
showBigPicture (pic) {
let vm = this
......@@ -643,8 +706,8 @@ export default {
engine: '',
vehicle_model: '',
certificate_number: '',
p_departure_date: '',
p_invoice_date: '',
departure_date: '',
invoice_date: '',
}
},
getRent (id) {
......@@ -674,9 +737,9 @@ export default {
hlsPopup.showLongCenter('车辆型号不能为空！')
} else if (this.rentInfo.certificate_number == '') {
hlsPopup.showLongCenter('合格证编号不能为空！')
} else if (this.rentInfo.p_departure_date == '') {
} else if (this.rentInfo.departure_date == '') {
hlsPopup.showLongCenter('发车日期不能为空！')
} else if (this.rentInfo.p_invoice_date == '') {
} else if (this.rentInfo.invoice_date == '') {
hlsPopup.showLongCenter('开票日期不能为空！')
} else {
let param = {
......@@ -687,8 +750,8 @@ export default {
engine: this.rentInfo.engine,
vehicle_model: this.rentInfo.vehicle_model,
certificate_number: this.rentInfo.certificate_number,
p_departure_date: this.rentInfo.p_departure_date,
p_invoice_date: this.rentInfo.p_invoice_date,
departure_date: this.rentInfo.departure_date,
invoice_date: this.rentInfo.invoice_date,
}
}
this.$post(url, param).then((res) => {
......@@ -712,6 +775,26 @@ export default {
})
}
},
// 选择识别类型
pickMethod () {
let vm = this
hlsPopup.showActionSheet({
titleText: '请选择证件类型',
buttonArray: ['徐工重型合格证', '车辆登记证', '出厂合格证'],
callback: index => {
if (index === 0) {
vm.certificationType = 'NORMAL'
vm.ocrShow()
} else if (index === 1) {
vm.certificationType = 'DAOLU'
vm.ocrShow()
} else if (index === 2) {
vm.certificationType = 'CHANYUN'
vm.ocrShow()
}
},
})
},
// ocr识别入口
ocrShow () {
let vm = this
......@@ -775,13 +858,14 @@ export default {
let vm = this
hlsPopup.showLoading('正在识别')
let url
if (this.factory_ocr_type == 'NORMAL') {
if (this.certificationType == 'NORMAL') {
url = process.env.ocrPath + '/baidu/ocr/vehicle_certificate'
} else if (this.factory_ocr_type == 'CHANYUN') {
} else if (this.certificationType == 'CHANYUN') {
url = process.env.ocrPath + '/baidu/ocr/chanyun'
} else if (this.factory_ocr_type == 'DAOLU') {
} else if (this.certificationType == 'DAOLU') {
url = process.env.ocrPath + '/baidu/ocr/daolu'
}
console.log('OCR识别URL：' + url)
hlsUtil.baiduOcr(fileUrl, url, function (res) {
hlsPopup.hideLoading()
console.log('OCR识别结果：' + JSON.stringify(res))
......@@ -939,6 +1023,11 @@ export default {
if (res.result === 'S') {
if (res.info !== undefined) {
Object.assign(vm.saveInfo, res.info)
if (res.info.if_sent_car == 'Y') {
vm.saveInfo.if_sent_car = true
} else if (res.info.if_sent_car == 'N') {
vm.saveInfo.if_sent_car = false
}
vm.saveInfo.product_plan_name = res.info.product_plan_id_n
vm.factory_ocr_type = res.info.factory_ocr_type
vm.saveInfo.division_n = res.info.product_name
......@@ -1042,7 +1131,7 @@ export default {
vm.saveInfo.finance_amount = vm.finance_amount
vm.saveInfo.credit_id = window.localStorage.credit_id
let param = {
master: vm.saveInfo,
master: JSON.parse(JSON.stringify(vm.saveInfo)),
}
if (vm.saveInfo.if_sent_car == true) {
param.master.if_sent_car = 'Y'
......@@ -1279,7 +1368,7 @@ export default {
nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'),
format: format,
callback: (date) => {
vm.rentInfo.p_departure_date = date
vm.rentInfo.departure_date = date
},
})
},
......@@ -1296,7 +1385,7 @@ export default {
nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'),
format: format,
callback: (date) => {
vm.rentInfo.p_invoice_date = date
vm.rentInfo.invoice_date = date
},
})
},
......
src/pages/contractCreate/create-base-info.vue
View file @ bd6801eb
......@@ -172,6 +172,14 @@
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" />
</item>
<item v-if="fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" readonly placeholder="" >
</item>
<item v-if="!fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" placeholder="请输入" >
</item>
<item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
......@@ -319,6 +327,14 @@
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" />
</item>
<item v-if="fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" readonly placeholder="" >
</item>
<item v-if="!fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" placeholder="请输入" >
</item>
<item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
......
src/pages/contractCreate/sales-info.vue
View file @ bd6801eb
......@@ -221,7 +221,7 @@ export default {
vm.inflow_used = '' // 已使用授信额度
vm.inflow_reset = '' // 剩余授信额度
vm.user_bp_type = window.localStorage.bp_type
vm.sales = window.localStorage.bp_name
// vm.sales = window.localStorage.bp_name
vm.multiple = window.localStorage.multipleRole
// {
// "bp_id_tenant":"8964",
......
src/pages/productQuery/entity-list.vue
View file @ bd6801eb
......@@ -30,6 +30,8 @@
<div slot="content" class="item-content">
<div class="pro-name">
<p>{{ item.product_name }}</p>
<span>办事处：{{ item.bp_name }}</span><br>
<span>产品型号：{{ item.product_code }}</span>
</div>
</div>
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
......@@ -273,17 +275,17 @@ export default {
width: 100%;
margin-left: 20px;
.pro-name {
height: 42px;
width: 90%;
position: relative;
p {
height: 42px;
line-height: 42px;
height: 36px;
line-height: 36px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #4B4A4B;
letter-spacing: 0;
font-weight: 600;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
}
.centers {
......
www/index.html
View file @ bd6801eb
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.ab4b75077c5dc235ef1ae0e67a560945.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.c03114a139eeae927c64.js></script><script type=text/javascript src=./static/js/app.67a421d22f3e21c60089.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.78435f9c748840b587c68e5ff0674abe.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.d1d652612de8a132d4e5.js></script><script type=text/javascript src=./static/js/app.2f217eda99a2e9b0949d.js></script></body></html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment