Skip to content

H
hls-xcmg-vue-app
Commit c74c7dbe authored by 14699's avatar 14699
Browse files
Options

fix:单据创建默认主办协办

parent 5e439375
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 87 deletions
config/prod.env.js
View file @ c74c7dbe
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://210.12.156.64:9090/r/api"', ocrPath:'"http://210.12.156.64:9090/r/api"',
fileUploadSvcPath:'"http://210.12.156.64:9090/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://210.12.156.64:9090/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"3.6.6"' currentVersion: '"3.6.7"'
} }
plugins/android.json
View file @ c74c7dbe
{ {
"prepare_queue": { "prepare_queue": {
"installed": [], "installed": [],
"uninstalled": [] "uninstalled": []
}, },
"config_munge": { "config_munge": {
"files": {} "files": {}
}, },
"installed_plugins": { "installed_plugins": {
"com.handmobile.cordovaplugin.hotpatch": { "com.handmobile.cordovaplugin.hotpatch": {
"PACKAGE_NAME": "com.hls.app" "PACKAGE_NAME": "com.hls.app"
}, },
"cordova-plugin-camera": { "cordova-plugin-camera": {
"PACKAGE_NAME": "com.hls.app" "PACKAGE_NAME": "com.hls.app"
}, }
"cordova-plugin-crosswalk-webview": { },
"XWALK_VERSION": "22+", "dependent_plugins": {
"XWALK_LITEVERSION": "xwalk_core_library_canary:17+", "cordova-plugin-compat": {
"XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect", "PACKAGE_NAME": "com.hls.app"
"XWALK_MODE": "embedded", },
"XWALK_MULTIPLEAPK": "true", "cordova-plugin-contacts": {
"PACKAGE_NAME": "com.hls.app" "PACKAGE_NAME": "com.hls.app"
}, }
"cordova-plugin-datepicker": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-device": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-dialogs": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-file": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-file-transfer": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-image-picker": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-media-capture": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-network-information": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-splashscreen": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-statusbar": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-whitelist": {
"PACKAGE_NAME": "com.hls.app"
},
"ionic-plugin-keyboard": {
"PACKAGE_NAME": "com.hls.app"
}
},
"dependent_plugins": {
"cordova-plugin-compat": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-contacts": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-themeablebrowser": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-x-toast": {
"PACKAGE_NAME": "com.hls.app"
},
"es6-promise-plugin": {
"PACKAGE_NAME": "com.hls.app"
} }
}
} }
\ No newline at end of file
src/pages/contractSigning/contract-detail.vue
View file @ c74c7dbe
...@@ -87,7 +87,12 @@ ...@@ -87,7 +87,12 @@
<h-content v-if="num === 0" class="business-condition"> <h-content v-if="num === 0" class="business-condition">
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item> <item>
<div slot="name" class="font-color">业务经办</div> <div slot="name" class="font-color">业务主办</div>
<input
slot="content" v-model="baseInfo.bp_user_id_n" readonly>
</item>
<item>
<div slot="name" class="font-color">业务协办</div>
<input <input
slot="content" v-model="baseInfo.zm_approver_bp_n" placeholder="请选择" slot="content" v-model="baseInfo.zm_approver_bp_n" placeholder="请选择"
readonly readonly
...@@ -679,7 +684,7 @@ ...@@ -679,7 +684,7 @@
<!-- <input slot="content" v-model="info.product_code" readonly />--> <!-- <input slot="content" v-model="info.product_code" readonly />-->
<!-- </item>--> <!-- </item>-->
<item > <item >
<img @click="deleteProduct(item)" src="../../assets/contractCreate/delete.png" style="padding-left: 10px;margin-top: 12px;height: 20px;"/> <img src="../../assets/contractCreate/delete.png" style="padding-left: 10px;margin-top: 12px;height: 20px;" @click="deleteProduct(item)">
<div slot="name" class="font-color">产品名称</div> <div slot="name" class="font-color">产品名称</div>
<input slot="content" v-model="item.ref_v02" readonly @click="saveProduct(item)"> <input slot="content" v-model="item.ref_v02" readonly @click="saveProduct(item)">
</item> </item>
...@@ -823,24 +828,24 @@ export default { ...@@ -823,24 +828,24 @@ export default {
debugger debugger
console.log('newVal' + newVal) console.log('newVal' + newVal)
if (this.quotationInfo.deposit_ratio) { if (this.quotationInfo.deposit_ratio) {
this.quotationInfo.deposit = newVal * this.quotationInfo.deposit_ratio/100 this.quotationInfo.deposit = newVal * this.quotationInfo.deposit_ratio / 100
} }
if (this.quotationInfo.lease_charge_ratio) { if (this.quotationInfo.lease_charge_ratio) {
this.quotationInfo.lease_charge = newVal * this.quotationInfo.lease_charge_ratio/100 this.quotationInfo.lease_charge = newVal * this.quotationInfo.lease_charge_ratio / 100
} }
}, },
'quotationInfo.deposit_ratio' (newVal, oldVal) { 'quotationInfo.deposit_ratio' (newVal, oldVal) {
debugger debugger
console.log('newVal' + newVal) console.log('newVal' + newVal)
if (this.quotationInfo.equip_price) { if (this.quotationInfo.equip_price) {
this.quotationInfo.deposit = this.quotationInfo.equip_price * newVal/100 this.quotationInfo.deposit = this.quotationInfo.equip_price * newVal / 100
} }
}, },
'quotationInfo.lease_charge_ratio' (newVal, oldVal) { 'quotationInfo.lease_charge_ratio' (newVal, oldVal) {
debugger debugger
console.log('newVal' + newVal) console.log('newVal' + newVal)
if (this.quotationInfo.equip_price) { if (this.quotationInfo.equip_price) {
this.quotationInfo.lease_charge = this.quotationInfo.equip_price * newVal/100 this.quotationInfo.lease_charge = this.quotationInfo.equip_price * newVal / 100
} }
}, },
}, },
...@@ -890,7 +895,6 @@ export default { ...@@ -890,7 +895,6 @@ export default {
}) })
}, },
activated () { activated () {
}, },
mounted () { mounted () {
this.getBpTenantSelects() this.getBpTenantSelects()
...@@ -899,14 +903,14 @@ export default { ...@@ -899,14 +903,14 @@ export default {
this.repayPeriod() this.repayPeriod()
}, },
methods: { methods: {
//删除设备 // 删除设备
deleteProduct (item) { deleteProduct (item) {
let vm = this let vm = this
let url = $config.basePath + 'zm_prj_lease_item_delete' let url = $config.basePath + 'zm_prj_lease_item_delete'
let param = { let param = {
master: { master: {
lists: [{ lists: [{
'project_lease_item_id': item.project_lease_item_id 'project_lease_item_id': item.project_lease_item_id,
}], }],
}, },
} }
...@@ -1135,6 +1139,18 @@ export default { ...@@ -1135,6 +1139,18 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.baseInfo = res.lists[0] vm.baseInfo = res.lists[0]
setTimeout(function () {
if (!vm.baseInfo.bp_user_id_n) {
let nowBind = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id'))
vm.baseInfo.bp_user_id_n = nowBind.bp_name
vm.baseInfo.bp_user_id = nowBind.bp_id
}
if (!vm.baseInfo.zm_approver_bp_n) {
let checkApprover = vm.approverBpList.filter(item => item.code_name === '李燕')
vm.baseInfo.zm_approver_bp_n = checkApprover[0].code_name
vm.baseInfo.zm_approver_bp = checkApprover[0].code
}
}, 100)
} }
}) })
}, },
......
src/pages/contractSigning/contract-new.vue
View file @ c74c7dbe
...@@ -103,7 +103,12 @@ ...@@ -103,7 +103,12 @@
<h-content v-if="num === 0" class="business-condition"> <h-content v-if="num === 0" class="business-condition">
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item> <item>
<div slot="name" class="font-color">业务经办</div> <div slot="name" class="font-color">业务主办</div>
<input
slot="content" v-model="baseInfo.bp_user_id_n" readonly>
</item>
<item>
<div slot="name" class="font-color">业务协办</div>
<input <input
slot="content" v-model="baseInfo.zm_approver_bp_n" placeholder="请选择" slot="content" v-model="baseInfo.zm_approver_bp_n" placeholder="请选择"
readonly readonly
...@@ -770,6 +775,9 @@ export default { ...@@ -770,6 +775,9 @@ export default {
}, },
mounted () { mounted () {
let nowBind = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id'))
this.baseInfo.bp_user_id_n = nowBind.bp_name
this.baseInfo.bp_user_id = nowBind.bp_id
this.getBpTenantSelects() this.getBpTenantSelects()
this.getInvoiceType() this.getInvoiceType()
this.getTaxpayer() this.getTaxpayer()
...@@ -917,6 +925,10 @@ export default { ...@@ -917,6 +925,10 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.approverBpList = res.lists.map(item => { vm.approverBpList = res.lists.map(item => {
if (item.bp_name === '李燕') {
vm.$set(vm.baseInfo, 'zm_approver_bp', item.bp_id)
vm.$set(vm.baseInfo, 'zm_approver_bp_n', item.bp_name)
}
return { return {
code: item.bp_id, code: item.bp_id,
code_name: item.bp_name, code_name: item.bp_name,
...@@ -1533,7 +1545,7 @@ export default { ...@@ -1533,7 +1545,7 @@ export default {
} }
master.user_phone = window.localStorage.user_phone master.user_phone = window.localStorage.user_phone
// master.phone= window.localStorage.user_phone // master.phone= window.localStorage.user_phone
master.project_id = vm.project_id master.project_id = vm.project_id
let param = { let param = {
master, master,
} }
......
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