Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/utils/ZzjgUtil.js

-
 const _DEFAULT_KEYS = [
   '公安厅',
   '公安局',
@@ -12,7 +11,14 @@ const _DEFAULT_KEYS = [
 const _TAG = 'src/utils/ZzjgUtil.js'
 
 export default {
-
+  formatContent(content) {
+    if (content && content.length <= 10) {
+      return content
+    }
+    let len = content.length
+    let last = this.lastZzjg(content, '')
+    return content.slice(0, 3) + '...' + last
+  },
   last(content, defult = '...') {
     if (content && content.length <= 10) {
       return content

src/views/bzxxgl/bzxxsh.vue

@@ -136,9 +136,10 @@
                     <span class="clearCheck" @click="clearSelection()">清空</span>
                 </el-tag>
 
+                <div class="bzxxsh-table">
+
                     <el-table
                             ref="multipleTable"
-                        class="bzxxsh-table"
                             :max-height="tableHeight"
                             :data="tableDate"
                             :row-key="getRowKeys"
@@ -148,7 +149,7 @@
                             @selection-change="handleSelectionChange">
 
                         <el-table-column type="selection" :reserve-selection="false"
-                                     :width="selectwidth" fixed="left" />
+                                         :width="getSelectWidth()" fixed="left" />
 
                         <div v-for="item in tableColumns">
                             <div v-if="item.prop === 'sfjrzg'">
@@ -261,8 +262,7 @@
 
                             <div v-else-if="item.prop === 'sbdwGajgjgdmStr'">
                                 <el-table-column v-if="item.isShow" :prop="item.prop"
-                                             :label="item.label" width="auto" :min-width="item.width"
-                                             show-overflow-tooltip>
+                                                 :label="item.label" width="auto" :min-width="item.width">
                                     <template slot-scope="scope">
                                         <el-tooltip effect="dark" :content="scope.row.sbdwGajgjgdmStr"
                                                     placement="top-start">
@@ -279,7 +279,8 @@
                             </div>
                         </div>
 
-                    <el-table-column prop="prop" label="操作" :width="czWidth" fixed="right" style="background: white">
+                        <el-table-column prop="prop" label="操作" :width="czWidth" fixed="right"
+                                         style="background: white">
                             <template slot-scope="scope">
                                 <bzxxsf-opt :ref="getShxxOpt(scope.row.id)" :params="scope.row" :is-st="isStRole"
                                             @refresh="bzxxsfOptRefresh"
@@ -289,6 +290,7 @@
                         </el-table-column>
                     </el-table>
 
+                </div>
                 <div class="bzxxsh-content-content-footer">
           <span class="record"
           >共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{
@@ -348,8 +350,8 @@ export default {
       TAG: '比中信息审核-',
       ruleForm: initRuleFrom,
 
-      YTMH: {width: '210', prop: 'ytmh', label: '源条码号', isShow: true},
-      MBTMH: {width: '207', prop: 'mbtmh', label: '目标条码号', isShow: true},
+      YTMH: {width: '214', prop: 'ytmh', label: '源条码号', isShow: true},
+      MBTMH: {width: '214', prop: 'mbtmh', label: '目标条码号', isShow: true},
       YZW: {width: '108', prop: 'yzw', label: '源指位/序号', isShow: true},
       MBZW: {width: '112', prop: 'mbzw', label: '目标指位/序号', isShow: true},
       SBDW: {width: '172', prop: 'sbdwGajgjgdmStr', label: '上报单位', isShow: true},
@@ -445,6 +447,9 @@ export default {
     },
   },
   methods: {
+    getSelectWidth() {
+      return this.isSelectBoo ? this.selectwidth : 1
+    },
     getLable(label) {
       return ZzjgUtil.last(label)
     },
@@ -462,8 +467,10 @@ export default {
         _that.SBDW.label = '地市' + _that.SBDW.label
         _that.SBSJ.label = '地市' + _that.SBSJ.label
         _that.SHR.label = '省厅复/' + _that.SHR.label
+        _that.SHR.width = '126'
       } else {
         _that.SHR.label = '地市' + _that.SHR.label
+        _that.SHR.width = '96'
       }
 
       _that.tableColumns.push(_that.YTMH)

src/views/cxyrd/modules/LTSrc.vue

@@ -387,6 +387,9 @@ export default {
             } else {
               self.$bus.emit('changImageEdit', 'xxx')
               self.$bus.emit('changImageEditTarget', 'xxx')
+              self.enumerate = [];
+              self.fingerTotal = 0;
+              self.changeStyle(0, []);
             }
           })
           self.isActive = "";

src/views/xtfkgl/AjXtljfkView.vue

@@ -209,7 +209,7 @@ export default {
   },
   methods: {
     loadData() {
-      // this.getList()
+      this.getList()
     },
     initTestData() {
       // 测试数据出初始化

src/views/xtfkgl/SjkyhSelect.vue

+<template>
+    <div class="root-div">
+
+        <el-dropdown
+                ref="dropdown"
+                trigger="click"
+                :hide-on-click="true"
+                @visible-change="visibleChange">
+
+            <div style="float: left;" class="opt-select">
+                <div class="select-left">{{selValue}}</div>
+                <div :class="isShowing?'select-right-focus':'select-right-normal'">
+                    <svg class="icon opt-select-right-svg" aria-hidden="true">
+                        <use xlink:href="#icon-shenhe" />
+                    </svg>
+                </div>
+            </div>
+
+            <el-dropdown-menu slot="dropdown" class="select-list-content">
+                <div class="select-list-content-left">
+                    <div class="list-item">用户</div>
+                    <div class="list-item">用户组</div>
+                </div>
+
+                <div class="select-list-content-right">
+                    <div class="top-div">
+                        <div v-for="item in curOpt" class="top-item">{{item.name}}</div>
+                    </div>
+                    <div class="bottom-div">
+                        <div class="queding">确定</div>
+                        <div class="quxiao">取消</div>
+                    </div>
+
+                </div>
+
+                <!--                <div v-for="item in curOpt" :key="item.icon" class="select-list-content-item">-->
+                <!--                    <svg class="icon opt-select-right-svg" aria-hidden="true"-->
+                <!--                         style="margin-right: 5px;width: 20px;height: 20px;">-->
+                <!--                        <use :xlink:href="item.icon" />-->
+                <!--                    </svg>-->
+                <!--                    {{item.name}}-->
+                <!--                </div>-->
+            </el-dropdown-menu>
+
+        </el-dropdown>
+
+    </div>
+</template>
+
+<script>
+export default {
+  name: 'SjkyhSelect',
+  data() {
+    return {
+      isShowing: false,
+      selValue: '请选择',
+      curOpt: [
+        {name: '审核0', value: '0', icon: '#icon-shenhe'},
+        {name: '审核1', value: '1', icon: '#icon-shenhe'},
+        {name: '审核2', value: '2', icon: '#icon-shenhe'},
+        {name: '审核3', value: '3', icon: '#icon-shenhe'},
+        {name: '审核4', value: '4', icon: '#icon-shenhe'},
+        {name: '审核5', value: '5', icon: '#icon-shenhe'},
+      ],
+    }
+  },
+  methods: {
+    visibleChange(val) {
+      let _that = this
+      _that.isShowing = val
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+    @import "../../../public/iconfont/iconfont.css";
+
+    .root-div {
+        width: 264px;
+        position: relative;
+        display: inline-block;
+    }
+
+    .opt-select-right-svg {
+        width: 16px;
+        height: 16px;
+    }
+
+
+    .opt-select {
+        width: 264px;
+        background: #FFFFFF;
+        box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
+        border-radius: 4px;
+        border: 1px solid #E6E6E8;
+
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+
+    .btn-sh {
+        cursor: pointer;
+        width: 72px;
+        height: 28px;
+        border-radius: 4px;
+        border: 1px solid #fe0000;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: #fe0000;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+
+    .select-left {
+        float: left;
+        width: 94px;
+        height: 32px;
+        border-radius: 4px 0px 0px 4px;
+        border: 1px solid #D5E5FC;
+        border-right: 0px;
+
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: #333333;
+        line-height: 14px;
+
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .select-right-normal {
+        float: left;
+        width: 32px;
+        height: 32px;
+        background: #E1EDFF;
+        border: 1px solid #D5E5FC;
+        border-radius: 0px 4px 4px 0px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .select-right-focus {
+        float: left;
+        width: 32px;
+        height: 32px;
+        background: #D5E5FC;
+        box-shadow: 2px 2px 2px 0px rgba(2, 122, 255, 0.41);
+        border-radius: 0px 4px 4px 0px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .select-list-content {
+        margin-top: 0px;
+        width: 264px;
+        height: 216px;
+        display: block;
+        padding-top: 10px;
+        z-index: 999;
+        background: #FFFFFF;
+        box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
+        border-radius: 4px;
+        border: 1px solid #E6E6E8;
+        position: absolute;
+
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .select-list-content-left {
+        width: 28%;
+        height: 216px;
+        /*height: 40px;*/
+        background: #FFFFFF;
+
+        .list-item {
+            width: 100%;
+            height: 40px;
+            font-size: 14px;
+            font-family: MicrosoftYaHei;
+            color: #333333;
+            line-height: 19px;
+
+            padding: 0px 0px 0px 15px;
+
+            display: flex;
+            align-items: center;
+            justify-content: left;
+        }
+    }
+
+    .select-list-content-right {
+        width: 72%;
+        height: 216px;
+        /*background: black;*/
+
+        .top-div {
+            width: 100%;
+            height: 170px;
+            overflow: scroll;
+
+            .top-item {
+                width: 100%;
+                height: 40px;
+                background: #FFFFFF;
+
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                color: #333333;
+                line-height: 19px;
+            }
+        }
+
+        .bottom-div {
+            width: 100%;
+            height: 55px;
+            background: #FFFFFF;
+            box-shadow: 0px -2px 4px 0px rgba(0, 0, 0, 0.06);
+            border-radius: 0px 0px 3px 3px;
+
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            .queding {
+                width: 72px;
+                height: 32px;
+                border-radius: 4px;
+                border: 1px solid #AEB5C2;
+
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                color: #2E3846;
+                line-height: 16px;
+
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                background: #ffffff;
+                cursor: pointer;
+                margin-right: 8px;
+            }
+
+            .quxiao {
+                width: 72px;
+                height: 32px;
+                background: #055FE7;
+
+                border-radius: 4px;
+                cursor: pointer;
+
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                color: #FFFFFF;
+                line-height: 16px;
+
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+        }
+    }
+
+    .select-list-content-item {
+        padding: 0px;
+        width: 126px;
+        height: 32px;
+        display: inline-block;
+        /*display: block;*/
+        position: relative;
+        z-index: 9999;
+        /*background: black;*/
+        padding-left: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: left;
+
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: #333333;
+        line-height: 19px;
+    }
+
+    .select-list-content-item:hover {
+        background: #F5F5F7;
+    }
+
+    .ysb-left {
+        float: left;
+        width: 94px;
+        height: 32px;
+        background: #FFFFFF;
+        border-radius: 4px 0px 0px 4px;
+        border: 1px solid #D9DCE2;
+        border-right: 0px;
+
+        font-family: MicrosoftYaHei;
+        color: #666666;
+        line-height: 14px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .ysb-right {
+        float: left;
+        width: 32px;
+        height: 32px;
+        background: #ECEDF1;
+        border: 1px solid #D9DCE2;
+        border-radius: 0px 4px 4px 0px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+
+    // 滚动条的宽度
+    /deep/ .top-div::-webkit-scrollbar {
+        width: 6px; // 横向滚动条
+        height: 6px; // 纵向滚动条 必写
+    }
+    // 滚动条的滑块
+    /deep/ .top-div::-webkit-scrollbar-thumb {
+        background-color: #dadde0;
+        border-radius: 3px;
+    }
+
+</style>

src/views/xtfkgl/XtfkglMain.vue

@@ -28,23 +28,22 @@
         </div>
         <br />
         <!-- 人员逻辑库 -->
-
         <ry-xtljfk-view
                 ref="ryXtfk"
                 v-show="isPerson"
-                @openBj="openRyBj"
-                @openGzl="openRyGzl"
-                @openSjgl="openRySjgl" />
+                @openBj="openBj"
+                @openGzl="openGzl"
+                @openSjgl="openSjgl" />
         <!-- 案件逻辑库  -->
         <aj-xtljfk-view
                 ref="ajXtfk"
                 v-show="!isPerson"
-                @openBj="openAjBj"
-                @openGzl="openAjGzl"
-                @openSjgl="openAjSjgl" />
+                @openBj="openBj"
+                @openGzl="openGzl"
+                @openSjgl="openSjgl" />
 
         <!--  新增分库页面-->
-        <add-xtfk-view ref="addXtfkViewRef" v-show="isAddFk" @close="closeXtfkView" />
+        <add-xtfk-view ref="addXtfk" :is-ry="isPerson" v-show="isAddFk" @close="closeXtfkView" />
         <gzl-view ref="gzlView" v-show="isShowGzl" @close="closeGzlView" />
     </el-container>
 </template>
@@ -83,30 +82,29 @@ export default {
     },
     addFk() { // 新增分库
       this.isAddFk = true
+      this.$refs.addXtfk.showAll()
     },
-    openRyBj() {   // 案件编辑
+
+    openBj() { // 人员/案件编辑
       this.isAddFk = true
+      this.$refs.addXtfk.showLjfk()
     },
-    openRyGzl() {    // 案件工作流
-      this.isShowGzl = true
+    openGzl() {// 人员/案件工作流
+      this.isAddFk = true
+      this.$refs.addXtfk.showGzl()
     },
-    openRySjgl() { // 案件数据管理
+    openSjgl() {  // 人员/案件数据管理
+      if (this.isPerson) {
 
-    },
-    closeXtfkView() {
-      this.isAddFk = false
-    },
+      } else {
 
-    openAjBj() { // 案件编辑
-      this.isAddFk = true
-    },
-    openAjGzl() {// 案件工作流
-      this.isShowGzl = true
+      }
     },
-    openAjSjgl() {  // 案件数据管理
 
-    },
 
+    closeXtfkView() {
+      this.isAddFk = false
+    },
     closeGzlView() {
       this.isShowGzl = false
     }