From 9db5bc0a1838beb45a78db8d72f1502dda362e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 14:24:57 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/xmpg/step1.vue  |  7 ++++++-
 .../processCenter/pages/creatProcess/xmpg/step3.vue  |  4 ++++
 .../processCenter/pages/creatProcess/xmpg/step5.vue  | 12 ++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 5f47ce3fb..f234e079a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -640,7 +640,11 @@ export default {
     },
     //查询项目下的标准
     getStandData() {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", {
+        id: this.projectId,
+        current: this.pageNo,
+        PageSize: this.pageSizeNo
+      }, {
         _this: this
       }, res => {
         res.data.records.forEach(item => {
@@ -649,6 +653,7 @@ export default {
           }
         })
         this.standData = res.data.records;
+        this.totalNo = res.data.total
         let ids = [];
         this.standData.forEach(item => {
           ids.push(item.standId);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index bfef3b75e..cc5e6c159 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -769,6 +769,10 @@ export default {
           if(index > -1){
             dataListChildren.splice(index, 1)
           }
+          dataListChildren.forEach(item => {
+            item.workPeople = this.$store.getters.userInfo.userName
+            item.workPeopleId = this.$store.getters.userInfo.userId
+          })
           this.dataList = dataListChildren;
           this.total = this.dataList.length;
         } else {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index fec5e76c9..9058c3e8f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -465,13 +465,13 @@ export default {
           dataListChildren = dataListChildren.concat(item);
         });
         dataListChildren = this.dataList.concat(dataListChildren);
-        let index = dataListChildren.findIndex(item => {
-          return item.people
+        let newDataListChildren = []
+        dataListChildren.forEach(item => {
+          if(!item.people){
+            newDataListChildren.push(item)
+          }
         })
-        if(index > -1){
-          dataListChildren.splice(index, 1)
-        }
-        this.dataList = dataListChildren;
+        this.dataList = newDataListChildren;
         this.total = this.dataList.length;
       });
     },

From ca7d96eb9500dd80d86fc0a939c3be0dd2f4e526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 16:40:24 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/complianceDetails/index.vue | 55 ++++++++++++++++++-
 .../components/solicitopinions/index.vue      | 11 +++-
 src/pages/home2/index.vue                     |  3 -
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 4cb725b59..252f9d06a 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -1,7 +1,7 @@
 <!--符合性详情-->
 <template>
   <div id="complianceDetails">
-    <el-divider content-position="left" v-if="unfit.length < 1 && fit.length < 1"  >暂无评估结果</el-divider>
+    <el-divider content-position="left" v-if="unfit.length < 1 && fit.length < 1 && noFit.length < 1"  >暂无评估结果</el-divider>
     <!-- 不满足-->
     <el-divider content-position="left" v-if="unfit.length"  >不满足</el-divider>
       <el-table
@@ -10,7 +10,7 @@
         :data="unfit"
         tooltip-effect="dark"
         border
-        style="width: 100%; min-height: 400px; margin-bottom: 30px;"
+        style="width: 100%; min-height: 250px; margin-bottom: 30px;"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
         <el-table-column
@@ -71,7 +71,7 @@
          :data="fit"
          tooltip-effect="dark"
          border
-         style="width: 100%; min-height: 400px; margin-bottom: 30px;"
+         style="width: 100%; min-height: 250px; margin-bottom: 30px;"
          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
          <el-table-column
@@ -107,6 +107,48 @@
        </el-table>
 <!--    <pagination :page="page" :total="total" @pageChange="pageChange"-->
 <!--                @pageSizeChange="pageSizeChange"></pagination>-->
+    <!--不涉及-->
+    <el-divider content-position="left" v-if="noFit.length">不涉及</el-divider>
+    <el-table
+      ref="selection"
+      v-if="noFit.length"
+      :data="noFit"
+      tooltip-effect="dark"
+      border
+      style="width: 100%; min-height: 260px; margin-bottom: 30px;"
+      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+        fontWeight: 'bold', height: '48px'}">
+      <el-table-column
+        prop="standNumber"
+        label="标准号/条款号"
+        width="160"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="researchNonCompliance"
+        label="不涉及"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="evaluationPeople"
+        label="评估人"
+        width="160"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="evaluationTime"
+        label="评估时间"
+        width="160"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.evaluationTime ? $moment(scope.row.evaluationTime).format('YYYY-MM-DD') : '' }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
     <loading :loading="loading">加载中...</loading>
   </div>
 </template>
@@ -118,6 +160,7 @@ export default {
       loading: false,
       fit: [], // 满足
       unfit: [], // 不满足
+      noFit: [], //不涉及
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -152,6 +195,12 @@ export default {
                 item.standNumber = item.standardItem
               }
             })
+            this.noFit = res.data.noFit.records
+            this.noFit.forEach(item => {
+              if(item.standardItem){
+                item.standNumber = item.standardItem
+              }
+            })
           } else {
             this.$message.warning(res.message)
           }
diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue
index c01a2fe4e..882219024 100644
--- a/src/pages/home2/components/solicitopinions/index.vue
+++ b/src/pages/home2/components/solicitopinions/index.vue
@@ -32,11 +32,16 @@
         </template>
       </el-table-column>
       <el-table-column
-              prop="endTime"
-              width="120"
-              label="结束时间">
+        prop="endTime"
+        width="120"
+        label="结束时间">
       </el-table-column>
     </el-table>
+    <div
+      style="height: 20px;background-color: #fff;text-align: right;color: #4788c0; position: absolute; bottom: 5px; right: 5px">
+      <span style="margin-right: 10px;cursor: pointer;font-size: 12px"
+            @click="$router.push('standardForComments')">更多 ⋙</span>
+    </div>
   </div>
 </template>
 
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index bb26a0be7..482136a58 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -22,9 +22,6 @@
            </el-tabs>
          </div>
        </div>
-       <div style="height: 20px;background-color: #fff;text-align: right;color: #4788c0">
-         <span style="margin-right: 10px;cursor: pointer;font-size: 12px" @click="$router.push('standardForComments')">更多 ⋙</span>
-       </div>
      </div>
     <div class="right_wrapper">
       <nav-menu></nav-menu>

From faa510e0c87227d801c63e01d3b81df734429bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 17:01:07 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 60ea457ae..f5f01c585 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -376,6 +376,13 @@ export default {
               }
             })
           });
+          this.dataList.forEach(item => {
+            if(item.children){
+              item.children.forEach(items => {
+                this.$set(items,'standType',item.standType)
+              })
+            }
+          })
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;

From d8b12037d38431424543619237f1acad8ebc6c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 17:11:24 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonConfomity/pages/rectificationDatabase.vue                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index f36e327c4..c9933b533 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -1266,7 +1266,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.id,
+          id: item.standId,
           pageType: "INLAND_STAND"
         }
       });

From c0dfdb7b5f8bcaf3fa9ad75a16697d6ad77bdd17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 17:21:16 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         |   1 +
 .../pages/details.vue                         | 497 ++++++++++++++----
 .../pages/details.vue                         |   1 +
 .../pages/standInvolveProjectDetail.vue       |   1 +
 4 files changed, 400 insertions(+), 100 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8e22d49a5..c2410f783 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1096,6 +1096,7 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands() {
       this.showTableFlag = false
+      this.sarAccessInfo.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index af8bb3d17..d5a8ab8c0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/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="高级搜索"
-      size="700px"
+      title="高级查询"
+      :before-close='cancelQueryInfo'
+      :visible.sync="showQueryMore"
       :wrapperClosable="false"
-      :visible.sync="isAdvancedSearch">
-      <div class="demo-drawer-content">
-        <el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
-          <el-form-item label="中文名称">
-            <el-input
-              class="showBox"
-              v-model="standardFormList.standName"
-              placeholder="请输入"
-              :maxlength="100"
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item label="适用车型">
-            <el-select
-              class="showBox"
-              v-model="standardFormList.typeApplicable"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in applyArcticOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="能源类型">
-            <el-select
-              class="showBox"
-              v-model="standardFormList.nylx"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in categoryOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="责任部门">
-            <el-input
-              v-model="standardForm.zrbm"
-              placeholder="请输入责任部门"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="适用产品线">
-            <el-select
-              class="showBox"
-              v-model="standardFormList.sycpx"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in sycpxOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
+      size="800px"
+    >
+      <div class="content_form" style="height: 100%">
+        <el-form :modal="sarAccessInfo" class="label-input-form" label-width="150px" style="margin: 20px">
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item :label="standLabelNum" class="add-form-item">
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+                  v-model="sarAccessInfo.standNumber"
+                  placeholder="请输入标准号"/>
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                  v-model="sarAccessInfo.lawsNumber"
+                  placeholder="请输入政策编号"/>
+                <el-input
+                  v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
+                  v-model="sarAccessInfo.standCode"
+                  placeholder="请输入标准号"/>
+              </el-form-item>
+
+              <el-form-item v-if="sarAccessInfo.dataSource === 'BUSINESS'" label="文本状态" class="add-form-item">
+                <el-select v-model="sarAccessInfo.textStatusBuss"
+                           placeholder="请选择文本状态"
+                           clearable>
+                  <el-option
+                    v-for="(opt,index) in textStatusBussOptions"
+                    :key="index"
+                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                  >
+                    {{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item v-else label="文本状态" class="add-form-item">
+                <el-select
+                  v-model="sarAccessInfo.textStatus"
+                  placeholder="请选择文本状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="opt in textStatusOptions"
+                    :value="opt.value === undefined ? '' :opt.value"
+                    :key="opt.value" :label="opt.label">{{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用车型 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['CLLX']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用车型" class="add-form-item">
+                <el-select v-model="sarAccessInfo.lawsSycx" filterable clearable>
+                  <el-option
+                    v-for="item in lawsSycxOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></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
-          size="small"
-          icon="el-icon-check"
-          type="primary"
-          @click="queryInfo">搜索
-        </el-button>
-        <el-button
-          size="small"
-          icon="el-icon-close"
-          @click="backInfo">取消
-        </el-button>
+        <el-button size="mini" @click="cancelQueryInfo">取消</el-button>
+        <el-button type="primary" size="mini" @click="okQueryInfo(1)">确认</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: "",
-        typeApplicable: "",
-        nylx: "",
-        sycpx: "",
-        standNumber: "",
-        standName: "",
-        responseUnit: "",
+      // 新增、编辑 数据搜索字段
+      sarAccessInfo: {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        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 => {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 7f0b3b962..c7809efbe 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/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>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 4e6e3b464..68cc08b59 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/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>

From 7fbbd3b16a1592933cea05a9c96d5df3b6691935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 17:34:11 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=20=E5=85=B6=E4=BB=96=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/projectAddEit.vue   | 1 +
 .../localProductsOrProjectLibrary/index.vue                 | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 685f9298c..4a5c39932 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1029,6 +1029,7 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands() {
       this.showTableFlag = false
+      this.sarAccessInfo.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 0e0a09b4f..b84c9949b 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -3,11 +3,11 @@
   <div id="listOfCountries" class="local-products-or-project-library v-class">
     <div class="search-area">
       <div class="left">
-        <el-form inline :model="localProTableSearch" class="label-input-form"
+        <el-form inline :model="projectLibrarySearch" class="label-input-form"
                  @keyup.enter.native="getLocalProductTableBtns">
           <el-form-item label="项目编号" class="search-item">
             <el-input
-              v-model="localProTableSearch.projectNumber"
+              v-model="projectLibrarySearch.projectNumber"
               placeholder="根据项目编号查找"
               :maxlength="100"
               clearable
@@ -473,6 +473,8 @@ export default {
        },*/
       //查询3类
       projectLibrarySearch: {
+        //项目编号
+        projectNumber: "",
         // 项目名称
         projectName: "",
         // 项目分类