修改清单bug

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -1096,6 +1096,7 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands() {
       this.showTableFlag = false
+      this.sarAccessInfo.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -195,7 +195,7 @@
             label="适用产品线">
           </el-table-column>
         </el-table>
-        <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
+        <pagination :page="page" :total="total" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>
@@ -235,91 +235,216 @@
       </div>
     </el-dialog>
 
+    <!--高级查询抽屉-->
     <el-drawer
-      title="高级搜索"
+      title="高级查询"
-      size="700px"
+      :before-close='cancelQueryInfo'
+      :visible.sync="showQueryMore"
       :wrapperClosable="false"
-      :visible.sync="isAdvancedSearch">
+      size="800px"
-      <div class="demo-drawer-content">
+    >
-        <el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
+      <div class="content_form" style="height: 100%">
-          <el-form-item label="中文名称">
+        <el-form :modal="sarAccessInfo" class="label-input-form" label-width="150px" style="margin: 20px">
-            <el-input
+          <ProcessTitle>
-              class="showBox"
+            <template slot="title">基础信息</template>
-              v-model="standardFormList.standName"
+          </ProcessTitle>
-              placeholder="请输入"
+          <el-row>
-              :maxlength="100"
+            <el-col :span="12">
-              size="small"
+              <el-form-item :label="standLabelNum" class="add-form-item">
-            />
+                <el-input
-          </el-form-item>
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
-          <el-form-item label="适用车型">
+                  v-model="sarAccessInfo.standNumber"
-            <el-select
+                  placeholder="请输入标准号"/>
-              class="showBox"
+                <el-input
-              v-model="standardFormList.typeApplicable"
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
-              placeholder="请选择"
+                  v-model="sarAccessInfo.lawsNumber"
-              filterable
+                  placeholder="请输入政策编号"/>
-              size="small"
+                <el-input
-            >
+                  v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
-              <el-option
+                  v-model="sarAccessInfo.standCode"
-                v-for="item in applyArcticOptions"
+                  placeholder="请输入标准号"/>
-                :value="item.value"
+              </el-form-item>
-                :key="item.value"
+
-                :label="item.label"
+              <el-form-item v-if="sarAccessInfo.dataSource === 'BUSINESS'" label="文本状态" class="add-form-item">
-              />
+                <el-select v-model="sarAccessInfo.textStatusBuss"
-            </el-select>
+                           placeholder="请选择文本状态"
-          </el-form-item>
+                           clearable>
-          <el-form-item label="能源类型">
+                  <el-option
-            <el-select
+                    v-for="(opt,index) in textStatusBussOptions"
-              class="showBox"
+                    :key="index"
-              v-model="standardFormList.nylx"
+                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
-              placeholder="请选择"
+                  >
-              filterable
+                    {{ opt.label }}
-              size="small"
+                  </el-option>
-            >
+                </el-select>
-              <el-option
+              </el-form-item>
-                v-for="item in categoryOptions"
+              <el-form-item v-else label="文本状态" class="add-form-item">
-                :value="item.value"
+                <el-select
-                :key="item.value"
+                  v-model="sarAccessInfo.textStatus"
-                :label="item.label"
+                  placeholder="请选择文本状态"
-              />
+                  clearable
-            </el-select>
+                >
-          </el-form-item>
+                  <el-option
-          <el-form-item label="责任部门">
+                    v-for="opt in textStatusOptions"
-            <el-input
+                    :value="opt.value === undefined ? '' :opt.value"
-              v-model="standardForm.zrbm"
+                    :key="opt.value" :label="opt.label">{{ opt.label }}
-              placeholder="请输入责任部门"
+                  </el-option>
-            >
+                </el-select>
-            </el-input>
+              </el-form-item>
-          </el-form-item>
+              <!-- 适用车型 -->
-          <el-form-item label="适用产品线">
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
-            <el-select
+                <custom-select-array
-              class="showBox"
+                  :config="applySYCX"
-              v-model="standardFormList.sycpx"
+                  v-model="sarAccessInfo['CLLX']"
-              placeholder="请选择"
+                ></custom-select-array>
-              filterable
+              </template>
-              size="small"
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
-            >
+                            label="适用车型" class="add-form-item">
-              <el-option
+                <el-select v-model="sarAccessInfo.lawsSycx" filterable clearable>
-                v-for="item in sycpxOptions"
+                  <el-option
-                :value="item.value"
+                    v-for="item in lawsSycxOptions"
-                :key="item.value"
+                    placeholder="请选择"
-                :label="item.label"
+                    :key="item.value"
-              />
+                    :value="item.value"
-            </el-select>
+                    :label="item.label"
-          </el-form-item>
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <template v-if="sarAccessInfo.dataSource === 'BUSINESS'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['SYCXCLASS']"
+                ></custom-select-array>
+              </template>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="standLabelName" class="add-form-item">
+                <el-input v-model="sarAccessInfo.standName" placeholder="请输入标准名称"></el-input>
+              </el-form-item>
+              <el-form-item label="是否纳入认证清单" class="add-form-item">
+                <el-select v-model="sarAccessInfo.isRelateAccess" clearable placeholder="根据是否纳入标准清单查找">
+                  <el-option value="1" label="是"></el-option>
+                  <el-option value="0" label="否"></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用认证 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYRZ"
+                  v-model="sarAccessInfo['SYRZ']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用认证" class="add-form-item">
+                <el-select v-model="sarAccessInfo.YYRZLAWS" clearable>
+                  <el-option
+                    v-for="item in YYRZLAWSOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <ProcessTitle>
+            <template slot="title">日期选择</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <!-- 发布日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource !== 'FOREIGN_LAWS'" label="发布日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.issueTime"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据标准发布日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else label="发布日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.issueTime"
+                  :editable="false"
+                  placeholder="请选择发布日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 新车型实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="新车型实施日期" class="add-form-item">
+                <el-date-picker
+                  value-format="yyyy-MM-dd"
+                  v-model="sarAccessInfo.XCXSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  placeholder="根据新车型实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="新车型实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.XCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <!-- 实施日期  -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.SSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.SSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 在产车实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="在产车实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.ZCCSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据在产车实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="在产车实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.ZCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button
+        <el-button size="mini" @click="cancelQueryInfo">取消</el-button>
-          size="small"
+        <el-button type="primary" size="mini" @click="okQueryInfo(1)">确认</el-button>
-          icon="el-icon-check"
-          type="primary"
-          @click="queryInfo">搜索
-        </el-button>
-        <el-button
-          size="small"
-          icon="el-icon-close"
-          @click="backInfo">取消
-        </el-button>
       </div>
     </el-drawer>
 
@@ -329,12 +454,33 @@
 
 <script>
 import { interfaceUrl } from "@/sysConfig";
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import CustomSelectArray from "@/components/CustomFormComponents/SelectArray";
+import { StandardsInfoPage } from "api/unqualProcess";
 
 export default {
   name: "AccessStandardDetails",
+  components:{
+    ProcessTitle,
+    CustomSelectArray
+  },
   data() {
     return {
-      isAdvancedSearch: false,
+      showQueryMore: false,
+      textStatusBussOptions: [],
+      textStatusOptions: [],
+      lawsSycxOptions: [], // 国内外政策适用车型
+      YYRZLAWSOptions: [], // 国内外政策适用认证
+      applySYCX: {
+        attrName: '适用车型',
+        options: []
+      },
+      applySYRZ: {
+        attrName: '适用认证',
+        options: []
+      },
+      standLabelNum: '标准号',
+      standLabelName: '标准名称',
       // 高级检索状态
       showSelectBox: true,
       textStatusMap: {},
@@ -367,19 +513,43 @@ export default {
         page: 1,
         Size: this.$store.getters.userInfo.configContent
       },
-      standardFormList: {
+      // 新增、编辑 数据搜索字段
-        zrbm: "",
+      sarAccessInfo: {
-        typeApplicable: "",
+        id: '',
-        nylx: "",
+        standName: '',
-        sycpx: "",
+        standNumber: '',
-        standNumber: "",
+        standCode: '', // 政策编号
-        standName: "",
+        textStatus: '',
-        responseUnit: "",
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
-        Size: this.$store.getters.userInfo.configContent
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
       },
       page: 1,
-      // pageSize: this.$store.getters.userInfo.configContent,
+      pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       stateList: [], // 标准状态列表
       activeName: "SKILL", // 当前激活
@@ -407,6 +577,130 @@ export default {
     };
   },
   methods: {
+//高级查询的 X
+    cancelQueryInfo() {
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        textStatus: '',
+        CLLX: '',
+        SYRZ: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: this.sarAccessInfo.standType,
+        askType: '', // 监管类型
+        dataSource: this.sarAccessInfo.dataSource, // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
+      this.showQueryMore = false
+    },
+    // 高级查询确认按钮
+    okQueryInfo() {
+      let item = this.sarAccessInfo
+      item.pageSize = this.$store.getters.userInfo.configContent
+      const data = item
+      // this.sarStandardsSearch.menuId = this.selectSarMenu.id
+      const formData = {...data}
+      formData.standType = this.sarAccessInfo.standType
+
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in formData) {
+        const value = formData[key];
+        if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        } else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
+        formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
+        formData.issueTime = null
+      } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
+        // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
+        // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
+      }*/
+      this.sarAccessInfo = formData
+      this.showQueryMore = false
+      this.selectLawsStands()
+    },
+    // 查询数据搜索 table 数据
+    selectLawsStands() {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfo.standType = 'INLAND'
+        this.pageInfo()
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        this.sarAccessInfo.standType = 'FOREIGN'
+        this.pageInfo()
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.standType = 'LAWS'
+        this.pageInfo()
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.sarAccessInfo.standType = 'BUSINESS'
+        this.pageInfo()
+      }
+    },
+    pageInfo() {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        StandardsInfoPage((this.sarAccessInfo)).then(res => {
+          this.standinfoList = res.data.list
+          this.standinfoList.forEach(item => {
+            if (item.standYear === null) {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber
+            } else {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            }
+            item.zrbm = item.attrInfoCaseMap.zrbm
+            item.sycpx = item.attrInfoCaseMap.sycpx
+            item.typeApplicable = item.attrInfoMap.CLLX
+            item.nylx = item.attrInfoMap.NYLX
+          })
+          this.total = res.data.count
+        }, e => {
+        })
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfo, {
+          _this: this,
+        }, res => {
+          this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
+        }, e => {
+        })
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfo, {
+          _this: this,
+        }, res => {
+          this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
+        }, e => {
+        })
+      }
+    },
     // 更新LOG关闭
     relateDialogClose() {
       this.relateDialog = false;
@@ -489,6 +783,7 @@ export default {
             this.standInfoTableLoading = false
           } else {
             this.standinfoList = []
+            this.standInfoTableLoading = false
           }
 
         }, e => {
@@ -778,13 +1073,8 @@ export default {
       this.standardForm.responseUnit = ''
       this.standardForm.standName = ''
       this.standardForm.standNumber = ''
-      this.standardFormList.standName = "";
-      this.standardFormList.typeApplicable = "";
-      this.standardFormList.nylx = "";
-      this.standardFormList.zrbm = "";
-      this.standardFormList.sycpx = "";
       this.showTableFlag = false;
-      this.isAdvancedSearch = true;
+      this.showQueryMore = true;
       this.page = 1;
       this.standardForm.page = 1;
       this.selectInfoMore();
@@ -862,7 +1152,6 @@ export default {
     }, res => {
       this.allSelectOptions = res.data || {};
       this.regionOptions = res.data.REGION; // 基础信息 区域list
-      this.applyArcticOptions = res.data.ENERGYTYPES || []; // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || []; // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY; // 国家、地区list
       this.standNatureOptions = res.data.SARPROPERTY; // 新增 标准性质
@@ -874,8 +1163,16 @@ export default {
       this.askNatureOptions = res.data.ACCESSTYPE;
       this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
       this.categoryOptions = res.data.NYLXCLASS; // 能源类型
-      this.textStatusOptions = res.data.WBZTCLASS;
+      this.textStatusOptions = res.data.WBZTCLASS;  // 文本状态
       this.sycpxOptions = res.data.SYCPXCLASS; // 适用产品线
+      this.lawsSycxOptions = res.data.lawsSycx // 国内外政策适用车型
+      this.YYRZLAWSOptions = res.data.YYRZLAWS // 国内外政策适用认证
+      // 企标文本状态
+      this.textStatusBussOptions = res.data.BUSSSTATE
+      // 适用车型
+      this.applySYCX.options = res.data.ENERGYTYPES
+      // 适用认证
+      this.applySYRZ.options = res.data.SYRZCLASS
       this.setMap(this.textStatusOptions);
       this.getGzzOption();
     }, e => {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -144,6 +144,7 @@
               <div class="table-jump" @click="changeState(scope.row)">
                 <div v-if="scope.row.unCount === 0">符合</div>
                 <div v-if="scope.row.unCount === 1">不符合</div>
+                <div v-if="scope.row.unCount === '-1'">不涉及</div>
                 <div v-else ></div>
               </div>
             </template>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -191,6 +191,7 @@
 <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
                 <div class="table-jump" @click="changeState(scope.row)">
                   <div v-if="scope.row.unCount === '0'">符合</div>
+                  <div v-if="scope.row.unCount === '-1'">不涉及</div>
                   <div v-else >不符合</div>
                 </div>
               </template>