FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20240619' into 'master'

Browse Source 
Fix foton 20240619

See merge request laws-foton-slrs/foton-laws-system-front!209
This commit is contained in:
王晓勇
2024-07-16 09:59:07 +00:00
parent 0b6a92d06c 69c20e52d4
commit 554141efbd
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+9 -8
View File
@@ -193,7 +193,8 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="240" width="200"
fixed="right"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button> <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
@@ -829,13 +830,13 @@
for( let a = 0; a < this.itemList.length; a++) { for( let a = 0; a < this.itemList.length; a++) {
for ( let b = 0; b < this.idList.length; b++) { for ( let b = 0; b < this.idList.length; b++) {
if (this.itemList[a].id === this.idList[b]) { if (this.itemList[a].id === this.idList[b]) {
this.itemList[a].technicalRequir = this.plForm.technicalRequir this.itemList[a].technicalRequir = this.plForm.technicalRequir ||this.itemList[a].technicalRequir
this.itemList[a].changePoint = this.plForm.changePoint this.itemList[a].changePoint = this.plForm.changePoint|| this.itemList[a].changePoint
this.itemList[a].complianceRequir = this.plForm.complianceRequir this.itemList[a].complianceRequir = this.plForm.complianceRequir||this.itemList[a].complianceRequir
this.itemList[a].complianceState = this.plForm.complianceState this.itemList[a].complianceState = this.plForm.complianceState||this.itemList[a].complianceState
this.itemList[a].newData = this.plForm.newData this.itemList[a].newData = this.plForm.newData|| this.itemList[a].newData
this.itemList[a].onlineData = this.plForm.onlineData this.itemList[a].onlineData = this.plForm.onlineData|| this.itemList[a].onlineData
this.itemList[a].applyArctic = this.plForm.applyArctic this.itemList[a].applyArctic = this.plForm.applyArctic|| this.itemList[a].applyArctic
} }
} }
} }
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+21 -6
View File
@@ -5406,6 +5406,10 @@ export default {
formData.menuId = this.parentNode.id formData.menuId = this.parentNode.id
} }
} }
if(formData.QCDW){
let arry=formData.QCDW.split('-')
formData.QCDW = arry[arry.length-1]
}
// 处理我的收藏和个性化标签传参 // 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'qbwdsc') { if (this.selectSarMenu.id === 'qbwdsc') {
formData.labelMenuId = undefined formData.labelMenuId = undefined
@@ -5452,12 +5456,23 @@ export default {
}else { }else {
val = value val = value
} }
advanceSearchVOList.push({ if(item.attrField=='QCDW') {
connect: 'and', let arry= val.split('-')
field: item.attrField || '', advanceSearchVOList.push({
type: 'like', connect: 'and',
value: val field: item.attrField || '',
}); type: 'like',
value: arry[arry.length-1]
});
}else{
advanceSearchVOList.push({
connect: 'and',
field: item.attrField || '',
type: 'like',
value: val
});
}
} }
}) })
} }