Skip to content

T
template_vue
Commit f302e8bb authored by kzy's avatar kzy
Browse files
Options

Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

parents 1e10bc42 97329ff0
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 95 deletions
src/api/equipment/application.js
View file @ f302e8bb
......@@ -18,3 +18,11 @@ export function addApplication(data) {
}
})
}
// 分页查询要处理的设备
export function getEquipment(params) {
return request({
url: '/wbwarehouse/canceListByPagination',
method: 'get',
params
})
}
src/views/equipment/application.vue
View file @ f302e8bb
......@@ -5,36 +5,24 @@
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 16%;">
<el-form-item label="pn" style="flex-basis: 50%;" prop="pn">
<el-input v-model="form.pn" placeholder="请输入pn" :style="{ width: '400px', height: '30px' }" :maxlength="50" />
<el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :minlength="3" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="phd" style="flex-basis: 50%;" prop="phd">
<el-input v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
<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 v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
<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">
<el-form-item label="pgx" style="flex-basis: 50%;" prop="pgx">
<el-select
v-model="form.pgx"
clearable
placeholder="请选择pgx"
:style="{ width: '400px', height: '30px' }"
>
<el-option
v-for="(dict,index) in pissbList"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
<el-form-item label="pnumber" style="flex-basis: 50%;" prop="pnumber">
<el-input ref="input4" v-model="form.pnumber" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
</el-col>
</el-row>
......@@ -56,6 +44,23 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" style="padding-left: 1.2%">
<el-form-item label="pgx" style="flex-basis: 50%;" prop="pgx">
<el-select
v-model="form.pgx"
clearable
placeholder="请选择pgx"
:style="{ width: '400px', height: '30px' }"
>
<el-option
v-for="(dict,index) in pissbList"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div class="button">
<el-button type="primary" @click="submitForm">提交</el-button>
......@@ -69,6 +74,11 @@ import { getDictData, addApplication } from '@/api/equipment/application'
export default {
name: 'Role',
mounted() {
this.$nextTick(() => {
this.$refs.input1.$refs.input.focus()
})
},
data() {
return {
form: {
......@@ -80,8 +90,11 @@ export default {
},
rule: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
phd: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
prank: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }]
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' }]
},
pissbList: [],
pgxList: [
......@@ -100,6 +113,17 @@ export default {
this.init()
},
methods: {
handelTab(i, e) {
const that = this
if (!that.$refs['input' + i]) {
return
}
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
},
// 重置
resetFrom() {
this.form = {
......@@ -127,10 +151,16 @@ export default {
addApplication(this.form).then(res => {
console.log('res', res)
if (res.code === 200) {
this.$message.success('操作成功')
if (res.data !== null) {
if (res.data.ptype === '1') {
this.$message.success('申请成功，请稍后去设备库领用')
} else if (res.data.ptype === '2') {
this.$message.success('申请成功，请稍后去工序库领用')
}
}
this.resetFrom()
} else if (res.code === null) {
this.$message.success(res.message)
this.$message.error(res.message)
}
})
}
......
src/views/equipment/boundManagement.vue
View file @ f302e8bb
......@@ -98,7 +98,7 @@
/>
<!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<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-item label="pn" prop="pn">
<el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
......@@ -116,7 +116,7 @@
<el-input ref="input5" v-model.trim="form.psm" :maxlength="8" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
<el-form-item label="pzl" prop="pzl">
<el-input ref="input6" v-model.trim="form.pzl" :maxlength="8" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
<el-input ref="input6" v-model.trim="form.pzl" :maxlength="7" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
<el-form-item label="parnk" prop="prank">
<el-input ref="input7" v-model.trim="form.prank" :maxlength="8" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
......
src/views/equipment/draw.vue
View file @ f302e8bb
......@@ -339,10 +339,15 @@
<script>
import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
import { parseTime } from '@/utils'
import { getEquipment } from '@/api/equipment/application'
export default {
name: 'Draw',
data() {
return {
ptype: '',
pgx: '',
prank: '',
pissb: '',
totalApplyDetail: 0,
applyList: [],
canceList: [],
......@@ -458,16 +463,7 @@ export default {
next()
},
created() {
this.resetQuery()
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
}
this.getList()
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data;
// });
},
methods: {
handleCance() {
......@@ -507,7 +503,18 @@ export default {
/** 查询warehouse列表 */
getDeviceList() {
this.loadingDetail = true
detailList(this.queryParamsDetail).then(res => {
const obj = {
ptype: this.ptype,
pgx: this.pgx,
prank: this.prank,
pissb: this.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows,
pn: this.queryParamsDetail.pn,
lot: this.queryParams.lot,
plocation: this.queryParams.plocation
}
getEquipment(obj).then(res => {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.totalDetail = res.total
this.detailApplyList = res.rows
......@@ -515,16 +522,43 @@ export default {
})
},
handle(row) {
console.log('row', row)
this.applyId = row.businessId
this.title = '处理'
this.openHandle = !this.openHandle
this.loadingDetail = true
detailList(this.queryParamsDetail).then(res => {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.totalDetail = res.total
this.ptype = row.ptype
this.pgx = row.pgx
this.prank = row.prank
this.pissb = row.pissb
const obj = {
pn: row.pn,
ptype: row.ptype,
pgx: row.pgx,
prank: row.prank,
pissb: row.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows
}
getEquipment(obj).then(res => {
if (res.code && res.code === null) {
this.$message.warning(res.message)
}
console.log('res')
if (res.rows.createDate && res.rows.createDate !== null) {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
}
this.detailApplyList = res.rows
this.loadingDetail = false
this.openHandle = true
})
// this.applyId = row.businessId
this.title = '处理'
// this.openHandle = !this.openHandle
this.loadingDetail = true
// detailList(this.queryParamsDetail).then(res => {
// res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
// this.totalDetail = res.total
// this.detailApplyList = res.rows
// this.loadingDetail = false
// })
},
// 获取所选行详情信息
handleDetail(row) {
......@@ -603,7 +637,8 @@ export default {
pn: '',
phd: '',
prank: '',
pstatus: ''
pstatus: '',
ptype: '1'
}
// this.dateRange = []
this.handleQuery()
......
src/views/equipment/management.vue
View file @ f302e8bb
......@@ -115,7 +115,7 @@
/>
<!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<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-item label="pn" prop="pn">
<el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
......@@ -133,7 +133,7 @@
<el-input ref="input5" v-model.trim="form.psm" :maxlength="8" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
<el-form-item label="pzl" prop="pzl">
<el-input ref="input6" v-model.trim="form.pzl" :maxlength="8" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
<el-input ref="input6" v-model.trim="form.pzl" :maxlength="7" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
<el-form-item label="parnk" prop="prank">
<el-input ref="input7" v-model.trim="form.prank" :maxlength="8" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
......
src/views/processManagement/deviceReuse/index.vue
View file @ f302e8bb
<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%;">
<el-form-item label="pn:" style="flex-basis: 50%;" prop="pn">
<el-input ref="input1" v-model="form.pn" placeholder="请输入pn" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
<el-input ref="input1" v-model="form.pn" placeholder="请输入pn" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="lot:" style="flex-basis: 50%;" prop="lot">
<el-input ref="input2" v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" />
<el-input ref="input2" v-model="form.lot" placeholder="请输入lot" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="位置:" style="flex-basis: 50%;" prop="plocation">
<el-input ref="input3" v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(3,$event)" />
<el-input ref="input3" v-model="form.plocation" placeholder="请输入位置" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
<el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />
<el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="psm:" style="flex-basis: 50%;" prop="psm">
<el-input ref="input5" v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" />
<el-input ref="input5" v-model="form.psm" placeholder="请输入psm" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
<el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(6,$event)" />
<el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="padding-left: 8.9%;">
<el-col :span="12" style="padding-left: 8.6%;">
<el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
<el-input ref="input7" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(7,$event)" />
<el-input ref="input7" v-model="form.prank" placeholder="请输入prank" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(7,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
&nbsp;&nbsp;
</el-col>
</el-row>
</el-form>
<el-form label-width="80px">
<el-row style="padding-left: 8.7%; padding-top: 1%">
<el-col :span="12">
<el-form-item style="flex-basis: 50%;">
<el-button type="primary" @click="submitForm">提交</el-button>
</el-form-item>
</el-col>
</el-row>
<div class="button">
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</el-form>
</div>
</template>
......
src/views/processManagement/draw.vue
View file @ f302e8bb
......@@ -265,7 +265,6 @@
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
......@@ -337,12 +336,17 @@
</div>
</template>
<script>
import { getEquipment } from '@/api/equipment/application'
import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
import { parseTime } from '@/utils'
export default {
name: 'Draw',
data() {
return {
ptype: '',
pgx: '',
prank: '',
pissb: '',
totalApplyDetail: 0,
applyList: [],
canceList: [],
......@@ -423,7 +427,7 @@ export default {
pn: undefined,
lot: undefined,
plocation: undefined,
ptype: 2,
ptype: '2',
delFlag: 0
},
// 查询warehouse的参数
......@@ -433,7 +437,7 @@ export default {
pn: undefined,
lot: undefined,
plocation: undefined,
ptype: 2,
ptype: '2',
delFlag: 0
},
// 表单参数
......@@ -458,16 +462,7 @@ export default {
next()
},
created() {
this.resetQuery()
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
}
this.getList()
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data;
// });
},
methods: {
handleCance() {
......@@ -507,7 +502,18 @@ export default {
/** 查询warehouse列表 */
getDeviceList() {
this.loadingDetail = true
detailList(this.queryParamsDetail).then(res => {
const obj = {
ptype: this.ptype,
pgx: this.pgx,
prank: this.prank,
pissb: this.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows,
pn: this.queryParamsDetail.pn,
lot: this.queryParams.lot,
plocation: this.queryParams.plocation
}
getEquipment(obj).then(res => {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.totalDetail = res.total
this.detailApplyList = res.rows
......@@ -515,16 +521,43 @@ export default {
})
},
handle(row) {
console.log('row', row)
this.applyId = row.businessId
this.title = '处理'
this.openHandle = !this.openHandle
this.loadingDetail = true
detailList(this.queryParamsDetail).then(res => {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.totalDetail = res.total
this.ptype = row.ptype
this.pgx = row.pgx
this.prank = row.prank
this.pissb = row.pissb
const obj = {
pn: row.pn,
ptype: row.ptype,
pgx: row.pgx,
prank: row.prank,
pissb: row.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows
}
getEquipment(obj).then(res => {
if (res.code && res.code === null ) {
this.$message.warning(res.message)
}
console.log('res')
if (res.rows.createDate && res.rows.createDate !== null) {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
}
this.detailApplyList = res.rows
this.loadingDetail = false
this.openHandle = true
})
// this.applyId = row.businessId
this.title = '处理'
// this.openHandle = !this.openHandle
this.loadingDetail = true
// detailList(this.queryParamsDetail).then(res => {
// res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
// this.totalDetail = res.total
// this.detailApplyList = res.rows
// this.loadingDetail = false
// })
},
// 获取所选行详情信息
handleDetail(row) {
......@@ -603,14 +636,18 @@ export default {
pn: '',
phd: '',
prank: '',
pstatus: ''
pstatus: '',
ptype: '2'
}
// this.dateRange = []
this.handleQuery()
},
// warehouse的重置按钮
resetQueryWarehouse() {
this.resetForm('queryFormWarehouse')
this.queryParamsDetail.pn = null
this.queryParamsDetail.lot = null
this.queryParamsDetail.plocation = null
this.queryParamsDetail.page = 1
this.handleQueryWarehouse()
},
// 多选框选中数据
......
src/views/sample/correctionLibrary/index.vue
View file @ f302e8bb
......@@ -27,23 +27,6 @@
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<!-- <div style="float: right">-->
<!-- <el-form-item>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="small"-->
<!-- 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-form-item>-->
<!-- </div>-->
</el-form>
<!-- 分割线 -->
<div class="placeholder" />
......
src/views/sample/sampleType/index.vue
View file @ f302e8bb
......@@ -130,13 +130,13 @@
<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" :maxlength="100" placeholder="请输入pn" />
<el-input v-model.trim="form.pn" clearable :maxlength="100" placeholder="请输入pn" />
</el-form-item>
<el-form-item label="dname" prop="dname">
<el-input v-model.trim="form.dname" :maxlength="100" placeholder="请输入dname" />
<el-input v-model.trim="form.dname" clearable :maxlength="100" placeholder="请输入dname" />
</el-form-item>
<el-form-item label="dno" prop="dno">
<el-input v-model.trim="form.dno" :maxlength="100" placeholder="请输入dno" />
<el-input v-model.trim="form.dno" clearable :maxlength="100" placeholder="请输入dno" />
</el-form-item>
<!-- <el-form-item label="remarks" prop="remarks">-->
<!-- <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
......
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