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

标准库添加备案日期搜索条件，预警查询条件修改

Browse Source
This commit is contained in:
shenyanpei
2022-01-17 16:37:09 +08:00
parent 606de7167d
commit 1e4e130c13
4 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+17
View File
@@ -1545,6 +1545,15 @@
</el-option>
</el-select>
</el-form-item>
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.BARQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="根据备案日期查找">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 标准类别-->
@@ -2331,6 +2340,7 @@ export default {
, TXLB: '',//体系类别
DYBXH: '',// 模块结构单元变形号
DYMC: '',//模块结构单元名称
BARQ: '' //备案日期
},
// 树形结构
// tree function
@@ -4345,6 +4355,13 @@ export default {
type: 'between',
value: value.join(',')
});
}else if (value !== null && value !== '' && (key === 'BARQ')){
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
});
}else if (value !== null && value !== ''){
advanceSearchVOList.push({
connect: "and",
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+22
View File
@@ -1067,6 +1067,17 @@
value-format="yyyy-MM-dd"
clearable></el-datePicker>
</el-form-item>
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-datePicker
:editable="false"
v-model="sarBussionessSearch.BARQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="根据备案日期查找">
</el-datePicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企标编号" class="add-form-item form-item-disabled">
@@ -2005,6 +2016,8 @@ export default {
// 基础信息
FZRQBUSS:'',
FSRQBUSS:'',
BARQ: '',
// 文本信息
FBGBUSS:'',
BZSMBUSS:'',
@@ -3926,6 +3939,14 @@ export default {
});
}
})
if (formData.BARQ !== null){
advanceSearchVOList.push({
connect: "and",
field: 'BARQ',
type: 'equals',
value: formData.BARQ
});
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData;
@@ -3935,6 +3956,7 @@ export default {
formData.endPutTime = formData.putTime ? formData.putTime[1] : null;
formData.FSRQBUSS = null;
formData.FZRQBUSS = null;
formData.BARQ = null
formData.putTime = null;
formData.issueTime = null;
}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+18
View File
@@ -514,6 +514,16 @@
</el-option>
</el-select>
</el-form-item>
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.BARQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="根据备案日期查找">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 标准类别-->
@@ -1885,6 +1895,7 @@ export default {
TXLB: '',//体系类别
DYMC: '', //模块结构单元名称
DYBXH: '',// 模块结构单元变形号
BARQ: '', // 备案日期
},
// 分页查询过程中用到的对象
@@ -3831,6 +3842,13 @@ export default {
type: 'between',
value: value.join(',')
});
}else if (value !== null && value !== '' && (key === 'BARQ')){
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
});
} else if (value !== null && value !== '') {
advanceSearchVOList.push({
connect: "and",