Merge remote-tracking branch 'origin/master'

jiangping

2024-10-10 d7c484c2f5ff13b000b38cc2d078bfe752d3dad8

 admin/src/views/platform/components/WaybillDetail.vue

@@ -27,7 +27,16 @@
      <div class="title">合同列表</div>
      <div class="content">
        <div class="item" v-for="item in info.wmsJobContractVOList">
          <div class="contract">合同号：{{ item.contractCode }}</div>
          <div class="contract">
            <span>合同号：{{ item.contractCode }}</span>
            <div>
              <span class="scs" v-if="item.platformWmsDetailList[0].status == 1">WMS作业已完成</span>
              <span class="pad" v-if="item.platformWmsDetailList[0].status == 0">WMS作业未完成</span>
              <span class="err" v-if="item.platformWmsDetailList[0].status == 2">WMS作业已取消</span>
              <span class="scs" v-if="item.platformWmsDetailList[0].lockStatus == 1">电子锁已上锁</span>
              <span class="pad" v-if="item.platformWmsDetailList[0].lockStatus == 0">电子锁未上锁</span>
            </div>
          </div>
          <div class="placeholder6">收货地：{{ item.address }}</div>
          <div class="list">
            <div class="line" v-for="line in item.platformWmsDetailList">
@@ -151,6 +160,17 @@
        font-size: 15px;
        color: #279baa;
        margin-bottom: 4px;
        display: flex;
        justify-content: space-between;
        .scs{
          color: #00ba67;
        }
        .pad{
          color: #f19c3f;
        }
        .err{
          color: red;
        }
      }

      .line {