Skip to content

C
confucius
Commit 8f5c377b authored by Mac's avatar Mac
Browse files
Options

修改上传问题

parent 61d9cedf
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 20 deletions
src/pages/administration/AssetsSystem/PropertyStockInShenpi.vue
View file @ 8f5c377b
<template>
<div class="approvalDetails padContent" v-loading="pageLoad" style="padding: 20px;">
<div style="border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle" style="float:inherit;color: #111111;font-size: 30px;">资产入库详情</span>
<span class="pageTitle" style="float:inherit;color: #111111;font-size: 30px;">资产入库详情</span>
<span @click="GoZcUrl" style="font-size:12px;text-decoration:underline;cursor: pointer;float:right">跳转到资产管理</span>
</div>
<div style="margin-top:30px;background:rgba(255,255,255,1);border-radius:10px;padding:20px;position:relative;">
<el-row class="HeaderDiv" style="border-bottom:1px solid #E2E4EB;padding-bottom:20px">
......@@ -349,7 +350,7 @@
</div>
</template>
<div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi' && !needSign" class="_upload_box" style="margin-bottom:20px;padding-left:75px">
<ul class="clearfix">
<ul class="clearfix" style="padding: 0;margin: 0;">
<li v-for="(img,imgIndex) in uploadImgList" :key="imgIndex">
<img :src="img" alt="">
<div class="_delete_img" @click="deleteImg(imgIndex)">
......@@ -422,6 +423,8 @@
import {
UploadSelfFile
} from '../../../api/common/common'
import {url_jump_zc,ViittoFileUrl} from "../../../utils/url"
export default {
name: 'PropertyStockInShenpi',
components: {
......@@ -852,6 +855,10 @@
}
}
},
GoZcUrl(){
let url=url_jump_zc+"/#/receiptApproval";
window.open(url)
},
},
}
......
src/pages/administration/AssetsSystem/RequisitionShenpi.vue
View file @ 8f5c377b
......@@ -315,7 +315,7 @@
</div>
</template>
<div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi' && !needSign" class="_upload_box" style="margin-bottom:20px;padding-left:75px">
<ul class="clearfix">
<ul class="clearfix" style="padding: 0;margin: 0;">
<li v-for="(img,imgIndex) in uploadImgList" :key="imgIndex">
<img :src="img" alt="">
<div class="_delete_img" @click="deleteImg(imgIndex)">
......@@ -406,7 +406,9 @@
import CheckDetails from "./CheckDetails.vue";
import {getAuditChangeLogPageList,setBuyingRequisitionManagers,getEmployeeList,bRAuditOrRefund,getBuyingRequisitionAuditDetail} from "../../../api/administration/AssetsShenpi"
import {url_jump_zc,ViittoFileUrl} from "../../../utils/url"
import {
UploadSelfFile
} from '../../../api/common/common'
export default {
name: 'PurchaseRequisitionDetail',
components: {
......@@ -574,8 +576,13 @@ export default {
var fileName = `${that.uuid(10,10)}.png`;
var path = `/assets/sign/`;
newArr.push(this.dataURLtoFile(imgUrl,fileName))
this.UploadSelfFileT(path, newArr, x => {
this.addMsg.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
// this.UploadSelfFileT(path, newArr, x => {
// this.addMsg.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
// }, 1);
UploadSelfFile('Temporary', this.dataURLtoFile(imgUrl,fileName), x => {
if(x.Code==1){
this.addMsg.SignImage = x.FileUrl
}
}, 1);
this.signState=false;
......@@ -784,10 +791,12 @@ export default {
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
let obj = this.domainManager().ViittoFileUrl + x.data.FilePath
this.uploadImgList.push(obj)
this.$message.success('上传成功')
UploadSelfFile('Temporary', file.file, x => {
if(x.Code==1){
let obj = x.FileUrl
this.uploadImgList.push(obj)
this.$message.success('上传成功')
}
}, 1);
},
getDetail(){
......
src/pages/administration/AssetsSystem/SuppliesStockInShenpi.vue
View file @ 8f5c377b
......@@ -3,7 +3,8 @@
<div style="border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle" style="float:inherit;color: #111111;font-size: 30px;">耗材入库单详情</span>
<!-- <span @click="backTo" class="backTo" style="">返回</span> -->
<span @click="GoZcUrl" style="font-size:12px;text-decoration:underline;cursor: pointer;float:right">跳转到资产管理</span>
</div>
<div style="margin-top:30px;background:rgba(255,255,255,1);border-radius:10px;padding:20px;position:relative;">
<el-row class="HeaderDiv" style="border-bottom:1px solid #E2E4EB;padding-bottom:20px">
......@@ -150,7 +151,7 @@
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul class="changLogList" v-if="danjuList.length>0">
<li class="changLogList_l" v-for="(log,li) in danjuList" :key="li">
<li class="changLogList_l" v-for="(log,li) in danjuList" :key="li" style="list-style:none;">
<span style="background-color: #47BF8C" class="_radius_green"></span>
<p> <span class="_color_blue">{{log.UpdateBy}}</span> <span style="float:right" class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.Content}}</p>
......@@ -358,7 +359,7 @@
</div>
</template>
<div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi' && !needSign" class="_upload_box" style="margin-bottom:20px;padding-left:75px">
<ul class="clearfix">
<ul class="clearfix" style="padding: 0;margin: 0;">
<li v-for="(img,imgIndex) in uploadImgList" :key="imgIndex">
<img :src="img" alt="">
<div class="_delete_img" @click="deleteImg(imgIndex)">
......@@ -429,7 +430,10 @@
<script>
import {getAuditChangeLogPageList,suppliesStockInAuditOrRefund,getSuppliesStockInAuditDetail} from "../../../api/administration/AssetsShenpi"
import {
UploadSelfFile
} from '../../../api/common/common'
import {url_jump_zc,ViittoFileUrl} from "../../../utils/url"
export default {
name: 'PurchaseRequisitionDetail',
components: {
......@@ -584,8 +588,10 @@ import {getAuditChangeLogPageList,suppliesStockInAuditOrRefund,getSuppliesStockI
var fileName = `${that.uuid(10,10)}.png`;
var path = `/assets/sign/`;
newArr.push(this.dataURLtoFile(imgUrl,fileName))
this.UploadSelfFileT(path, newArr, x => {
this.addMsg.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
UploadSelfFile('Temporary', this.dataURLtoFile(imgUrl,fileName), x => {
if(x.Code==1){
this.addMsg.SignImage = x.FileUrl
}
}, 1);
this.signState=false;
......@@ -800,10 +806,12 @@ import {getAuditChangeLogPageList,suppliesStockInAuditOrRefund,getSuppliesStockI
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
let obj = this.domainManager().ViittoFileUrl + x.data.FilePath
this.uploadImgList.push(obj)
this.$message.success('上传成功')
UploadSelfFile('Temporary', file.file, x => {
if(x.Code==1){
let obj = x.FileUrl
this.uploadImgList.push(obj)
this.$message.success('上传成功')
}
}, 1);
},
getDetail(){
......@@ -858,6 +866,10 @@ import {getAuditChangeLogPageList,suppliesStockInAuditOrRefund,getSuppliesStockI
}
}
},
GoZcUrl(){
let url=url_jump_zc+"/#/receiptApproval";
window.open(url)
},
},
}
......@@ -1020,6 +1032,8 @@ import {getAuditChangeLogPageList,suppliesStockInAuditOrRefund,getSuppliesStockI
.approvalDetails ._delete_img i.iconfont{display: inline-block;width: 32px;height: 32px;border-radius: 50%;color: #E95252 !important;background-color:rgba(251, 251, 251, 0.9); margin-top: 26px;}
.approvalDetails ._upload_box ul li{float: left;height:82px;width:143px;padding:0px 20px 20px 0;text-align: center;position: relative;cursor: pointer;margin-right: 10px;}
.approvalDetails ._upload_box ul li img{height:82px;width:143px;}
.approvalDetails ul li{list-style: none;}
.approvalDetails ._upload_box ul li:hover ._delete_img{opacity: 1;}
.approvalDetails .button span{
display: inline-block;
......
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