Commit 5407ddaf authored by 高宇's avatar 高宇

Merge remote-tracking branch 'origin/project1' into project1

parents 74f1a295 39321b5f
......@@ -10,14 +10,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="phd" style="flex-basis: 50%;" prop="phd">
<el-input ref="input2" v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
<el-input ref="input2" v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 16%;">
<el-form-item label="prank" style="flex-basis: 50%;" prop="prank">
<el-input ref="input3" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
<el-input ref="input3" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
<el-col :span="12" >
......@@ -74,11 +74,6 @@ import { getDictData, addApplication } from '@/api/equipment/application'
export default {
name: 'Role',
mounted() {
this.$nextTick(() => {
this.$refs.input1.$refs.input.focus()
})
},
data() {
return {
form: {
......@@ -90,8 +85,8 @@ export default {
},
rule: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
phd: [{ required: true,pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
prank: [{ required: true,pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
phd: [{ required: true, pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
prank: [{ required: true, pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
pgx: [{ required: true, message: '请输入pgx', trigger: 'blur' }],
pissb: [{ required: true, message: '请输入pissb', trigger: 'blur' }],
pnumber: [{ required: true, message: '请输入pnumber', trigger: 'blur' }]
......@@ -109,6 +104,11 @@ export default {
]
}
},
mounted() {
this.$nextTick(() => {
this.$refs.input1.$refs.input.focus()
})
},
created() {
this.init()
},
......@@ -145,7 +145,7 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
}).then(() => {
this.$refs.form.validate((valid) => {
if (valid) {
addApplication(this.form).then(res => {
......
......@@ -158,15 +158,17 @@
</el-form-item>
<el-form-item label="ptype" prop="ptype">
<el-input
ref="input2"
v-model="form.ptype"
placeholder="请输入ptype"
clearable
:maxlength="100"
size="small"
@keyup.enter.native="handelTab(2,$event)"
/>
</el-form-item>
<el-form-item label="prank" prop="prank">
<el-input v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" />
<el-input ref="input3" v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" @keyup.enter.native="handelTab(3,$event)"/>
</el-form-item>
<el-form-item label="pissb" prop="pissb">
<el-select
......@@ -185,10 +187,10 @@
</el-select>
</el-form-item>
<el-form-item label="psm" prop="psm">
<el-input v-model.trim="form.psm" :maxlength="9" placeholder="请输入psm" />
<el-input ref="input4" v-model.trim="form.psm" :maxlength="9" placeholder="请输入psm" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
<el-form-item label="psy" prop="psy">
<el-input v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" />
<el-input ref="input5" v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -322,9 +324,11 @@ export default {
// });
},
methods: {
// 初始化要调的接口
init() {
this.getDict()
// 回车跳转下一个输入框
focusNextInput(form) {
this.$nextTick(() => {
this.$refs[form].$refs.input.focus()
})
},
// 回车到下一个输入框方法
handelTab(i, e) {
......@@ -337,6 +341,10 @@ export default {
})
}
},
// 初始化要调的接口
init() {
this.getDict()
},
/** 查询基础信息列表 */
getList() {
this.loading = true
......
......@@ -99,7 +99,7 @@
<!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-form-item label="pn" prop="pn">
<el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
......
This diff is collapsed.
......@@ -149,7 +149,7 @@
</div>
</el-dialog>
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
......@@ -216,7 +216,7 @@
:visible.sync="table"
direction="rtl"
size="50%"
:close-on-click-modal= "false"
:close-on-click-modal="false"
>
<el-table v-loading="loading" border :data="tableList" style="padding: 0 10px;" @selection-change="handleSelectionChange">
......@@ -377,10 +377,9 @@ export default {
// 查询参数
queryParams: {
page: 1,
rows: 10,
rows: 10,
ptype: 2,
pstatus:0,
pstatus: 0
},
// 表单参数
......@@ -666,7 +665,7 @@ export default {
page: 1,
rows: 10,
ptype: 2,
pstatus:0
pstatus: 0
}
this.resetForm('queryForm')
this.handleQuery()
......
......@@ -53,7 +53,7 @@
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备管理列表</div>
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange" >
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="pn" prop="businessId" :show-overflow-tooltip="true">
<template slot-scope="scope">
......@@ -80,7 +80,7 @@
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" >
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
<template slot-scope="scope">
<span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
......@@ -116,7 +116,7 @@
<!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-form-item label="pn" prop="pn">
<el-input ref="input1" v-model.trim="form.pn" :maxlength="100" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
......
......@@ -141,8 +141,8 @@ import {
listRole,
updateRole
} from '@/api/system/role'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default {
name: 'Role',
......
<template>
<div class="app-container">
<!-- 表单区域-->
<el-form ref="form" :model="form" :rules="rule" label-width="80px">
<!-- 标题-->
<!-- 表单区域-->
<el-form ref="form" :model="form" :rules="rule" label-width="80px">
<!-- 标题-->
<div class="info"><span class="title">再利用</span></div>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
......
......@@ -434,8 +434,7 @@ export default {
}
}
})
},
}
}
}
......
......@@ -130,22 +130,22 @@
<el-dialog title="样品库信息" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
<el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
<el-form-item label="name" prop="name">
<el-input v-model.trim="form.name" :maxlength="30" placeholder="请输入name" />
<el-input ref="input2" v-model.trim="form.name" :maxlength="30" placeholder="请输入name" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
<el-form-item label="qty" prop="qty">
<el-input v-model.trim="form.qty" :maxlength="30" placeholder="请输入qty" />
<el-input ref="input3" v-model.trim="form.qty" :maxlength="30" placeholder="请输入qty" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
<el-form-item label="maxQty" prop="maxQty">
<el-input v-model.trim="form.maxQty" :maxlength="30" placeholder="请输入max_qty" />
<el-input ref="input4" v-model.trim="form.maxQty" :maxlength="30" placeholder="请输入max_qty" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
<el-form-item label="minQty" prop="minQty">
<el-input v-model.trim="form.minQty" :maxlength="30" placeholder="请输入min_qty" />
<el-input ref="input5" v-model.trim="form.minQty" :maxlength="30" placeholder="请输入min_qty" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
<el-form-item label="unit" prop="unit">
<el-input v-model.trim="form.unit" :maxlength="30" placeholder="请输入unit" />
<el-input ref="input6" v-model.trim="form.unit" :maxlength="30" placeholder="请输入unit" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -172,7 +172,7 @@ export default {
rules: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
name: [{ required: true, message: '请输入name', trigger: 'blur' }],
qty: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
qty: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
},
......@@ -192,6 +192,23 @@ export default {
this.getList()
},
methods: {
// 回车跳转下一个输入框
focusNextInput(form) {
this.$nextTick(() => {
this.$refs[form].$refs.input.focus()
})
},
// 回车到下一个输入框方法
handelTab(i, e) {
const that = this
if (that.$refs['input' + i]) {
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
}
},
// 清空表单
reFrom() {
this.form = {
......
......@@ -112,22 +112,22 @@
<el-dialog title="库存修正信息" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
<el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" ref="input1" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
<el-form-item label="name" prop="name">
<el-input v-model.trim="form.name" :maxlength="30" placeholder="请输入name" />
<el-input v-model.trim="form.name" :maxlength="30" placeholder="请输入name" ref="input2" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
<el-form-item label="qty" prop="qty">
<el-input v-model.trim="form.qty" :maxlength="30" placeholder="请输入qty" />
<el-input v-model.trim="form.qty" :maxlength="30" placeholder="请输入qty" ref="input3" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
<el-form-item label="maxQty" prop="maxQty">
<el-input v-model.trim="form.maxQty" :maxlength="30" placeholder="请输入max_qty" />
<el-input v-model.trim="form.maxQty" :maxlength="30" placeholder="请输入max_qty" ref="input4" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
<el-form-item label="minQty" prop="minQty">
<el-input v-model.trim="form.minQty" :maxlength="30" placeholder="请输入min_qty" />
<el-input v-model.trim="form.minQty" :maxlength="30" placeholder="请输入min_qty" ref="input5" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
<el-form-item label="unit" prop="unit">
<el-input v-model.trim="form.unit" :maxlength="30" placeholder="请输入unit" />
<el-input v-model.trim="form.unit" :maxlength="30" placeholder="请输入unit" ref="input6" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -154,7 +154,7 @@ export default {
rules: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
name: [{ required: true, message: '请输入name', trigger: 'blur' }],
qty: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
qty: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
},
......@@ -174,6 +174,23 @@ export default {
this.getList()
},
methods: {
// 回车跳转下一个输入框
focusNextInput(form) {
this.$nextTick(() => {
this.$refs[form].$refs.input.focus()
})
},
// 回车到下一个输入框方法
handelTab(i, e) {
const that = this
if (that.$refs['input' + i]) {
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
}
},
// 清空表单
reFrom() {
this.form = {
......
......@@ -115,13 +115,13 @@
<el-row :gutter="10" justify="start" align="middle">
<el-col :span="12">
<el-form-item label="pn:" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" ref="input1" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
<el-form-item label="lot:" prop="lot">
<el-input v-model.trim="singleDetails.lot" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.lot" :readonly="isReadOnly" ref="input2" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
<el-form-item label="unit:" prop="unit">
<el-input v-model.trim="singleDetails.unit" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.unit" :readonly="isReadOnly" ref="input3" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
......@@ -133,7 +133,7 @@
{{ singleDetails.qty }}
</el-form-item>
<el-form-item label="memo:" prop="memo">
<el-input v-model.trim="singleDetails.memo" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.memo" :readonly="isReadOnly" ref="input4" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
</el-col>
</el-row>
......@@ -141,13 +141,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="操作员:" prop="userName">
<el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" ref="input5" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="操作时间:" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" ref="input6" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-col>
</el-row>
......@@ -354,10 +354,28 @@ export default {
created() {
this.getList()
},
// 监听回车
mounted() {
this.$refs.autoGetFocusInput.focus()
},
methods: {
// 回车跳转下一个输入框
focusNextInput(form) {
this.$nextTick(() => {
this.$refs[form].$refs.input.focus()
})
},
// 回车到下一个输入框方法
handelTab(i, e) {
const that = this
if (that.$refs['input' + i]) {
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
}
},
/** TODO:查询工序库的出入库记录列表 */
getList() {
this.loading = true
......
......@@ -46,13 +46,13 @@
icon="el-icon-plus"
@click="handleAdd"
>新增</el-button>
<!-- <el-button-->
<!-- style="padding: 8px 7px;"-->
<!-- type="success"-->
<!-- size="small"-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"-->
<!-- >导出</el-button>-->
<!-- <el-button-->
<!-- style="padding: 8px 7px;"-->
<!-- type="success"-->
<!-- size="small"-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"-->
<!-- >导出</el-button>-->
</el-form-item>
</div>
</el-form>
......@@ -78,11 +78,11 @@
{{ scope.row.dno || '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true" width="200px">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
......@@ -130,17 +130,17 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" clearable :maxlength="100" placeholder="请输入pn" />
<el-input v-model.trim="form.pn" clearable :maxlength="100" placeholder="请输入pn" ref="input1" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
<el-form-item label="dname" prop="dname">
<el-input v-model.trim="form.dname" clearable :maxlength="100" placeholder="请输入dname" />
<el-input v-model.trim="form.dname" clearable :maxlength="100" placeholder="请输入dname" ref="input2" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
<el-form-item label="dno" prop="dno">
<el-input v-model.trim="form.dno" clearable :maxlength="100" placeholder="请输入dno" />
<el-input v-model.trim="form.dno" clearable :maxlength="100" placeholder="请输入dno" ref="input3" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
<!-- <el-form-item label="remarks" prop="remarks">-->
<!-- <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="remarks" prop="remarks">-->
<!-- <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel"> </el-button>
......@@ -203,6 +203,23 @@ export default {
this.getList()
},
methods: {
// 回车跳转下一个输入框
focusNextInput(form) {
this.$nextTick(() => {
this.$refs[form].$refs.input.focus()
})
},
// 回车到下一个输入框方法
handelTab(i, e) {
const that = this
if (that.$refs['input' + i]) {
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
}
},
// 删除
handleDelete(row) {
const id = row.businessId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment