From 7ff76fe4bcc7a2512ef1582c61d28d0291e22044 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Sun, 8 Aug 2021 18:08:03 +0800
Subject: [PATCH 1/3] commit

---
 .../pages/creatProcess/bzjd/step1-1.vue       | 15 +++++++++++-
 .../pages/creatProcess/bzjd/step1.vue         | 24 ++++++++++++++++++-
 .../pages/creatProcess/bzjd/step2.vue         | 15 +++++++++++-
 .../pages/creatProcess/bzjd/step3.vue         | 17 +++++++++++--
 .../pages/creatProcess/bzjd/step4.vue         | 17 +++++++++++--
 .../pages/creatProcess/bzjd/step5.vue         | 17 +++++++++++--
 .../pages/creatProcess/bzjd/step6.vue         | 17 +++++++++++--
 7 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index edcdc36b2..719b13749 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -103,14 +103,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         label="责任人"
@@ -367,6 +371,8 @@
         name: "bzjdStep1-1",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 textStatusMap: {},
                 listModel2: false,
                 standInfoList2: [],
@@ -457,6 +463,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getData () {
                 queryTaskFirst({
                     bpnId: this.$route.query.bpnId
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index a4a4a67cf..f5f4d3930 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -104,14 +104,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         label="责任人"
@@ -347,6 +351,15 @@
                 </div>
             </div>
         </el-drawer>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
         <Role-tree
                 check-box
                 :is-title="drawerTitle"
@@ -367,6 +380,8 @@
         name: "bzjdStep1",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 textStatusMap: {},
                 listModel2: false,
                 standInfoList2: [],
@@ -457,6 +472,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             showUser (row) {
                 let routeUrl = this.$router.resolve({
                     name: 'ItemSplitInfo',
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 2dc293708..69682b390 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -98,14 +98,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         label="责任人"
@@ -227,6 +231,8 @@
         name: "bzjdStep2",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 type: '',
                 drawerTitle: '',
                 histortData: [],
@@ -262,6 +268,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 214893b7a..e5d7f7e21 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -99,14 +99,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -370,6 +374,8 @@
         name: "bzjdStep3",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 fhList: [
                     {
                         value: '1',
@@ -418,6 +424,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 7ee51700c..f646d40d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -94,14 +94,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -274,6 +278,8 @@
         name: "bzjdStep4",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -300,6 +306,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index f28d59a08..2b6f9324c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -94,14 +94,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -274,6 +278,8 @@
         name: "bzjdStep5",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -300,6 +306,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index f0b635020..414ab7eb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -95,14 +95,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -273,6 +277,8 @@
         name: "bzjdStep6",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -299,6 +305,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?=
 =?UTF-8?q?=E6=A0=87=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 => {
       })
     },

From a44cefdcebec76b4d4409e61e492909e0dfa8d80 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Mon, 9 Aug 2021 09:05:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?navMenu=E8=BF=98=E5=9C=A8=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E5=85=88=E6=B3=A8=E9=87=8A=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 73450e5bc..84fe9f31a 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -93,11 +93,11 @@ export default {
             //   path: '/partCodeApply',
             //   menuId: ''
             // },
-            {
-              title: '标准法规工作组数据统计',
-              path: '/dataStatisComments',
-              menuId: ''
-            },
+            // {
+            //   title: '标准法规工作组数据统计',
+            //   path: '/dataStatisComments',
+            //   menuId: ''
+            // },
             {
               title: '海外标准法规',
               path: '/foreignStandardsAndRegulations',