合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!64
This commit is contained in:
高嵩
2023-04-21 09:19:06 +08:00
4 changed files with 90 additions and 4 deletions
+7
View File
@@ -0,0 +1,7 @@
import axios from '@/common/axios'
// 根据企标编号查找文件
export function selectByIdAtt(id){
return axios._getData('/lawss/sarBussionessStand/selectByIdAtt', { id })
}
+35 -2
View File
@@ -538,7 +538,7 @@ export default {
})
},
_getData (url, params, config = {}) {
_getData (url, params = {}, config = {}) {
return new Promise((resolve,reject)=>{
// 参数包含this
let _this = config._this || false
@@ -558,7 +558,7 @@ export default {
})
},
_postData (url, param, config = {}) {
_postData (url, param = {}, config = {}) {
return new Promise((resolve,reject) => {
var _formData = formData(param)
// 参数包含this
@@ -585,4 +585,37 @@ export default {
})
},
_downloadFile (url, params = {}, method = 'get', fileName = '导出文件') {
_axios({
method,
url,
data: method !== 'get' ? params : {},
params: method === 'get' ? params : {},
responseType: 'blob'
}).then(
res => {
const data = res.data
// 兼容ie
if (window.navigator.msSaveOrOpenBlob) {
try {
const blobObject = new Blob([data])
window.navigator.msSaveOrOpenBlob(blobObject, fileName)
} catch (e) {
console.log(e)
}
return
}
// a标签实现下载
// type为导出文件格式 例application/vnd.openxmlformats-officedocument.spreadsheetml.sheet 导出为xlsx格式
let url = window.URL.createObjectURL(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }))
let a = document.createElement('a')
a.style.display = 'none'
a.href = url
a.setAttribute('download', fileName)
document.body.appendChild(a)
a.click()
document.body.removeChild(a);
URL.revokeObjectURL(url); // 释放对象URL
})
},
}
@@ -1084,6 +1084,7 @@
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import { selectByIdAtt } from "@/api/flow/index.js"
let Base64 = require('js-base64').Base64;
@@ -2568,6 +2569,48 @@
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
// 修订 时 手动查找代替企标编号 发布稿放到历史版本
if(this.replaceLawType === 'DTQBBHBUSS' && this.form.standStatus === '2' && this.selectedListRep.length){
let ids = this.selectedListRep.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
try{
selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
}else{
init = init + ',' + item.fbgbussNmae
}
return init
},'')
this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbuss
}else{
init = init + ',' + item.fbgbuss
}
return init
},'')
}else if(res && res.data && res.data.length === 0){
this.form.LSBBBUSS = ''
this.form.LSBBBUSSName = ''
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
})
}catch(e){
console.log(e)
}
}
this.$refs.selections.clearSelection()
},
filterSetData(data){
@@ -2765,7 +2765,7 @@
},'')
// const id = this.selectedListRep[0].id
this.selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data[0].fbgbuss !== '') {
if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
@@ -2784,8 +2784,11 @@
},'')
// this.form.LSBBBUSSName = res.data[0].fbgbussNmae
// this.form.LSBBBUSS = res.data[0].fbgbuss
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
}else if(res && res.data && res.data.length === 0){
this.form.LSBBBUSS = ''
this.form.LSBBBUSSName = ''
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
})
}