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

src/components/mySelect/index.vue

@@ -3,7 +3,7 @@
         <el-dropdown placement="bottom" @command="handleCommand" trigger="click">
             <div class="my-select-input__wrap">
                 <input class="el-input__inner" type="text" v-model.lazy="selectVal" v-show="false">
-                <input class="el-input__inner" type="text" v-model.lazy="showLabel" readonly="readonly">
+                <input class="el-input__inner mySelect" type="text" v-model.lazy="showLabel" readonly="readonly">
             </div>
             <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
@@ -11,6 +11,7 @@
                         :key="index"
                         :command="item">{{ item.label }}</el-dropdown-item>
             </el-dropdown-menu>
+            <i class="el-icon-arrow-down myIcon"></i>
         </el-dropdown>
     </div>
 </template>
@@ -76,65 +77,29 @@
     .active {
         background-color: rgb(245, 247, 250);
     }
-    /*ul {*/
+    .mySelect {
-    /*    position: absolute;*/
+        width: 100%;
-    /*    z-index: 9999;*/
+        position: relative;
-    /*    background-color: rgb(255, 255, 255);*/
+    }
-    /*    box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px 0px;*/
+    .mySelect:focus + .myIcon{
-    /*    box-sizing: border-box;*/
+        transform:rotate(180deg);
-    /*    border-width: 1px;*/
+        -ms-transform:rotate(180deg); 	/* IE 9 */
-    /*    border-style: solid;*/
+        -moz-transform:rotate(180deg); 	/* Firefox */
-    /*    border-color: rgb(228, 231, 237);*/
+        -webkit-transform:rotate(180deg); /* Safari 和 Chrome */
-    /*    border-image: initial;*/
+        -o-transform:rotate(180deg);
-    /*    border-radius: 4px;*/
+    }
-    /*    box-sizing: border-box;*/
+    .mySelect:focus-within + .myIcon{
-    /*    list-style: none;*/
+        transform:rotate(180deg);
-    /*    padding: 6px 0px;*/
+        -ms-transform:rotate(180deg); 	/* IE 9 */
-    /*    margin: 0px;*/
+        -moz-transform:rotate(180deg); 	/* Firefox */
-    /*    display: block;*/
+        -webkit-transform:rotate(180deg); /* Safari 和 Chrome */
-    /*    list-style-type: disc;*/
+        -o-transform:rotate(180deg);
-    /*    margin-block-start: 1em;*/
+    }
-    /*    margin-block-end: 1em;*/
+    .myIcon {
-    /*    margin-inline-start: 0px;*/
+        cursor: pointer;
-    /*    margin-inline-end: 0px;*/
+        position: absolute;
-    /*    width: 100%;*/
+        right: 7px;
-    /*    li {*/
+        top: calc(~'50% - 7px');
-    /*        list-style:none;*/
+        transition: all .3s;
-    /*        height: 34px;*/
+    }
-    /*        line-height: 34px;*/
-    /*        padding: 0 20px;*/
-    /*    }*/
-    /*    li:hover {*/
-    /*        background-color: rgb(245, 247, 250);*/
-    /*    }*/
-    /*}*/
-    /*.mySelect {*/
-    /*    width: 100%;*/
-    /*    position: relative;*/
-    /*    option {*/
-    /*        height: 34px;*/
-    /*        line-height: 34px;*/
-    /*        padding: 0 20px;*/
-    /*    }*/
-    /*}*/
-    /*.mySelect:focus + .myIcon{*/
-    /*    transform:rotate(180deg);*/
-    /*    -ms-transform:rotate(180deg); 	!* IE 9 *!*/
-    /*    -moz-transform:rotate(180deg); 	!* Firefox *!*/
-    /*    -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/
-    /*    -o-transform:rotate(180deg);*/
-    /*}*/
-    /*.mySelect:focus-within + .myIcon{*/
-    /*    transform:rotate(180deg);*/
-    /*    -ms-transform:rotate(180deg); 	!* IE 9 *!*/
-    /*    -moz-transform:rotate(180deg); 	!* Firefox *!*/
-    /*    -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/
-    /*    -o-transform:rotate(180deg);*/
-    /*}*/
-    /*.myIcon {*/
-    /*    position: absolute;*/
-    /*    right: 7px;*/
-    /*    top: calc(~'50% - 7px');*/
-    /*    transition: all .3s;*/
-    /*}*/
 </style>

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -353,7 +353,7 @@ export default {
         showRegionId: '',
         selVal: '',
         isSearch: '1',
-        sarType: '',
+        sarType: 'STAND',
         isWarn: '1'
       },
       attrTypeOptions: [
@@ -561,7 +561,7 @@ export default {
     queryDisplayLocationList (sarType) {
       return new Promise((resolve, reject) => {
         this.$http.get('lawssBase/utArea/getAreaList', {
-          sarType: 'INLAND_STAND'
+          sarType: sarType
         }, {
           _this: this
         }, res => {

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -235,8 +235,7 @@
                                         width="170"
                                         align="center">
 <!--                                    <template slot-scope="scope">-->
-<!--                                        <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>-->
+<!--                                        <div @click="showUser(scope.row)" class="table-jump">{{ scope.row.showNumber }}</div>-->
-<!--                                        <div v-else>{{ scope.row.showNumber }}</div>-->
 <!--                                    </template>-->
                                 </el-table-column>
                                 <el-table-column
@@ -245,8 +244,7 @@
                                         show-overflow-tooltip
                                         align="center">
 <!--                                    <template slot-scope="scope">-->
-<!--                                        <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>-->
+<!--                                        <span @click="showUser(scope.row)" class="table-jump">{{ scope.row.standName }}</span>-->
-<!--                                        <span v-else>{{ scope.row.standName }}</span>-->
 <!--                                    </template>-->
                                 </el-table-column>
                                 <el-table-column
@@ -459,6 +457,24 @@
             ProcessTitle
         },
         methods: {
+            showUser (row) {
+                let routeUrl = this.$router.resolve({
+                    name: 'ItemSplitInfo',
+                    query: {
+                        infoId: row.id,
+                        result: row.result,
+                    }
+                })
+                window.open(routeUrl.href, '_blank')
+                // this.$store.commit('setDetailMap', this.$route.path)
+                // this.$router.push({
+                //     name: 'ItemSplitInfo',
+                //     query: {
+                //         infoId: row.id,
+                //         result: row.result,
+                //     }
+                // })
+            },
             setMap(data){
                 data.forEach(item => {
                     this.$set(this.textStatusMap, item.value, item.label)

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -272,14 +272,14 @@
             choiceZRRS (row, type, index) {
                 this.type = type
                 if (type === 1) {
-                    this.drawerTitle = '选择责任部门对接人'
+                    this.drawerTitle = '选择执行人'
                     this.nodeList2 = []
                     this.zxIndex= index
                     this.nodeList2.push(row)
                     this.modalshowflag2 = true
                 } else {
                     // 批量
-                    this.drawerTitle = '批量选择责任部门对接人'
+                    this.drawerTitle = '批量选择执行人'
                     if (this.zxIdList.length > 0) {
                         this.nodeList2 = []
                         this.modalshowflag2 = true

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -220,13 +220,13 @@
                                 <el-table-column type="selection" width="55" align="center"/>
                                 <el-table-column label="标准号" align="center">
                                     <template slot-scope="scope">
-                                        <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                                        <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
-                                        <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
+                                        <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
                                     </template>
                                 </el-table-column>
                                 <el-table-column prop="cname" label="标准名称" align="center">
                                     <template slot-scope="scope">
-                                        <div>{{ scope.row.standName }}</div>
+                                        <div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -361,6 +361,23 @@
             }
         },
         methods: {
+            // 点击查看
+            handlePreview (item) {
+                let pageType
+                if (item.standType === 'FOREIGN') {
+                    pageType = 'FOREIGN_STAND'
+                } else {
+                    pageType = 'INLAND_STAND'
+                }
+                let routeUrl = this.$router.resolve({
+                    name: 'OtherStandardDetails',
+                    params: {
+                        id: item.id,
+                        pageType: pageType
+                    }
+                })
+                window.open(routeUrl.href, '_blank')
+            },
             getData () {
                 queryTaskFirst({
                     bpnId: this.$route.query.bpnId

src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue

@@ -221,13 +221,13 @@
                 <el-table-column type="selection" width="55" align="center"/>
                 <el-table-column label="标准号" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                    <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
-                    <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
+                    <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="cname" label="标准名称" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standName }}</div>
+                    <div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
                   </template>
                 </el-table-column>
               </el-table>
@@ -361,6 +361,23 @@ export default {
     }
   },
   methods: {
+    // 点击查看
+    handlePreview (item) {
+      let pageType
+      if (item.standType === 'FOREIGN') {
+        pageType = 'FOREIGN_STAND'
+      } else {
+        pageType = 'INLAND_STAND'
+      }
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: pageType
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     addZqyjList() {
       this.title = '国内外标准库'
       this.listModel = true

src/router/index.js

@@ -1708,6 +1708,7 @@ const routes = [
     meta: {
       requireAuth: true,
       title: '征求意见详情',
+      parentPath: '/standardForComments',
       // isBoolean: true,
       // menuId: ''
     }