Commit 3e8c1c32 authored by Mac's avatar Mac

修改问题

parent 858be198
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_il9ypki1in.css');
@import url('//at.alicdn.com/t/font_2077629_xkbuljsn3gc.css');
html,
body,
......
......@@ -33,11 +33,7 @@ Date.prototype.Format = function (fmt) {
};
Vue.use(ElementUI)
Vue.use(Erpindex)
Vue.use(Viewer,{
defaultOptions: {
zIndex: 9999
}
})
Vue.use(Viewer);
Vue.component(VTable.name, VTable)
Vue.component(VPagination.name, VPagination)
......
......@@ -324,7 +324,7 @@
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
getCompanyList: function () { //获取公司列表
getSchoolPage(this.schoolMsg).then(res => {
......@@ -382,7 +382,7 @@
},
goURL: function (url, edit, id) {
// this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
var tempStr = '/financial/financalDocument/' + url ;
var tempStr = '/financial/financalDocument/' + url +'?edit=' + edit + '&id='+id;
this.$router.push({
path: tempStr
});
......
......@@ -424,7 +424,7 @@
</div>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src.subCode">
<img v-for="src in images" :src="src" :key="src.subCode" style="display:none">
</viewer>
<div class="_tit _tit2 w830px">
<p>
......@@ -655,13 +655,13 @@
goPrintPageNew(type,id,Merge,OrderSource){
if(type===1){
let routeData = this.$router.resolve({
name: 'PrintPageN',
path: '/financial/financalDocument/PrintPageN',
query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageN',
path: '/financial/financalDocument/PrintPageN',
query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
});
window.open(routeData.href, "_blank");
......
......@@ -837,7 +837,7 @@
<p style="font-size:24px;">为了更好地打印效果,请点击页面上的“打印单据”再来进行打印,谢谢。</p>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
<img v-for="src in images" :src="src" :key="src" style=" display: none;">
</viewer>
<el-dialog custom-class='w400' title="特殊驳回" :visible.sync="finacialDialog" center>
......
......@@ -361,7 +361,7 @@
<button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
<img v-for="src in images" :src="src" :key="src" style="display:none">
</viewer>
</div>
</template>
......@@ -412,7 +412,7 @@
}
},
created(){
if (this.$route.query.edit) {
if (this.$route.query.edit && this.$route.query.edit !='undefined') {
let id = this.$route.query.id
this.getData(id)
} else {
......
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