新增页面，国际化

locale/en.json

@@ -59,6 +59,7 @@
 	"button.warehousing": "Warehousing",
 	"button.save": "Save",
 	"button.outstore-confirm": "Outbound Confirmation",
+	"button.verify": "Verify",
 	"login.username": "Username",
 	"login.password": "Password",
 	"login.remember": "Remember username",
@@ -161,6 +162,7 @@
 	"filter.customer-number": "Customer number",
 	"filter.product-thickness": "Product thickness",
 	"filter.material-type": "Material type",
+	"filter.outer-label-code": "Outer Carton Label Code",
 	"grid.number": "Serial number",
 	"grid.select": "Select",
 	"grid.work-order-number": "Work order number",
@@ -253,6 +255,8 @@
 	"toast.material-not-empty": "The material cannot be empty",
 	"toast.quantity-not-empty": "The quantity cannot be empty",
 	"toast.scan-wooden-box-code": "Please scan the wooden box code",
+	"toast.prompt": "Prompt",
+	"toast.sure-perform-operation": "Are you sure you want to perform this operation?",
 	"select.coaster": "Small pallet",
 	"select.large-tray": "Large pallet",
 	"select.lualified-products": "Qualified products",

locale/id.json

@@ -59,6 +59,7 @@
 	"button.warehousing": "Perdagangan",
 	"button.save": "Simpan",
 	"button.outstore-confirm": "Konfirmasi Deposit",
+	"button.verify": "Verifikasi",
 	"login.username": "Nama pengguna",
 	"login.password": "Kata sandi",
 	"login.remember": "Ingat nama pengguna",
@@ -161,6 +162,7 @@
 	"filter.customer-number": "Nomor pelanggan",
 	"filter.product-thickness": "Ketebalan produk",
 	"filter.material-type": "Jenis bahan",
+	"filter.outer-label-code": "Kode Label Karton Luar",
 	"grid.number": "Nomor urut",
 	"grid.select": "Pilih",
 	"grid.work-order-number": "Nomor pesanan kerja",
@@ -253,6 +255,8 @@
 	"toast.material-not-empty": "Bahan tidak boleh kosong",
 	"toast.quantity-not-empty": "Jumlah tidak boleh kosong",
 	"toast.scan-wooden-box-code": "Silakan scan kode kotak kayu",
+	"toast.prompt": "Petunjuk",
+	"toast.sure-perform-operation": "Apakah Anda yakin ingin melakukan operasi ini?",
 	"select.coaster": "Palet kecil",
 	"select.large-tray": "Palet besar",
 	"select.lualified-products": "Produk layak",

locale/zh-Hans.json

@@ -59,6 +59,7 @@
 	"button.warehousing": "入库",
 	"button.save": "保存",
 	"button.outstore-confirm": "出库确认",
+	"button.verify": "校验",
 	"login.username": "用户名",
 	"login.password": "密码",
 	"login.remember": "记住用户名",
@@ -161,6 +162,7 @@
 	"filter.customer-number": "客户编号",
 	"filter.product-thickness": "产品厚度",
 	"filter.material-type": "物料类型",
+	"filter.outer-label-code": "外箱标签码",
 	"grid.number": "序号",
 	"grid.select": "选择",
 	"grid.work-order-number": "工单号",
@@ -253,6 +255,8 @@
 	"toast.material-not-empty": "物料不能为空",
 	"toast.quantity-not-empty": "数量不能为空",
 	"toast.scan-wooden-box-code": "请扫木箱码",
+	"toast.prompt": "提示",
+	"toast.sure-perform-operation": "确定要执行此操作吗？",
 	"select.coaster": "小托盘",
 	"select.large-tray": "大托盘",
 	"select.lualified-products": "合格品",

pages.json

@@ -472,6 +472,13 @@
                 "navigationStyle": "custom"
             }
             
+        },
+        {
+        	"path" : "pages/SecondPhase/ThreeCodeToOne",
+        	"style" : 
+        	{
+        		"navigationStyle": "custom"
+        	}
         }
     ],
 	"globalStyle": {

pages/SecondPhase/BoxReturn.vue

@@ -64,7 +64,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._boxReturn()
 				}

pages/SecondPhase/DeliveryUnbindConfirm.vue

@@ -158,7 +158,7 @@
 				if (this.dataList.length === 0) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._twoPdaOutConfirm()
 				}

pages/SecondPhase/EmptyBoxInStore.vue

@@ -71,7 +71,7 @@
 				if (!this.val2 || !this.val3) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._twoPdaBoxIn()
 				}

pages/SecondPhase/EmptyBoxOutStore.vue

@@ -139,7 +139,7 @@
 				if (!this.checkArr.length) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._twoPdaVehicleIn()
 				}

pages/SecondPhase/EmptyVehicleInStore.vue

@@ -66,7 +66,7 @@
 				if (!this.val1 || !this.val2 || !this.index) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._twoPdaVehicleIn()
 				}

pages/SecondPhase/ManMaintain.vue

@@ -57,7 +57,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._updatePackagePoint()
 				}

pages/SecondPhase/SubRollPackUnbind.vue

@@ -16,7 +16,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm">子卷包装解绑</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
 		</view>
 	</view>
 </template>
@@ -50,7 +50,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._toEndSub()
 				}

pages/SecondPhase/ThreeCodeToOne.vue

@@ -0,0 +1,97 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="三码合一"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('select.internal-label')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('select.tube-label')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.box-code')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val3" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.outer-label-code')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val4" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_checkCode">{{$t('button.verify')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {checkCode} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _checkCode () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.val3 || !this.val4) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await checkCode(this.val1, this.val2, this.val3, this.val4)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.clearUp()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.val4 = ''
+			}
+		}
+	}
+</script>

pages/SecondPhase/finished/BoxWeight.vue

@@ -80,7 +80,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._saveBoxInfo()
 				}

pages/SecondPhase/finished/ReturnToStore.vue

@@ -66,7 +66,7 @@
 				if (!this.index || !this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._twoPdaReturnIn()
 				}

pages/SecondPhase/finished/abnorToStore.vue

@@ -75,7 +75,7 @@
 				if (!this.index || !this.val1 || !this.val2 || !this.val3) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._twoPdaReback()
 				}

pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue

@@ -60,7 +60,7 @@
 				if (!this.val2 || !this.val3) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._boxIn()
 				}

pages/SecondPhase/kmxk/EmptyBoxSave.vue

@@ -63,7 +63,7 @@
 				if (!this.val2 || !this.val3) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._updateWeight()
 				}

pages/SecondPhase/kmxk/PointSave.vue

@@ -88,7 +88,7 @@
 				if (!this.val2 || !this.val3) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._updatePoint()
 				}

pages/SecondPhase/lvt/EmptyBox.vue

@@ -33,7 +33,7 @@
 						<thead>
 							<tr>
 								<th>{{$t('filter.box-no')}}</th>
-								<th>木箱料号</th>
+								<th>{{$t('filter.box-type')}}</th>
 								<th>{{$t('filter.wooden-box-description')}}</th>
 								<th>{{$t('filter.max-sub-num')}}</th>
 								<th>{{$t('grid.wooden-box-length')}}</th>

pages/SecondPhase/point/ErrorOutUnlock.vue

@@ -62,7 +62,7 @@
 				if (!this.val1 && !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._abnormalOut()
 				}

pages/SecondPhase/point/ManPass.vue

@@ -58,7 +58,7 @@
 				if (!this.index) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._confirmPass()
 				}

pages/SecondPhase/point/PointManage.vue

@@ -77,7 +77,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._pointOperate(type)
 				}

pages/SecondPhase/production/BakeDetail.vue

@@ -195,7 +195,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._inCoolIvt()
 				}
@@ -227,7 +227,7 @@
 				this.disabled2 = false
 			},
 			async handleConfirm2 () {
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this.modalToSure()
 				}

pages/SecondPhase/production/BakeProcess.vue

@@ -161,7 +161,7 @@
 				if ((!this.val1 || !this.val2) && type === '2') {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					if (type === '1') {
 						this._ovenInAndOut1(type)

pages/SecondPhase/production/ControlPoint.vue

@@ -68,7 +68,7 @@
 				if (!this.val1 && !this.index1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._updatePackageInfo()
 				}

pages/SecondPhase/production/ManmadeBake.vue

@@ -104,7 +104,7 @@
 				if (!this.val1 || !this.val2 || !this.val5) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._handleBakingovenInAndOut1(type)
 				}
@@ -153,7 +153,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._handleBakingcheckConfirm()
 				}

pages/SecondPhase/production/MjMake.vue

@@ -59,7 +59,7 @@
 				if (!this.val1 || !this.index) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._bakingReBake()
 				}

pages/SecondPhase/production/MjWeight.vue

@@ -60,7 +60,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._confirmWeight()
 				}

pages/SecondPhase/production/PrintTable.vue

@@ -77,7 +77,7 @@
 				if (!this.val1 || !this.index1 || !this.index2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._printTable()
 				}

pages/SecondPhase/production/SboProcess.vue

@@ -183,7 +183,7 @@
 				if (!this.val2 && type === '7') {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					if (type === '5') {
 						this._confirmBlanking()
@@ -254,7 +254,7 @@
 					this.type = ''
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._rawScrollDowm(type)
 				}

pages/SecondPhase/production/ZjCheck.vue

@@ -57,7 +57,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._updatePackageInfo()
 				}

pages/SecondPhase/production/ZjInStore.vue

@@ -122,7 +122,7 @@
 				if (!this.arr1.length) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._zjInBoundConfirm()
 				}

pages/SecondPhase/slitting/AGVPass.vue

@@ -46,7 +46,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._AGVPass()
 				}

pages/SecondPhase/slitting/BaitRoll.vue

@@ -148,7 +148,7 @@
 				if (!this.index1 ||!this.index2 || !this.index3 || (!this.upL && !this.upR)) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._downBait()
 				}

pages/SecondPhase/slitting/CallShaft.vue

@@ -168,7 +168,7 @@
 				if (!this.index2 || (!this.upL && !this.upR && !this.lowL && !this.lowR)) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._forcedFeedShaft()
 				}

pages/SecondPhase/slitting/Cutaxis.vue

@@ -140,7 +140,7 @@
 				if (!this.index || !this.dataList.length) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._downShafts()
 				}

pages/SecondPhase/slitting/DoInitShaft.vue

@@ -69,7 +69,7 @@
 				if (!this.index) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._doInitShaftPoint()
 				}

pages/SecondPhase/slitting/PaperBind.vue

@@ -122,7 +122,7 @@
 				if (!this.dataList.length) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._operateIvt(type)
 				}

pages/SecondPhase/slitting/RollCacheManage.vue

@@ -65,7 +65,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._rollCacheManage(type)
 				}

pages/SecondPhase/slitting/ShaftSave.vue

@@ -45,7 +45,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._shaftMaintenanceInventory(type)
 				}

pages/SecondPhase/slitting/SlittingCutting2.vue

@@ -191,7 +191,7 @@
 				if (!this.index || !this.dataList.length) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._downRolls2()
 				}

pages/SecondPhase/slitting/SlittingFeeding.vue

@@ -327,7 +327,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._feedingVehicleReturn(type)
 				}

pages/SecondPhase/slitting/StockingArea.vue

@@ -57,7 +57,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._doStockAreaBinding()
 				}
@@ -80,7 +80,7 @@
 				if (!this.val1) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._doStockAreaUnbinding()
 				}
@@ -103,7 +103,7 @@
 				if (!this.val1 || !this.val2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._instorStock(type)
 				}

pages/SecondPhase/slitting/SubRollWeight.vue

@@ -87,7 +87,7 @@
 				if (!this.val1 || (!this.val2 && !this.val3)) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._doSubRollWeightBinding()
 				}

pages/SecondPhase/slitting/TubeStock.vue

@@ -149,7 +149,7 @@
 				if (this.val1 || !this.index1 || !this.index2) {
 					return
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
 				if (isConfirmed) {
 					this._moveStock()
 				}

pages/home/home.vue

@@ -95,11 +95,11 @@
 					this.show = true
 					this.secM = e.sonTree
 					this.icon = e.path
-					this.title = e.title
+					this.title = e[this.$langPre.computedProp('title')]
 				}
 			},
 			toPage2 (e) {
-				let url = e.path + '?title=' + e.title
+				let url = e.path + '?title=' + e[this.$langPre.computedProp('title')]
 				uni.redirectTo({
 					url: url
 				})	

utils/getData3.js

@@ -628,3 +628,10 @@ export const packagerelation = (sn, cname, cn, cd, product, desc, weight, think,
 		material_type: type
 	}
 })
+/**
+ * 三码合一校验（二期打包间管理-三码合一）
+ */
+export const checkCode = (ncode, gcode, bcode, ccode) => request({
+	url:'api/pdmBiSubpackagerelation/checkCode',
+	data: {nb_code: ncode, gb_code: gcode, box_code: bcode, customer_code: ccode}
+})

utils/mork2.js

@@ -58,7 +58,8 @@ export const allAuthority = () => {
 				{menu_id: '1', zh_title: '装箱口木箱回库', path: '/pages/SecondPhase/BoxReturn'},
 				{menu_id: '1', zh_title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'},
 				{menu_id: '1', zh_title: '包装关系维护', path: '/pages/SecondPhase/PackRelation'},
-				{menu_id: '1', zh_title: '客户标签打印', path: '/pages/SecondPhase/CustomerLabelPrint'}
+				{menu_id: '1', zh_title: '客户标签打印', path: '/pages/SecondPhase/CustomerLabelPrint'},
+				{menu_id: '1', zh_title: '三码合一', path: '/pages/SecondPhase/ThreeCodeToOne'}
 			]},
 			{menu_id: '6', path: 'RF04', zh_title: '点位管理', sonTree: [
 				{menu_id: '1', zh_title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},