Commit 93362a6a authored by linxin's avatar linxin

Merge branch 'liuxin' into develop

parents 7a3048af 511725c0
Pipeline #4419 canceled with stages
...@@ -322,6 +322,7 @@ export default { ...@@ -322,6 +322,7 @@ export default {
if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') { if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') {
return true return true
} else { } else {
debugger
return false return false
} }
}, },
......
...@@ -276,24 +276,39 @@ ...@@ -276,24 +276,39 @@
<img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson"> <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson">
</div> </div>
</div> </div>
<item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider"> <div v-if="!fromPutted" >
<list-item :item-height="68"> <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
<item> <list-item :item-height="68">
<span slot="left-icon" class="left-icon">{{ index+1 }}</span> <item>
<div slot="name"> <span slot="left-icon" class="left-icon">{{ index+1 }}</span>
担保人{{ index+1 }}姓名 <div slot="name">
<br >证件号 担保人{{ index+1 }}姓名
</div> <br >证件号
<div slot="content"> </div>
<input v-model="item.bp_name" placeholder="暂无信息" readonly > <div slot="content">
<input v-model="item.id_card_no" placeholder="暂无信息" readonly > <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
</div> <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
</item> </div>
</list-item> </item>
<div slot="buttons"> </list-item>
<option-button type="warn" text @click.native="deleteFun(item)" /> <div slot="buttons">
</div> <option-button type="warn" text @click.native="deleteFun(item)" />
</item-option> </div>
</item-option>
</div>
<list-item v-if="fromPutted" :item-height="68">
<item v-for="(item,index) in selectUdertake" :key="index">
<span slot="left-icon" class="left-icon">{{ index+1 }}</span>
<div slot="name">
担保人{{ index+1 }}姓名
<br >证件号
</div>
<div slot="content">
<input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
<input v-model="item.id_card_no" placeholder="暂无信息" readonly >
</div>
</item>
</list-item>
</h-content> </h-content>
<bottom-tab class="add-box"> <bottom-tab class="add-box">
<tab-button class="before" @click.native="$routeGo()">上一步</tab-button> <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
...@@ -321,7 +336,7 @@ export default { ...@@ -321,7 +336,7 @@ export default {
bp_agent_id: '', bp_agent_id: '',
pageNum: 1, pageNum: 1,
pageNumSearch: 1, pageNumSearch: 1,
status: window.localStorage.contractReadonly, status: '', // 是否为已提交
BussinessSituationList: [], // 行业情况 BussinessSituationList: [], // 行业情况
jobSituationList: [], // 职业情况 jobSituationList: [], // 职业情况
houseInfonList: [], // 房产信息 houseInfonList: [], // 房产信息
...@@ -365,6 +380,26 @@ export default { ...@@ -365,6 +380,26 @@ export default {
}, },
immediate: true, immediate: true,
}, },
'saveInfo.abc_deduction_flag': {
handler (newVal, oldVal) {
if (newVal === 'N') {
this.checked = false
} else if (newVal === 'Y') {
this.checked = true
}
},
immediate: true,
},
'saveInfo.special_flag': {
handler (newVal, oldVal) {
if (newVal === 'N') {
this.checkedApproved = false
} else if (newVal === 'Y') {
this.checkedApproved = true
}
},
immediate: true,
},
'checkedApproved': { 'checkedApproved': {
handler (newVal, oldVal) { handler (newVal, oldVal) {
if (newVal === false) { if (newVal === false) {
...@@ -384,20 +419,21 @@ export default { ...@@ -384,20 +419,21 @@ export default {
vm.salesEnter = '' vm.salesEnter = ''
vm.saveTed = false vm.saveTed = false
vm.showModalValue = false vm.showModalValue = false
vm.checked = false // 农行代扣
vm.checkedApproved = false // 是否特批
vm.pageNum = 1 vm.pageNum = 1
vm.pageNumSearch = 1 vm.pageNumSearch = 1
vm.undertakeList = [] vm.undertakeList = []
vm.bp_class = window.localStorage.bp_class_tenant vm.bp_class = window.localStorage.bp_class_tenant
vm.status = window.localStorage.contractReadonly
vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值,防止缓存 vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值,防止缓存
if (from.name === 'SalesInfo') { if (from.name === 'SalesInfo') {
vm.salesEnter = 'SalesInfo' vm.salesEnter = 'SalesInfo'
vm.fromPutted = false vm.fromPutted = false
vm.checked = false // 农行代扣
vm.checkedApproved = false // 是否特批
Object.keys(vm.saveInfo).forEach(i => { Object.keys(vm.saveInfo).forEach(i => {
if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') { if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} else if (i === 'abc_deduction_flag' && i === 'special_flag') { } else if (i === 'abc_deduction_flag' || i === 'special_flag') {
vm.saveInfo[i] = 'N' vm.saveInfo[i] = 'N'
} else if (i === 'bp_id') { } else if (i === 'bp_id') {
vm.saveInfo[i] = window.localStorage.bp_id_tenant vm.saveInfo[i] = window.localStorage.bp_id_tenant
...@@ -823,7 +859,7 @@ export default { ...@@ -823,7 +859,7 @@ export default {
deleteFun (e) { deleteFun (e) {
let deleteIndex let deleteIndex
this.selectUdertake.forEach((i, index, arr) => { this.selectUdertake.forEach((i, index, arr) => {
if (arr[index].bp_name.indexOf(e.bp_name) !== -1) { if (arr[index].bp_name.indexOf(e.bp_guta_name) !== -1) {
deleteIndex = index deleteIndex = index
} }
}) })
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</h-content> </h-content>
<bottom-tab class="add-box"> <bottom-tab class="add-box">
<tab-button class="before" @click.native="handSave">保存</tab-button> <tab-button class="before" @click.native="handSave">保存</tab-button>
<tab-button class="next" @click.native="handleSubmit">提交</tab-button> <tab-button class="next" @click.native="isSubmit">提交</tab-button>
</bottom-tab> </bottom-tab>
</h-view> </h-view>
</template> </template>
...@@ -500,23 +500,36 @@ export default { ...@@ -500,23 +500,36 @@ export default {
handSave () { handSave () {
hlsPopup.showLongCenter('保存成功!') hlsPopup.showLongCenter('保存成功!')
}, },
isSubmit () {
let vm = this
this.hlsPopup.showConfirm({
title: '提示',
content: '您确定提交吗?',
onConfirm: data => {
if (data === 1) {
this.handleSubmit()
}
},
})
},
// 项目提交审批 // 项目提交审批
handleSubmit () { handleSubmit () {
let vm = this let vm = this
let url = process.env.basePath + 'prj_project_submit' let url = process.env.basePath + 'prj_project_submit'
let param = { let param = {
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
phone:window.localStorage.getItem('user_phone'), phone: window.localStorage.getItem('user_phone'),
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
console.log('项目提交审批', res)
if (res.result === 'S') { if (res.result === 'S') {
vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({ vm.$router.push({
name: 'MyInfo', name: 'ContractCreateList',
}) })
// vm.showLists = res.lists } else {
vm.hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
......
...@@ -472,11 +472,11 @@ export default { ...@@ -472,11 +472,11 @@ export default {
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.code === '00') {
vm.hlsPopup.showSuccess('保存成功') vm.hlsPopup.showSuccess('保存成功')
vm.getEquipment()
setTimeout(() => { setTimeout(() => {
vm.downNum = false vm.downNum = false
vm.getEquipment()
}, 2000) }, 2000)
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
......
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