diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index d7b32da68..958c1cd4b 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -166,7 +166,16 @@
{{ scope.row.itemsName }}
-
+
+
+
+ {{ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0,20) + '...' }}
+
+
{{ scope.row.issueTime ? scope.row.issueTime.substring(0, 10) : '' }}
@@ -226,6 +235,16 @@
@click="exportExcel">提交
+
+
+
+
+
@@ -237,6 +256,8 @@ export default {
name: "standardWarning",
data() {
return {
+ detailTextDialog: false,
+ detailText: '',
selectedList: [],
exportName: '',
exportModelFlag: false,
@@ -653,7 +674,12 @@ export default {
// this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
// this.field = field
},
- ...mapMutations(["setDetailMap"])
+ ...mapMutations(["setDetailMap"]),
+
+ openDialog(text) {
+ this.detailText = text
+ this.detailTextDialog = true
+ }
},
props: {
reload: {
@@ -1049,5 +1075,11 @@ export default {
margin: 24px 0;
}
}
+ .textDialog {
+ /deep/ .el-dialog__body {
+ height: 400px;
+ overflow-y: auto;
+ }
+ }
}
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 3c4728fe2..bc1457fca 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1545,6 +1545,15 @@
+
+
+
+
+
@@ -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",
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index b0c5d5ea0..9234a5547 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1067,6 +1067,17 @@
value-format="yyyy-MM-dd"
clearable>
+
+
+
+
+
+
@@ -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;
}
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index ec974d0bd..54e646167 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -514,6 +514,16 @@
+
+
+
+
+
+
@@ -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",