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

src/pages/localTool/standardWarning.vue

@@ -166,7 +166,16 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="termsConditions" label="条款内容" width="400" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column
+                  prop="termsConditions"
+                  label="条款内容"
+                  width="400"
+                  align="center">
+                  <template slot-scope="scope">
+                    <a v-if="scope.row.termsConditions === null"></a>
+                    <a v-else @click="openDialog(scope.row.termsConditions)">{{ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0,20) + '...' }}</a>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="issueTime" label="发布日期" width="120" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.issueTime ? scope.row.issueTime.substring(0, 10) : '' }}</span>
@@ -226,6 +235,16 @@
                      @click="exportExcel">提交</el-button>
         </span>
     </el-dialog>
+
+    <el-dialog
+      class="textDialog"
+      title="条款内容"
+      :visible.sync="detailTextDialog"
+      width="50%">
+      <span style="line-height: normal" v-html="detailText" ></span>
+      <div slot="footer" class="dialog-footer">
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -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;
+    }
+  }
 }
 </style>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -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

@@ -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

@@ -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",