fix

pyt

2025-04-08 45c801d66ddf475edf56709d8a50f25cf776a4ba

fix

 src/utils/request.js

@@ -38,14 +38,6 @@
        ...config.params,

      }

    }

    if (config.method == 'post') {

      if (!config.data) config.data = {};

      config.data = {

        ...config.data,

      }

      // console.log(config.data);

      
    }

    return config

  },

  error => {


 src/view/Home.vue

@@ -113,8 +113,9 @@
        </div>
        <div class="table-box">
            <div class="flex a-center p-3">
                <el-button type="primary" class="search" @click="exportExcel">导出 | Export</el-button>
                <el-button type="primary" class="search" @click="exportExcel(false)">导出 | Export</el-button>
                <el-button type="primary" class="search" @click="importExcel">导入 | Import</el-button>
                <a type="primary" class="Download" @click="exportExcel([])">下载模板 | Download Template</a>
            </div>
            <el-table :data="tableData" style="width: 100%" border>
                <el-table-column width="200" prop="orderId" align="center">
@@ -447,11 +448,44 @@
            }
            this.getLists()
        },
        Download() {

        },
        // 导出Excel
        exportExcel() {
            exportList({ userExtra: localStorage.getItem('extra') }).then(res => {
                // 准备导出数据
                const exportData = res.data.map(item => ({
        async exportExcel(arr) {
            let exportData = [{
                '集装箱号 | Container No.': null,
                '提单号 | BOL No.': null,
                '柜型 | Container Type': null,
                '船司 | Carrier': null,
                '船名航次 | Vessel Name and Voyage': null,
                '提柜地 | Pickup Location': null,
                '预计到港 | ETA': null,
                'SOC': null,
                'DG': null,
                '是否超重 | Overweight': null,
                '是否查验 | Exam/Inspection': null,
                'DROP/LIVE': null,
                'Hold': null,
                '客户单号 | Customer Ref. No.': null,
                '品名 | Commodity': null,
                '数量 | QTY': null,
                '包装种类 | Packages': null,
                '毛重 | Gr. Wt': null,
                '毛重(磅) | Weight (LBs)': null,
                '体积 | Volume': null,
                '收件人 | Consignee': null,
                '收件人公司 | Company Name': null,
                '邮编 | Postal Code': null,
                '地址 | Address': null,
                '联系电话 | Tel': null,
                '邮箱 | Email': null,
                '其他联系方式 | Other Contact Information': null,
                '备注 | Remarks': null
            }];
            if (!arr) {
                let res = await exportList({ userExtra: localStorage.getItem('extra') })
                exportData = res.data.map(item => ({
                    '集装箱号 | Container No.': item.ContainerNo,
                    '提单号 | BOL No.': item.BolNo,
                    '柜型 | Container Type': item.containerType,
@@ -481,6 +515,8 @@
                    '其他联系方式 | Other Contact Information': item.otherContactInformation,
                    '备注 | Remarks': item.remarks
                }));
            }
            // 准备导出数据

                // 创建工作簿
                const wb = XLSX.utils.book_new();
@@ -524,7 +560,6 @@

                // 导出文件
                XLSX.writeFile(wb, `订单列表_${new Date().toLocaleDateString()}.xlsx`);
            })
        },

        // 导入Excel
@@ -556,10 +591,34 @@
                        const headers = jsonData[0];
                        // 验证模板格式
                        const requiredFields = [
                            '客户单号', '集装箱号', '柜型Type', '提单号', 'SOC', 'DG', 'DG级别',
                            'drop/live', 'hold', '是否查验', '是否超重', '品名', '数量', '包装种类',
                            '毛重', '体积', '船司', '船名航次', 'ETA ', '提柜地',
                            '收件人', '收件人公司', '地址', '邮编', '联系电话', '邮箱', '其他联系方式', '备注'
                            '集装箱号 | Container No.',
                            '提单号 | BOL No.',
                            '柜型 | Container Type',
                            '船司 | Carrier',
                            '船名航次 | Vessel Name and Voyage',
                            '提柜地 | Pickup Location',
                            '预计到港 | ETA',
                            'SOC',
                            'DG',
                            '是否超重 | Overweight',
                            '是否查验 | Exam/Inspection',
                            'DROP/LIVE',
                            'Hold',
                            '客户单号 | Customer Ref. No.',
                            '品名 | Commodity',
                            '数量 | QTY',
                            '包装种类 | Packages',
                            '毛重 | Gr. Wt',
                            '毛重(磅) | Weight (LBs)',
                            '体积 | Volume',
                            '收件人 | Consignee',
                            '收件人公司 | Company Name',
                            '邮编 | Postal Code',
                            '地址 | Address',
                            '联系电话 | Tel',
                            '邮箱 | Email',
                            '其他联系方式 | Other Contact Information',
                            '备注 | Remarks'
                        ];

                        // 检查表头是否匹配
@@ -578,43 +637,39 @@

                            return {
                                userExtra: JSON.parse(localStorage.getItem('userInfo')).extra,
                                ContainerNo: item['集装箱号'],
                                BolNo: item['提单号'],
                                containerType: item['柜型Type'],
                                carrier: item['船司'],
                                vesselNameAndVoyage: item['船名航次'],
                                pickupLocation: item['提柜地'],
                                eta: item['ETA '],
                                ContainerNo: item['集装箱号 | Container No.'],
                                BolNo: item['提单号 | BOL No.'],
                                containerType: item['柜型 | Container Type'],
                                carrier: item['船司 | Carrier'],
                                vesselNameAndVoyage: item['船名航次 | Vessel Name and Voyage'],
                                pickupLocation: item['提柜地 | Pickup Location'],
                                eta: item['预计到港 | ETA'],
                                soc: item['SOC'],
                                dg: item['DG'],
                                overweight: item['是否超重'],
                                exam: item['是否查验'],
                                dropOrLive: item['drop/live'],
                                hold: item['hold'],
                                customerRefNo: item['客户单号'],
                                commodity: item['品名'],
                                qty: item['数量'],
                                packages: item['包装种类'],
                                GrWt: item['毛重'],
                                weightLBS: item['毛重_1'],
                                volume: item['体积'],
                                consignee: item['收件人'],
                                companyName: item['收件人公司'],
                                postalCode: item['邮编'],
                                address: item['地址'],
                                tel: item['联系电话'],
                                email: item['邮箱'],
                                otherContactInformation: item['其他联系方式'],
                                remarks: item['备注']
                                overweight: item['是否超重 | Overweight'],
                                exam: item['是否查验 | Exam/Inspection'],
                                dropOrLive: item['DROP/LIVE'],
                                hold: item['Hold'],
                                customerRefNo: item['客户单号 | Customer Ref. No.'],
                                commodity: item['品名 | Commodity'],
                                qty: item['数量 | QTY'],
                                packages: item['包装种类 | Packages'],
                                GrWt: item['毛重 | Gr. Wt'],
                                weightLBS: item['毛重(磅) | Weight (LBs)'],
                                volume: item['体积 | Volume'],
                                consignee: item['收件人 | Consignee'],
                                companyName: item['收件人公司 | Company Name'],
                                postalCode: item['邮编 | Postal Code'],
                                address: item['地址 | Address'],
                                tel: item['联系电话 | Tel'],
                                email: item['邮箱 | Email'],
                                otherContactInformation: item['其他联系方式 | Other Contact Information'],
                                remarks: item['备注 | Remarks']
                            };
                        });

                        // 去掉第一项
                        const finalData = [...headers, ...transformedData.map(Object.values)];
                        console.log('转换后的数据：', finalData);

                        // 使用post方法直接传递数组
                        iptOrder(finalData).then(res => {
                        iptOrder(transformedData).then(res => {
                            if (res) {
                                this.$message({
                                    message: '导入成功',
@@ -650,8 +705,16 @@
}
</style>
<style scoped lang="less">
.Download {
    text-decoration: underline;
    color: #014099;
    margin-left: 20px;
    font-weight: bold;
    cursor: pointer;
}

.search {
    width: 190px;
    // width: 190px;
    height: 50px;
    background: #014099;
    border-radius: 4px;

 src/view/addOrder.vue

@@ -18,10 +18,11 @@
          </div>



          <div v-if="activeTab == 1">

            <div class="flex wrap">

              <div class="grid-content bg-purple">

                <el-form-item label="" prop="container" label-width="0">

            <div class="flex">

              <el-form-item label="" class="label1" prop="container" label-width="0">

                <div class="flex">

                  <div class="box">

                    <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">集装箱号：</div>

@@ -31,10 +32,11 @@
                  <el-input :disabled="type != 'add'" v-model="form.container" placeholder="请输入"></el-input>

                </div>

              </el-form-item>



              <el-form-item label="" class="label2" prop="bol" label-width="0px">

              </div>

              <div class="grid-content bg-purple">

                <el-form-item label="" prop="bol" label-width="0px">

                <div class="flex">

                  <div class="box1">

                    <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">提单号：</div>

@@ -44,10 +46,11 @@
                  <el-input :disabled="type != 'add'" v-model="form.bol" placeholder="请输入"></el-input>

                </div>

              </el-form-item>



              <el-form-item label="" class="label3" prop="cargoType" label-width="0px">

              </div>

              <div class="grid-content bg-purple">

                <el-form-item label="" class="" prop="cargoType" label-width="0px">

                <div class="flex">

                  <div class="box3">

                    <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">货柜类型：</div>

@@ -62,10 +65,12 @@
                </div>

              </el-form-item>

            </div>

            </div>

            <div class="flex wrap">

              <div class="grid-content bg-purple"><el-form-item label="" class="label1" prop="carrier"

                  label-width="0px">

            <div class="flex">

              <el-form-item label="" class="label1" prop="carrier" label-width="0px">

                <div class="flex">

                  <div class="box">

                    <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">船司：</div>

@@ -77,11 +82,11 @@
                      :key="item.value"></el-option>

                  </el-select>

                </div>

              </el-form-item>



              <el-form-item label="" class="label2" prop="vesselAndVoyage" label-width="0px">

                </el-form-item></div>

              <div class="grid-content bg-purple"> <el-form-item label="" class="label2" prop="vesselAndVoyage"

                  label-width="0px">

                <div class="flex">

                  <div class="box1">

                    <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">航名航次：</div>

@@ -90,10 +95,11 @@
                  </div>

                  <el-input :disabled="type != 'add'" v-model="form.vesselAndVoyage" placeholder="请输入"></el-input>

                </div>

              </el-form-item>

              <el-form-item label="" class="label3" prop="pickupLocation" label-width="0px">

                </el-form-item></div>

              <div class="grid-content bg-purple"> <el-form-item label="" class="label3" prop="pickupLocation"

                  label-width="0px">

                <div class="flex">

                  <div class="box3">

                    <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">提柜地：</div>

@@ -105,10 +111,10 @@
                      :key="item.value"></el-option>

                  </el-select>

                </div>

              </el-form-item>

              <el-form-item label="" class="label4" prop="ETA" label-width="0">

                </el-form-item></div>

              <div class="grid-content bg-purple"> <el-form-item label="" class="label4" prop="ETA" label-width="0">

                <div class="flex">

                  <div class="box2">

                    <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">预计到达日期：</div>

@@ -120,12 +126,14 @@
                    <div></div>

                  </el-date-picker>

                </div>

              </el-form-item>

                </el-form-item></div>

            </div>

            <div class="flex">





            <div class="flex wrap">

              <el-form-item label="" class="label1" prop="SOC" label-width="0">

                <div class="flex" style="align-items: center">

                  <div class="box4">

                  <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">SOC：</div>

@@ -139,7 +147,7 @@
              </el-form-item>

              <el-form-item label="" class="label7" prop="DG" label-width="0">

                <div class="flex" style="align-items: center">

                  <div class="box5">

                  <div class="shrink0 label">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">DG：</div>

@@ -154,7 +162,7 @@
              </el-form-item>

              <el-form-item label="" class="label8" prop="overweight" label-width="0">

                <div class="flex" style="align-items: center">

                  <div class="box6">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">是否超重：</div>

@@ -170,7 +178,7 @@
              </el-form-item>

              <el-form-item label="" class="label4" prop="customsInspection" label-width="0">

                <div class="flex" style="align-items: center">

                  <div class="box7">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">是否查验：</div>

@@ -184,11 +192,9 @@
                  </el-radio-group>

                </div>

              </el-form-item>

            </div>

            <div class="flex">

              <el-form-item label="" class="" prop="dropOrLive" label-width="0">

                <div class="flex" style="align-items: center">

                  <div class="box8">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">DROP/LIVE：</div>

                    </div>

@@ -202,7 +208,7 @@
              </el-form-item>

              <el-form-item label="" class="" prop="dropOrLive" label-width="0">

                <div class="flex" style="align-items: center">

                  <div class="box8" style="width: 206px;">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">Hold：</div>

                    </div>

@@ -220,7 +226,6 @@
            <DetailInfoTop :info="detailInfo" />

          </div>

        </div>



        <div class="bg" v-if="activeTab == 1">

          <span>如果是OT/FR等特种柜型，请提供具体包装明细</span>

          <span>Please send detailed packing list for OT, FR or other special containers</span>

@@ -233,10 +238,10 @@
            <span class="clearfix_text">货柜信息 ｜ Container Det</span>

          </div>

          <div class="box-cardes">

            <div class="flex">

            <div class="flex wrap">

              <el-form-item label="" class="label1" prop="clientOrder" label-width="0">

                <div class="flex">

                  <div class="box9">

                  <div class="label shrink0">

                    <div class="flex">

                      <!-- <div class="red">*</div> -->

                      <div class="box_text1">客户单号：</div>

@@ -249,7 +254,7 @@


              <el-form-item label="" class="label2" prop="product" label-width="0px">

                <div class="flex">

                  <div class="box1">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">品名：</div>

@@ -262,7 +267,7 @@


              <el-form-item label="" class="label3" prop="QTY" label-width="0px">

                <div class="flex">

                  <div class="box3">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">包装数量：</div>

@@ -276,7 +281,7 @@
              </el-form-item>

              <el-form-item label="" class="label4" prop="QTYUnit" label-width="0">

                <div class="flex">

                  <div class="box2">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">单位选择：</div>

@@ -289,11 +294,9 @@
                  </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">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">重量：</div>

@@ -306,10 +309,9 @@
                  </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="label shrink0">

                    <div class="flex">

                      <!-- <div class="red">*</div> -->

                      <div class="box_text1">≈重量(磅)：</div>

@@ -323,7 +325,7 @@
              </el-form-item>

              <el-form-item label="" class="label3" prop="volume" label-width="0px">

                <div class="flex">

                  <div class="box3">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="red">*</div>

                      <div class="box_text1">体积：</div>

@@ -349,10 +351,10 @@
          </div>

          <div class="">

            <div class="box-cards">

              <div class="flex">

              <div class="flex wrap">

                <el-form-item label="" class="label1" prop="contact" label-width="0">

                  <div class="flex">

                    <div class="box">

                    <div class="label shrink0">

                      <div class="flex">

                        <!-- <div class="red">*</div> -->

                        <div class="box_text1">收件人：</div>

@@ -365,7 +367,7 @@


                <el-form-item label="" class="label2" prop="consigneeCompany" label-width="0px">

                  <div class="flex">

                    <div class="box1">

                    <div class="label shrink0">

                      <div class="flex">

                        <div class="red">*</div>

                        <div class="box_text1">收件人公司：</div>

@@ -378,7 +380,7 @@


                <el-form-item label="" class="label3" prop="post" label-width="0px">

                  <div class="flex">

                    <div class="box3">

                    <div class="label shrink0">

                      <div class="flex">

                        <div class="red">*</div>

                        <div class="box_text1">目的地邮编：</div>

@@ -392,7 +394,7 @@
                </el-form-item>

                <el-form-item label="" class="label4" prop="address" label-width="0">

                  <div class="flex">

                    <div class="box2">

                    <div class="label shrink0">

                      <div class="flex">

                        <div class="red">*</div>

                        <div class="box_text1">地址：</div>

@@ -402,13 +404,10 @@
                    <el-input :disabled="type != 'add'" v-model="form.address" placeholder="请输入"></el-input>

                  </div>

                </el-form-item>

              </div>

              <div class="flex">

                <div class="tip_box label5">



                  <el-form-item label="" class="" prop="tel" label-width="0px">

                    <div class="flex">

                      <div class="box">

                      <div class="label shrink0">

                        <div class="flex">

                          <!-- <div class="red">*</div> -->

                          <div class="box_text1">联系电话：</div>

@@ -428,7 +427,7 @@
                <div class="tip_box label5">

                  <el-form-item label="" class="" prop="email" label-width="0px">

                    <div class="flex">

                      <div class="box1">

                      <div class="label shrink0">

                        <div class="flex">

                          <!-- <div class="red">*</div> -->

                          <div class="box_text1">邮箱：</div>

@@ -446,6 +445,9 @@
                  </div>

                </div>

              </div>

              <div class="flex">



              </div>



            </div>



@@ -458,8 +460,8 @@
                </div>

                <div class="box_text3">Other Contact Information</div>

              </div>

              <quill-editor :disabled="type != 'add'" class="editor" v-model="form.specialRequest"

                ref="myQuillEditor" :options="editorOption" @blur="onEditorBlur($event)" @focus="onEditorFocus($event)"

              <quill-editor :disabled="type != 'add'" class="editor" v-model="form.specialRequest" ref="myQuillEditor"

                :options="editorOption" @blur="onEditorBlur($event)" @focus="onEditorFocus($event)"

                @change="onEditorChange($event)">

              </quill-editor>

            </div>

@@ -496,12 +498,10 @@
            <span class="clearfix_text">货柜动态 ｜ Container Status</span>

          </div>

          <div class="box-cardes">

            <div class="flex">

              


            <div class="flex wrap">

              <el-form-item label="" class="label2" label-width="0px">

                <div class="flex">

                  <div class="box1">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">最晚免费日期：</div>

                    </div>

@@ -513,7 +513,7 @@


              <el-form-item label="" class="label3" label-width="0px">

                <div class="flex">

                  <div class="box3">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">提柜日期：</div>

                    </div>

@@ -524,7 +524,7 @@
              </el-form-item>

              <el-form-item label="" class="label4" label-width="0">

                <div class="flex">

                  <div class="box2">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">计划送柜日期：</div>

                    </div>

@@ -535,10 +535,10 @@
                </div>

              </el-form-item>

            </div>

            <div class="flex">

            <div class="flex wrap">

              <el-form-item label="" class="label6" label-width="0px">

                <div class="flex">

                  <div class="box9" style="width: 200px">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">实际送货日期：</div>

                    </div>

@@ -550,7 +550,7 @@
              </el-form-item>

              <el-form-item label="" class="label3" label-width="0px">

                <div class="flex">

                  <div class="box3">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">报空日期：</div>

                    </div>

@@ -561,7 +561,7 @@
              </el-form-item>

              <el-form-item label="" class="label4" label-width="0">

                <div class="flex">

                  <div class="box2">

                  <div class="label shrink0">

                    <div class="flex">

                      <div class="box_text1">还空日期：</div>

                    </div>

@@ -572,7 +572,7 @@
              </el-form-item>

              <el-form-item label="" class="label1" label-width="0">

                <div class="flex">

                  <div class="box9" style="width: 200px">

                  <div class="label shrink0">

                    <div class="flex">

                      <!-- <div class="red">*</div> -->

                      <!-- <div class="box_text1">车架号：</div> -->

@@ -958,6 +958,10 @@
      }).then(resp => {

        this.form = resp.data

        this.detailInfo = resp.data

        if (resp.data.poundWeight) {

          resp.data.poundWeight = resp.data.poundWeight.toFixed(2) * 1

        }

        
        if (resp.data.DOFileUrls) {

          resp.data.DOFileUrls.map(item => {

            this.fileList1.push({ url: item.url, name: item.url.split('ownload/')[1] })

@@ -1007,7 +1011,6 @@
    },

    onInput(e) {

      this.form.poundWeight = Number(e * 2.2).toFixed(2)



    },

    submit(e) {

      console.log(e, 'e');

@@ -1355,6 +1358,27 @@
  font-style: normal;

}



.wrap {

  flex-wrap: wrap;

}



.label {

  width: 195px;

  text-align: right;



  .flex {

    justify-content: end;

  }



  .el-form-item__error {

    left: 200px;

  }

}



::v-deep .el-form-item__error {

  left: 200px;

}



.ml-56 {

  margin-left: 56px;

}

@@ -1424,6 +1448,7 @@


::v-deep .el-form-item__content {

  margin: 0 !important;

  line-height: unset;

}



::v-deep .el-card {

@@ -1626,53 +1651,42 @@
  flex-shrink: 0;

}



.label1 {

  ::v-deep .el-form-item__error {

    left: 90px !important;

  }

}

// .label6 {

//   ::v-deep .el-form-item__error {

//     left: 110px !important;

//   }

// }



.label6 {

  ::v-deep .el-form-item__error {

    left: 110px !important;

  }

}

// .label7 {

//   ::v-deep .el-form-item__error {

//     left: 205px !important;

//   }

// }



.label7 {

  ::v-deep .el-form-item__error {

    left: 205px !important;

  }

}

// .label8 {

//   ::v-deep .el-form-item__error {

//     left: 188px !important;

//   }

// }



.label8 {

  ::v-deep .el-form-item__error {

    left: 188px !important;

  }

}



.label2 {

  ::v-deep .el-form-item__error {

    left: 214px !important;

  }

}

// .label3 {

//   ::v-deep .el-form-item__error {

//     left: 213px !important;

//   }

// }



.label3 {

  ::v-deep .el-form-item__error {

    left: 213px !important;

  }

}

// .label4 {

//   ::v-deep .el-form-item__error {

//     left: 247px !important;

//   }

// }



.label4 {

  ::v-deep .el-form-item__error {

    left: 247px !important;

  }

}



.label5 {

  ::v-deep .el-form-item {

    margin-bottom: 11px !important;

  }

}

// .label5 {

//   ::v-deep .el-form-item {

//     margin-bottom: 11px !important;

//   }

// }



.mt-43 {

  margin-top: 43px;