From bc21f9f6963b4c08e74a22bdc957dca672122584 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 26 Sep 2023 14:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=94=BF=E7=AD=96-?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../policy/components/advancedSearch.vue      | 654 +++++++++++-------
 .../policy/components/editDrawer.vue          |   4 +-
 .../policy/components/mainTable.vue           | 105 +--
 .../policy/components/policySearch.vue        |  43 +-
 .../policy/components/policyTable.vue         |  32 +-
 5 files changed, 541 insertions(+), 297 deletions(-)

diff --git a/src/pages/policyRegulation/policy/components/advancedSearch.vue b/src/pages/policyRegulation/policy/components/advancedSearch.vue
index c79e6d6fd..70eec276f 100644
--- a/src/pages/policyRegulation/policy/components/advancedSearch.vue
+++ b/src/pages/policyRegulation/policy/components/advancedSearch.vue
@@ -1,125 +1,218 @@
 <template>
   <el-drawer
       title="高级搜索"
-      size="700px"
+      size="800px"
       :wrapperClosable="false"
       :visible.sync="isAdvancedSearch">
     <div class="demo-drawer-content">
       <el-form
           :model="lawsStandInfoSearch"
-          :inline="true"
           class="label-input-form table-lattice"
-          label-width="76px"
-          style="display: flex;flex-wrap: wrap">
+          label-width="80px">
         <ProcessTitle>
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="prc-content-border">
           <el-row :gutter="24">
             <el-col :span="12">
-              <el-form-item label="政策分类" title="政策分类" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.lawsType" filterable clearable>
-                  <el-option
-                      v-for="item in dict.lawsTypeOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="发文日期" class="add-form-item form-item-disabled">
-                <el-datePicker v-model="lawsStandInfoSearch.issueTime"
-                               :editable="false"
-                               placeholder="请选择发文日期"
-                               value-format="yyyy-MM-dd"
-                               clearable></el-datePicker>
-              </el-form-item>
-              <el-form-item label="适用区域" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.lawsSyqy" filterable clearable>
-                  <el-option
-                      v-for="item in dict.lawsSyqyOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="年度" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.lawsYear" filterable clearable>
-                  <el-option
-                      v-for="item in dict.lawsYearOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="信息简报" class="add-form-item form-item-disabled">
-                <el-input v-model="lawsStandInfoSearch.lawsBulletin" clearable
-                          placeholder="请输入政策文号"
-                ></el-input>
-              </el-form-item>
+              <SelectFormItem label="1级政策分类"
+                              title="1级政策分类"
+                              v-model="lawsStandInfoSearch.lawsTypeFirstLevel"
+                              :options="dict.lawsTypeFirstLevelOptions">
+              </SelectFormItem>
+              <SelectFormItem label="3级政策分类"
+                              title="3级政策分类"
+                              v-model="lawsStandInfoSearch.lawsTypeThirdLevel"
+                              :options="dict.lawsTypeThirdLevelOptions">
+              </SelectFormItem>
+              <InputFormItem label="政策名称"
+                             title="政策名称"
+                             v-model="lawsStandInfoSearch.lawsName">
+              </InputFormItem>
+              <InputFormItem label="政策文号"
+                             title="政策文号"
+                             v-model="lawsStandInfoSearch.lawsNo">
+              </InputFormItem>
+              <InputFormItem label="发文单位"
+                             title="发文单位"
+                             v-model="lawsStandInfoSearch.issueCompany">
+              </InputFormItem>
+              <SelectFormItem label="文本状态"
+                              title="文本状态"
+                              v-model="lawsStandInfoSearch.lawsTextState"
+                              :options="dict.lawsTextStateOptions">
+              </SelectFormItem>
+              <SelectFormItem label="是否纳入认证清单"
+                              title="是否纳入认证清单"
+                              v-model="lawsStandInfoSearch.isRelateAccess"
+                              :options="isRelateAccessOptions || []">
+              </SelectFormItem>
+              <InputFormItem label="福田转发通知文号"
+                             title="福田转发通知文号"
+                             v-model="lawsStandInfoSearch.lawsNotisyncNum">
+              </InputFormItem>
+              <InputFormItem label="信息简报"
+                             title="信息简报"
+                             v-model="lawsStandInfoSearch.lawsBulletin">
+              </InputFormItem>
+              <InputFormItem label="备注（最终政策发布）"
+                             title="备注（最终政策发布）"
+                             v-model="lawsStandInfoSearch.lawsRemark">
+              </InputFormItem>
+
+              <!--#region-->
+              <!--<el-form-item label="政策分类" title="政策分类" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.lawsType" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.lawsTypeOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="发文日期" class="add-form-item form-item-disabled">-->
+              <!--  <el-datePicker v-model="lawsStandInfoSearch.issueTime"-->
+              <!--                 :editable="false"-->
+              <!--                 placeholder="请选择发文日期"-->
+              <!--                 value-format="yyyy-MM-dd"-->
+              <!--                 clearable></el-datePicker>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="适用区域" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.lawsSyqy" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.lawsSyqyOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="年度" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.lawsYear" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.lawsYearOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="信息简报" class="add-form-item form-item-disabled">-->
+              <!--  <el-input v-model="lawsStandInfoSearch.lawsBulletin" clearable-->
+              <!--            placeholder="请输入政策文号"-->
+              <!--  ></el-input>-->
+              <!--</el-form-item>-->
+              <!--#endregion-->
+
             </el-col>
             <el-col :span="12">
-              <el-form-item label="政策文号" class="add-form-item form-item-disabled">
-                <el-input v-model="lawsStandInfoSearch.lawsNo" clearable
-                          placeholder="请输入政策文号"></el-input>
-              </el-form-item>
-              <el-form-item label="发文单位" title="发文单位" class="add-form-item form-item-disabled">
-                <el-input v-model="lawsStandInfoSearch.issueCompany" placeholder="请输入发文单位" clearable></el-input>
-              </el-form-item>
-              <el-form-item label="适用车型" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.lawsSycx" filterable clearable>
-                  <el-option
-                      v-for="item in dict.lawsSycxOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="是否纳入认证清单" title="是否纳入认证清单" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.isRelateAccess">
-                  <el-option value="1" label="是" key="1"></el-option>
-                  <el-option value="2" label="否" key="2"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="福田转发通知文号" title="福田转发通知文号" class="add-form-item form-item-disabled">
-                <el-input v-model="lawsStandInfoSearch.lawsNotisyncNum" placeholder="请输入福田转发通知文号" clearable></el-input>
-              </el-form-item>
-              <el-form-item label="标签" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.lawsLabel" filterable clearable>
-                  <el-option
-                      v-for="item in dict.lawsLabelOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24">
-            <el-col :span="24">
-              <el-form-item label="征集意见周期" title="征集意见周期" class="add-form-item form-item-disabled">
-                <el-date-picker
-                    v-model="commentCycleDate"
-                    :picker-options="pickerOptions"
-                    type="daterange"
-                    range-separator="至"
-                    start-placeholder="起始时间"
-                    end-placeholder="结束时间"
-                    value-format="yyyy-MM-dd"
-                    align="right">
-                </el-date-picker>
-              </el-form-item>
+              <SelectFormItem label="2级政策分类"
+                              title="2级政策分类"
+                              v-model="lawsStandInfoSearch.lawsTypeSecondLevel"
+                              :options="dict.lawsTypeSecondLevelOptions">
+              </SelectFormItem>
+              <SelectFormItem label="4级政策分类"
+                              title="4级政策分类"
+                              v-model="lawsStandInfoSearch.lawsTypeFourthLevel"
+                              :options="dict.lawsTypeFourthLevelOptions">
+              </SelectFormItem>
+              <InputFormItem label="英文名称"
+                             title="英文名称"
+                             v-model="lawsStandInfoSearch.lawsEnName">
+              </InputFormItem>
+              <DatePickerFormItem label="发文日期"
+                                  title="发文日期"
+                                  v-model="lawsStandInfoSearch.issueTime">
+              </DatePickerFormItem>
+              <DataRangePickerFormItem label="征集意见周期"
+                                       title="征集意见周期"
+                                       :startTime.sync="lawsStandInfoSearch.commentCycleStart"
+                                       :endTime.sync="lawsStandInfoSearch.commentCycleEnd">
+              </DataRangePickerFormItem>
+              <SelectMultipleFormItem label="适用车型"
+                                      title="适用车型"
+                                      v-model="lawsStandInfoSearch.lawsSycx"
+                                      :options="dict.lawsSycxOptions || []">
+              </SelectMultipleFormItem>
+              <SelectFormItem label="年度"
+                              title="年度"
+                              v-model="lawsStandInfoSearch.lawsYear"
+                              :options="dict.lawsYearOptions">
+              </SelectFormItem>
+              <InputFormItem label="通知文号链接"
+                             title="通知文号链接"
+                             v-model="lawsStandInfoSearch.notisyncNumLink">
+              </InputFormItem>
+              <SelectMultipleFormItem label="标签"
+                                      title="标签"
+                                      v-model="lawsStandInfoSearch.lawsLabel"
+                                      :options="dict.lawsLabelOptions">
+              </SelectMultipleFormItem>
+
+              <!--#region-->
+              <!--<el-form-item label="政策文号" class="add-form-item form-item-disabled">-->
+              <!--  <el-input v-model="lawsStandInfoSearch.lawsNo" clearable-->
+              <!--            placeholder="请输入政策文号"></el-input>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="发文单位" title="发文单位" class="add-form-item form-item-disabled">-->
+              <!--  <el-input v-model="lawsStandInfoSearch.issueCompany" placeholder="请输入发文单位" clearable></el-input>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="适用车型" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.lawsSycx" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.lawsSycxOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="是否纳入认证清单" title="是否纳入认证清单" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.isRelateAccess">-->
+              <!--    <el-option value="1" label="是" key="1"></el-option>-->
+              <!--    <el-option value="2" label="否" key="2"></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="福田转发通知文号" title="福田转发通知文号" class="add-form-item form-item-disabled">-->
+              <!--  <el-input v-model="lawsStandInfoSearch.lawsNotisyncNum" placeholder="请输入福田转发通知文号" clearable></el-input>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="标签" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.lawsLabel" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.lawsLabelOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+            <!--#endregion-->
             </el-col>
           </el-row>
+          <!--#region-->
+          <!--<el-row :gutter="24">-->
+          <!--  <el-col :span="24">-->
+          <!--    <el-form-item label="征集意见周期" title="征集意见周期" class="add-form-item form-item-disabled">-->
+          <!--      <el-date-picker-->
+          <!--          v-model="commentCycleDate"-->
+          <!--          :picker-options="pickerOptions"-->
+          <!--          type="daterange"-->
+          <!--          range-separator="至"-->
+          <!--          start-placeholder="起始时间"-->
+          <!--          end-placeholder="结束时间"-->
+          <!--          value-format="yyyy-MM-dd"-->
+          <!--          align="right">-->
+          <!--      </el-date-picker>-->
+          <!--    </el-form-item>-->
+          <!--  </el-col>-->
+          <!--</el-row>-->
+          <!--#endregion-->
         </div>
         <ProcessTitle>
           <template slot="title">实施日期</template>
@@ -127,29 +220,55 @@
         <div class="prc-content-border">
           <el-row :gutter="24">
             <el-col :span="12">
-              <el-form-item label="实施日期" class="add-form-item form-item-disabled">
-                <el-datePicker v-model="lawsStandInfoSearch.SSRQLAWS"
-                               :editable="false"
-                               placeholder="请选择实施日期"
-                               value-format="yyyy-MM-dd"
-                               clearable></el-datePicker>
-              </el-form-item>
-              <el-form-item label="新车型实施日期" title="新车型实施日期" class="add-form-item form-item-disabled">
-                <el-datePicker v-model="lawsStandInfoSearch.XCXSSRQLAWS"
-                               :editable="false"
-                               placeholder="请选择实施日期"
-                               value-format="yyyy-MM-dd"
-                               clearable></el-datePicker>
-              </el-form-item>
+              <DatePickerGroupFormItem label="实施日期"
+                                       title="实施日期"
+                                       v-model="lawsStandInfoSearch.SSRQLAWS"
+              ></DatePickerGroupFormItem>
+              <DatePickerFormItem label="新生产实施日期"
+                                  title="新生产实施日期"
+                                  v-model="lawsStandInfoSearch.ZCXSSRQLAWS">
+              </DatePickerFormItem>
+              <DatePickerFormItem label="生效日期"
+                                  title="生效日期"
+                                  v-model="lawsStandInfoSearch.SXRQLAWS">
+              </DatePickerFormItem>
+
+              <!--#region-->
+              <!--<el-form-item label="实施日期" class="add-form-item form-item-disabled">-->
+              <!--  <el-datePicker v-model="lawsStandInfoSearch.SSRQLAWS"-->
+              <!--                 :editable="false"-->
+              <!--                 placeholder="请选择实施日期"-->
+              <!--                 value-format="yyyy-MM-dd"-->
+              <!--                 clearable></el-datePicker>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="新车型实施日期" title="新车型实施日期" class="add-form-item form-item-disabled">-->
+              <!--  <el-datePicker v-model="lawsStandInfoSearch.XCXSSRQLAWS"-->
+              <!--                 :editable="false"-->
+              <!--                 placeholder="请选择实施日期"-->
+              <!--                 value-format="yyyy-MM-dd"-->
+              <!--                 clearable></el-datePicker>-->
+              <!--</el-form-item>-->
+              <!--#endregion-->
             </el-col>
             <el-col :span="12">
-              <el-form-item label="在产车实施日期" title="在产车实施日期" class="add-form-item form-item-disabled">
-                <el-datePicker v-model="lawsStandInfoSearch.ZCXSSRQLAWS"
-                               :editable="false"
-                               placeholder="请选择实施日期"
-                               value-format="yyyy-MM-dd"
-                               clearable></el-datePicker>
-              </el-form-item>
+              <DatePickerFormItem label="新认证实施日期"
+                                  title="新认证实施日期"
+                                  v-model="lawsStandInfoSearch.XRZSSRQLAWS"
+              ></DatePickerFormItem>
+              <DatePickerFormItem label="在用车实施日期"
+                                  title="在用车实施日期"
+                                  v-model="lawsStandInfoSearch.XCXSSRQLAWS"
+              ></DatePickerFormItem>
+
+              <!--#region-->
+              <!--<el-form-item label="在产车实施日期" title="在产车实施日期" class="add-form-item form-item-disabled">-->
+              <!--  <el-datePicker v-model="lawsStandInfoSearch.ZCXSSRQLAWS"-->
+              <!--                 :editable="false"-->
+              <!--                 placeholder="请选择实施日期"-->
+              <!--                 value-format="yyyy-MM-dd"-->
+              <!--                 clearable></el-datePicker>-->
+              <!--</el-form-item>-->
+              <!--#endregion-->
             </el-col>
           </el-row>
         </div>
@@ -159,88 +278,120 @@
         <div class="prc-content-border">
           <el-row :gutter="24">
             <el-col :span="12">
-              <el-form-item label="发布机构" title="发布机构" class="add-form-item form-item-disabled">
-                <el-input v-model="lawsStandInfoSearch.FBJGLAWS" placeholder="请输入发布机构" clearable></el-input>
-              </el-form-item>
-              <el-form-item label="投稿人" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.TGRLAWS" filterable clearable>
-                  <el-option
-                      v-for="item in dict.TGRLAWSOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="能源类型" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.NYLXLAWS" filterable clearable>
-                  <el-option
-                      v-for="item in dict.NYLXLAWSOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="责任部门" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.ZRBMLAWS" filterable clearable>
-                  <el-option
-                      v-for="item in dict.ZRBMLAWSOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
+              <SelectFormItem label="我司参与深度"
+                              title="我司参与深度"
+                              v-model="lawsStandInfoSearch.CYSDLAWS"
+                              :options="dict.CYSDLAWSOptions">
+              </SelectFormItem>
+              <DepartmentFormItem label="投稿单位"
+                                  title="投稿单位"
+                                  v-model="lawsStandInfoSearch.TGDWLAWS"
+                                  :ids.sync="lawsStandInfoSearch.TGDWLAWSID">
+              </DepartmentFormItem>
+              <DepartmentFormItem label="责任部门"
+                                  title="责任部门"
+                                  v-model="lawsStandInfoSearch.ZRBMLAWS"
+                                  :ids.sync="lawsStandInfoSearch.ZRBMLAWSID">
+              </DepartmentFormItem>
+              <!--#region-->
+              <!--<el-form-item label="发布机构" title="发布机构" class="add-form-item form-item-disabled">-->
+              <!--  <el-input v-model="lawsStandInfoSearch.FBJGLAWS" placeholder="请输入发布机构" clearable></el-input>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="投稿人" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.TGRLAWS" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.TGRLAWSOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.NYLXLAWS" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.NYLXLAWSOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="责任部门" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.ZRBMLAWS" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.ZRBMLAWSOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--#endregion-->
             </el-col>
             <el-col :span="12">
-              <el-form-item label="我司参与深度" title="我司参与深度" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.CYSDLAWS" filterable clearable>
-                  <el-option
-                      v-for="item in dict.CYSDLAWSOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="投稿单位" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.TGDWLAWS" filterable clearable>
-                  <el-option
-                      v-for="item in dict.TGDWLAWSOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="适用认证" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.YYRZLAWS" filterable clearable>
-                  <el-option
-                      v-for="item in dict.YYRZLAWSOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="责任工程师" class="add-form-item form-item-disabled">
-                <el-select v-model="lawsStandInfoSearch.ZRGCSLAWS" filterable clearable>
-                  <el-option
-                      v-for="item in dict.ZRGCSLAWSOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
+              <personFormItem label="投稿人"
+                              title="投稿人"
+                              v-model="lawsStandInfoSearch.TGRLAWS">
+              </personFormItem>
+              <SelectMultipleFormItem label="适用认证"
+                                      title="适用认证"
+                                      v-model="lawsStandInfoSearch.SYRZLAWS"
+                                      :options="dict.syrzOptions">
+              </SelectMultipleFormItem>
+              <personFormItem label="责任工程师"
+                              title="责任工程师"
+                              v-model="lawsStandInfoSearch.ZRGCSLAWS">
+              </personFormItem>
+              <!--#region-->
+              <!--<el-form-item label="我司参与深度" title="我司参与深度" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.CYSDLAWS" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.CYSDLAWSOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="投稿单位" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.TGDWLAWS" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.TGDWLAWSOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="适用认证" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.YYRZLAWS" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.YYRZLAWSOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--<el-form-item label="责任工程师" class="add-form-item form-item-disabled">-->
+              <!--  <el-select v-model="lawsStandInfoSearch.ZRGCSLAWS" filterable clearable>-->
+              <!--    <el-option-->
+              <!--        v-for="item in dict.ZRGCSLAWSOptions"-->
+              <!--        placeholder="请选择"-->
+              <!--        :key="item.value"-->
+              <!--        :value="item.value"-->
+              <!--        :label="item.label"-->
+              <!--    ></el-option>-->
+              <!--  </el-select>-->
+              <!--</el-form-item>-->
+              <!--#endregion-->
             </el-col>
           </el-row>
         </div>
@@ -250,14 +401,38 @@
         <div class="prc-content-border">
           <el-row :gutter="24">
             <el-col :span="12">
-              <el-form-item label="代替文件号" title="代替文件号" class="add-form-item form-item-disabled">
-                <el-input v-model="lawsStandInfoSearch.DTWJHLAWS" placeholder="请输入代替文件号" clearable></el-input>
-              </el-form-item>
+              <InputForStandardsForLaws label="代替文件号"
+                                        title="代替文件号"
+                                        v-model="lawsStandInfoSearch.DTWJHLAWS"
+              ></InputForStandardsForLaws>
+              <InputForStandardsForLaws label="引用标准&政策"
+                                        title="引用标准&政策"
+                                        v-model="lawsStandInfoSearch.YYBZZCLAWS"
+              ></InputForStandardsForLaws>
+              <InputFormItem label="参会记录"
+                             title="参会记录"
+                             v-model="lawsStandInfoSearch.CHJLLAWS">
+              </InputFormItem>
+              <!--#region-->
+              <!--<el-form-item label="代替文件号" title="代替文件号" class="add-form-item form-item-disabled">-->
+              <!--  <el-input v-model="lawsStandInfoSearch.DTWJHLAWS" placeholder="请输入代替文件号" clearable></el-input>-->
+              <!--</el-form-item>-->
+              <!--#endregion-->
             </el-col>
             <el-col :span="12">
-              <el-form-item label="被代替文件号" title="被代替文件号" class="add-form-item form-item-disabled">
-                <el-input v-model="lawsStandInfoSearch.BDTWJHLAWS" placeholder="请输入被代替文件号" clearable></el-input>
-              </el-form-item>
+              <InputForStandardsForLaws label="被代替文件号"
+                                        title="被代替文件号"
+                                        v-model="lawsStandInfoSearch.BDTWJHLAWS"
+              ></InputForStandardsForLaws>
+              <InputFormItem label="相关流程"
+                             title="相关流程"
+                             v-model="lawsStandInfoSearch.XGLC">
+              </InputFormItem>
+              <!--#region-->
+              <!--<el-form-item label="被代替文件号" title="被代替文件号" class="add-form-item form-item-disabled">-->
+              <!--  <el-input v-model="lawsStandInfoSearch.BDTWJHLAWS" placeholder="请输入被代替文件号" clearable></el-input>-->
+              <!--</el-form-item>-->
+              <!--#endregion-->
             </el-col>
           </el-row>
         </div>
@@ -281,42 +456,43 @@
 
 <script>
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import SelectFormItem from "@/components/hzwlComponents/SelectFormItem";
+import InputFormItem from "@/components/hzwlComponents/InputFormItem";
+import DatePickerFormItem from "@/components/hzwlComponents/DatePickerFormItem";
+import DataRangePickerFormItem from "@/components/hzwlComponents/DataRangePickerFormItem";
+import SelectMultipleFormItem from "@/components/hzwlComponents/SelectMultipleFormItem";
+import DatePickerGroupFormItem from "@/components/hzwlComponents/DatePickerGroupFormItem";
+import DepartmentFormItem from "@/components/hzwlComponents/DepartmentFormItem";
+import personFormItem from "@/components/hzwlComponents/personFormItem";
+import InputForStandardsForLaws from "@/components/hzwlComponents/InputForStandardsForLaws";
+
 export default {
   name: "advancedSearch",
   components: {
-    ProcessTitle
+    ProcessTitle,
+    SelectFormItem,
+    InputFormItem,
+    DatePickerFormItem,
+    DataRangePickerFormItem,
+    SelectMultipleFormItem,
+    DatePickerGroupFormItem,
+    DepartmentFormItem,
+    personFormItem,
+    InputForStandardsForLaws
   },
   data () {
     return{
       isAdvancedSearch: false,
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
-      },
-      commentCycleDate: ''
+      isRelateAccessOptions: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '2'
+        }
+      ]
     }
   },
   props: {
diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue
index b384238f0..4a6a9721e 100644
--- a/src/pages/policyRegulation/policy/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policy/components/editDrawer.vue
@@ -445,8 +445,10 @@
               <template v-else-if="field.attrField === 'SSRQLAWS'">
                 <DatePickerGroupFormItem
                     :key="field.attrField"
-                    :config="field"
+                    :label="field.attrName"
+                    :prop="field.attrField"
                     v-model="sarLawsStandEO[field.attrField]"
+                    label-width="150px"
                     :disabled="formdisableflag"
                 ></DatePickerGroupFormItem>
               </template>
diff --git a/src/pages/policyRegulation/policy/components/mainTable.vue b/src/pages/policyRegulation/policy/components/mainTable.vue
index e4e4a43c0..083cb4a1c 100644
--- a/src/pages/policyRegulation/policy/components/mainTable.vue
+++ b/src/pages/policyRegulation/policy/components/mainTable.vue
@@ -36,6 +36,7 @@
           show-overflow-tooltip
           prop="lawsNo"
           label="政策文号"
+          sortable
           min-width="120"
       >
         <template slot-scope="scope">
@@ -48,6 +49,7 @@
           show-overflow-tooltip
           prop="issueCompany"
           label="发文单位"
+          sortable
           min-width="120"
       >
         <template slot-scope="scope">
@@ -71,21 +73,22 @@
       </el-table-column>
       <el-table-column
           show-overflow-tooltip
-          prop="SSRQLAWS"
+          prop="ssrqlaws"
           label="实施日期"
           sortable
           min-width="120"
       >
         <template slot-scope="scope">
-          <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ formatDate(scope.row.SSRQLAWS) }}</a>
-          <a v-else-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ formatDate(scope.row.SSRQLAWS) }}</a>
-          <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ formatDate(scope.row.SSRQLAWS) }}</a>
+          <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ formatDate(scope.row.ssrqlaws) }}</a>
+          <a v-else-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ formatDate(scope.row.ssrqlaws) }}</a>
+          <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ formatDate(scope.row.ssrqlaws) }}</a>
         </template>
       </el-table-column>
       <el-table-column
           show-overflow-tooltip
           prop="lawsSycx"
           label="适用车型"
+          sortable
           min-width="120"
       >
         <template slot-scope="scope">
@@ -341,8 +344,10 @@ export default {
       }
       formData['attrSearchStr'] = JSON.stringify(attrSearchMap)
       // 排序
-      formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
-      formData.nowOrder = this.nowOrder
+      if (this.nowOrder) {
+        formData.nowOrderBy = this.nowOrderBy
+        formData.nowOrder = this.nowOrder
+      }
       // this.SarExportSearchEo = formData
       this.$emit('SarExportSearchEo', formData)
       this.$http.get('lawss/sarLawsInfo/page', formData, {
@@ -373,44 +378,58 @@ export default {
     },
     // 表格排序
     sortChange(sortObj) {
-      if (sortObj.column.order !== 'normal') {
-        this.nowOrder = ''
-        this.orderBy = ''
-        switch (sortObj.column.property) {
-          case 'issueTime' :
-            // 后台联调
-            this.orderBy = 1;
-            this.nowOrder = sortObj.column.order
-            if (this.nowOrder === 'ascending') {
-              this.nowOrder = 2
-            } else if (this.nowOrder === 'descending') {
-              this.nowOrder = 1
-            }
-            break
-          // case 'putTime' :
-          case 'XCXSSRQLAWS' :
-            // 后台联调
-            this.orderBy = 2;
-            this.nowOrder = sortObj.column.order
-            if (this.nowOrder === 'ascending') {
-              this.nowOrder = 2
-            } else if (this.nowOrder === 'descending') {
-              this.nowOrder = 1
-            }
-            break
-          case 'standStatusShow' :
-            this.orderBy = 3;
-            this.nowOrder = sortObj.column.order
-            if (this.nowOrder === 'ascending') {
-              this.nowOrder = 2
-            } else if (this.nowOrder === 'descending') {
-              this.nowOrder = 1
-            }
-            break
-        }
-        //搜索后排序,应该以被搜索后的数据排序
-        this.getBussionStandTable(this.lawsStandInfoSearch)
+      this.nowOrderBy = sortObj.column.property
+      // this.nowOrder = sortObj.order
+      switch (sortObj.order) {
+        case 'descending':
+          this.nowOrder = 'desc';
+          break;
+        case 'ascending':
+          this.nowOrder = 'asc';
+          break;
+        default:
+          this.nowOrder = void 0
+          break;
       }
+
+      // if (sortObj.column.order !== 'normal') {
+      //   this.nowOrder = ''
+      //   this.orderBy = ''
+      //   switch (sortObj.column.property) {
+      //     case 'issueTime' :
+      //       // 后台联调
+      //       this.orderBy = 1;
+      //       this.nowOrder = sortObj.column.order
+      //       if (this.nowOrder === 'ascending') {
+      //         this.nowOrder = 2
+      //       } else if (this.nowOrder === 'descending') {
+      //         this.nowOrder = 1
+      //       }
+      //       break
+      //     // case 'putTime' :
+      //     case 'XCXSSRQLAWS' :
+      //       // 后台联调
+      //       this.orderBy = 2;
+      //       this.nowOrder = sortObj.column.order
+      //       if (this.nowOrder === 'ascending') {
+      //         this.nowOrder = 2
+      //       } else if (this.nowOrder === 'descending') {
+      //         this.nowOrder = 1
+      //       }
+      //       break
+      //     case 'standStatusShow' :
+      //       this.orderBy = 3;
+      //       this.nowOrder = sortObj.column.order
+      //       if (this.nowOrder === 'ascending') {
+      //         this.nowOrder = 2
+      //       } else if (this.nowOrder === 'descending') {
+      //         this.nowOrder = 1
+      //       }
+      //       break
+      //   }
+      // }
+      //搜索后排序,应该以被搜索后的数据排序
+      this.getBussionStandTable(this.lawsStandInfoSearch)
     },
     // 选择项勾选改变
     standSelectChange (data) {
diff --git a/src/pages/policyRegulation/policy/components/policySearch.vue b/src/pages/policyRegulation/policy/components/policySearch.vue
index 3748e6e51..6ba3568b5 100644
--- a/src/pages/policyRegulation/policy/components/policySearch.vue
+++ b/src/pages/policyRegulation/policy/components/policySearch.vue
@@ -7,17 +7,34 @@
       <div class="search-area">
         <div class="left">
           <el-form :modal="lawsStandInfoSearch" :inline="true" class="label-input-form" @submit.native.prevent="getBussionStandTableBtn(lawsStandInfoSearch)">
-            <el-formItem label="政策编号" prop="lawsNumber" class="search-item">
-              <el-input v-model="lawsStandInfoSearch.lawsNumber" clearable placeholder="根据编号查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(lawsStandInfoSearch)"/>
-            </el-formItem>
+            <!--<el-formItem label="政策编号" prop="lawsNumber" class="search-item">-->
+            <!--  <el-input v-model="lawsStandInfoSearch.lawsNumber" clearable placeholder="根据编号查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(lawsStandInfoSearch)"/>-->
+            <!--</el-formItem>-->
             <el-formItem label="政策名称" prop="numberName" class="search-item">
-              <el-input v-model="lawsStandInfoSearch.numberName" clearable placeholder="根据名称查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(lawsStandInfoSearch)"/>
+              <el-input v-model="lawsStandInfoSearch.lawsName" clearable placeholder="根据政策名称查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(lawsStandInfoSearch)"/>
+            </el-formItem>
+            <el-formItem label="政策文号" prop="lawsNo" class="search-item">
+              <el-input v-model="lawsStandInfoSearch.lawsNo" clearable placeholder="根据政策文号查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(lawsStandInfoSearch)"/>
+            </el-formItem>
+            <el-formItem label="发文单位" prop="issueCompany" class="search-item">
+              <el-input v-model="lawsStandInfoSearch.issueCompany" clearable placeholder="根据发文单位查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(lawsStandInfoSearch)"/>
+            </el-formItem>
+            <el-formItem label="适用车型" prop="lawsSycx" class="search-item">
+              <el-select :value="lawsSycx" multiple filterable clearable collapse-tags @change="lawsSycxChange">
+                <el-option
+                    v-for="item in dict.lawsSycxOptions"
+                    placeholder="请选择适用车型"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                ></el-option>
+              </el-select>
             </el-formItem>
             <el-formItem label="文本状态" prop="lawsTextState" class="search-item">
               <el-select v-model="lawsStandInfoSearch.lawsTextState" filterable clearable>
                 <el-option
-                    v-for="item in lawsTextStateOptions"
-                    placeholder="请选择"
+                    v-for="item in dict.lawsTextStateOptions"
+                    placeholder="请选择文本状态"
                     :key="item.value"
                     :value="item.value"
                     :label="item.label"
@@ -65,9 +82,14 @@ export default {
       type: Object,
       default: () => ({})
     },
-    lawsTextStateOptions: {
-      type: Array,
-      default: () => []
+    dict: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    lawsSycx () {
+      return this.lawsStandInfoSearch.lawsSycx ? this.lawsStandInfoSearch.lawsSycx.split(',') : []
     }
   },
   methods:{
@@ -83,6 +105,9 @@ export default {
     clearAllSearch (flag) {
       this.$emit('clearSearch')
     },
+    lawsSycxChange (value) {
+      this.$set(this.lawsStandInfoSearch, 'lawsSycx', value.join(','))
+    }
   }
 }
 </script>
diff --git a/src/pages/policyRegulation/policy/components/policyTable.vue b/src/pages/policyRegulation/policy/components/policyTable.vue
index 9257a928b..6d8408beb 100644
--- a/src/pages/policyRegulation/policy/components/policyTable.vue
+++ b/src/pages/policyRegulation/policy/components/policyTable.vue
@@ -4,7 +4,7 @@
     <!-- 普通搜索 -->
     <policySearch ref="policySearchRef"
                   :lawsStandInfoSearch="lawsStandInfoSearch"
-                  :lawsTextStateOptions="dict.lawsTextStateOptions"
+                  :dict="dict"
                   @getBussionStandTableBtn="getBussionStandTableBtn"
                   @clearSearch="clearSearch"
                   @selectMoreBtn="selectMoreBtn"></policySearch>
@@ -100,9 +100,9 @@ export default {
     configStandDrawer
   },
   data () {
+    const lawsStandInfoSearch = {}
     return {
-      lawsStandInfoSearch: {}, // 分页查询过程中用到的对象
-      commentCycleDate: '', // 征集意见周期
+      lawsStandInfoSearch, // 分页查询过程中用到的对象
       dict: {},
 
       // 导出相关
@@ -124,14 +124,16 @@ export default {
   methods: {
     // 打开高级搜索
     selectMoreBtn () {
-      this.$set(this, 'lawsStandInfoSearch', {})
+      this.$set(this, 'lawsStandInfoSearch', {
+        commentCycleStart: '',
+        commentCycleEnd: ''
+      })
       this.$refs.advancedSearchRef.open()
     },
 
     // 清除搜索条件
     clearSearch () {
       this.$set(this, 'lawsStandInfoSearch', {})
-      this.commentCycleDate = ''
       this.$refs.advancedSearchRef.close()
       this.$nextTick(() => {
         this.getBussionStandTableBtn()
@@ -154,6 +156,7 @@ export default {
     // 高级搜索
     advancedSearch () {
       this.$set(this.lawsStandInfoSearch, 'page', 1)
+      this.lawsStandInfoSearch = { ...this.lawsStandInfoSearch }
       this.$refs.mainTableRef.getBussionStandTable(this.lawsStandInfoSearch, '', 'sel')
     },
 
@@ -276,6 +279,25 @@ export default {
         this.dict.CYSDLAWSOptions = res.data.CYSDLAWS
         this.dict.TGDWLAWSOptions = res.data.TGDWLAWS
         this.dict.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
+        this.dict.lawsSycxOptions = res.data.lawsSycx
+        this.dict.lawsTypeFirstLevelOptions = res.data.lawsTypeFirstLevel
+        this.dict.lawsTypeSecondLevelOptions = res.data.lawsTypeSecondLevel
+        this.dict.lawsTypeThirdLevelOptions = res.data.lawsTypeThirdLevel
+        this.dict.lawsTypeFourthLevelOptions = res.data.lawsTypeFourthLevel
+        this.dict.lawsTextStateOptions = res.data.lawsTextState
+        this.dict.lawsSyqyOptions = res.data.lawsSyqy
+        this.dict.lawsSycxOptions = res.data.lawsSycx
+        this.dict.lawsYearOptions = res.data.lawsYear
+        this.dict.lawsLabelOptions = res.data.lawsLabel
+        this.dict.CYSDLAWSOptions = res.data.CYSDLAWS
+        this.dict.TGRLAWSOptions = res.data.TGRLAWS
+        this.dict.TGDWLAWSOptions = res.data.TGDWLAWS
+        this.dict.NYLXLAWSOptions = res.data.NYLXLAWS
+        this.dict.YYRZLAWSOptions = res.data.YYRZLAWS
+        this.dict.ZRBMLAWSOptions = res.data.ZRBMLAWS
+        this.dict.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
+        this.dict.syrzOptions = res.data.YYRZLAWS
+        this.dict = { ...this.dict }
       }, e => {
       })
     },