|
@@ -150,7 +150,7 @@ import { getStoreValue } from '~src/utils/storage'
|
|
|
import { isNumberReg } from '~uti/tools'
|
|
|
import HcBillBaseModal from './addBillBaseModal.vue'
|
|
|
import qualityRleation from './qualityRleation.vue'
|
|
|
-import { arrToId, arrToKey, deepClone, getArrValue, getObjValue, getRandom, isNullES } from 'js-fast-way'
|
|
|
+import { arrToId, arrToKey, deepClone, getArrValue, getObjValue, getRandom, isArrIndex, isNullES } from 'js-fast-way'
|
|
|
import BigNumber from 'bignumber.js'
|
|
|
import { getHeader } from 'hc-vue3-ui'
|
|
|
|
|
@@ -566,6 +566,7 @@ const attachmentUpload = () => {
|
|
|
}
|
|
|
const attachmentUploadChange = (a, b, fileList) => {
|
|
|
baseForm.value.fileList = getArrValue(fileList)
|
|
|
+ selectId.value = arrToKey( baseForm.value.fileList, 'selectId', ',')
|
|
|
}
|
|
|
|
|
|
//文件上传
|
|
@@ -641,6 +642,7 @@ const addModalClose = () => {
|
|
|
isShow.value = false
|
|
|
baseForm.value = { fileList: [], pictureUrl: '' }
|
|
|
addTableData.value = []
|
|
|
+ selectId.value = ''
|
|
|
emit('close')
|
|
|
}
|
|
|
//关联质检资料
|
|
@@ -664,17 +666,23 @@ const closeQual = ()=>{
|
|
|
const finishModal = (rows)=>{
|
|
|
let fileList = []
|
|
|
rows.forEach(ele => {
|
|
|
- fileList.push({
|
|
|
- fileName:ele.dataName,
|
|
|
- filePdfUrl:ele.evisaPdfUrl ? ele.evisaPdfUrl : ele.pdfUrl,
|
|
|
- fileType:1,
|
|
|
- fileUrl:ele.evisaPdfUrl ? ele.evisaPdfUrl : ele.pdfUrl,
|
|
|
- selectId:ele.selectId,
|
|
|
- })
|
|
|
+ const isPush = isArrIndex( baseForm.value.fileList, 'selectId', ele.selectId)
|
|
|
+ if (!isPush) {
|
|
|
+ fileList.push({
|
|
|
+ fileName:ele.dataName,
|
|
|
+ filePdfUrl:ele.evisaPdfUrl ? ele.evisaPdfUrl : ele.pdfUrl,
|
|
|
+ fileType:1,
|
|
|
+ fileUrl:ele.evisaPdfUrl ? ele.evisaPdfUrl : ele.pdfUrl,
|
|
|
+ selectId:ele.selectId,
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
})
|
|
|
fileList.forEach((ele)=>{
|
|
|
baseForm.value.fileList.push(ele)
|
|
|
})
|
|
|
+
|
|
|
+ selectId.value = arrToKey( baseForm.value.fileList, 'selectId', ',')
|
|
|
}
|
|
|
</script>
|