Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

src/main.js

@@ -12,6 +12,7 @@ import './plugins/axios'
 import fHttp from './request/http.js'
 import NetUtil from './netmgr/NetUtil'
 import RegExpUtil from './utils/verify-data/RegExpUtil.js'
+import ValueFormatUtil from './utils/ValueFormatUtil.js'
 import App from './App.vue'
 import router from './router'
 import store from './store'
@@ -44,6 +45,7 @@ import IconSvg from './utils/IconSvg.vue'
 Vue.component('svg-icon', IconSvg)
 moment.locale('zh-cn')
 Vue.prototype.$moment = moment
+window.moment = moment
 // 引入上传组件
 import uploader from 'vue-simple-uploader'
 
@@ -87,6 +89,8 @@ window.user = UserUtil
 window.ljkUtil = LjkUtil
 window.fHttp = fHttp
 window.fRegExp = RegExpUtil
+Vue.prototype.$fFormatUtil = ValueFormatUtil
+window.fFormatUtil = ValueFormatUtil
 window.NetUtil = NetUtil
 Vue.use(VueWechatTitle)
 Vue.use(VueClipboard)

src/netmgr/cxyrd/cxyrd.js

@@ -23,7 +23,7 @@ const _path = {
 }
 export default {
   // 获取案件指纹
-  ajfinger(_parameter) {
+  ajfinger(_parameter) {             A
     return fHttp.postJson(_path.ajfinger, _parameter, HttpConfigUtil.closeLoadAndTip())
   },
   // 获取案件掌纹

src/request/http.js

@@ -80,11 +80,11 @@ let initConfig = (config) => {
   if (config[HttpConfig._TYPE.LOADING] !== false) {
     showLoading(config[HttpConfig._TYPE.LOADING_TARGET]) // 如果设置了targer,使用设置的target,比如el-table
   }
-  logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP)
-  if (config[HttpConfig._TYPE.TIP]) {
+  // logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP+'')
+  if (config[HttpConfig._TYPE.TIP] !== true) {
     _IS_SHOW_TIP = config[HttpConfig._TYPE.TIP]
   }
-  logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP)
+  // logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP +'')
   console.log('initConfig', config)
   return config
 }

src/utils/ValueFormatUtil.js

+export default {
+
+  // 时间格式化
+  dateTimeFormat (row, colnum) {
+    let prop = colnum.property;
+    return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---";
+  },
+
+  dateTimeFormat1 (row, colnum) {
+    let prop = colnum.property;
+    return row[prop] ? moment(row[prop]).format("YYYY-MM-DD hh:mm:ss") : "---";
+  },
+
+  // 普通值非空格式化 空返回  '---'
+  valueFormat(row, colnum) {
+    let prop = colnum.property
+    return row[prop] ? row[prop] : '---'
+  },
+
+  // 普通值非空格式化   空返回 '0'
+  valueFormat0(row, colnum) {
+    let prop = colnum.property
+    return row[prop] ? row[prop] : '0'
+  },
+}

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -1763,3 +1763,12 @@ export default {
 
     // @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/AllPersonnelBase/Index.vue

@@ -19,3 +19,12 @@ export default {
 
 <style lang="scss" scoped>
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/AllPersonnelBase/dclb.vue

@@ -1219,3 +1219,12 @@ export default {
   height: 56px !important;
 }
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/AllPersonnelBase/gzlb.vue

@@ -1984,3 +1984,12 @@ export default {
 
     // @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/AllPersonnelBase/modules/gz.vue

@@ -326,3 +326,12 @@ export default {
   border: 1px solid #EEEEEE;
 }
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/AllPersonnelBase/modules/xzry.vue

@@ -963,7 +963,6 @@ export default {
 
 /deep/.flexBox {
   display: flex;
-
   .el-checkbox {
     margin-right: 24px;
 

src/views/AllPersonnelBase/qbalk.vue

@@ -1559,3 +1559,12 @@ const datas1 = [
 }
 // @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/SystemManage/GroupManage.vue

@@ -1956,3 +1956,12 @@ export default {
     @import "./scss/boxShadow";
     // @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/SystemManage/GroupPermission.vue

@@ -930,3 +930,12 @@ export default {
 @import "scss/userpermission.scss";
 @import "scss/group";
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/SystemManage/PermissionManage.vue

@@ -183,13 +183,14 @@
           >
             <template slot-scope="scope">
               <div
+               v-if="scope.row.permissionNames && scope.row.permissionNames !== '/'"
                 v-for="(item, index) in scope.row.permissionNames &&
                 scope.row.permissionNames.split(',')"
-                :key="index"
-              >
+                :key="index">
                 {{ index > 0 ? "/" : "" }}
                 {{ item }}
               </div>
+              <span v-else>{{ '---' }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="status" label="启用状态" width="auto">
@@ -1151,3 +1152,12 @@ export default {
   }
 }
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/SystemManage/QueryPermission.vue

@@ -964,3 +964,12 @@ export default {
 
     // @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/SystemManage/RoleManage.vue

@@ -31,8 +31,7 @@
           <div
             @click.stop="copy(item.id)"
             @mouseenter="$set(item, 'enter', true)"
-            @mouseleave="$set(item, 'enter', false)"
-          >
+            @mouseleave="$set(item, 'enter', false)">
             <svg-icon
               icon-class="copy"
               v-show="fuzhi"
@@ -93,23 +92,17 @@
         <div class="autoPlay" ref="diyRoles">
           <el-checkbox-group v-model="btnCheckList">
             <div v-for="item in diyRoleList" :key="item.id" class="chooseItem">
-              <el-checkbox :label="item.id" class="checkChoose" v-if="delimgBoo"
-                >1</el-checkbox
-              >
-              <div
-                @click.stop="() => {}"
+              <el-checkbox :label="item.id" class="checkChoose" v-if="delimgBoo">1</el-checkbox>
+              <div @click.stop="() => {}"
                 :class="{
                   'diy-role-item': true,
                   active: item.id === diyRoleItemIndex,
-                  delWidth: delimgBoo,
-                }"
-              >
+                  delWidth: delimgBoo,}">
                 <div
                   v-show="!item.edit"
                   class="diy-edit-title"
                   :title="item.value"
-                  @click="chooseDiyRoleItem(item)"
-                >
+                  @click="chooseDiyRoleItem(item)">
                   {{ item.value }}
                 </div>
                 <el-input
@@ -1022,6 +1015,7 @@ export default {
   padding-right: 15px;
   padding-left: 20px;
   overflow: auto;
+  background: #30fd5301;
   &::-webkit-scrollbar {
     width: 10px; /*高宽分别对应横竖滚动条的尺寸*/
     height: 10px;
@@ -1098,3 +1092,12 @@ export default {
   }
 }
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/SystemManage/UserPermission.vue

@@ -781,4 +781,8 @@ export default {
   }
 }
 @import "scss/userpermission.scss";
+
+.manage-page .line {
+  height: 2rem !important;
+}
 </style>

src/views/SystemManage/scss/role.scss

@@ -4,23 +4,28 @@
       color: #666666 !important;
     }
   }
+
   width: 100%;
   padding: 24px;
   display: flex;
   flex-direction: row;
   font-family: HarmonyOS_Sans_SC;
+
   div {
     display: inline-block;
   }
+
   .is-disabled.is-checked {
     .el-checkbox__inner {
       background-color: #b1b6c2 !important;
       border-color: #b1b6c2 !important;
+
       &::after {
         border-color: #fff;
       }
     }
   }
+
   .sider {
     //border: #03A9F4 1px solid;
     //width: 240px;
@@ -28,6 +33,7 @@
     height: 100%;
     //margin-right: 10px;
     text-align: center;
+
     .btns {
       width: 200px;
       height: 45px;
@@ -35,6 +41,7 @@
       flex-direction: row;
       padding-top: 10px;
       border-bottom: 1px solid #eeeeee;
+
       .add {
         width: 110px;
         height: 32px;
@@ -44,15 +51,18 @@
         border-radius: 4px;
         border: 1px solid #aeb5c2;
         cursor: pointer;
+
         &:hover {
           border: #055fe7 1px solid;
           color: #055fe7;
         }
+
         &:active {
           border: #055fe7 1px solid;
           color: #055fe7;
         }
       }
+
       .img-btn {
         width: 32px;
         height: 32px;
@@ -64,20 +74,24 @@
         justify-content: center;
         align-items: center;
         cursor: pointer;
+
         &:hover {
           border-color: #377fec;
         }
+
         > img {
           margin: 0 !important;
           line-height: 32px;
         }
       }
     }
+
     .default-role {
       width: 215px;
       height: 366px;
       display: flex;
       flex-direction: column;
+
       .default-role-item {
         width: 190px;
         height: 40px;
@@ -89,35 +103,41 @@
         border-radius: 4px;
         margin-top: 10px;
         cursor: pointer;
+
         &:hover {
           background: #055fe7;
           color: #ffffff;
         }
+
         &.active {
           background: #055fe7;
           color: #ffffff;
         }
       }
     }
+
     .hr {
       height: 1px;
       width: 200px;
       display: block;
       background-color: #eeeeee;
     }
+
     .diy-roles {
       //border: saddlebrown 1px solid;
       width: 215px;
       height: 420px;
       box-sizing: border-box;
       padding-left: 20px;
+      //background: #90ff00ff;
       //display: flex;
       //flex-direction: column;
       overflow: scroll;
+
       .diy-role-item {
         float: right;
         box-sizing: border-box;
-        padding-right: 40px;
+        //padding-right: 40px;
         position: relative;
         width: 190px;
         height: 40px;
@@ -127,13 +147,16 @@
         color: #333333;
         line-height: 40px;
         margin-top: 10px;
-        margin-left: -22px;
+        //margin-right: -16px;
         cursor: pointer;
         overflow: hidden;
+        transform: translateX(-6px);
+
         &.active {
           border: 1px solid #055fe7;
           color: #055fe7;
         }
+
         .diy-edit-title {
           width: 146px;
           padding-left: 10px;
@@ -145,6 +168,7 @@
           /*文字超出宽度则显示ellipsis省略号*/
           text-overflow: ellipsis;
         }
+
         .diy-edit-btn {
           width: 35px;
           height: 25px;
@@ -154,6 +178,7 @@
           position: absolute;
           right: 0;
           top: 0;
+
           i {
             position: absolute;
             top: 5px;
@@ -163,6 +188,7 @@
             color: #055FE7;
             cursor: pointer;
           }
+
           .img {
             width: 13px;
             height: 14px;
@@ -173,18 +199,21 @@
       }
     }
   }
+
   .main {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     justify-content: center;
+
     .header {
       height: 55px;
       width: 100%;
       display: flex;
       align-items: center;
       padding-bottom: 7px;
+
       .btns {
         width: 224px;
         height: 48px;
@@ -192,6 +221,7 @@
         border-radius: 8px;
         text-align: center;
         margin: 0px auto;
+
         .btn {
           margin-top: 8px;
           width: 104px;
@@ -199,6 +229,7 @@
           line-height: 32px;
           color: #666666;
           cursor: pointer;
+
           &.active {
             background: #ffffff;
             color: #055fe7;
@@ -207,6 +238,7 @@
           }
         }
       }
+
       .save {
         .btn {
           width: 72px;
@@ -219,6 +251,7 @@
         }
       }
     }
+
     .role-info {
       width: 100%;
       background: #ffffff;
@@ -226,111 +259,143 @@
       border-radius: 10px;
       display: flex;
       flex-direction: row;
+
       .menus {
         width: 155px;
         height: 100%;
         border-right: 1px solid #eeeeee;
+
         .div3 {
+          padding: 20px;
           width: 100%;
           height: 150px;
           border-bottom: 1px solid #eeeeee;
+
           &:first-of-type {
             height: 130px;
           }
+
           &:nth-of-type(2) {
-            height: 165px;
+            height: 160px;
           }
+
           .el-checkbox {
-            margin: 10px 20px 0 20px;
-            &:not(:first-of-type) {
-              margin-top: 20px;
+            margin: 0px 0px 12px 0px;
+
+            &:last-of-type {
+              margin-bottom: 0px;
             }
           }
         }
+
         .div2 {
+          padding: 20px;
           width: 100%;
           height: 85px;
           border-bottom: 1px solid #eeeeee;
           .el-checkbox {
-            margin: 12px 20px 0 20px;
+            margin-bottom: 12px;
           }
         }
+
         .div1 {
+          padding: 20px;
           width: 100%;
           height: 68px;
           border-bottom: 1px solid #eeeeee;
+
           .el-checkbox {
-            margin: 22px 20px 0 20px;
+            //margin: 22px 20px 0 20px;
+            margin-bottom: 12px;
           }
         }
+
         // 未选中字体颜色
         /deep/ .el-checkbox {
           font-size: 14px;
           color: #333333;
           font-weight: 400;
         }
+
         /deep/ .el-checkbox__input .el-checkbox__inner:hover {
           border-color: #055fe7;
         }
+
         // 选中样式
-        /deep/.el-checkbox__input.is-checked + .el-checkbox__label {
+        /deep/ .el-checkbox__input.is-checked + .el-checkbox__label {
           font-size: 14px;
           font-weight: 400;
           color: #333333;
         }
+
         /deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
           background: #055fe7;
           border-color: #055fe7;
         }
       }
+
       .content {
         width: 100%;
         height: 725px;
+
         .div3 {
+          padding: 20px;
           width: 100%;
           height: 150px;
+
           &:first-of-type {
             height: 130px;
           }
+
           &:nth-of-type(2) {
-            height: 165px;
+            height: 160px;
           }
+
           border-bottom: 1px solid #eeeeee;
-          padding-left: 30px;
-          padding-top: 8px;
+          //padding-left: 30px;
+          //padding-top: 8px;
           .line {
-            height: 40px;
+            height: 32px;
             width: 220px;
           }
         }
+
         .div2 {
+          padding: 20px;
           width: 100%;
           height: 85px;
           border-bottom: 1px solid #eeeeee;
-          padding-left: 30px;
-          .el-checkbox {
-            margin: 10px 20px 0 0px;
-          }
+          //padding-left: 30px;
+
+          //.el-checkbox {
+          //  margin: 10px 20px 0 0px;
+          //}
+
           .line {
-            height: 40px;
+            height: 32px;
             width: 220px;
           }
         }
+
         .div1 {
+          padding: 20px;
           width: 100%;
           height: 68px;
           border-bottom: 1px solid #eeeeee;
-          padding-left: 30px;
+          //padding-left: 30px;
+
           .line {
-            height: 40px;
+            height: 32px;
             width: 220px;
+
             > .el-checkbox {
               margin-left: 0 !important;
             }
           }
-          .el-checkbox {
-            margin: 22px 20px 0 25px;
-          }
+
+          //.el-checkbox {
+          //  margin: 22px 20px 0 25px;
+          //}
         }
 
         // 未选中字体颜色
@@ -342,15 +407,18 @@
           font-weight: 400;
           margin-right: 50px;
         }
+
         /deep/ .el-checkbox__input .el-checkbox__inner:hover {
           border-color: #055fe7;
         }
+
         // 选中样式
-        /deep/.el-checkbox__input.is-checked + .el-checkbox__label {
+        /deep/ .el-checkbox__input.is-checked + .el-checkbox__label {
           font-size: 14px;
           font-weight: 400;
           color: #333333;
         }
+
         /deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
           background: #055fe7;
           border-color: #055fe7;
@@ -358,15 +426,19 @@
       }
     }
   }
+
   .barLine {
     width: 800px !important;
   }
+
   .barInLine {
     width: 600px !important;
   }
+
   .w400 {
     width: 400px !important;
   }
+
   .w450 {
     width: 220px !important;
   }

src/views/SystemManage/scss/userpermission.scss

@@ -167,11 +167,12 @@
       display: flex;
       justify-content: flex-start;
       align-items: center;
+      margin-left: 0px;
       //border: 1px solid hotpink; width: auto;
       .info-item {
         display: flex;
         align-items: center;
-        padding: 0 20px 0 20px;
+        padding: 0 20px 0 0px;
         border-right: 1px solid #e6e6e8;
         .info-title {
           width: auto;
@@ -355,6 +356,7 @@
         width: 155px;
         border-right: 1px solid #eeeeee;
         .div3 {
+          padding: 20px;
           width: 100%;
           height: 165px;
           &:first-of-type {
@@ -365,26 +367,34 @@
           }
           border-bottom: 1px solid #eeeeee;
           .el-checkbox {
-            margin: 10px 20px 0 20px;
-            &:not(:first-of-type) {
-              margin-top: 20px;
+            //margin: 10px 20px 0 20px;
+            //&:not(:first-of-type) {
+            //  margin-top: 20px;
+            //}
+            margin: 0px 0px 12px 0px;
+            &:last-of-type {
+              margin-bottom: 0px;
             }
           }
         }
         .div2 {
+          padding: 20px;
           width: 100%;
           height: 85px;
           border-bottom: 1px solid #eeeeee;
           .el-checkbox {
-            margin: 12px 20px 0 20px;
+            //margin: 12px 20px 0 20px;
+            margin-bottom: 12px;
           }
         }
         .div1 {
+          padding: 20px;
           width: 100%;
           height: 55px;
           border-bottom: 1px solid #eeeeee;
           .el-checkbox {
-            margin: 15px 20px 0 20px;
+            //margin: 15px 20px 0 20px;
+            margin-bottom: 12px;
           }
         }
         // 未选中字体颜色
@@ -410,6 +420,7 @@
       .content {
         width: 100%;
         .div3 {
+          padding: 20px;
           &:last-of-type {
             height: 150px;
           }
@@ -420,9 +431,9 @@
           width: 100%;
           height: 165px;
           border-bottom: 1px solid #eeeeee;
-          padding-left: 30px;
-          padding-top: 8px;
-          .line {
+          //padding-left: 30px;
+          //padding-top: 8px;
+          /deep/.line{
             width: 220px;
             height: 30px;
           }
@@ -430,10 +441,11 @@
         .div2 {
           width: 100%;
           height: 85px;
-          padding-left: 30px;
+          padding: 20px;
+          //padding-left: 30px;
           border-bottom: 1px solid #eeeeee;
           .el-checkbox {
-            margin: 10px 20px 0 25px;
+            //margin: 10px 20px 0 25px;
           }
           .line /deep/ {
             width: 220px;
@@ -444,12 +456,13 @@
           }
         }
         .div1 {
+          padding: 20px;
           width: 100%;
           height: 55px;
-          padding-left: 30px;
+          //padding-left: 30px;
           border-bottom: 1px solid #eeeeee;
           .el-checkbox {
-            margin: 15px 20px 0 25px;
+            //margin: 15px 20px 0 25px;
           }
           .line /deep/ {
             width: 220px;

src/views/SystemManage/systemLog.vue

@@ -303,3 +303,12 @@ export default {
 }
 @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/bzxxgl/bzxxfh.vue

@@ -20,10 +20,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="源条码号：" prop="ytmh" class="ytmh">
-            <el-input placeholder="请输入源条码号" v-model.trim="ruleForm.ytmh" maxlength="23" clearable @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
+            <el-input placeholder="请输入源条码号" v-model.trim="ruleForm.ytmh" maxlength="23" clearable show-word-limit @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
           </el-form-item>
           <el-form-item label="目标条码号：" prop="mbtmh" class="mbtmh">
-            <el-input placeholder="请输入目标条码号" v-model.trim="ruleForm.mbtmh" maxlength="23" clearable @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
+            <el-input placeholder="请输入目标条码号" v-model.trim="ruleForm.mbtmh" maxlength="23" clearable show-word-limit @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
           </el-form-item>
         </div>
         <div class="line1 line2">
@@ -91,23 +91,23 @@
         <el-table :height="height" ref="multipleTable" :data="tableDate" :row-key="getRowKeys" tooltip-effect="dark" style="width: 100%;" :class="{delSelection: !selectBoo}" class="bzxxfh-table" @selection-change="handleSelectionChange">
           <el-table-column type="selection" :reserve-selection="true" :width="width33">
           </el-table-column>
-          <el-table-column prop="ytmh" label="源条码号" :width="width1">
+          <el-table-column prop="ytmh" label="源条码号" :width="width1" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="mbtmh" label="目标条码号" :width="width1">
+          <el-table-column prop="mbtmh" label="目标条码号" :width="width1" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="yzw" label="源指位/序号" :width="width4">
+          <el-table-column prop="yzw" label="源指位/序号" :width="width4" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="mbzw" label="目标指位/序号" :width="width4">
+          <el-table-column prop="mbzw" label="目标指位/序号" :width="width4" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="bzdwGajgjgdmStr" label="比中单位" :width="width2">
+          <el-table-column prop="bzdwGajgjgdmStr" label="比中单位" :width="width2" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="bzrXm" label="比中人" :width="width3">
+          <el-table-column prop="bzrXm" label="比中人" :width="width3" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="bzsj" label="比中时间" :width="width4" :formatter="dateTimeFormat">
+          <el-table-column prop="bzsj" label="比中时间" :width="width4" :formatter="$fFormatUtil.dateTimeFormat">
           </el-table-column>
-          <el-table-column prop="fhrXm" label="复核人" :width="width3">
+          <el-table-column prop="fhrXm" label="复核人" :width="width3" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="dateTimeFormat">
+          <el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="$fFormatUtil.dateTimeFormat">
           </el-table-column>
           <el-table-column prop="reviewStatus" label="复核状态" :width="width5">
             <template slot-scope="scope">
@@ -198,7 +198,6 @@ export default {
         personLogicIds: [],
         caseLogicIds: []
       },
-      rules: {},
       selectBoo: false,// 是否批量操作
       width33: 50,
       width4: 120,
@@ -234,7 +233,25 @@ export default {
       // 人员逻辑库
       personLogicIds: [],
       // 案件逻辑库
-      caseLogicIds: []
+      caseLogicIds: [],
+      rules: {
+        ytmh: [
+          {required: false, message: '请输入条码号', trigger: 'change'},
+          {
+            pattern: fRegExp.SYS._TMH,
+            message: '格式不正确',
+            trigger: 'change'
+          }
+        ],
+        mbtmh: [
+          {required: false, message: '请输入条码号', trigger: 'change'},
+          {
+            pattern: fRegExp.SYS._TMH,
+            message: '格式不正确',
+            trigger: 'change'
+          }
+        ],
+      }
     }
   },
   components: {
@@ -542,11 +559,6 @@ export default {
       this.currPage = page;
       this.getData(page)
     },
-    // 时间格式化
-    dateTimeFormat (row, colnum) {
-      let prop = colnum.property;
-      return row[prop] ? this.$moment(row[prop]).format("YYYY-MM-DD") : "---";
-    },
     /**
      * @description: 单选事件
      * @param {*} val
@@ -643,3 +655,12 @@ export default {
   padding-left: 20px;
 }
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/bzxxgl/bzxxsh.vue

@@ -961,3 +961,12 @@ const initRuleFrom = {
     }
 
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/bzxxgl/scss/bzxxfh.scss

@@ -14,13 +14,12 @@ $tableHeight: var(--tableHeight, 33rem);
     }
   }
   .bzxxfh-top {
-    margin: 24px 24px 16px 24px;
+    margin: 24px 20px 16px 24px;
     //border-bottom: 1px solid #eeeeee;
-    padding: 16px 20px 10px 20px;
+    padding: 16px 0px 8px 20px;
     background: #F6F8FA;
     box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
     border-radius: 10px;
-
     /deep/.el-form-item__label {
       width: 70px !important;
       padding: 0;
@@ -72,11 +71,11 @@ $tableHeight: var(--tableHeight, 33rem);
       }
       .ytmh {
         /deep/ .el-input {
-          width: 256px;
+          width: 290px;
           height: 32px;
           .el-input__inner {
             height: 32px;
-            width: 256px;
+            width: 290px;
           }
         }
       }
@@ -89,11 +88,11 @@ $tableHeight: var(--tableHeight, 33rem);
           margin-left: 90px !important;
         }
         /deep/ .el-input {
-          width: 256px;
+          width: 290px;
           height: 32px;
           .el-input__inner {
             height: 32px;
-            width: 256px;
+            width: 290px;
           }
         }
       }
@@ -114,6 +113,13 @@ $tableHeight: var(--tableHeight, 33rem);
       /deep/.el-form-item__label {
         text-align: left;
       }
+      .rdsj{
+        .el-input__inner {
+          height: 32px;
+          width: 290px;
+          margin-top: 2px;
+        }
+      }
     }
     .line3 {
       .fhyh {
@@ -155,6 +161,7 @@ $tableHeight: var(--tableHeight, 33rem);
         }
       }
       .clear-btn {
+        transform: translateX(20px);
         cursor: pointer;
         font-size: 14px;
         font-family: HarmonyOS_Sans_SC;
@@ -162,6 +169,7 @@ $tableHeight: var(--tableHeight, 33rem);
         margin-right: 8px;
       }
       .select-btn {
+        transform: translateX(20px);
         cursor: pointer;
         width: 72px;
         height: 32px;
@@ -499,6 +507,12 @@ $tableHeight: var(--tableHeight, 33rem);
       }
     }
   }
+
+  /deep/.el-form-item__error {
+    padding-top: 0rem;
+    margin-top: 0rem;
+  }
+
   .jcbzgx-dialog {
     width: 300px;
     height: 118px;

src/views/cxyrd/QueryConfirm.vue

@@ -2407,3 +2407,12 @@ b {
   padding-left: 20px;
 }
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/drFPTX/Index.vue

@@ -1961,3 +1961,12 @@ export default {
 
     // @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/drFPTX/RAList.vue

@@ -2440,4 +2440,13 @@ export default {
 }
 // @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>
 

src/views/xtfkgl/AjXtljfkView.vue

@@ -186,7 +186,7 @@ export default {
       width4: 136,  //启用状态
       width5: 260, //逻辑库说明
       width6: 120, // 操作
-      height: '42rem',
+      height: '43rem',
 
       tableDate: [],
 
@@ -569,3 +569,12 @@ export default {
     @import "scss/xtfkgl_main";
 
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/xtfkgl/RyXtljfkView.vue

@@ -191,7 +191,7 @@ export default {
       width4: 136,  //启用状态
       width5: 260, //逻辑库说明
       width6: 120, // 操作
-      height: '42rem',
+      height: '43rem',
 
       tableDate: [],
 
@@ -574,3 +574,12 @@ export default {
 
     @import "scss/xtfkgl_main";
 </style>
+<style scoped lang="scss">
+    /deep/ .el-table .el-table__body tr.current-row > td {
+        background-color: transparent !important;
+    }
+
+    /deep/ .el-table .el-table__body tr:hover > td {
+        background-color: transparent !important;
+    }
+</style>

src/views/zljc/Index.vue

@@ -160,6 +160,7 @@
             prop="barcode"
             label="人员编号"
             :width="width1"
+            :formatter="$fFormatUtil.valueFormat"
             show-overflow-tooltip
           >
           </el-table-column>
@@ -167,12 +168,14 @@
             prop="name"
             label="姓名"
             :width="width4"
+            :formatter="$fFormatUtil.valueFormat"
             show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column
             prop="codeDwName"
             label="捺印单位"
+            :formatter="$fFormatUtil.valueFormat"
             :width="width1"
             show-overflow-tooltip
           >
@@ -180,12 +183,14 @@
           <el-table-column
             prop="collectDate"
             label="捺印日期"
-            :width="width1"
+            :formatter="$fFormatUtil.dateTimeFormat"
+            :width="width4"
           >
           </el-table-column>
           <el-table-column
             prop="createTime"
             label="分配时间"
+            :formatter="$fFormatUtil.dateTimeFormat1"
             :width="width1"
           >
           </el-table-column>
@@ -222,6 +227,7 @@
           <el-table-column
             prop="collectNumber"
             label="补采次数"
+            :formatter="$fFormatUtil.valueFormat0"
             :width="width4"
           >
           </el-table-column>
@@ -341,7 +347,7 @@ export default {
       selectBoo: false, // 是否批量操作
       multipleSelection: [], // 表单选择项目
       width33: 50,
-      width4: 120,
+      width4: 140,
       width1: 220,
       width2: 160,
       width3: 110,
@@ -963,3 +969,12 @@ $tableHeight: var(--tableHeight, 33rem);
 }
 @import "@/assets/css/globalBase.scss";
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/zljc/jcxq.vue

@@ -458,7 +458,7 @@ export default {
 };
 </script>
 
-<style lang="scss"scoped>
+<style scoped lang="scss">
 .p1 {
   padding-top: 109px;
 }
@@ -499,21 +499,21 @@ export default {
         border: none;
       }
       /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
-        width: 129px;
+        width: 130px;
         height: 32px;
         background: #ddebff;
         border-radius: 2px;
         font-size: 14px;
         font-family: HarmonyOS_Sans_SC;
-        background-color: #055fe7;
-        color: #fff;
+        background-color: #DDEBFF;
+        color: #055FE7;
         border: none;
         &:hover {
-          background: #377fec;
-        }
-        &:active {
-          background: #044cb9;
+          /*background: #377fec;*/
         }
+        /*&:active {*/
+        /*  background: #044cb9;*/
+        /*}*/
       }
     }
     .headRight {

src/views/zzwlr/htcj.vue

@@ -539,3 +539,12 @@
     color: #333333;
   }
 </style>
+<style scoped lang="scss">
+  /deep/ .el-table .el-table__body tr.current-row > td {
+    background-color: transparent !important;
+  }
+
+  /deep/ .el-table .el-table__body tr:hover > td {
+    background-color: transparent !important;
+  }
+</style>

src/views/zzwlr/xzry.scss

@@ -164,6 +164,7 @@
 
 /deep/.flexBox {
   display: flex;
+  margin: 0px 18px;
 
   .el-checkbox {
     margin-right: 24px;

src/views/zzwlr/xzry.vue

@@ -149,7 +149,7 @@
           <div>人员逻辑分库</div>
         </el-row>
         <el-row class="flexBox">
-          <div style="margin: 0.9375rem 0"></div>
+          <div style="margin: 0.9375rem 0;"></div>
           <el-checkbox-group v-model="checkedTargets" style="padding-right: 6.875rem">
             <el-checkbox v-for="(value, key) in targets" :key="key" :label="value.code">{{ value.name }}</el-checkbox>
           </el-checkbox-group>

vue.config.js

@@ -113,13 +113,13 @@ module.exports = {
         // target: "http://192.168.128.108:8099/", // 张 认定
         // target: "http://192.168.128.101:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
-        target: "http://192.168.128.111:8099",  // 湖南-张呈光
+        // target: "http://192.168.128.111:8099",  // 湖南-张呈光
         // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/   ma
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
         // target: "http://www.meetfood.cn:2390", // 湖南-线上
-        // target: "http://zwpt.xzclub.top:9333/",
-        // target: "http://192.168.128.102:8099",  // 江
+        target: "http://zwpt.xzclub.top:9333/",
+        // target: "http://192.168.128.103:8099",  // 江
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -129,9 +129,9 @@ module.exports = {
 
       "/security": {
         // target: "http://192.168.128.106:8765", // 湖南-王
-        target: "http://192.168.128.111:8765/", // 张 认定
+        // target: "http://192.168.128.111:8765/", // 张 认定
         // target: "http://www.meetfood.cn:2390", // 湖南-王
-        // target: "http://zwpt.xzclub.top:9333/",
+        target: "http://zwpt.xzclub.top:9333/",
         // target: "http://192.168.128.109:8765",
         ws: true,
         changeOrigin: true,