UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

资质富文本还原

Browse Source
20231126-yw
黄泽腾 2 years ago
parent cc06bca172
commit c108a20366
8 changed files with 152 additions and 164 deletions
Show Stats Download Patch File Download Diff File

3
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -623,6 +623,7 @@ export default {
invCode: null,
fromCorp: null,
fromCorpName: null,
fromName: null,
fromInvCode: null,
remark: null,
fromType: 2,
@ -1460,6 +1461,8 @@ export default {
JSON.parse(JSON.stringify(this.orderFormData))
);
tQuery.billNo = this.orderFormData.billNo;
console.log("tQuery:");
console.log(tQuery);
if (this.orderFormData.billNo == null) {
this.$message.error("请先录入单据信息！");
return;

123
src/views/purchase/cert/supCertAddDialog.vue
Unescape Escape View File

@ -97,49 +97,41 @@
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>文件：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item>-->
<!-- <el-upload-->
<!-- :disabled="formData.auditStatus == 1"-->
<!-- class="upload-demo"-->
<!-- ref="upload"-->
<!-- :action="this.uploadUrl"-->
<!-- :on-preview="uploadHandlePreview"-->
<!-- :on-remove="uploadHandleRemove"-->
<!-- :headers="headers"-->
<!-- :on-exceed="uploadHandleExceed"-->
<!-- accept=".jpg,.png"-->
<!-- :on-change="uploadOnchange"-->
<!-- :on-success="uploadHandleSuccess"-->
<!-- :on-error="uploadHandleError"-->
<!-- :file-list="fileList"-->
<!-- :data="{type:'image2'}"-->
<!-- :auto-upload="true">-->
<!-- <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
<!-- {{ choiceFile }}-->
<!-- </el-button>-->
<!-- <div>只能上传 jpg,png 文件，且不超过 3 MB</div>-->
<!-- </el-upload>-->
<!-- &lt;!&ndash; <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"&ndash;&gt;-->
<!-- &lt;!&ndash; style="text-align:right"&ndash;&gt;-->
<!-- &lt;!&ndash; >文件预览&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button&ndash;&gt;-->
<!-- &lt;!&ndash; >&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row gutter="20" class="el-row" type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="文件：" prop="filePath">
<cusEditor ref="editorRef" style="width:90vh;height: 100%;overflow: auto; " :content="formData.filePath"
:type="`image2`"/>
<el-row>
<el-col :span="3">
<div class="ao-text">
<span>文件：</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item>
<el-upload
:disabled="formData.auditStatus == 1"
class="upload-demo"
ref="upload"
:action="this.uploadUrl"
:on-preview="uploadHandlePreview"
:on-remove="uploadHandleRemove"
:headers="headers"
:on-exceed="uploadHandleExceed"
accept=".jpg,.png"
:on-change="uploadOnchange"
:on-success="uploadHandleSuccess"
:on-error="uploadHandleError"
:file-list="fileList"
:data="{type:'image2'}"
:auto-upload="true">
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
{{ choiceFile }}
</el-button>
<div>只能上传 jpg,png 文件，且不超过 3 MB</div>
</el-upload>
<!-- <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
<!-- style="text-align:right"-->
<!-- >文件预览-->
<!-- </el-button-->
<!-- >-->
</el-form-item>
</el-col>
</el-row>
@ -179,7 +171,6 @@ export default {
data() {
return {
BASE_URL: process.env.VUE_APP_BASE_API,
newFilePath: this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=" + this.formData.filePath,
code: "",
isCleck:false,
formData: {
@ -209,11 +200,12 @@ export default {
};
},
components: {
// draggable,
// ElImageViewer
draggable,
ElImageViewer
},
methods: {
submitUpload() {
this.$refs["dataForm"].validate(valid => {
if (valid) {
if (this.formData.auditStatus == 1) {
@ -238,25 +230,22 @@ export default {
onConfirmSubmit(val) {
this.formData.repeatUpload = val;
console.log(this.formData)
this.onSubmit();
// this.formData.repeatUpload = val;
// console.log(this.formData)
// if (this.$isNotBlank(this.formData.filePath)) {
// if (this.$refs.upload.uploadFiles.length > 0) {
// this.$refs.upload.submit();
// this.onSubmit();
// } else {
// this.onSubmit();
// }
//
// } else {
// console.log(this.$refs.upload.uploadFiles.length);
// if (this.$refs.upload.uploadFiles.length > 0) {
// this.$refs.upload.submit();
// } else {
// this.$message.warning(`请选择文件`);
// }
// }
if (this.$isNotBlank(this.formData.filePath)) {
if (this.$refs.upload.uploadFiles.length > 0) {
this.$refs.upload.submit();
this.onSubmit();
} else {
this.onSubmit();
}
} else {
console.log(this.$refs.upload.uploadFiles.length);
if (this.$refs.upload.uploadFiles.length > 0) {
this.$refs.upload.submit();
} else {
this.$message.warning(`请选择文件`);
}
}
},
@ -273,10 +262,8 @@ export default {
this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
this.formData.productIdFk = this.inputQuery.productId;
}
if (this.formData.auditStatus != 1){
if (this.formData.auditStatus != 1)
this.formData.auditStatus = "6";
this.formData.filePath = this.$refs.editorRef.html
}
if (this.editTye == 1) {
insertCompanyCert(this.formData).then(response => {

26
src/views/purchase/company/supCompanyAduditDialog.vue
Unescape Escape View File

@ -515,19 +515,19 @@ export default {
'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
},
showImgViewer(row){
let newWindow = window.open();
newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
// this.imgList=[];
// previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
// if (response.code === 20000) {
// this.imgList=response.data;
// }
// });
// this.imgViewerVisible = true;
// const m = (e) => { e.preventDefault() };
// document.body.style.overflow = 'hidden';
// document.addEventListener("touchmove", m, false); // 禁止页面滑动
// let newWindow = window.open();
// newWindow.document.write(row.filePath)
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList=[];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
});
this.imgViewerVisible = true;
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false;

48
src/views/purchase/company/supCompanyEditDialog.vue
Unescape Escape View File

@ -10,13 +10,13 @@
<el-col :span="10" class="el-col">
<el-form-item label="企业名称:" label-width="150px" prop="companyName">
<el-select v-model="inputQuery.companyName" @change="getCompanyId" placeholder="请选择企业名称" style="width: 100%">
<el-option
v-for="item in maintainsList"
:key="item.name"
:label="item.name"
:value="item.id">
<span style="float: left">{{ item.name }}</span>
</el-option>
<el-option
v-for="item in maintainsList"
:key="item.name"
:label="item.name"
:value="item.id">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
@ -417,9 +417,9 @@ export default {
}
,
created() {
if(this.editType == 1){
this.getCompanyCertList();
}
if(this.editType == 1){
this.getCompanyCertList();
}
this.getBasicUnitMaintainsList();
this.headers = {
ADMIN_ID: store.getters.adminId,
@ -493,21 +493,19 @@ export default {
}
,
showImgViewer(row) {
let newWindow = window.open();
newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
// this.imgList = [];
// previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
// if (response.code === 20000) {
// this.imgList=response.data;
// }
// });
// this.imgViewerVisible = true;
// const m = (e) => {
// e.preventDefault()
// };
// document.body.style.overflow = 'hidden';
// document.addEventListener("touchmove", m, false); // 禁止页面滑动
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
});
this.imgViewerVisible = true;
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false;

30
src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
Unescape Escape View File

@ -550,21 +550,21 @@ export default {
'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
},
showImgViewer(row) {
let newWindow = window.open();
newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
// this.imgList = [];
// previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
// if (response.code === 20000) {
// this.imgList=response.data;
// }
// });
// this.imgViewerVisible = true;
// const m = (e) => {
// e.preventDefault()
// };
// document.body.style.overflow = 'hidden';
// document.addEventListener("touchmove", m, false); // 禁止页面滑动
// let newWindow = window.open();
// newWindow.document.write(row.filePath)
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
});
this.imgViewerVisible = true;
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false;

30
src/views/purchase/manufacturer/supManufacturerEditDialog.vue
Unescape Escape View File

@ -600,21 +600,21 @@ export default {
'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
},
showImgViewer(row) {
let newWindow = window.open();
newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
// this.imgList = []
// previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
// if (response.code === 20000) {
// this.imgList = response.data
// }
// })
// this.imgViewerVisible = true
// const m = (e) => {
// e.preventDefault()
// }
// document.body.style.overflow = 'hidden'
// document.addEventListener('touchmove', m, false) // 禁止页面滑动
// let newWindow = window.open();
// newWindow.document.write(row.filePath)
this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
this.imgList = []
previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
if (response.code === 20000) {
this.imgList = response.data
}
})
this.imgViewerVisible = true
const m = (e) => {
e.preventDefault()
}
document.body.style.overflow = 'hidden'
document.addEventListener('touchmove', m, false) // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false

26
src/views/purchase/product/supProductAuditDialog.vue
Unescape Escape View File

@ -560,19 +560,19 @@ export default {
indexOf(ext.toLowerCase()) !== -1;
},
showImgViewer(row){
let newWindow = window.open();
newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
// this.imgList=[];
// previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
// if (response.code === 20000) {
// this.imgList=response.data;
// }
// });
// this.imgViewerVisible = true;
// const m = (e) => { e.preventDefault() };
// document.body.style.overflow = 'hidden';
// document.addEventListener("touchmove", m, false); // 禁止页面滑动
// let newWindow = window.open();
// newWindow.document.write(row.filePath)
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList=[];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
});
this.imgViewerVisible = true;
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer(){
this.imgViewerVisible = false;

30
src/views/purchase/product/supProductEditDialog.vue
Unescape Escape View File

@ -669,21 +669,21 @@ export default {
'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
},
showImgViewer(row) {
let newWindow = window.open();
newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
// this.imgList = []
// previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
// if (response.code === 20000) {
// this.imgList = response.data
// }
// })
// this.imgViewerVisible = true
// const m = (e) => {
// e.preventDefault()
// }
// document.body.style.overflow = 'hidden'
// document.addEventListener('touchmove', m, false) // 禁止页面滑动
// let newWindow = window.open();
// newWindow.document.write(row.filePath)
this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
this.imgList = []
previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
if (response.code === 20000) {
this.imgList = response.data
}
})
this.imgViewerVisible = true
const m = (e) => {
e.preventDefault()
}
document.body.style.overflow = 'hidden'
document.addEventListener('touchmove', m, false) // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false

Write Preview
Loading…
Cancel
Save