Merge branch 'static-static' of http://10.1.235.20:3000/core/static into static-static

2019/bj-zqzt/biz/css/base.css

@@ -3573,16 +3573,10 @@ button.add-others {
  width: 14.4%;
  border-top:1px solid #E6E9ED; ;
}
.customer-small-btn.ipu-active {
  opacity: .7;
}
.customer-btns .customer-big-btn {
  height: .48rem;
  background:linear-gradient(180deg,rgba(63,148,248,1) 0%,rgba(69,127,255,1) 100%);
}
.customer-big-btn.ipu-active {
  opacity: .7;
}
.customer-small-btn .btn-pic{
  width: .24rem;
  height:.24rem;
@@ -3621,14 +3615,6 @@ button.add-others {
  background: url(../img/unsuspend-btn.png) center center no-repeat;
  background-size: contain;
}
.unsuspend-btn.customer-small-btn.disabled-btn .btn-pic{
  width: .18rem;
  background: url(../img/unsuspend-disabled-btn.png) center center no-repeat;
  background-size: contain;
}
.unsuspend-btn.customer-small-btn.disabled-btn .btn-text{
  color: rgba(142, 147, 153, .4);
}
.suspend-btn.customer-small-btn .btn-pic{
  width: .18rem;
  background: url(../img/suspend-btn.png) center center no-repeat;
@@ -3646,6 +3632,12 @@ button.add-others {
  line-height: .1rem;
  margin-top: .02rem;
}
.customer-small-btn.ipu-active {
  opacity: .7;
}
.customer-small-btn.disabled-btn {
  opacity: .5;
}
.customer-big-btn .btn-pic {
  width: .19rem;
  height: .19rem;
@@ -3671,6 +3663,9 @@ button.add-others {
  line-height:.16rem;
  margin-left: .07rem;
}
.customer-big-btn.ipu-active {
  opacity: .7;
}
.calculate-btn {
  width: .6rem;
  height:.6rem;
@@ -6643,6 +6638,10 @@ ul li .details-info {
  background: url("../img/delay2.png") center center no-repeat;
  background-size: contain;
}
.menu-pic.group {
  background: url("../img/group.png") center center no-repeat;
  background-size: contain;
}
/* 电子协议单详情 */
.sheet-details-head {
  padding:.17rem .16rem;
@@ -7158,6 +7157,10 @@ ul li .details-info {
  font-size: .14rem;
  line-height: .22rem;
}
.work-state-detail {
  color: #3F93F8;
  margin-left: .05rem;
}
.construction-approval-area .sj-audit-user{
  margin-top:.04rem;
  padding-bottom: 0;
@@ -7197,3 +7200,14 @@ ul li .details-info {
  color:#67ACFF;
  background:rgba(247,250,255,1);
}
.work-state-area {
  padding: .2rem .24rem;
  background: #fff;
  border-radius: .08rem .08rem 0 0;;
}
.work-state-title {
  font-size: .16rem;
  color: #2B2F33;
  text-align: center;
  line-height: .22rem;
}

2019/bj-zqzt/biz/js/construction-sheet-details.js

@@ -28,18 +28,38 @@ require(['jquery', 'ipuUI'], function ($, ipuUI) {
    // 操作按钮
    $('.customer-btns>div').on('click', function () {
      let option = $(this).find(".btn-text").text().trim();
      if (option == "解挂") {
        if (!$(this).has("disabled-btn")) {
      if (!$(this).hasClass("disabled-btn")) {
        if (option == "解挂") {
          location.href = "work-order-unsuspend.html"
        } else if (option == "挂起") {
          location.href = "work-order-suspend.html"
        } else if (option == "延期") {
          location.href = "work-order-delay.html"
        } else if (option == "加急") {
          location.href = "work-order-emergency.html"
        }
      } else if (option == "挂起") {
        location.href = "work-order-suspend.html"
      } else if (option == "延期") {
        location.href = "work-order-delay.html"
      } else if (option == "加急") {
        location.href = "work-order-emergency.html"
      }
    })
    // 工单状态详情
    $(".sheet-details-area").on("click", ".work-state-detail", function () {
      $(".upload-pic-popup-slide ").addClass("active");
    });
    // 关闭slide
    $(".normal-slide-close").click(function () {
      $(".upload-pic-popup-slide ").removeClass("active");
    });
    // 点空白区域关闭上传水牌界面
    $(".upload-pic-popup-slide").click(function () {
      $(this).removeClass("active");
    });
    //点击其他地方不做处理
    $(".upload-pic-popup-slide .work-state-area").click(function () {
      return false;
    });
  });
});

2019/bj-zqzt/biz/js/construction-sheet-list.js

@@ -36,19 +36,27 @@ require(['jquery', 'ipuUI'], function ($, ipuUI) {
      });
    });
    // 全部中的条件搜索事件
    $(".common-select-search-btn").click(function () {
      search();
    });
    // 监测输入框按下事件
    $(".common-search-input").keyup(function (e) {
      var currKey = e.keyCode || e.which || e.charCode;
      let currKey = e.keyCode || e.which || e.charCode;
      if ($(this).val() != "") {
        // 如果输入框值不为空，clean按钮显示
        $(".search-input-clean").show();
      } else {
        // 如果输入框为空，clean按钮隐藏
        $(".search-input-clean").hide();
      }
      if (currKey == 13) {// 按下回车进行查询
        search();
      }
    });
    // 输入框清除按钮点击事件
    $(".search-input-clean").click(function () {
      $(".search-input-clean").hide();
      $(".common-search-input").val("").focus();
    });
    // 选项点击事件跳转至详情页
    $(".construction-list-area").on("click", ".agreement-sheet-item", function () {
      location.href = "construction-sheet-details.html"

2019/bj-zqzt/construction-sheet-details.html

@@ -122,13 +122,11 @@
                      <div class="sj-audit-time">15:31:32</div>
                    </div>
                    <div class="ipu-flex-grow-1 sj-audit-result">
                      <div class="sj-audit-title">工单状态</div>
                      <div class="sj-audit-title"><span>工单状态</span><span class="work-state-detail">详情</span></div>
                      <div class="sj-audit-user ipu-flex ipu-flex-align-center">
                        <div>操作人(二级部门 三级部门)</div>
                        <div class="call-pic" data-phone="13423454321"></div>
                      </div>
                      <div class="sj-audit-reason">操作原因：这是一段文字</div>
                      <div class="sj-audit-desc">操作描述：这是一段文字</div>
                    </div>
                  </div>
@@ -138,11 +136,12 @@
                      <div class="sj-audit-time">15:31:32</div>
                    </div>
                    <div class="ipu-flex-grow-1 sj-audit-result">
                      <div class="sj-audit-title">工单状态</div>
                      <div class="sj-audit-title"><span>工单状态</span><span class="work-state-detail">详情</span></div>
                      <div class="sj-audit-user ipu-flex ipu-flex-align-center">
                        <div>操作人(二级部门 三级部门)</div>
                        <div class="call-pic" data-phone="13423454321"></div>
                      </div>
                      <div class="sj-audit-desc">综资发起</div>
                    </div>
                  </div>
@@ -152,7 +151,7 @@
                      <div class="sj-audit-time">15:31:29</div>
                    </div>
                    <div class="ipu-flex-grow-1 sj-audit-result">
                      <div class="sj-audit-title">加急状态</div>
                      <div class="sj-audit-title"><span>加急状态</span><span class="work-state-detail">详情</span></div>
                      <div class="sj-audit-user ipu-flex ipu-flex-align-center">
                        <div>周瑞明(城区一分公司 政企部)</div>
                        <div class="call-pic" data-phone="13423454321"></div>
@@ -168,7 +167,7 @@
                      <div class="sj-audit-time">15:31:32</div>
                    </div>
                    <div class="ipu-flex-grow-1 sj-audit-result">
                      <div class="sj-audit-title">工单状态</div>
                      <div class="sj-audit-title"><span>工单状态</span><span class="work-state-detail">详情</span></div>
                      <div class="sj-audit-user ipu-flex ipu-flex-align-center">
                        <div>操作人(二级部门 三级部门)</div>
                        <div class="call-pic" data-phone="13423454321"></div>
@@ -186,7 +185,7 @@
      </div>
      <div class="ipu-flex-col">
        <div class="customer-btns ipu-flex ipu-flex-align-center">
          <!--解挂两种状态，激活状态去掉disabled-btn-->
          <!--未激活状态加上样式disabled-btn-->
          <div class="unsuspend-btn customer-small-btn disabled-btn ipu-flex ipu-flex-vertical ipu-flex-align-center">
            <div class="btn-pic"></div>
            <div class="btn-text">解挂</div>
@@ -208,6 +207,35 @@
    </div>
    <!--工单详情-->
    <div class="upload-pic-popup-slide">
      <div class="ipu-flex-row ipu-flex-vertical">
        <div class="ipu-flex-col ipu-flex-col-auto"></div>
        <div class="work-state-area ipu-flex-col ipu-flex ipu-flex-vertical">
          <div class="work-state-header">
            <div class="work-state-title ipu-fn-row">加急待确认</div>
            <div class="normal-slide-close"></div>
          </div>
          <div class="normal-content-item ipu-flex">
            <div class="normal-content-tag ipu-flex-col">要求完成时间</div>
            <div class="normal-content-value ipu-flex-col-auto">2020-02-21 13:34:23</div>
          </div>
          <div class="normal-content-item ipu-flex">
            <div class="normal-content-tag ipu-flex-col">预计加急结束时间</div>
            <div class="normal-content-value ipu-flex-col-auto">2020-02-21 13:34:23</div>
          </div>
          <div class="normal-content-item ipu-flex">
            <div class="normal-content-tag ipu-flex-col">加急原因</div>
            <div class="normal-content-value ipu-flex-col-auto">无</div>
          </div>
          <div class="normal-content-item ipu-flex">
            <div class="normal-content-tag ipu-flex-col">加急描述</div>
            <div class="normal-content-value ipu-flex-col-auto">无</div>
          </div>
        </div>
      </div>
    </div>
  </div>
</div>
</body>

2019/bj-zqzt/construction-sheet-list.html

@@ -33,10 +33,10 @@
          <div class="sort-type" data-type="CUST_NAME">客户名称</div>
          <div class="unfold-status"></div>
        </div>
        <div class="ipu-flex-grow-1">
          <input type="text" class="common-search-input common-select-search-input" placeholder="输入关键字进行查询"/>
        <div class="ipu-flex-grow-1" style="position: relative">
          <input type="text" class="common-search-input common-select-search-input" placeholder="输入关键字进行查询" style="padding:.07rem .36rem"/>
          <div class="search-input-clean" style="display:none;top:.09rem;right: .08rem;left:auto;"></div>
        </div>
        <button class="ipu-btn common-btn common-select-search-btn">搜索</button>
      </div>
      <div class="customer-list-head ipu-flex ipu-flex-justify-space ipu-flex-align-center">
        <div class="business-count">共<span>0</span>个客户</div>