pyt
2025-02-12 9883cf18e99e8ba21f700cbe632adfe091f260ce
修改bug
3个文件已修改
287 ■■■■■ 已修改文件
src/App.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/Home.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/addOrder.vue 254 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/App.vue
@@ -25,9 +25,9 @@
</script>
<style lang='less'>
::-webkit-scrollbar {
  display: none;
}
// ::-webkit-scrollbar {
//   display: none;
// }
html,
body,
src/view/Home.vue
@@ -63,30 +63,35 @@
        </div>
        <div class="table-box">
            <el-table :data="tableData" style="width: 100%" border>
                <el-table-column prop="orderId" label="订单编号" align="center">
                <el-table-column width="200" prop="orderId" label="订单编号" align="center">
                </el-table-column>
                <el-table-column prop="container" label="集装箱号" align="center">
                <el-table-column width="200" prop="container" label="集装箱号" align="center">
                </el-table-column>
                <el-table-column prop="bol" label="提单号" align="center">
                <el-table-column width="200" prop="bol" label="提单号" align="center">
                </el-table-column>
                <el-table-column prop="mail" label="收件人邮箱" align="center">
                <el-table-column width="200" prop="mail" label="收件人邮箱" align="center">
                </el-table-column>
                <el-table-column prop="address" label="收件人地址" align="center">
                <el-table-column width="250" prop="address" label="收件人地址" align="center">
                </el-table-column>
                <el-table-column prop="estimatedArrival" label="预计到达时间" align="center">
                <el-table-column width="200" prop="estimatedArrival" label="预计到达时间" align="center">
                </el-table-column>
                <el-table-column prop="deliverySchedule" label="预计送柜日期" align="center">
                <el-table-column width="200" prop="deliverySchedule" label="预计送柜日期" align="center">
                </el-table-column>
                <el-table-column prop="realSchedule" label="实际送货日期" align="center">
                <el-table-column width="200" prop="realSchedule" label="实际送货日期" align="center">
                </el-table-column>
                <el-table-column prop="DO" label="DO文件是否上传" align="center">
                <el-table-column width="150" prop="DO" label="DO文件是否上传" align="center">
                    <template slot-scope="scope">
                        <div>{{ scope.row.DO ? '是' : '否' }}</div>
                    </template>
                </el-table-column>
                <el-table-column prop="status" label="订单状态" align="center">
                <el-table-column width="150" prop="status" label="订单状态" align="center">
                    <template slot-scope="scope">
                        <div v-if="scope.row.status == '收货⼈已确认' || scope.row.status == '待卡⻋确认' || scope.row.status == '待收货⼈确认'">预约中</div>
                        <div v-else-if="scope.row.status == '卡⻋和收货⼈均确认'">预约完成</div>
                        <div v-else>{{ scope.row.status }}</div>
                    </template>
                </el-table-column>
                <el-table-column prop="option" label="操作" align="center">
                <el-table-column width="150" prop="option" label="操作" align="center" fixed="right">
                    <template slot-scope="scope">
                        <el-button type="text" class="table-btn"
                            @click="handleClick(scope.row, 'detail')">查看详情</el-button><span class="line-set">|</span>
src/view/addOrder.vue
@@ -406,6 +406,7 @@
                  <div class="tip">
                    <img class="tip-img" src="@/assets/addOrder/img1@2x.png" alt="" />
                    <span>联系电话和邮箱至少填写其中一项</span>
                    <span></span>
                  </div>
                </div>
                <div class="tip_box label5">
@@ -421,9 +422,11 @@
                      <el-input :disabled="type == 'detail'" v-model="form.email" placeholder="请输入"></el-input>
                    </div>
                  </el-form-item>
                  <div class="tip">
                  <div class="tip flex">
                    <img class="tip-img" src="@/assets/addOrder/img1@2x.png" alt="" />
                    <span>联系电话和邮箱至少填写其中一项</span>
                    <div>联系电话和邮箱至少填写其中一项
                      <div>多个邮箱请填写到“其他联系⽅式”</div>
                    </div>
                  </div>
                </div>
              </div>
@@ -463,7 +466,130 @@
        </el-card>
        <el-card class="box-card mt-13">
          <div slot="header" class="clearfix">
            <span class="clearfix_text">货柜动态</span>
          </div>
          <div class="box-cardes">
            <div class="flex">
              <el-form-item label="" class="label1" prop="clientOrder" label-width="0">
                <div class="flex">
                  <div class="box9" style="width: 200px">
                    <div class="flex">
                      <!-- <div class="red">*</div> -->
                      <div class="box_text1">车架号:</div>
                    </div>
                    <div class="box_text2">Frame number</div>
                  </div>
                  <el-input :disabled="type == 'detail'" v-model="form.clientOrder" placeholder="请输入"></el-input>
                </div>
              </el-form-item>
              <el-form-item label="" class="label2" prop="product" label-width="0px">
                <div class="flex">
                  <div class="box1">
                    <div class="flex">
                      <div class="red">*</div>
                      <div class="box_text1">最晚免费日期:</div>
                    </div>
                    <div class="box_text2">LFD</div>
                  </div>
                  <el-input :disabled="type == 'detail'" v-model="form.product" placeholder="请输入"></el-input>
                </div>
              </el-form-item>
              <el-form-item label="" class="label3" prop="QTY" label-width="0px">
                <div class="flex">
                  <div class="box3">
                    <div class="flex">
                      <div class="red">*</div>
                      <div class="box_text1">提柜日期:</div>
                    </div>
                    <div class="box_text2">Pickup Date</div>
                  </div>
                  <el-input :disabled="type == 'detail'" v-model="form.QTY" placeholder="请输入"></el-input>
                </div>
              </el-form-item>
              <el-form-item label="" class="label4" prop="QTYUnit" label-width="0">
                <div class="flex">
                  <div class="box2">
                    <div class="flex">
                      <div class="red">*</div>
                      <div class="box_text1">计划送柜日期:</div>
                    </div>
                    <div class="box_text2">Delivery Schedule</div>
                  </div>
                  <el-select :disabled="type == 'detail'" v-model="form.QTYUnit" clearable placeholder="请选择">
                    <el-option :label="item.label" :value="item.value" v-for="item in optionsUs"
                      :key="item.value"></el-option>
                  </el-select>
                </div>
              </el-form-item>
            </div>
            <div class="flex">
              <el-form-item label="" class="label6" prop="weight" label-width="0px">
                <div class="flex">
                  <div class="box9" style="width: 200px">
                    <div class="flex">
                      <div class="red">*</div>
                      <div class="box_text1">实际送货日期:</div>
                    </div>
                    <div class="box_text2"></div>
                  </div>
                  <el-input type="number" :disabled="type == 'detail'" v-model="form.weight" @input="onInput"
                    placeholder="请输入">
                    <div style="line-height: 50px;" slot="prefix-icon">KG</div>
                  </el-input>
                </div>
              </el-form-item>
              <el-form-item label="" class="label2" prop="poundWeight" label-width="0px">
                <div class="flex">
                  <div class="box1">
                    <div class="flex">
                      <!-- <div class="red">*</div> -->
                      <div class="box_text1">送柜日期:</div>
                    </div>
                    <div class="box_text2">Delivery Date</div>
                  </div>
                  <el-input disabled v-model="form.poundWeight" placeholder="请输入">
                    <div style="line-height: 50px;" slot="suffix">LBS</div>
                  </el-input>
                </div>
              </el-form-item>
              <el-form-item label="" class="label3" prop="volume" label-width="0px">
                <div class="flex">
                  <div class="box3">
                    <div class="flex">
                      <div class="red">*</div>
                      <div class="box_text1">报空日期:</div>
                    </div>
                    <div class="box_text2">Empty Report Date</div>
                  </div>
                  <el-input type="number" :disabled="type == 'detail'" v-model="form.volume" placeholder="请输入">
                    <div style="line-height: 50px;" slot="suffix">CMB</div>
                  </el-input>
                </div>
              </el-form-item>
              <el-form-item label="" class="label4" prop="QTYUnit" label-width="0">
                <div class="flex">
                  <div class="box2">
                    <div class="flex">
                      <div class="red">*</div>
                      <div class="box_text1">还空日期:</div>
                    </div>
                    <div class="box_text2">Empty Return Date</div>
                  </div>
                  <el-select :disabled="type == 'detail'" v-model="form.QTYUnit" clearable placeholder="请选择">
                    <el-option :label="item.label" :value="item.value" v-for="item in optionsUs"
                      :key="item.value"></el-option>
                  </el-select>
                </div>
              </el-form-item>
            </div>
          </div>
        </el-card>
        <el-card class="box-card mt-13">
          <div slot="header" class="clearfix">
            <span class="clearfix_text">附件</span>
@@ -650,14 +776,64 @@
          label: "ONE",
        },
        {
          value: "CMA",
          label: "CMA",
          value: "CMA CGM",
          label: "CMA CGM",
        },
        {
          value: "CGM",
          label: "CGM",
          value: "EVERGREEN",
          label: "EVERGREEN",
        },
        {
          value: "ZIM",
          label: "ZIM",
        },
        {
          value: "YANG MING",
          label: "YANG MING",
        },
        {
          value: "WANHAI LINE",
          label: "WANHAI LINE",
        },
        {
          value: "MAERSK",
          label: "MAERSK",
        },
        {
          value: "MSC",
          label: "MSC",
        },
        {
          value: "HMM",
          label: "HMM",
        },
        {
          value: "HPL",
          label: "HPL",
        },
        {
          value: "HDW",
          label: "HDW",
        },
        {
          value: "T.S.LINE",
          label: "T.S.LINE",
        },
        {
          value: "SEA LEAD",
          label: "SEA LEAD",
        },
        {
          value: "SM LINE",
          label: "SM LINE",
        },
        {
          value: "OTHERS",
          label: "OTHERS",
        }
      ],
      //COSCO、OOCL、ONE、CMA CGM、EVERGREEN(EMC)、ZIM、YANG MING(YML)、WANHAI LINE(WHL)、MAERSK(MSK)、MSC、HMM、HPL、HDW、T.S.LINE、SEA LEAD、SM LINE、OTHERS
      optionsCpa: [
        {
          value: "COSCO",
@@ -672,13 +848,61 @@
          label: "ONE",
        },
        {
          value: "CMA",
          label: "CMA",
          value: "CMA CGM",
          label: "CMA CGM",
        },
        {
          value: "CGM",
          label: "CGM",
          value: "EVERGREEN",
          label: "EVERGREEN",
        },
        {
          value: "ZIM",
          label: "ZIM",
        },
        {
          value: "YANG MING",
          label: "YANG MING",
        },
        {
          value: "WANHAI LINE",
          label: "WANHAI LINE",
        },
        {
          value: "MAERSK",
          label: "MAERSK",
        },
        {
          value: "MSC",
          label: "MSC",
        },
        {
          value: "HMM",
          label: "HMM",
        },
        {
          value: "HPL",
          label: "HPL",
        },
        {
          value: "HDW",
          label: "HDW",
        },
        {
          value: "T.S.LINE",
          label: "T.S.LINE",
        },
        {
          value: "SEA LEAD",
          label: "SEA LEAD",
        },
        {
          value: "SM LINE",
          label: "SM LINE",
        },
        {
          value: "OTHERS",
          label: "OTHERS",
        }
      ],
      optionsUs: [
        {
@@ -700,7 +924,7 @@
      ],
      optionsPL: [],
      rules: {
        email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
        // email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
        container: [{ required: true, message: "请输入", trigger: "blur" }],
        bol: [{ required: true, message: "请输入", trigger: "blur" }],
        cargoType: [{ required: true, message: "请选择", trigger: "blur" }],
@@ -770,11 +994,17 @@
    }).then(resp => {
      console.log(resp, '----');
      if (resp.data.length > 0) {
        this.optionsPL = resp.data[0].ports.map(item => {
        this.optionsPL = resp.data[0].ports
          .map(item => {
          item.value = item.port
          item.label = item.port
          return item
        })
          .sort((a, b) => {
            if (a.value < b.value) return -1
            if (a.value > b.value) return 1
            return 0
          })
      }