Merge branch 'develop' into 'test'

Develop

See merge request !69

src/components/navMenu/index.vue

@@ -93,11 +93,11 @@ export default {
             //   path: '/partCodeApply',
             //   menuId: ''
             // },
-            {
+            // {
-              title: '标准法规工作组数据统计',
+            //   title: '标准法规工作组数据统计',
-              path: '/dataStatisComments',
+            //   path: '/dataStatisComments',
-              menuId: ''
+            //   menuId: ''
-            },
+            // },
             {
               title: '海外标准法规',
               path: '/foreignStandardsAndRegulations',

src/pages/details/otherStandardDetails/index.vue

@@ -418,28 +418,52 @@
                 trigger="click"
                 :value="false"
               >
-                <el-input
+<!--                <el-input-->
-                  v-model="standItemSearch.orgName"
+<!--                  v-model="standItemSearch.orgName"-->
-                  slot="reference"
+<!--                  slot="reference"-->
-                  placeholder="请选择部门"
+<!--                  placeholder="请选择部门"-->
-                  readonly
+<!--                  readonly-->
-                  id="searchInlandDeptBtn"
+<!--                  id="searchInlandDeptBtn"-->
-                  @on-change="inputChange"
+<!--                  @on-change="inputChange"-->
-                  style="margin-right: 0;"/>
+<!--                  style="margin-right: 0;"/>-->
                 <div class="api">
-                  <laws-tree :zNodes="searchInlandNodes"
+<!--                  <laws-tree :zNodes="searchInlandNodes"-->
-                             treeDivId="domesticTree1"
+<!--                             treeDivId="domesticTree1"-->
-                             ref="reloadTree2"
+<!--                             ref="reloadTree2"-->
-                             deptSelect
+<!--                             deptSelect-->
-                             showRMenu
+<!--                             showRMenu-->
-                             @treeDblClick="searchInlandNodesClick"
+<!--                             @treeDblClick="searchInlandNodesClick"-->
-                             class="ztree" style="width: 200px;height: 400px;overflow: auto">
+<!--                             class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
-                  </laws-tree>
+<!--                  </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: '',
+        itemsName:'',
-        orgName: '',
-        validFlag: '0',
         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.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
-        _this: this, loading: 'tableLoading'
-      }, 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 => {
       })
     },

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

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',

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,

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,

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,

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,

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,