From 1ebc598658f85c07c7cbabaf289ab89838a8acc9 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 08:54:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 8b8aa91..166dc7d 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -207,7 +207,7 @@
<el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
<el-table-column prop="list" :label="$t('List Number')"></el-table-column>
<el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="230" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -222,7 +222,7 @@
<el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
<el-table-column prop="list" :label="$t('List Number')"></el-table-column>
<el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="230" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -311,10 +311,10 @@
<el-form-item :label="$t('order')">
<el-input v-model="form.orderId" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
+ <el-form-item :label="$t('length(inch)')">
<el-input v-model="form.height" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
+ <el-form-item :label="$t('width(inch)')">
<el-input v-model="form.width" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Barcodid')">
@@ -470,7 +470,7 @@
<el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
<el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>
<el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="170" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
--
Gitblit v1.8.0