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

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

@ -97,49 +97,41 @@
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row>--> <el-row>
<!-- <el-col :span="3">--> <el-col :span="3">
<!-- <div class="ao-text">--> <div class="ao-text">
<!-- <span>文件：</span>--> <span>文件：</span>
<!-- </div>--> </div>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="8">--> <el-col :span="8">
<!-- <el-form-item>--> <el-form-item>
<!-- <el-upload--> <el-upload
<!-- :disabled="formData.auditStatus == 1"--> :disabled="formData.auditStatus == 1"
<!-- class="upload-demo"--> class="upload-demo"
<!-- ref="upload"--> ref="upload"
<!-- :action="this.uploadUrl"--> :action="this.uploadUrl"
<!-- :on-preview="uploadHandlePreview"--> :on-preview="uploadHandlePreview"
<!-- :on-remove="uploadHandleRemove"--> :on-remove="uploadHandleRemove"
<!-- :headers="headers"--> :headers="headers"
<!-- :on-exceed="uploadHandleExceed"--> :on-exceed="uploadHandleExceed"
<!-- accept=".jpg,.png"--> accept=".jpg,.png"
<!-- :on-change="uploadOnchange"--> :on-change="uploadOnchange"
<!-- :on-success="uploadHandleSuccess"--> :on-success="uploadHandleSuccess"
<!-- :on-error="uploadHandleError"--> :on-error="uploadHandleError"
<!-- :file-list="fileList"--> :file-list="fileList"
<!-- :data="{type:'image2'}"--> :data="{type:'image2'}"
<!-- :auto-upload="true">--> :auto-upload="true">
<!-- <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">--> <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
<!-- {{ choiceFile }}--> {{ choiceFile }}
<!-- </el-button>--> </el-button>
<!-- <div>只能上传 jpg,png 文件，且不超过 3 MB</div>--> <div>只能上传 jpg,png 文件，且不超过 3 MB</div>
<!-- </el-upload>--> </el-upload>
<!-- &lt;!&ndash; <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"&ndash;&gt;--> <!-- <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
<!-- &lt;!&ndash; style="text-align:right"&ndash;&gt;--> <!-- style="text-align:right"-->
<!-- &lt;!&ndash; >文件预览&ndash;&gt;--> <!-- >文件预览-->
<!-- &lt;!&ndash; </el-button&ndash;&gt;--> <!-- </el-button-->
<!-- &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-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -179,7 +171,6 @@ export default {
data() { data() {
return { return {
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
newFilePath: this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=" + this.formData.filePath,
code: "", code: "",
isCleck:false, isCleck:false,
formData: { formData: {
@ -209,11 +200,12 @@ export default {
}; };
}, },
components: { components: {
// draggable, draggable,
// ElImageViewer ElImageViewer
}, },
methods: { methods: {
submitUpload() { submitUpload() {
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {
if (this.formData.auditStatus == 1) { if (this.formData.auditStatus == 1) {
@ -238,25 +230,22 @@ export default {
onConfirmSubmit(val) { onConfirmSubmit(val) {
this.formData.repeatUpload = val; this.formData.repeatUpload = val;
console.log(this.formData) console.log(this.formData)
this.onSubmit(); if (this.$isNotBlank(this.formData.filePath)) {
// this.formData.repeatUpload = val; if (this.$refs.upload.uploadFiles.length > 0) {
// console.log(this.formData) this.$refs.upload.submit();
// if (this.$isNotBlank(this.formData.filePath)) { this.onSubmit();
// if (this.$refs.upload.uploadFiles.length > 0) { } else {
// this.$refs.upload.submit(); this.onSubmit();
// this.onSubmit(); }
// } else {
// this.onSubmit(); } else {
// } console.log(this.$refs.upload.uploadFiles.length);
// if (this.$refs.upload.uploadFiles.length > 0) {
// } else { this.$refs.upload.submit();
// console.log(this.$refs.upload.uploadFiles.length); } else {
// if (this.$refs.upload.uploadFiles.length > 0) { this.$message.warning(`请选择文件`);
// this.$refs.upload.submit(); }
// } else { }
// this.$message.warning(`请选择文件`);
// }
// }
}, },
@ -273,10 +262,8 @@ export default {
this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk; this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
this.formData.productIdFk = this.inputQuery.productId; this.formData.productIdFk = this.inputQuery.productId;
} }
if (this.formData.auditStatus != 1){ if (this.formData.auditStatus != 1)
this.formData.auditStatus = "6"; this.formData.auditStatus = "6";
this.formData.filePath = this.$refs.editorRef.html
}
if (this.editTye == 1) { if (this.editTye == 1) {
insertCompanyCert(this.formData).then(response => { 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; 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
}, },
showImgViewer(row){ showImgViewer(row){
let newWindow = window.open(); // let newWindow = window.open();
newWindow.document.write(row.filePath) // newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
// this.imgList=[]; this.imgList=[];
// previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
// if (response.code === 20000) { if (response.code === 20000) {
// this.imgList=response.data; this.imgList=response.data;
// } }
// }); });
// this.imgViewerVisible = true; this.imgViewerVisible = true;
// const m = (e) => { e.preventDefault() }; const m = (e) => { e.preventDefault() };
// document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
// document.addEventListener("touchmove", m, false); // 禁止页面滑动 document.addEventListener("touchmove", m, false); // 禁止页面滑动
}, },
closeImgViewer() { closeImgViewer() {
this.imgViewerVisible = false; 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-col :span="10" class="el-col">
<el-form-item label="企业名称:" label-width="150px" prop="companyName"> <el-form-item label="企业名称:" label-width="150px" prop="companyName">
<el-select v-model="inputQuery.companyName" @change="getCompanyId" placeholder="请选择企业名称" style="width: 100%"> <el-select v-model="inputQuery.companyName" @change="getCompanyId" placeholder="请选择企业名称" style="width: 100%">
<el-option <el-option
v-for="item in maintainsList" v-for="item in maintainsList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -417,9 +417,9 @@ export default {
} }
, ,
created() { created() {
if(this.editType == 1){ if(this.editType == 1){
this.getCompanyCertList(); this.getCompanyCertList();
} }
this.getBasicUnitMaintainsList(); this.getBasicUnitMaintainsList();
this.headers = { this.headers = {
ADMIN_ID: store.getters.adminId, ADMIN_ID: store.getters.adminId,
@ -493,21 +493,19 @@ export default {
} }
, ,
showImgViewer(row) { showImgViewer(row) {
let newWindow = window.open(); this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
newWindow.document.write(row.filePath) this.imgList = [];
// this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
// this.imgList = []; if (response.code === 20000) {
// previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { this.imgList=response.data;
// if (response.code === 20000) { }
// this.imgList=response.data; });
// } this.imgViewerVisible = true;
// }); const m = (e) => {
// this.imgViewerVisible = true; e.preventDefault()
// const m = (e) => { };
// e.preventDefault() document.body.style.overflow = 'hidden';
// }; document.addEventListener("touchmove", m, false); // 禁止页面滑动
// document.body.style.overflow = 'hidden';
// document.addEventListener("touchmove", m, false); // 禁止页面滑动
}, },
closeImgViewer() { closeImgViewer() {
this.imgViewerVisible = false; 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; 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
}, },
showImgViewer(row) { showImgViewer(row) {
let newWindow = window.open(); // let newWindow = window.open();
newWindow.document.write(row.filePath) // newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
// this.imgList = []; this.imgList = [];
// previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
// if (response.code === 20000) { if (response.code === 20000) {
// this.imgList=response.data; this.imgList=response.data;
// } }
// }); });
// this.imgViewerVisible = true; this.imgViewerVisible = true;
// const m = (e) => { const m = (e) => {
// e.preventDefault() e.preventDefault()
// }; };
// document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
// document.addEventListener("touchmove", m, false); // 禁止页面滑动 document.addEventListener("touchmove", m, false); // 禁止页面滑动
}, },
closeImgViewer() { closeImgViewer() {
this.imgViewerVisible = false; 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 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
}, },
showImgViewer(row) { showImgViewer(row) {
let newWindow = window.open(); // let newWindow = window.open();
newWindow.document.write(row.filePath) // newWindow.document.write(row.filePath)
// this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name=' this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
// this.imgList = [] this.imgList = []
// previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => { previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
// if (response.code === 20000) { if (response.code === 20000) {
// this.imgList = response.data this.imgList = response.data
// } }
// }) })
// this.imgViewerVisible = true this.imgViewerVisible = true
// const m = (e) => { const m = (e) => {
// e.preventDefault() e.preventDefault()
// } }
// document.body.style.overflow = 'hidden' document.body.style.overflow = 'hidden'
// document.addEventListener('touchmove', m, false) // 禁止页面滑动 document.addEventListener('touchmove', m, false) // 禁止页面滑动
}, },
closeImgViewer() { closeImgViewer() {
this.imgViewerVisible = false this.imgViewerVisible = false

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

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

Write Preview
Loading…
Cancel
Save