From ae234efb788bca2fa77f700442427996fa7f4aca Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 14 十一月 2024 11:58:00 +0800
Subject: [PATCH] Merge branch 'hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/components/ComChangeEdit.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/views/fysp/check/components/ComChangeEdit.vue b/src/views/fysp/check/components/ComChangeEdit.vue
index bfcf316..c297afb 100644
--- a/src/views/fysp/check/components/ComChangeEdit.vue
+++ b/src/views/fysp/check/components/ComChangeEdit.vue
@@ -21,7 +21,11 @@
:disabled="readonly"
accept="image/*"
>
- <el-button type="primary" id="uploadBtnId" style="display: none"></el-button>
+ <el-button
+ type="primary"
+ id="uploadBtnId"
+ style="display: none"
+ ></el-button>
<el-icon>
<Plus />
</el-icon>
@@ -30,21 +34,16 @@
<el-button type="primary" @click="onSubmit">淇濆瓨</el-button>
<el-button @click="this.$emit('submited', false)">鍙栨秷</el-button>
</div>
- <el-dialog
- title="浠绘剰鍥剧墖"
- width="80%"
- v-model="anyPhotoDialog"
- :before-close="beforeAnyPhotoDialogclose"
+ <ArbitraryPhoto
+ :max-select="3"
+ v-if="anyPhotoDialog"
+ v-model:dialog-visible="anyPhotoDialog"
+ @selectByAnyPhonoEvent="handleSelectedAnyPhono"
+ :subtask="subtask"
+ :defaultFile="fileList"
+ ref="arbitraryPhotoRef"
>
- <ArbitraryPhoto
- v-if="anyPhotoDialog"
- @selectByAnyPhonoEvent="handleSelectedAnyPhono"
- :subtask="subtask"
- :defaultFile="fileList"
- ref="arbitraryPhotoRef"
- >
- </ArbitraryPhoto>
- </el-dialog>
+ </ArbitraryPhoto>
<el-dialog
title="鍙拌处鍥剧墖"
width="80%"
@@ -145,14 +144,19 @@
return;
}
let beforeEditImgList = [];
- useCloned(this.oldChangeFileList).cloned.value.forEach((oldChangeFileitem) => {
- if (oldChangeFileitem.ischanged == 1) {
- oldChangeFileitem.url =
- $fysp.imgUrl + oldChangeFileitem.extension1 + oldChangeFileitem.guid + '.jpg';
- oldChangeFileitem.name = '1';
- beforeEditImgList.push(oldChangeFileitem);
+ useCloned(this.oldChangeFileList).cloned.value.forEach(
+ (oldChangeFileitem) => {
+ if (oldChangeFileitem.ischanged == 1) {
+ oldChangeFileitem.url =
+ $fysp.imgUrl +
+ oldChangeFileitem.extension1 +
+ oldChangeFileitem.guid +
+ '.jpg';
+ oldChangeFileitem.name = '1';
+ beforeEditImgList.push(oldChangeFileitem);
+ }
}
- });
+ );
this.fileList = useCloned(beforeEditImgList).cloned.value;
this.oldFileList = useCloned(beforeEditImgList).cloned.value;
},
@@ -179,13 +183,12 @@
}
exclude = false;
// picUrls.push(item)
- } else {
}
});
const that = this;
let deleteImgCopy = this.deleteImg;
-
+
if (this.changeType == 1) {
fileUtil.getImageFiles(picUrls, function (files) {
data.append('deleteImg', deleteImgCopy);
@@ -193,11 +196,11 @@
files.forEach((image) => {
data.append('images', image);
});
-
+
problemApi.updateChange(data).then((res) => {});
});
that.$emit('submited', true);
- }else {
+ } else {
fileUtil.getImageFiles(picUrls, function (files) {
data.append('problemId', that.problemId);
files.forEach((image) => {
--
Gitblit v1.9.3