分切上料语言

locale/en.json

@@ -5,9 +5,13 @@
 	"utils.read-more": "Read more",
 	"utils.no-more": "No more",
 	"button.confirm": "OK",
+	"button.cancel": "Cancel",
 	"button.search": "Query",
 	"button.confirm-receipt": "Confirm receipt",
 	"button.confirm-outbound": "Confirm outbound",
+	"button.empty-shaft-return": "Empty shaft return",
+	"button.manual-call": "Manual call",
+	"button.call": "Call",
 	"login.username": "User name",
 	"login.password": "Password",
 	"login.remember": "Remember username",
@@ -69,8 +73,12 @@
 	"filter.point": "Point",
 	"filter.mother-roll": "Mother roll",
 	"filter.state": "State",
+	"filter.starting-point": "Starting point",
+	"filter.finishing-point": "Finishing point",
+	"grid.number": "No.",
 	"grid.work-order-number": "Work order number",
 	"grid.mother-roll-number": "Mother roll number",
+	"grid.sub-roll-number": "Sub roll number",
 	"grid.start-time": "Start time",
 	"grid.end-time": "End time",
 	"grid.machine-code": "Machine code",
@@ -84,5 +92,16 @@
 	"grid.product-description": "Product description",
 	"grid.in-oven-time": "In oven time",
 	"grid.out-oven-time": "Out oven time",
-	"grid.is-it-baked": "Is it baked"
+	"grid.is-it-baked": "Is it baked",
+	"grid.split-group": "Split group",
+	"grid.production-sequence": "Production sequence",
+	"grid.date-of-manufacture": "Date of manufacture",
+	"grid.order-number": "Order No.",
+	"grid.paper-FRP-tube": "Paper tube/FRP tube",
+	"grid.paper-tube-material-code": "Paper tube material code",
+	"grid.paper-tube-material-description": "Paper tube material description",
+	"grid.paper-tube-specifications": "Paper tube specifications",
+	"grid.FRP-pipe-material-code": "FRP pipe material code",
+	"grid.FRP-pipe-material-description": "FRP pipe material description",
+	"grid.FRP-pipe-specifications": "FRP pipe specifications"
 }

locale/id.json

@@ -5,9 +5,13 @@
 	"utils.read-more": "Lihat lebih",
 	"utils.no-more": "Tidak lagi",
 	"button.confirm": "OK",
+	"button.cancel": "Batalkan",
 	"button.search": "pertanyaan",
 	"button.confirm-receipt": "Konfirmasi penerimaan",
 	"button.confirm-outbound": "Konfirmasi keluar",
+	"button.empty-shaft-return": "Kembali shaft kosong",
+	"button.manual-call": "Panggilan manual",
+	"button.call": "Panggilan",
 	"login.username": "Nama pengguna",
 	"login.password": "Sandi",
 	"login.remember": "Ingat nama pengguna",
@@ -66,11 +70,15 @@
 	"menu.task-management": "Manajemen tugas",
 	"menu.rgv-status-query": "Pertanyaan status RGV",
 	"filter.area": "Daerah",
+	"grid.number": "Nomor",
 	"filter.point": "Posisi titik",
 	"filter.mother-roll": "Mother roll",
 	"filter.state": "Keadaan",
+	"filter.starting-point": "Titik awal",
+	"filter.finishing-point": "Titik akhir",
 	"grid.work-order-number": "Nomor urutan kerja",
-	"grid.mother-roll-number": "Nomor Roll Ibu",
+	"grid.mother-roll-number": "Nomor roll ibu",
+	"grid.sub-roll-number": "Nomor sub roll",
 	"grid.start-time": "Waktu awal",
 	"grid.end-time": "Waktu akhir",
 	"grid.machine-code": "Koding mesin",
@@ -84,5 +92,16 @@
 	"grid.product-description": "Deskripsi Produk",
 	"grid.in-oven-time": "Waktunya memasuki oven",
 	"grid.out-oven-time": "Waktunya meninggalkan oven",
-	"grid.is-it-baked": "Apakah sudah dipanggang"
+	"grid.is-it-baked": "Apakah sudah dipanggang",
+	"grid.split-group": "Grup pembagian",
+	"grid.production-sequence": "Jujukan produksi",
+	"grid.date-of-manufacture": "Tarikh produksi",
+	"grid.order-number": "Nomor perintah",
+	"grid.paper-FRP-tube": "Tuba kertas/Tuba FRP",
+	"grid.paper-tube-material-code": "Kode bahan tub kertas",
+	"grid.paper-tube-material-description": "Deskripsi material tabung kertas",
+	"grid.paper-tube-specifications": "Spesifikasi tabung kertas",
+	"grid.FRP-pipe-material-code": "Kode bahan pipa FRP",
+	"grid.FRP-pipe-material-description": "Deskripsi bahan pipa FRP",
+	"grid.FRP-pipe-specifications": "Spesifikasi pipa FRP"
 }

locale/zh-Hans.json

@@ -5,9 +5,13 @@
 	"utils.read-more": "查看更多",
 	"utils.no-more": "没有更多",
 	"button.confirm": "确定",
+	"button.cancel": "取消",
 	"button.search": "查询",
 	"button.confirm-receipt": "确认入库",
 	"button.confirm-outbound": "确认出库",
+	"button.empty-shaft-return": "空轴送回",
+	"button.manual-call": "人工呼叫",
+	"button.call": "呼叫",
 	"login.username": "用户名",
 	"login.password": "密码",
 	"login.remember": "记住用户名",
@@ -69,8 +73,12 @@
 	"filter.point": "点位",
 	"filter.mother-roll": "母卷",
 	"filter.state": "状态",
+	"filter.starting-point": "起点",
+	"filter.finishing-point": "起点",
+	"grid.number": "序号",
 	"grid.work-order-number": "工单号",
 	"grid.mother-roll-number": "母卷号",
+	"grid.sub-roll-number": "子卷号",
 	"grid.start-time": "开始时间",
 	"grid.end-time": "结束时间",
 	"grid.machine-code": "机台编码",
@@ -84,5 +92,16 @@
 	"grid.product-description": "产品描述",
 	"grid.in-oven-time": "入烘箱时间",
 	"grid.out-oven-time": "出烘箱时间",
-	"grid.is-it-baked": "是否烘烤"
+	"grid.is-it-baked": "是否烘烤",
+	"grid.split-group": "分切组",
+	"grid.production-sequence": "生产顺序",
+	"grid.date-of-manufacture": "生产日期",
+	"grid.order-number": "订单号",
+	"grid.paper-FRP-tube": "纸筒/FRP管",
+	"grid.paper-tube-material-code": "纸筒物料编码",
+	"grid.paper-tube-material-description": "纸筒物料描述",
+	"grid.paper-tube-specifications": "纸筒规格",
+	"grid.FRP-pipe-material-code": "FRP管物料编码",
+	"grid.FRP-pipe-material-description": "FRP管物料描述",
+	"grid.FRP-pipe-specifications": "FRP管规格"
 }

pages/ProductManage/SlittingFeeding.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="分切上料"></nav-bar>
+		<nav-bar :title="$t('menu.cutting-and-feeding')"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">区域</view>
+					<view class="filter_label">{{$t('filter.area')}}</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">点位</span>
+						<span class="filter_label">{{$t('filter.point')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
@@ -21,7 +21,7 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">母卷号</span>
+						<span class="filter_label">{{$t('filter.mother-roll')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
@@ -35,21 +35,21 @@
 					<table>
 						<thead>
 							<tr>
-								<th>序号</th>
+								<th>{{$t('grid.number')}}</th>
-								<th>母卷号</th>
+								<th>{{$t('grid.mother-roll-number')}}</th>
-								<th>子卷号</th>
+								<th>{{$t('grid.sub-roll-number')}}</th>
-								<th>机台编号</th>
+								<th>{{$t('grid.machine-code')}}</th>
-								<th>分切组</th>
+								<th>{{$t('grid.split-group')}}</th>
-								<th>生产顺序</th>
+								<th>{{$t('grid.production-sequence')}}</th>
-								<th>生产日期</th>
+								<th>{{$t('grid.date-of-manufacture')}}</th>
-								<th>订单号</th>
+								<th>{{$t('grid.order-number')}}</th>
-								<th>纸筒/FRP管</th>
+								<th>{{$t('grid.paper-FRP-tube')}}</th>
-								<th>纸筒物料编码</th>
+								<th>{{$t('grid.paper-tube-material-code')}}</th>
-								<th>纸筒物料描述</th>
+								<th>{{$t('grid.paper-tube-material-description')}}</th>
-								<th>纸筒规格</th>
+								<th>{{$t('grid.paper-tube-specifications')}}</th>
-								<th>FRP管物料编码</th>
+								<th>{{$t('grid.FRP-pipe-material-code')}}</th>
-								<th>FRP管物料描述</th>
+								<th>{{$t('grid.FRP-pipe-material-description')}}</th>
-								<th>FRP管规格</th>
+								<th>{{$t('grid.FRP-pipe-specifications')}}</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -77,15 +77,15 @@
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn">空轴送回</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn">{{$t('button.empty-shaft-return')}}</button>
-			<button class="submit-button" @tap="handleSure">人工呼叫</button>
+			<button class="submit-button" @tap="handleSure">{{$t('button.manual-call')}}</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">{{$t('button.call')}}</button>
-			<button class="submit-button" @tap="searchList">查询</button>
+			<button class="submit-button" @tap="searchList">{{$t('button.search')}}</button>
 		</view>
 		<view v-if="active" class="msg_wrapper msg_wrapper_1">
 			<view class="msg_box">
 				<view class="filter_item">
-					<view class="filter_label">起点</view>
+					<view class="filter_label">{{$t('filter.starting-point')}}</view>
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val3"
@@ -94,7 +94,7 @@
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">母卷号</view>
+					<view class="filter_label">{{$t('filter.mother-roll')}}</view>
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val4"
@@ -102,7 +102,7 @@
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">终点</view>
+					<view class="filter_label">{{$t('filter.finishing-point')}}</view>
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val5"
@@ -110,8 +110,8 @@
 					</view>
 				</view>
 				<view class="msg_btns">
-					<button class="submit-button msg_btn" @tap="cancleModal">取消</button>
+					<button class="submit-button msg_btn" @tap="cancleModal">{{$t('button.cancel')}}</button>
-					<button class="submit-button msg_btn" @tap="modalToSure">确认</button>
+					<button class="submit-button msg_btn" @tap="modalToSure">{{$t('button.confirm')}}</button>
 				</view>
 			</view>
 		</view>
@@ -141,9 +141,9 @@
 				reload: false,
 				status: 'more',
 				contentText: {
-					contentdown: '查看更多',
+					contentdown: this.$t('utils.read-more'),
-					contentrefresh: '加载中',
+					contentrefresh: this.$t('utils.loading'),
-					contentnomore: '没有更多'
+					contentnomore: this.$t('utils.no-more')
 				},
 				totalCount: 0,
 				pageNum: 1,
@@ -319,9 +319,10 @@
 <style lang="stylus">
 	.slide_new table td:first-child, .slide_new table th:first-child
 		width 92rpx
+		min-width 92rpx
 	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
 		position sticky
-		left 89rpx
+		left 92rpx
 		z-index 102
 		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>