fix
pyt
2025-03-07 d8e5feabd889df40bfca39ea08cc548ec65f2063
fix
3个文件已修改
76 ■■■■ 已修改文件
src/utils/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/Home.vue 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/Login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.js
@@ -63,7 +63,7 @@
      
      if (res.data.data && res.data.data.result && res.data.data.result == -1) {
        Message({
          message: res.data.data.msg || '服务器错误',
          message: res.data.data.msg || '服务器错误 | Server Error',
          type: 'error',
          duration: 2000
        })
src/view/Home.vue
@@ -223,10 +223,26 @@
                        </div>
                    </template>
                    <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>
                        <div
                            v-if="scope.row.status == '收货⼈已确认' || scope.row.status == '待卡车确认' || scope.row.status == '待收货⼈确认'">
                            <div>预约中</div>
                            <div>Booking</div>
                        </div>
                        <div v-else-if="scope.row.status == '卡车和收货⼈均确认'">
                            <div>预约完成</div>
                            <div>Appt Confirmed</div>
                        </div>
                        <div v-else>
                            <div>{{ scope.row.status }}</div>
                            <div>{{ fanyiObj[scope.row.status] }}</div>
                        </div>
                    </template>
                </el-table-column>
                <el-table-column width="200" prop="hold" align="center">
                    <template #header>
                        <div class="custom-header">
                            <div>Hold</div>
                        </div>
                    </template>
                </el-table-column>
                <el-table-column width="150" prop="option" align="center" fixed="right">
@@ -237,13 +253,13 @@
                        </div>
                    </template>
                    <template slot-scope="scope">
                        <el-button type="text" class="table-btn" @click="handleClick(scope.row, 'detail')">查看详情</el-button>
                        <el-button type="text" class="table-btn"
                            @click="handleClick(scope.row, 'detail')">查看详情</el-button>
                        <span class="line-set">|</span>
                        <el-button type="text" class="table-btn" @click="handleClick(scope.row, 'edit')">编辑</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <!-- <div class="text-right pagination-card">
                <el-pagination background :page-size="pagination.pageSize" layout="slot,prev,pager,next"
                    :current-page="pagination.pageNum" @current-change="handleCurrentChange"
@@ -281,65 +297,81 @@
                status: '',
                extra: JSON.parse(localStorage.getItem('userInfo')).extra
            },
            fanyiObj: {
                '待到港': 'Pending Arrival',
                '已到港': 'Arrived at Port',
                '可提柜': 'Ready for Pickup',
                '预约中': 'Booking In Progress',
                '预约完成': 'Appt Confirmed',
                '送柜中': 'On the Way',
                '送柜完成': 'Delivered',
                '返空': 'Empty Return',
                '订单完成': 'Order Completed',
                '已取消': 'Cancelled',
                '预约中': 'Booking',
                '预约完成': 'Appt Confirmed'
            },
            options: [
                {
                    id: '待到港',
                    label: '待到港'
                    label: '待到港 | Pending Arrival',
                },
                {
                    id: '已到港',
                    label: '已到港'
                    label: '已到港 | Arrived at Port',
                },
                {
                    id: '可提柜',
                    label: '可提柜'
                    label: '可提柜 | Ready for Pickup'
                },
                {
                    id: '预约中',
                    label: '预约中'
                    label: '预约中 | Booking In Progress'
                },
                {
                    id: '预约完成',
                    label: '预约完成'
                    label: '预约完成 | Appt Confirmed'
                },
                {
                    id: '送柜中',
                    label: '送柜中'
                    label: '送柜中 | On the Way'
                },
                {
                    id: '送柜完成',
                    label: '送柜完成'
                    label: '送柜完成 | Delivered'
                },
                {
                    id: '返空',
                    label: '返空'
                    label: '返空 | Empty Return'
                },
                {
                    id: '订单完成',
                    label: '订单完成'
                    label: '订单完成 | Order Completed'
                },
                {
                    id: '已取消',
                    label: '已取消'
                    label: '已取消 | Cancelled'
                },
                {
                    id: '预约中',
                    label: '预约中'
                    label: '预约中 | Booking'
                },
                {
                    id: '预约完成',
                    label: '预约完成'
                    label: '预约完成 | Appt Confirmed'
                }
            ],
            tableData: [],
            option1: [
                {
                    id: 1,
                    label: '是'
                    label: '是 (Y)',
                    value: '是'
                },
                {
                    id: 2,
                    label: '否'
                    label: '否 (N)',
                    value: '否'
                }
            ],
            // pagination: {
src/view/Login.vue
@@ -81,7 +81,7 @@
            }
            if (!this.codeStr.match(new RegExp(this.code, "i"))) {
                this.$message({
                    message: '验证码错误',
                    message: '验证码错误 | Captcha Error',
                    type: 'warning'
                });
                this.codeStr = generateVerificationCode()