Commit 4c1235f2 authored by 郑娟's avatar 郑娟

Merge branch 'i-0-s_uat' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into i-0-s_uat

parents 5a355fe5 81a0eedf
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"0.5.8"' currentVersion: '"3.7.2"'
} }
...@@ -121,6 +121,7 @@ export default { ...@@ -121,6 +121,7 @@ export default {
vm.historyData = [] vm.historyData = []
vm.appendixData = [] vm.appendixData = []
vm.isTodo = vm.$route.params.type === 'todo' vm.isTodo = vm.$route.params.type === 'todo'
vm.isEditType = false // 30节点可编辑合同类型、开票类型
vm.getData() vm.getData()
vm.getHistory() vm.getHistory()
......
...@@ -50,11 +50,7 @@ ...@@ -50,11 +50,7 @@
<Partner :bplist="bplist" /> <Partner :bplist="bplist" />
</div> </div>
<div v-if="tabNum === 4" class="z100"> <div v-if="tabNum === 4" class="z100">
<Equipment v-if="equipmentData.length>0" :equipmentData="equipmentData" /> <Appendix :appendixData="appendixData" @upData="getData"></Appendix>
<Empty v-else description="无"/>
</div>
<div v-if="tabNum === 5" class="z100">
<Appendix ref="myappendix" :appendixData="appendixData" @upData="getData" />
<div v-show="isTodo" class="approveBottom"> <div v-show="isTodo" class="approveBottom">
<span> 审批意见 </span> <span> 审批意见 </span>
<textarea v-model="confirm_note" cols="8" rows="5" placeholder="请输入" /> <textarea v-model="confirm_note" cols="8" rows="5" placeholder="请输入" />
......
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