提交详情增加分发

src/web/staticres/common-module/personDialog/personDialog.css

@@ -0,0 +1,301 @@
+
+.ent_powerPerson_dialog {
+    display: flex;
+    align-items: center;
+}
+.ent_powerPerson_dialog .el-dialog {
+    margin: 0 auto 0 !important;
+}
+.ent_powerPerson_dialog .el-dialog__header {
+    font-size: 26px;
+    color: #1D1D1D;
+}
+.ent_powerPerson_dialog .el-dialog__body {
+    padding: 20px 30px;
+}
+.ent_powerPerson_dialog .content {
+    display: flex;
+    justify-content: space-between;
+}
+.ent_powerPerson_dialog .content .content_right {
+    width: 400px;
+    height: 400px;
+    border-radius: 6px;
+    margin: 0 5px;
+    display: flex;
+    flex-direction: column;
+    border: 1px solid #ECECEC;
+}
+.ent_powerPerson_dialog .content .content_left > h4 {
+    padding: 14px 20px;
+    font-size: 14px;
+    color: #1D1D1D;
+}
+.ent_powerPerson_dialog .content .content_left > .search {
+    margin-left: 20px;
+    width: 360px;
+}
+.ent_powerPerson_dialog .content .content_left > .search .el-input-group {
+    width: 100%;
+    border: 1px solid rgba(0, 0, 0, 0.05);
+    border-radius: 18px;
+}
+.ent_powerPerson_dialog .content .content_left > .search .el-input-group .el-input-group__prepend {
+    border-radius: 18px 0 0 18px;
+    background: #F7F7F7;
+    border: none;
+    padding: 0 12px;
+}
+.ent_powerPerson_dialog .content .content_left > .search .el-input-group .el-input-group__prepend img {
+    width: 20px;
+    height: 20px;
+    margin-top: 6px;
+    cursor: pointer;
+}
+.ent_powerPerson_dialog .content .content_left > .search .el-input__icon.el-icon-search {
+    width: 24px;
+    height: 24PX;
+}
+.ent_powerPerson_dialog .content .content_left > .search .el-input__inner {
+    background: #F7F7F7;
+    border: 1px solid #ECECEC;
+    border-radius: 22px;
+}
+.ent_powerPerson_dialog .content .content_left > .search .el-input__icon{
+  line-height: 40px!important;
+}
+.ent_powerPerson_dialog .content .content_left .all {
+    height: 40px;
+    display: flex;
+    align-content: center;
+    align-items: center;
+    margin-top: 10px;
+    padding: 0 20px;
+    box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+}
+.ent_powerPerson_dialog .content .content_left .all .seleced {
+    width: 18px;
+    height: 18px;
+    border-radius: 50%;
+    border: 1px solid #e0e0e0;
+    cursor: pointer;
+    margin-right: 10px;
+}
+.ent_powerPerson_dialog .content .content_left .all .selectAll {
+    border: none;
+    background: url(/common-module/personDialog/img/checked.png) no-repeat center center;
+    background-size: 20px;
+}
+.ent_powerPerson_dialog .content .content_left .all .selectHalf {
+    border: none;
+    background: url(/common-module/personDialog/img/half.png) no-repeat center center;
+    background-size: 20px;
+}
+.ent_powerPerson_dialog .content .content_left {
+    width: 400px;
+    height: 400px;
+    border-radius: 6px;
+    margin: 0 5px;
+    display: flex;
+    flex-direction: column;
+    border: 1px solid #ECECEC;
+}
+.ent_powerPerson_dialog .content .content_left .allList {
+    flex: 1;
+    overflow: auto;
+}
+.ent_powerPerson_dialog .content .content_left .allList .active {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-right: 20px;
+    height: 40px;
+    box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+}
+.ent_powerPerson_dialog .content .content_left .allList::-webkit-scrollbar {
+    width: 8px;
+}
+.ent_powerPerson_dialog .content .content_left .allList::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: #ECECEC;
+    opacity: 0.15;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div {
+    transition: all 0.5s;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-right: 20px;
+    height: 40px;
+    box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList > div {
+    padding: 0 20px;
+    line-height: 40px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList > div h5 {
+    box-shadow: none;
+    padding-left: 0;
+    padding-right: 10px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 > div {
+    padding: 0 20px;
+    line-height: 40px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 > div h5 {
+    box-shadow: none;
+    padding-left: 0;
+    padding-right: 10px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 {
+    color: #1D1D1D;
+    display: flex;
+    align-items: center;
+    padding: 0 20px;
+    line-height: 40px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 > span {
+    flex: 1;
+    margin-left: 10px;
+    cursor: pointer;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 i {
+    cursor: pointer;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 .seleced {
+    width: 18px;
+    height: 18px;
+    border-radius: 50%;
+    border: 1px solid #e0e0e0;
+    cursor: pointer;
+    position: relative;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 .selectAll {
+    border: none;
+    background: url(/common-module/personDialog/img/checked.png) no-repeat center center;
+    background-size: 20px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 .selectHalf {
+    border: none;
+    background: url(/common-module/personDialog/img/half.png) no-repeat center center;
+    background-size: 20px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div h5 .el-icon-arrow-down {
+    font-size: 16px;
+    color: #aaa;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div.toggle .el-icon-arrow-down {
+    transform: rotateZ(180deg);
+}
+.ent_powerPerson_dialog .content .content_left .allList > div.toggle .itemList {
+    max-height: 0px !important;
+    opacity: 0;
+    overflow: hidden;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList {
+    opacity: 1;
+    max-height: 4000px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList > div {
+    cursor: pointer;
+    color: #686868;
+    display: flex;
+    align-items: center;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList > div span {
+    padding-right: 20px;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList > div .userName {
+    margin-right: auto;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList > div.active {
+    background: #F5F5FB;
+}
+.ent_powerPerson_dialog .content .content_left .allList > div .itemList > div.selectDisabled {
+    pointer-events: none;
+    background: #F5F5FB;
+}
+.ent_powerPerson_dialog .content .content_right h4 {
+    padding: 14px 15px;
+    font-size: 14px;
+    color: #1D1D1D;
+}
+.ent_powerPerson_dialog .content .content_right ul {
+    flex: 1;
+    overflow: auto;
+}
+.ent_powerPerson_dialog .content .content_right ul::-webkit-scrollbar {
+    width: 8px;
+}
+.ent_powerPerson_dialog .content .content_right ul::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: #ECECEC;
+    opacity: 0.15;
+}
+.ent_powerPerson_dialog .content .content_right ul li {
+    float: none;
+    padding: 0 20px;
+    box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+    line-height: 40px;
+    color: #686868;
+    display: flex;
+    align-items: center;
+}
+.ent_powerPerson_dialog .content .content_right ul li span {
+    padding-right: 20px;
+}
+.ent_powerPerson_dialog .content .content_right ul li .userName {
+    margin-right: auto;
+}
+.ent_powerPerson_dialog .content .content_right ul li i {
+    cursor: pointer;
+    font-size: 24px;
+    color: #AAAAAA;
+}
+.ent_powerPerson_dialog p {
+    color: #2ABED1;
+    line-height: 24px;
+    padding: 20px 0 0;
+    text-align: center;
+}
+.ent_powerPerson_dialog p.rootdialog {
+    color: #686868;
+}
+.ent_powerPerson_dialog p.rootdialog > span {
+    color: #2ABED1;
+}
+.ent_powerPerson_dialog button {
+    width: 132px;
+    height: 36px;
+    background: transparent;
+    border-radius: 6px;
+    margin: 0 20px;
+    font-size: 16px;
+}
+.ent_powerPerson_dialog button:active {
+    opacity: 0.8;
+}
+.ent_powerPerson_dialog .save {
+    border: 1px solid #2ABED1;
+    color: #2ABED1;
+}
+.ent_powerPerson_dialog .cancle {
+    border: 1px solid #e0e0e0;
+    color: #686868;
+}
+.ent_powerPerson_dialog .ent_person_tip {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 32px;
+    margin-top: 20px;
+    padding: 0;
+    color: #F56500;
+    background: rgba(255, 159, 64, 0.08);
+    border-radius: 4px;
+}
+.ent_powerPerson_dialog .ent_person_tip .tip_icon {
+    margin: 0 4px 2px 0;
+    width: 18px;
+    height: 18px;
+}

src/web/staticres/common-module/personDialog/personDialog.scss

@@ -1,292 +1,356 @@
-.ent_powerPerson_dialog{
+.ent_powerPerson_dialog {
   display: flex;
   align-items: center;
-  .el-dialog{
-    margin: 0 auto 0!important;
+
+  .el-dialog {
+    margin: 0 auto 0 !important;
   }
-    .el-dialog__header{
-        font-size: 26px;
-        color: #1D1D1D;
+
+  .el-dialog__header {
+    font-size: 26px;
+    color: #1D1D1D;
+  }
+
+  .el-dialog__body {
+    padding: 20px 30px;
+  }
+
+  .content {
+    display: flex;
+    justify-content: space-between;
+
+    .content_right {
+      width: 400px;
+      height: 400px;
+      border-radius: 6px;
+      margin: 0 5px;
+      display: flex;
+      flex-direction: column;
+      border: 1px solid #ECECEC;
+    }
+    .content_left > h4 {
+      padding: 14px 20px;
+      font-size: 14px;
+      color: #1D1D1D;
     }
-    .el-dialog__body{
-      padding: 20px 30px;
+    .content_left > .search {
+      margin-left: 20px;
+      width: 360px;
+
+      .el-input-group {
+        width: 100%;
+        border: 1px solid rgba(0, 0, 0, 0.05);
+        border-radius: 18px;
+
+        .el-input-group__prepend {
+          border-radius: 18px 0 0 18px;
+          background: #F7F7F7;
+          border: none;
+          padding: 0 12px;
+
+          img {
+            width: 20px;
+            height: 20px;
+            margin-top: 6px;
+            cursor: pointer;
+          }
+        }
+      }
+
+      .el-input__icon.el-icon-search {
+        width: 24px;
+        height: 24PX;
+      }
+
+      .el-input__inner {
+        background: #F7F7F7;
+        border: 1px solid #ECECEC;
+        border-radius: 22px;
+      }
+
     }
-    .content{
+    .content_left .all {
+      height: 40px;
+      display: flex;
+      align-content: center;
+      align-items: center;
+      margin-top: 10px;
+      padding: 0 20px;
+      box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+
+      .seleced {
+        width: 18px;
+        height: 18px;
+        border-radius: 50%;
+        border: 1px solid #e0e0e0;
+        cursor: pointer;
+        margin-right: 10px;
+      }
+
+      .selectAll {
+        border: none;
+        background: url(/common-module/personDialog/img/checked.png) no-repeat center center;
+        background-size: 20px;
+      }
+
+      .selectHalf {
+        border: none;
+        background: url(/common-module/personDialog/img/half.png) no-repeat center center;
+        background-size: 20px;
+      }
+    }
+    .content_left {
+      width: 400px;
+      height: 400px;
+      border-radius: 6px;
+      margin: 0 5px;
+      display: flex;
+      flex-direction: column;
+      border: 1px solid #ECECEC;
+    }
+    .content_left .allList {
+      flex: 1;
+      overflow: auto;
+
+      .active {
         display: flex;
         justify-content: space-between;
-        .content_left,.content_right{
-            width: 400px;
-            height: 400px;
-            // max-height: 400px;
-            // min-height: 300px;
-            border-radius: 6px;
-            margin: 0 5px;
-            display: flex;
-            flex-direction: column;
-            border: 1px solid #ECECEC;
+        align-items: center;
+        padding-right: 20px;
+        height: 40px;
+        box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+      }
+
+      /* 滚动条样式 */
+      &::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 8px;
+      }
+
+      &::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 3px;
+        background: #ECECEC;
+        opacity: 0.15;
+      }
+
+    }
+    .content_left .allList > div {
+      transition: all 0.5s;
+
+      
+      .itemList>div {
+        padding: 0 20px;
+        line-height: 40px;
+
+        h5 {
+          box-shadow: none;
+          padding-left: 0;
+          padding-right: 10px;
+        }
+      }
+      h5 > div {
+        padding: 0 20px;
+        line-height: 40px;
+
+        h5 {
+          box-shadow: none;
+          padding-left: 0;
+          padding-right: 10px;
+        }
+      }
+
+      h5 {
+        color: #1D1D1D;
+        display: flex;
+        align-items: center;
+
+        >span {
+          flex: 1;
+          margin-left: 10px;
+          cursor: pointer;
+        }
+
+        i {
+          cursor: pointer;
+        }
+
+        .seleced {
+          width: 18px;
+          height: 18px;
+          border-radius: 50%;
+          border: 1px solid #e0e0e0;
+          cursor: pointer;
+          position: relative;
+        }
+
+        .selectAll {
+          border: none;
+          background: url(/common-module/personDialog/img/checked.png) no-repeat center center;
+          background-size: 20px;
+        }
+
+        .selectHalf {
+          border: none;
+          background: url(/common-module/personDialog/img/half.png) no-repeat center center;
+          background-size: 20px;
+        }
+
+        .el-icon-arrow-down {
+          font-size: 16px;
+          color: #aaa;
+
         }
-        .content_left{
-          h4{
-            padding: 14px 20px ;
-            font-size: 14px;
-            color: #1D1D1D;
+      }
+
+      &.toggle {
+        .el-icon-arrow-down {
+          transform: rotateZ(180deg);
+        }
+
+        .itemList {
+          max-height: 0px !important;
+          opacity: 0;
+          overflow: hidden;
+        }
+      }
+
+      .itemList {
+        // transition: all  0.5s ;
+        opacity: 1;
+        max-height: 4000px;
+
+        >div {
+          cursor: pointer;
+          color: #686868;
+          display: flex;
+          align-items: center;
+
+          span {
+            padding-right: 20px;
           }
-          .search{
-              margin-left: 20px;
-              width: 360px;
-              ::v-deep {
-                .el-input-group{
-                  width: 100%;
-                  border: 1px solid rgba(0,0,0,0.05);
-                  border-radius: 18px;
-                  .el-input-group__prepend{
-                      border-radius: 18px 0 0 18px;
-                      background: #F7F7F7;
-                      border:none;
-                      padding: 0 12px;
-                      img{
-                          width: 20px;
-                          height: 20px;
-                          margin-top: 6px;
-                          cursor: pointer;
-                      }
-                  }
-                }
-                .el-input__icon.el-icon-search {
-                  width: 24px;
-                  height: 24PX;
-                }
-                .el-input__inner{
-                  background: #F7F7F7;
-                  border: 1px solid #ECECEC;
-                  border-radius: 22px;
-                }
-              }
+
+          .userName {
+            margin-right: auto;
           }
-          .all {
-            height: 40px;
-            display: flex;
-            align-content: center;
-            align-items: center;
-            margin-top: 10px;
-            padding: 0 20px;
-            box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
-            .seleced{
-              width: 18px;
-              height: 18px;
-              border-radius: 50%;
-              border: 1px solid #e0e0e0;
-              cursor: pointer;
-              margin-right: 10px;
-            }
-            .selectAll{
-              border:none;
-              background: url(/common-module/personDialog/img/checked.png) no-repeat center center;
-              background-size: 20px;
-            }
-            .selectHalf{
-              border:none;
-              background: url(/common-module/personDialog/img/half.png) no-repeat center center;
-              background-size: 20px;
-            }
+
+          &.active {
+            background: #F5F5FB;
           }
-          .allList{
-            flex: 1;
-            overflow: auto;
-            .active {
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
-              padding-right: 20px;
-              height: 40px;
-              box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
-            }
-            /* 滚动条样式 */
-            &::-webkit-scrollbar {
-                /*滚动条整体样式*/
-                width: 8px;
-            }
-            &::-webkit-scrollbar-thumb {
-                /*滚动条里面小方块*/
-                border-radius: 3px;
-                background: #ECECEC;
-                opacity: 0.15;
-            }
-            >div{
-              transition: all 0.5s;
-              h5,.itemList>div{
-                 padding: 0 20px;
-                 line-height: 40px;
-                 h5 {
-                   box-shadow: none;
-                   padding-left: 0;
-                   padding-right: 10px;
-                 }
-              }
-              h5{
-                // margin-top: 16px;
-                color: #1D1D1D;
-                display: flex;
-                align-items: center;
-                >span{
-                  flex: 1;
-                  margin-left: 10px;
-                  cursor: pointer;
-                }
-                i{
-                  cursor: pointer;
-                }
-                .seleced{
-                  width: 18px;
-                  height: 18px;
-                  border-radius: 50%;
-                  border: 1px solid #e0e0e0;
-                  cursor: pointer;
-                  position: relative;
-                }
-                .selectAll{
-                   border:none;
-                   background: url(/common-module/personDialog/img/checked.png) no-repeat center center;
-                   background-size: 20px;
-                }
-                .selectHalf{
-                  border:none;
-                   background: url(/common-module/personDialog/img/half.png) no-repeat center center;
-                   background-size: 20px;
-                }
-                .el-icon-arrow-down{
-                  font-size: 16px;
-                   color: #aaa;
-
-                }
-              }
-               &.toggle{
-                  .el-icon-arrow-down{
-                     transform: rotateZ(180deg);
-                  }
-                  .itemList{
-                      max-height: 0px!important;
-                      opacity: 0;
-                      overflow: hidden;
-                  }
-                }
-              .itemList{
-                // transition: all  0.5s ;
-                opacity: 1;
-                max-height:4000px;
-                >div{
-                  cursor: pointer;
-                  color: #686868;
-                  display: flex;
-                  align-items: center;
-                  span{
-                    padding-right: 20px;
-                  }
-                  .userName{
-                    margin-right: auto;
-                  }
-                  &.active{
-                    background: #F5F5FB;
-                  }
-                  &.selectDisabled {
-                    pointer-events: none;
-                    background: #F5F5FB;
-                  }
-                }
-
-              }
-            }
 
+          &.selectDisabled {
+            pointer-events: none;
+            background: #F5F5FB;
           }
         }
-        .content_right{
-          h4{
-            padding: 14px 15px;
-            font-size: 14px;
-            color: #1D1D1D;
+
+      }
+    }
+
+    .content_right {
+      h4 {
+        padding: 14px 15px;
+        font-size: 14px;
+        color: #1D1D1D;
+      }
+
+      ul {
+        flex: 1;
+        overflow: auto;
+
+        /* 滚动条样式 */
+        &::-webkit-scrollbar {
+          /*滚动条整体样式*/
+          width: 8px;
+        }
+
+        &::-webkit-scrollbar-thumb {
+          /*滚动条里面小方块*/
+          border-radius: 3px;
+          background: #ECECEC;
+          opacity: 0.15;
+        }
+
+        li {
+          float: none;
+          padding: 0 20px;
+          box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
+          line-height: 40px;
+          color: #686868;
+          display: flex;
+          align-items: center;
+
+          span {
+            padding-right: 20px;
           }
-          ul{
-            flex: 1;
-            overflow: auto;
-            /* 滚动条样式 */
-            &::-webkit-scrollbar {
-                /*滚动条整体样式*/
-                width: 8px;
-            }
-            &::-webkit-scrollbar-thumb {
-                /*滚动条里面小方块*/
-                border-radius: 3px;
-                background: #ECECEC;
-                opacity: 0.15;
-            }
-            li{
-              float: none;
-              padding: 0 20px;
-              box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
-              line-height: 40px;
-              color: #686868;
-              display: flex;
-              align-items: center;
-              span{
-                padding-right: 20px;
-              }
-              .userName{
-                margin-right: auto;
-              }
-              i{
-                cursor: pointer;
-                font-size: 24px;
-                color: #AAAAAA;
-              }
-            }
+
+          .userName {
+            margin-right: auto;
+          }
+
+          i {
+            cursor: pointer;
+            font-size: 24px;
+            color: #AAAAAA;
           }
-        }
-    }
-    p{
-      color: #2ABED1;
-      line-height: 24px;
-      padding: 20px 0 0;
-      text-align: center;
-      &.rootdialog{
-        color: #686868;
-        >span{
-          color: #2ABED1;
         }
       }
     }
-    button{
-        width: 132px;
-        height: 36px;
-        background: transparent;
-        border-radius: 6px;
-        margin: 0 20px;
-        font-size: 16px;
-        &:active{
-            opacity: 0.8;
-        }
-    }
-    .save{
-        border: 1px solid #2ABED1;
+  }
+
+  p {
+    color: #2ABED1;
+    line-height: 24px;
+    padding: 20px 0 0;
+    text-align: center;
+
+    &.rootdialog {
+      color: #686868;
+
+      >span {
         color: #2ABED1;
+      }
     }
-    .cancle{
-        border: 1px solid #e0e0e0;
-        color: #686868;
+  }
+
+  button {
+    width: 132px;
+    height: 36px;
+    background: transparent;
+    border-radius: 6px;
+    margin: 0 20px;
+    font-size: 16px;
+
+    &:active {
+      opacity: 0.8;
     }
-    .ent_person_tip{
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      height: 32px;
-      margin-top: 20px;
-      padding: 0;
-      color: #F56500;
-      background: rgba(255, 159, 64, 0.08);
-      border-radius: 4px;
-      .tip_icon{
-        margin: 0 4px 2px 0;
-        width: 18px;
-        height: 18px;
-      }
+  }
+
+  .save {
+    border: 1px solid #2ABED1;
+    color: #2ABED1;
+  }
+
+  .cancle {
+    border: 1px solid #e0e0e0;
+    color: #686868;
+  }
+
+  .ent_person_tip {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 32px;
+    margin-top: 20px;
+    padding: 0;
+    color: #F56500;
+    background: rgba(255, 159, 64, 0.08);
+    border-radius: 4px;
+
+    .tip_icon {
+      margin: 0 4px 2px 0;
+      width: 18px;
+      height: 18px;
     }
+  }
 }

src/web/staticres/js/superSearch.js

@@ -1599,8 +1599,8 @@ function distributeInit(){
       }
     }
   })
-  $('#right-distribute').show();
-  $('.line-distribute').show();
+  // $('#right-distribute').show();
+  // $('.line-distribute').show();
   $('#right-distribute').off('click').bind('click',function(e){
     e.stopPropagation()
     let len = $('.custom-checkbox:not(".check-all"):checked').length;
@@ -1622,11 +1622,11 @@ function distributeInit(){
         // 无地区
         person_Dialog.selectArea = []  
       }
-      person_Dialog.titleMsg = '选择分发人员'
+      person_Dialog.titleMsg = '选择分发人员' // 设置弹窗标题
       person_Dialog.searchVal = ''
-      person_Dialog.centerDialogVisible = true
-      person_Dialog.selectDataIds = checked_id
-      person_Dialog.getData('yes')
+      person_Dialog.centerDialogVisible = true // 打开弹窗
+      person_Dialog.selectDataIds = checked_id // 传入标讯ID
+      person_Dialog.getData('yes') // 发送获取人员列表请求
     }else{
       toastFn('尚未选择公告，请选择', 1000)
     }

src/web/staticres/public-pc/js/article-content.js

@@ -1800,8 +1800,8 @@ var industry = getQueryString("industry");
 var subscopeclass = goTemplateData.params.obj.s_subscopeclass;
 var buyerclass =goTemplateData.params.obj.buyerclass;
 
-if (area !="" && area != "A"&&area!=undefined){
-  $(".com-statusbar").append('<span class="com-area"><a href="/list/area/'+goTemplateData.params.obj.areaadd+'.html">'+area+'</a></span>');
+if (area !="" && area != "A"&&area!=undefined){ // 标签栏插入标签
+  $(".com-tagsbar").append('<span class="com-area"><a href="/list/area/'+goTemplateData.params.obj.areaadd+'.html">'+area+'</a></span>');
 }
 if(typeof(type) == "undefined" || type == null || type == ""){
   type = goTemplateData.params.obj.toptype;
@@ -1816,8 +1816,8 @@ if(typeof(type) == "undefined" || type == null || type == ""){
     type = "";
   }
 }
-if(typeof(type) != "undefined" && type != null && type != ""){
-  $(".com-statusbar").append('<span class="com-type"><a href="/list/stype/'+goTemplateData.params.obj.stypeadd+'.html">'+type+'</a></span>');
+if(typeof(type) != "undefined" && type != null && type != ""){ // 标签栏插入标签
+  $(".com-tagsbar").append('<span class="com-type"><a href="/list/stype/'+goTemplateData.params.obj.stypeadd+'.html">'+type+'</a></span>');
 }
 // 2023-5-24 P341去掉
 // if(industry && industry!="undefined"){
@@ -1833,20 +1833,22 @@ if(typeof(type) != "undefined" && type != null && type != ""){
 //   }
 // }
 // P341支持全部用户可见
-if(buyerclass && buyerclass !== '其它'){
-  $(".com-statusbar").append('<span class="com-buyerclass"><a>'+buyerclass+'</a></span>');
+if(buyerclass && buyerclass !== '其它'){ // 标签栏插入标签
+  $(".com-tagsbar").append('<span class="com-buyerclass"><a>'+buyerclass+'</a></span>');
 }
 var bidamount_class=goTemplateData.params.obj.bidamount
 var budget_class=goTemplateData.params.obj.budget
 var amount=getacount(bidamount_class,budget_class)
-if (amount!=""){
-  $(".com-statusbar").append('<span class="com-amount"><a>'+conversionMoeny(amount)+'</a></span>');
+if (amount!=""){ // 标签栏插入标签
+  $(".com-tagsbar").append('<span class="com-amount"><a>'+conversionMoeny(amount)+'</a></span>');
 }
 //
 if(publishtime != "" && typeof(publishtime) != "undefined"){
   var diff =goTemplateData.params.obj.publishtimeShorDate
-  if(diff != null){
-    $(".com-statusbar").append('<span class="com-time"><i class="glyphicon bofangjilu"></i>'+diff+'</span>');
+  if(diff != null){ // 按钮行 左边插入时间
+    // <i class="glyphicon bofangjilu"></i> //时间图标
+    $(".com-statusbar").append('<span class="com-time">'+diff+'</span>');
+    // $(".com-tagsbar").append('<span class="com-time">'+diff+'</span>');
   }
 }
 var upno = goTemplateData.params.obj.i_upno || 0

src/web/templates/common/personDialog.html

@@ -1,4 +1,6 @@
-<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/personDialog/personDialog.scss?v={{Msg "seo" "version"}}'>
+<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/personDialog/personDialog.css?v={{Msg "seo" "version"}}'>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.7.14/vue.min.js></script>
+<script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.13-rc/lib/index.js"></script>
 <div id="personDialog">
   <div class="ent_powerPerson">
     <el-dialog
@@ -15,9 +17,6 @@
                 <h4>选择</h4>
                 <div class="search">
                   <el-input prefix-icon="el-icon-search" v-model="searchVal" placeholder="搜索" >
-                    <!-- <template slot="prepend">
-                      <img style="width: 20px;height: 20px" src="@/assets/images/search.png" alt="">
-                    </template> -->
                   </el-input>
                 </div>
                 <div class="all" v-if="allQuan">
@@ -26,15 +25,6 @@
                   <span class="noselect" @click="allToggle()">全选</span>
                 </div>
                 <div class="allList">
-                  <!-- <div v-for="(item,i) in deal_personList" :key="item.id" :class="{toggle:!item.toggle}">
-                    <h5><i class="seleced" @click="selectGroup(item,i)" :class="item.status"></i> <span class="noselect"  @click="toggle(item,i)">{{ item.name }}</span> <i @click="toggle(item,i)" class="el-icon-arrow-down" :id="'up'+i"></i></h5>
-                    <div class="itemList" :id="'plays'+i">
-                       <div v-for="val in deal_personList" :key="val.user_id" @click="chooseUser(val,'single')" :class="{active:val.checked, 'selectDisabled':val.disabled}">
-                          <h5><i class="seleced" :class="{'selectAll':val.checked&&!val.disabled }"></i></h5>
-                          <span class="userName">{{ val.username }}</span> <span> {{ val.phone }}</span>
-                       </div>
-                    </div>
-                  </div> -->
                   <div v-for="val in deal_personList" :key="val.id" @click="chooseUser(val,'single')" :class="{active:val.toggle, 'selectDisabled':val.disabled}">
                     <h5>
                       <i class="seleced" :class="{'selectAll':val.checked&&!val.disabled }"></i>
@@ -51,15 +41,12 @@
                     <span class="userName">@@ item.name @@</span>
                     <span>@@ item.phone @@</span>
                     <i class="el-icon-error" @click="delChooseUser(i)"></i>
-                    <!-- <p v-else style="width:24px;height:24px;"></p> -->
+                   
                   </li>
                 </ul>
             </div>
         </div>
-        <!-- <p v-if="currentIndex !== 1 && pagetype!=='manage'">已选择{{ maxLength }}人共购买{{ personList.length }}人</p>
-        <p class="rootdialog" v-else>已选择 <span>{{ selectedList.length }}</span> 人共购买 <span>{{ empower_count }}</span> 人</p> -->
         <p class="ent_person_tip" v-if="pagetype!==''">
-          <!-- <img class="tip_icon" src="@/assets/images/icon/guanyu.png" alt=""> -->
           <span>注：同一人员只能拥有1个超级订阅或大会员产品权限，如需添加请删除该人员原有的产品权限</span>
         </p>
         <span slot="footer" class="dialog-footer btns">
@@ -69,13 +56,11 @@
       </el-dialog>
 </div>
 </div>
-<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.7.14/vue.min.js></script>
 <script>
   var person_Dialog = new Vue({
     el: "#personDialog",
     delimiters: ["@@", "@@"],
-    // template: temp,
-    data () {
+    data: function () {
     return {
       pagetype:'',
       selectData:{},
@@ -84,8 +69,8 @@
       vt:'',
       centerDialogVisible: false,
       searchVal: '',
-      personList: {},
-      personSpareList: {},
+      personList: [{"id":4357,"name":"企业管理员","phone":"18738625921"}],
+      personSpareList:[{"id":4357,"name":"企业管理员","phone":"18738625921"}],
       selectedList: [],
       checked: false,
       titleMsg: '',
@@ -107,7 +92,7 @@
       selectAreas:[]
     }
   },
-  created () {
+  created: function  () {
     this.$watch('searchVal', this.debounce((newValue, oldValue) => {
       console.log(newValue, oldValue)
       const searchList = []
@@ -195,7 +180,7 @@
       }
     },
     // 获取人员列表
-    async getData (flag = 'no', num) {
+     getData (flag = 'no', num) {
       this.filterType = !!num
       this.loading = true
       const selectAreas = this.selectAreas
@@ -212,38 +197,48 @@
         region: num ? '' : selectAreas.toString(),
         queryType: num || ''
       }
-      const res = await getDistributor(this.vt, params)
-      if (res.error_code === 0 && res.data && res) {
-        // this.personList = data
-        this.personList = {}
-        this.loading = false
-        res.data.forEach(v => {
-          v.toggle = true
-          v.status = false
-        })
-        this.personList = res.data
-        this.personSpareList = res.data
-        if (flag === 'yes') {
-          if (this.searchVal) {
-            this.allQuan = false
-          }
-          return
-        }
-        this.maxLength = res.data.checked
-        if (this.pagetype !== 'manage') {
-          this.selectedList = res.data.checkedList
-        }
-        this.allChecked = true
-        if (res.data.checked === 0) {
-          this.quan = false
-        }
-      } else {
-        this.personList = {}
-        this.loading = false
-      }
-      if (this.searchVal === '') {
-        this.allQuan = true
-      }
+      $.ajax({
+              type: 'post',
+              contentType: "application/json",
+              url: '/jyapi/jybx/subscribe/eType/distributor',
+              data: JSON.stringify(params),
+              dataType: 'json',
+              success: function (res) {
+                if (res.error_code === 0 && res.data && res) {
+                  // this.personList = data
+                 this.personList = {}
+                 this.loading = false
+                 res.data.forEach(v => {
+                   v.toggle = true
+                   v.status = false
+                 })
+                 this.personList = res.data
+                 this.personSpareList = res.data
+                 if (flag === 'yes') {
+                   if (this.searchVal) {
+                     this.allQuan = false
+                   }
+                   return
+                 }
+                 this.maxLength = res.data.checked
+                 if (this.pagetype !== 'manage') {
+                   this.selectedList = res.data.checkedList
+                 }
+                  this.allChecked = true
+                 if (res.data.checked === 0) {
+                   this.quan = false
+                 }
+                } else {
+                  this.personList = {}
+                  this.loading = false
+                }
+
+                if (this.searchVal === '') {
+                  this.allQuan = true
+               }
+                
+              }
+            })  
     },
     // 数组去重
     newArrFn (arr) {
@@ -270,24 +265,34 @@
         if (delId.length !== 0) {
           if (this.filterType) {
             console.log('刷新？')
-           
           } else {
-            getMsgDistributor({ messageId: this.selectDataIds.toString(), staffs: data }).then(res => {
-             if (res.error_code === 0) {
-              if (res.data === 1) {
-               this.$message({ message: '分发成功', type: 'success' })
-              } else {
-                this.$message({ message: res.error_msg, type: 'warning' })
+            let this_ = this
+            let params_Data = {
+                infoids:this_.selectDataIds,
+                staffs:delId.toString()
               }
-            } else {
-              this.$message({ message: res.error_msg, type: 'warning' })
-            }
-           })
-           
+            $.ajax({
+              type: 'post',
+              contentType: "application/json",
+              url: '/jybx/subscribe/bidDistributor',
+              data: JSON.stringify(params_Data),
+              dataType: 'json',
+              success: function (res) {
+                if (res.error_code === 0) {
+                  if (res.data === 1) {
+                    this_.$message({ message: '分发成功', type: 'success' })
+                  } else {
+                    this_.$message({ message: res.error_msg, type: 'warning' })
+                  }
+                } else {
+                  this_.$message({ message: res.error_msg, type: 'warning' })
+               }
+              }
+            }) 
           }
         } else {
           if (this.filterType) {
-            this.$message({ message: '请选择', type: 'warning' }) 
+            this.$message({ message: '请选择人员', type: 'warning' }) 
           } else {
             this.$message({ message: '请选择分发人员', type: 'warning' })
           }
@@ -391,7 +396,7 @@
     this._scrollTop = document.scrollingElement.scrollTop
     document.body.style.position = 'fixed'
     document.body.style.width = '100%'
-    document.body.style.top = -_scrollTop + 'px'
+    document.body.style.top = -this._scrollTop + 'px'
   },
 
   // popup 关闭时调用
@@ -402,5 +407,5 @@
     document.scrollingElement.scrollTop = this._scrollTop
   }
   }
-  });
+  })
 </script>

src/web/templates/pc/biddetail_rec.html

@@ -131,12 +131,21 @@
         .join-bid-persons:hover+.tooltip-names{
             opacity: 1;
         }
+        #statusbar{
+          padding: 10px 0 !important;
+          line-height: 24px;
+        }
+        .com-tagsbar{
+          margin-top: 12px;
+        }
     </style>
 </head>
 <body style="height: 100%">
 {{include "/common/pchead.html"}}
 <!-- 分享弹框 -->
 {{include "/common/shareboxDialog.html"}}
+<!-- 分发弹窗 -->
+{{include "/common/personDialog.html"}}
 <script type="text/javascript">
   var _loop = false;
   var refer = document.referrer;
@@ -191,6 +200,7 @@
                 <!--			<span style="border-bottom:1px solid #2cb7ca">{{.T.obj.title}}</span>-->
                 {{.T.obj.title}}
             </div>
+            <div class="com-tagsbar"></div>
             <div class="com-statusbar" id="statusbar">
                 <!-- 自定义标签弹框 -->
                 <div class="tags-box" id="collectTags">
@@ -435,6 +445,9 @@
                 <span class="com-collect" id="bidJoin" onclick="joinBidAction('in')" style="display: none;"><img class="icon-title-img" src='{{Msg "seo" "cdn"}}/images/canbiao.png'/>参标</span>
       <span class="com-icon" id="share-colleague">
         <img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/share-colleague.png">转给同事
+      </span>
+      <span class="com-icon" id="manual-distribution" style="display: none;">
+        <img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/biddingSearch/distribute.png">分发
       </span>
 			</div>
 			<div class="sub-info-container">
@@ -1778,11 +1791,12 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
           }
         }
         initChat()
+        const pagedata = {{.T.obj}} ;
+        distributionInit()
         $('#share-colleague').on('click', function(){
           sharebox_Dialog.showNewuserDialog = true
         })
         // 分享弹框 数据注入
-        const pagedata = {{.T.obj}} ;
         const stype = extractString(pagedata.urlpath)
         sharebox_Dialog.sendData({pageData:pagedata, title:pagedata.title, desc:'标讯信息', link:window.location.href, type:'biddetail_rec',code:1,id:pagedata._id,stype:stype});
         function extractString(str) {
@@ -1790,6 +1804,37 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
           const match = str.match(regex);
           return match ? match[1] : null;
         }
+
+      function distributionInit(){
+          $.ajax({
+          type: 'get',
+          contentType: "application/json",
+          url: '/bigmember/isAdd',
+          success: function (r) {
+           if (r.data) {
+             if(r.data.entSubscribe == 1){
+               $('#manual-distribution').show();
+            }  
+           }
+          }
+        })
+        // 分发弹框
+        $('#manual-distribution').on('click', function(){
+          if(pagedata.area){
+        // 拉起选择人员弹窗 有地区
+           person_Dialog.selectAreas = [pagedata.area]
+         }else{
+        // 无地区
+           person_Dialog.selectArea = []  
+         }
+         person_Dialog.titleMsg = '选择分发人员' // 设置弹窗标题
+         person_Dialog.searchVal = ''
+         person_Dialog.centerDialogVisible = true // 打开弹窗
+         person_Dialog.selectDataIds = [pagedata._id]// 传入标讯ID
+         person_Dialog.getData('yes') // 发送获取人员列表请求
+        })  
+      }  
+
       })
     </script>
     <!--百度统计start-->

src/web/templates/pc/supsearch.html

@@ -706,6 +706,8 @@
 </head>
 <body data-page-name="supsearch">
 {{include "/common/pchead.html"}}
+<!-- 选择人员组件 -->
+{{include "/common/personDialog.html"}}
 <div class="modal fade" id="labModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content" id="labmodalcont">