Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

2022-07-14 14:22:18 +08:00
parent 54a342082c 2e2f239a27
commit a9533f2d18
8 changed files with 201 additions and 47 deletions
@@ -74,19 +74,20 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
-							   @RequestParam(name = "cut") String cut) {
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
-			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
-			paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
-			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
-		}
+							   @RequestParam(name = "cut") String cut,
+							   HttpServletRequest req) {
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
+//			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
+//			paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
+//			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
+//		}

 		IPage page = new Page(pageNo, pageSize);
-		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestEO, cut);
+		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestEO, cut, req);
        return Result.OK(list);
 	}

@@ -6,6 +6,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService;
@@ -13,13 +14,13 @@ import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;

@@ -66,22 +67,23 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
    @ApiOperation(value="历史参数项收集清单-列表查询", notes="历史参数项收集清单-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("params:manifest:history")
-	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
+	public Result<?> queryList(ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 							   @RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
-							   @RequestParam(name = "cut") String cut) {
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
-			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
-			paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
-			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
-		}
+							   @RequestParam(name = "cut") String cut,
+							   HttpServletRequest req) {
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getNioNumber())) {
+//			paramsCollectManifestHistoryEO.setNioNumber(paramsCollectManifestHistoryEO.getNioNumber().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getParamsName())) {
+//			paramsCollectManifestHistoryEO.setParamsName(paramsCollectManifestHistoryEO.getParamsName().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getDre())) {
+//			paramsCollectManifestHistoryEO.setDre(paramsCollectManifestHistoryEO.getDre().replace("%","\\%"));
+//		}

 		IPage page = new Page(pageNo, pageSize);
-		IPage list = paramsCollectManifestHistoryEOService.queryList(page, paramsCollectManifestEO, cut);
+		IPage list = paramsCollectManifestHistoryEOService.queryList(page, paramsCollectManifestHistoryEO, cut, req);
        return Result.OK(list);
 	}

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;

+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;

@@ -63,7 +64,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	 * @param cut
 	 * @return
 	 */
-	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut);
+	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut, HttpServletRequest req);

 	/**
 	 * 列表表头中英文切换
@@ -2,9 +2,9 @@ package com.jero.modules.cert.collect.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;

+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;

@@ -19,11 +19,11 @@ public interface IParamsCollectManifestHistoryEOService extends IService<ParamsC
 	/**
 	 * 列表查询
 	 * @param page
-	 * @param paramsCollectManifestEO
+	 * @param paramsCollectManifestHistoryEO
 	 * @param cut
 	 * @return
 	 */
-	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut);
+	IPage queryList(IPage page, ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO, String cut, HttpServletRequest req);

 	/**
 	 * 列表表头中英文切换
@@ -12,6 +12,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
@@ -61,6 +62,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
@@ -248,7 +250,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @return
 	 */
 	@Override
-    public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
+    public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut, HttpServletRequest req) {
+		QueryWrapper<ParamsCollectManifestEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestEO, req.getParameterMap());
+		queryWrapper.lambda().notIn(ParamsCollectManifestEO::getControlType, ControlTypeEnum.Title.getValue())
+				.orderByDesc(ParamsCollectManifestEO::getDelFlag)
+				.orderByDesc(ParamsCollectManifestEO::getAddFlag)
+				.orderByDesc(ParamsCollectManifestEO::getChangeFlag)
+				.orderByAsc(ParamsCollectManifestEO::getNioNumber);
+
 		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();

 		String userTypes = paramsCollectManifestEO.getUserTypes();
@@ -268,16 +277,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
 		if ("sdt".equals(userTypes)) {
-			paramsCollectManifestEO.setSdt(loginUser.getUsername());
+//			paramsCollectManifestEO.setSdt(loginUser.getUsername());
+			queryWrapper.lambda().eq(ParamsCollectManifestEO::getSdt, loginUser.getUsername())
+					.in(ParamsCollectManifestEO::getState, '2','4','5','6','7','8');
 		} else if ("dre".equals(userTypes)) {
-			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
-		} else if ("sdt,dre".equals(userTypes)) {
+//			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
+			queryWrapper.lambda().eq(ParamsCollectManifestEO::getDre, loginUser.getUsername())
+					.in(ParamsCollectManifestEO::getState, '4','6','7','8');
+		}/* else if ("sdt,dre".equals(userTypes)) {
 			paramsCollectManifestEO.setSdt(loginUser.getUsername());
 			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
-		} else if ("guest".equals(userTypes)) {
+		}*/ else if ("guest".equals(userTypes)) {
 			return page;
 		}
-		IPage pageInfo = paramsCollectManifestEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+//		IPage pageInfo = paramsCollectManifestEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+		IPage pageInfo = page(page, queryWrapper); // 查询固定列
 		List<ParamsCollectManifestEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
 		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
@@ -2,11 +2,13 @@ package com.jero.modules.cert.collect.service.impl;

 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.cert.collect.entity.*;
@@ -27,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -74,10 +77,15 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	 * @return
 	 */
 	@Override
-	public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
-		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
+	public IPage queryList(IPage page, ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO, String cut, HttpServletRequest req) {
+		QueryWrapper<ParamsCollectManifestHistoryEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestHistoryEO, req.getParameterMap());
+		queryWrapper.lambda().notIn(ParamsCollectManifestHistoryEO::getControlType, ControlTypeEnum.Title.getValue())
+				.orderByAsc(ParamsCollectManifestHistoryEO::getNioNumber);

-		IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+		String paramsManifestId = paramsCollectManifestHistoryEO.getParamsManifestId();
+
+		IPage pageInfo = page(page, queryWrapper); // 查询固定列
+//		IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
 		List<ParamsCollectManifestHistoryEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
 		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
@@ -31,7 +31,7 @@
           <span
             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
             <span
-               @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
+               @click='areaOfResponsibility(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
           </span>
             <span v-else>
             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
@@ -41,6 +41,23 @@
             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
           </span>
         </span>
+        <span slot="operationzr" slot-scope="record">
+           <span v-if='currentPersonRole === "homo"'>
+<!--           认证工程师  -->
+           <span
+             v-if='record.state == "待发起收集" || record.state == "工程接口人退回"'>
+             <span
+               @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+             <span v-else>
+             <span @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+           </span>
+           <span v-else>
+             <span @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+         </span>
+
        <span slot="detailClick" slot-scope="text,record">
          <collection-type :detailDate='text'/>
        </span>
@@ -95,6 +112,46 @@
        </div>
      </div>
    </a-modal>
+    <!--  修改责任领域--->
+    <a-modal v-model="areaVisiblezr" :title="$t('areaOfResponsibility')" width='620px' :footer="null"
+             @cancel="cancel">
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='Dateline'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+
+      >
+        <a-row :gutter='24'>
+          <a-col :span='24'>
+            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
+<!--              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
+<!--                        v-model="Dateline.querySdt">-->
+<!--                <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
+<!--                    <span style="display: inline-block;width: 100%" :title=" item.label ">-->
+<!--                      {{ item.label }}-->
+<!--                    </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+              <j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
+          </a-button>
+          <a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
    <!--  配置信息--->
    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
      <div class="content-text">
@@ -236,6 +293,7 @@
        sdt: 0, // 工程接口人
        dre: 0, // 填写人
        areaVisible: false,
+        areaVisiblezr:false,
        form: {},
        rules: {
          querySdt: [
@@ -244,6 +302,13 @@
              message: this.$t('PleaseSelect') + this.$t('engineeringInterfacePerson'),
              trigger: 'change'
            }
+          ],
+          queryzr: [
+            {
+              required: true,
+              message: this.$t('PleaseSelect') + this.$t('areaOfResponsibility'),
+              trigger: 'change'
+            }
          ]
        },
        wrapperCol: {
@@ -346,6 +411,44 @@
          }
        })
      },
+      // 责任领域 保存
+      handleSubmitzr(record) {
+        let _this = this
+        let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            axios({
+              url: '/jero-boot/params/collectManifest/updateDutyTerritory',
+              method: 'post',
+              data: param,
+              transformRequest: [function(data) {
+                let ret = ''
+                for (let it in data) {
+                  ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                }
+                return ret
+              }],
+              headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-Access-Token': _this.token
+              }
+            })
+              .then((res) => {
+                console.log(res)
+                if (res.data.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.areaVisiblezr = false
+                  this.getTableList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+              .catch((error) => {
+                console.log(error)
+              })
+          }
+        })
+      },
      // 工程接口人 保存
      handleSubmit(record) {
        let _this = this
@@ -389,8 +492,12 @@
        this.areaVisible = false
        this.$refs['ruleForm'].resetFields()
      },
+      cancel(){
+        this.areaVisiblezr = false
+        this.$refs['ruleForm'].resetFields()
+      },
      // 点击工程接口人的详情人员 有权限
-      ondataValueTobeinitiated(record) {
+      areaOfResponsibility(record) {
        this.areaVisible = true
        // this.$refs.ruleForm.clearValidate()
        this.$nextTick(() => {
@@ -399,9 +506,22 @@
          this.$refs.ruleForm.clearValidate()
        })
      },
+      // 点击责任领域的详情人员 有权限
+      ondataValueTobe(record) {
+        this.areaVisiblezr = true
+        // this.$refs.ruleForm.clearValidate()
+        this.$nextTick(() => {
+          this.Dateline = { ...this.Dateline }
+          this.getquerySdtId = record.id
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
      dataValueTobeinitiated() {
        this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
      },
+      dataValueTobe() {
+        this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('toHavePermission'))
+      },
      // 点击工程接口人的详情人员 无权限
      ondataValueNot() {
        this.$message.warning(this.$t('operatethisbutton'))
@@ -491,9 +611,15 @@
                  sorter: res.sort,
                  width: 160
                })
+                console.log(res)
                this.columns[index].scopedSlots = {
                  customRender: 'titleName'
                }
+                if(res.click1){
+                  this.columns[index].scopedSlots = {
+                    customRender: 'operationzr'
+                  }
+                }
                if (res.click) {
                  // 工程接口人列表修改
                  this.columns[index].scopedSlots = {
@@ -20,8 +20,8 @@
                      <div class="title-text" :title="$t('newNiONumber')">
                        <span>{{$t('newNiONumber')}}</span>
                      </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
-                               v-model="formInline.nioNumber"></a-input>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
+                               v-model="formInline.nioNumber"></j-input>
                    </div>
                  </a-col>
                  <a-col :md="6" :sm="8">
@@ -29,8 +29,8 @@
                      <div class="title-text" :title="$t('ParameterName')">
                        <span>{{$t('ParameterName')}}</span>
                      </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
-                               v-model="formInline.paramsName"></a-input>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                               v-model="formInline.paramsName"></j-input>
                    </div>
                  </a-col>
 <!--                  <a-col :md="6" :sm="8">-->
@@ -60,8 +60,8 @@
                      <div class="title-text" :title="$t('completedBy')">
                        <span>{{$t('completedBy')}}</span>
                      </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
-                               v-model="formInline.dre"></a-input>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
+                               v-model="formInline.dre"></j-input>
                    </div>
                  </a-col>
 <!--                  <a-col :md="6" :sm="8">-->
@@ -87,7 +87,9 @@
                  <span style="float: right;overflow: hidden;margin-right: 11px"
                        class="table-page-search-submitButtons">
               <a-col :md="6" :sm="24">
+<!--                 v-if="this.$route.query.it === undefined"-->
                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+
                                      @handleSuperQuery="handleSuperQuery"
                                      :fieldList="fieldList"/>
                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
@@ -519,13 +521,13 @@
        fieldList: [
          {
            type: '',
-            value: 'attestationType',
+            value: 'certCategory',
            text: this.$t('certificationCategory'),
            dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
          },
          {
            type: '',
-            value: 'attestationRank',
+            value: 'state',
            text: this.$t('status'),
            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
          },