From f862b5fc889e89d260e77852323ce1fb8c5941d6 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 8 Aug 2021 22:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 93 ++++++++++++-------
 1 file changed, 59 insertions(+), 34 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index afc9a4ef2..3514f3266 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -418,28 +418,52 @@
                 trigger="click"
                 :value="false"
               >
-                <el-input
-                  v-model="standItemSearch.orgName"
-                  slot="reference"
-                  placeholder="请选择部门"
-                  readonly
-                  id="searchInlandDeptBtn"
-                  @on-change="inputChange"
-                  style="margin-right: 0;"/>
+<!--                <el-input-->
+<!--                  v-model="standItemSearch.orgName"-->
+<!--                  slot="reference"-->
+<!--                  placeholder="请选择部门"-->
+<!--                  readonly-->
+<!--                  id="searchInlandDeptBtn"-->
+<!--                  @on-change="inputChange"-->
+<!--                  style="margin-right: 0;"/>-->
                 <div class="api">
-                  <laws-tree :zNodes="searchInlandNodes"
-                             treeDivId="domesticTree1"
-                             ref="reloadTree2"
-                             deptSelect
-                             showRMenu
-                             @treeDblClick="searchInlandNodesClick"
-                             class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                  </laws-tree>
+<!--                  <laws-tree :zNodes="searchInlandNodes"-->
+<!--                             treeDivId="domesticTree1"-->
+<!--                             ref="reloadTree2"-->
+<!--                             deptSelect-->
+<!--                             showRMenu-->
+<!--                             @treeDblClick="searchInlandNodesClick"-->
+<!--                             class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+<!--                  </laws-tree>-->
                 </div>
               </el-popover>
             </el-form-item>
+
+
+
+
             <el-form-item class="search-item">
-              <el-input v-model="standItemSearch.nameOrRequest" size="small" placeholder="根据条款名称/内容查找" clearable maxlength="100"></el-input>
+              <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable maxlength="100"></el-input>
+            </el-form-item>
+<!--            新车实施日期-->
+            <el-form-item class="search-item">
+              <div class="block">
+                <el-date-picker
+                    v-model="standItemSearch.XCXSSRQ"
+                    type="date"
+                    placeholder="新车实施日期">
+                </el-date-picker>
+              </div>
+            </el-form-item>
+<!--            //在产车实施日期-->
+            <el-form-item class="search-item">
+              <div class="block">
+                <el-date-picker
+                    v-model="standItemSearch.ZCCSSRQ"
+                    type="date"
+                    placeholder="在产车实施日期">
+                </el-date-picker>
+              </div>
             </el-form-item>
 <!--            <el-form-item class="search-item">-->
 <!--              <el-input v-model="standItemSearch.parts" size="small" placeholder="根据涉及零部件查找" clearable maxlength="100"></el-input>-->
@@ -507,7 +531,7 @@
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="itemsName"
+              prop="itemsTitle"
               label="条款内容"
           >
           </el-table-column>
@@ -533,30 +557,30 @@
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="putTime"
+              prop="applyArctic"
               label="适用车型"
           >
           </el-table-column>
           <el-table-column
-            prop="responsibleUnitShow"
+            prop="responsibleUnit"
             label="责任部门">
           </el-table-column>
           <el-table-column
-            prop="zrgcs"
+            prop="dutyEngineer"
             label="责任工程师">
           </el-table-column>
           <el-table-column
-            prop="dutyEngineerShow"
+            prop="comparedWithPrevious"
             label="基于上一版本差异"
             width="150">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="svppsShow"
+            prop="complianceRequire"
             label="符合性状态">
           </el-table-column>
           <el-table-column
-            prop="applyArcticShow"
+            prop="complianceState"
             label="合规性分析">
           </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -1247,15 +1271,13 @@ export default {
       modalStandItemflag: false,
       tableLoading: false,
       standItemSearch: {
+        XCXSSRQ:'',
+        ZCCSSRQ:'',
         standId: '',
         fileType: '',
-        responsibleUnit: '',
-        orgName: '',
-        validFlag: '0',
+        itemsName:'',
         pageSize: this.$store.getters.userInfo.configContent,
         page: 1,
-        nameOrRequest: '',
-        parts: ''
       },
       standitemTotal: 0,
       searching: false,
@@ -2231,11 +2253,14 @@ export default {
     selectSarStandItems (id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
-      this.$http.get('lawss/sarStandItems/getSarStandItemsList', this.standItemSearch, {
-        _this: this, loading: 'tableLoading'
-      }, res => {
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
         this.selectedItemList = []
-        this.standItemList = res.data.list
+        if (res.ok) {
+          this.standItemList = res.data;
+          console.log("hello"+this.standItemList+res.data);
+          this.standitemTotal = res.data.count // 分页需要
+        }
+
         // if (this.standItemList != null && this.standItemList.length > 0) {
         //   for (let ind = 0; ind < this.standItemList.length; ind++) {
         //     // 去掉html标签
@@ -2244,7 +2269,7 @@ export default {
         //     this.standItemList[ind].termsConditions = itemContent
         //   }
         // }
-        this.standitemTotal = res.data.count // 分页需要
+
       }, e => {
       })
     },