root/apt-nl-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
xiangxy
2024-05-13 11:05:18 +08:00
parent f783a3c10b
commit 45f60763cc
4 changed files with 135 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/i18n/langs/en.js
View File

@@ -24,6 +24,7 @@ module.exports = {
dialogtip: 'If Select Return Site', dialogtip: 'If Select Return Site',
returnsite: 'Return Site', returnsite: 'Return Site',
pointcode: 'Point Code', pointcode: 'Point Code',
returnsitecode: 'Return Code',
button1: 'Auto Pickup', button1: 'Auto Pickup',
button2: 'Auto Release', button2: 'Auto Release',
button3: 'Input Target Position', button3: 'Input Target Position',

1
src/i18n/langs/zh.js
View File

@@ -24,6 +24,7 @@ module.exports = {
dialogtip: '是否选择返回点', dialogtip: '是否选择返回点',
returnsite: '返回点', returnsite: '返回点',
pointcode: '点位编码', pointcode: '点位编码',
returnsitecode: '返回编码',
button1: '自动取货', button1: '自动取货',
button2: '自动放货', button2: '自动放货',
button3: '输入点位', button3: '输入点位',

241
src/pages/modules/taskmanage/CarryPoint.vue
View File

@@ -41,6 +41,19 @@
></keyboard-input> ></keyboard-input>
</div> </div>
</div> </div>
<div class="form_item">
<div class="form_item__label">{{ $t('carrypoint.returnsitecode') }}</div>
<div class="form_item__content">
<!-- <input type="text" class="form_item__input" v-model="returnsitecode" @focus="show" data-layout="normal"> -->
<keyboard-input
inputClass="form_item__input"
keyboardClass="returnsitecode"
:value="returnsitecode"
@inputChange="inputChange2"
@inputFocus="inputFocus2"
></keyboard-input>
</div>
</div>
</div> </div>
</div> </div>
<div v-if="type === '2'" class="form_wraper"> <div v-if="type === '2'" class="form_wraper">
@@ -81,6 +94,7 @@ export default {
type: '', type: '',
title: '', title: '',
pointcode: '', pointcode: '',
returnsitecode: '',
unclick: false, unclick: false,
disabled: false, disabled: false,
visible: false, visible: false,
@@ -94,114 +108,114 @@ export default {
pkId: '', pkId: '',
selectObj: {}, selectObj: {},
value: '', value: '',
dataList: [] // dataList: []
// dataList: [ dataList: [
// { {
// point_code: '01', point_code: '01',
// code_name: '18-一线起升电机', code_name: '18-一线起升电机',
// en_code_name: 'english-test' en_code_name: 'english-test'
// }, },
// { {
// point_code: '02', point_code: '02',
// code_name: 'A-ZD102' code_name: 'A-ZD102'
// }, },
// { {
// point_code: '3', point_code: '3',
// code_name: 'A-ZD103' code_name: 'A-ZD103'
// }, },
// { {
// point_code: '4', point_code: '4',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '5', point_code: '5',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '6', point_code: '6',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '7', point_code: '7',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '8', point_code: '8',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '9', point_code: '9',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '10', point_code: '10',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '11', point_code: '11',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '12', point_code: '12',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '13', point_code: '13',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '14', point_code: '14',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '15', point_code: '15',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '16', point_code: '16',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '17', point_code: '17',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '18', point_code: '18',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '19', point_code: '19',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '20', point_code: '20',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '21', point_code: '21',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '22', point_code: '22',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '23', point_code: '23',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '24', point_code: '24',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '25', point_code: '25',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// }, },
// { {
// point_code: '26', point_code: '26',
// code_name: 'A-ZD101' code_name: 'A-ZD101'
// } }
// ] ]
} }
}, },
created () { created () {
@@ -214,6 +228,7 @@ export default {
switch (type) { switch (type) {
case '1': case '1':
this.pointcode = '' this.pointcode = ''
this.returnsitecode = ''
this.unclick = true this.unclick = true
break break
case '2': case '2':
@@ -225,7 +240,8 @@ export default {
toSureDialog (type) { toSureDialog (type) {
switch (type) { switch (type) {
case '1': case '1':
this.confirmPoint(this.pointcode, '1') this.confirmPoint(this.pointcode, '1', this.returnsitecode)
this.$refs.child.active = false
break break
case '2': case '2':
if (this.value) { if (this.value) {
@@ -249,6 +265,9 @@ export default {
inputFocus () { inputFocus () {
this.visible = false this.visible = false
}, },
inputFocus2 () {
this.visible = false
},
hide () { hide () {
this.visible = false this.visible = false
}, },
@@ -257,6 +276,9 @@ export default {
// 限制只能输入数字,后端校验 // 限制只能输入数字,后端校验
// this.pointcode = val.replace(/[^\d]/g, '') // this.pointcode = val.replace(/[^\d]/g, '')
}, },
inputChange2 (val) {
this.returnsitecode = val
},
// 这个接口需要放到agv上去才行 // 这个接口需要放到agv上去才行
async initData () { async initData () {
let res = await queryPoint() let res = await queryPoint()
@@ -280,6 +302,7 @@ export default {
toRadio (e) { toRadio (e) {
this.pkId = this.pkId === e.point_code ? '' : e.point_code this.pkId = this.pkId === e.point_code ? '' : e.point_code
this.selectObj = e this.selectObj = e
this.toast('终点已选中')
}, },
toSure (pcode, type) { toSure (pcode, type) {
this.confirmPoint(pcode, type) this.confirmPoint(pcode, type)

2
src/style/common.styl
View File

@@ -665,7 +665,7 @@
.grid_wrapper table th .grid_wrapper table th
font-size 28px font-size 28px
.form_item__label .form_item__label
font-size 25px font-size 24px
.button_control p .button_control p
font-size 34px font-size 34px
.title_wrap h2 .title_wrap h2