Skip to content

T
template_vue
Commit c2f29763 authored by wdy's avatar wdy
Browse files
Options

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

parents b9bf9ac2 5b6f4b04
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 81 deletions
src/views/equipment/basicInfo.vue
View file @ c2f29763
......@@ -135,14 +135,14 @@
@pagination="getList"
/>
<!-- 添加或修改设备基本信息配置对话框 -->
<!-- 添加或修改 -->
<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
ref="input1"
v-model.trim="form.pn"
:maxlength="5"
:maxlength="100"
placeholder="请输入pn"
@keyup.enter.native="handelTab(1,$event)"
/>
......@@ -179,7 +179,7 @@
</el-select>
</el-form-item>
<el-form-item label="prank" prop="prank">
<el-input v-model.trim="form.prank" :maxlength="5" placeholder="请输入prank" />
<el-input v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" />
</el-form-item>
<el-form-item label="pissb" prop="pissb">
<el-select
......@@ -198,10 +198,10 @@
</el-select>
</el-form-item>
<el-form-item label="psm" prop="psm">
<el-input v-model.trim="form.psm" :maxlength="5" placeholder="请输入psm" />
<el-input v-model.trim="form.psm" :maxlength="9" placeholder="请输入psm" />
</el-form-item>
<el-form-item label="psy" prop="psy">
<el-input v-model.trim="form.psy" :maxlength="5" placeholder="请输入psy" />
<el-input v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -217,7 +217,7 @@ import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/
import { parseTime } from '@/utils'
import { getDictData } from '@/api/equipment/application'
export default {
name: 'Role',
name: 'BasicInfo',
data() {
return {
// 遮罩层
......@@ -288,8 +288,7 @@ export default {
// 表单校验
rules: {
pn: [
{ required: true, message: '请输入pn', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
{ required: true, message: '请输入pn', trigger: 'change' }
],
ptype: [
{ required: true, message: '请选择ptype', trigger: 'change' }
......@@ -299,16 +298,16 @@ export default {
],
prank: [
{ required: true, message: '请输入prank', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
{ pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
pissb: [
{ required: true, message: '请选择pissb', trigger: 'blur' }
],
psm: [
{ required: true, message: '请输入psm', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
{ pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
psy: [
{ required: true, message: '请输入psy', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
{ pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }
]
},
deptOptions: []
......
src/views/equipment/check.vue
View file @ c2f29763
......@@ -224,6 +224,8 @@
>
<el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="pn" prop="pn" >
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
......
src/views/equipment/checkProcess.vue
View file @ c2f29763
......@@ -223,7 +223,9 @@
size="50%"
>
<el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="pn" prop="pn" >
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
......
src/views/equipment/draw.vue
View file @ c2f29763
......@@ -235,13 +235,6 @@
</template>
</el-table-column>
</el-table>
<!-- <pagination-->
<!-- v-show="totalDetail>0"-->
<!-- :total="totalDetail"-->
<!-- :page.sync="queryParams.page"-->
<!-- :limit.sync="queryParams.rows"-->
<!-- @pagination="getDeviceList"-->
<!-- />-->
</el-dialog>
<!-- TODO: 处理 -->
......@@ -348,7 +341,7 @@
import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
import { parseTime } from '@/utils'
export default {
name: 'Role',
name: 'Draw',
data() {
return {
totalApplyDetail: 0,
......
src/views/equipment/equipmentAbandonment.vue
View file @ c2f29763
......@@ -214,22 +214,22 @@
<el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
<el-form-item label="fq_yy" prop="fq_yy">
<el-input v-model.trim="abandonFrom.fq_yy" :maxlength="30" placeholder="请输入fq_yy" />
<el-input v-model.trim="abandonFrom.fq_yy" :maxlength="100" placeholder="请输入fq_yy" />
</el-form-item>
<el-form-item label="fq_bz" prop="fq_bz">
<el-input v-model.trim="abandonFrom.fq_bz" :maxlength="30" placeholder="请输入fq_bz" />
<el-input v-model.trim="abandonFrom.fq_bz" :maxlength="100" placeholder="请输入fq_bz" />
</el-form-item>
<el-form-item label="fq_dd" prop="fq_dd">
<el-input v-model.trim="abandonFrom.fq_dd" :maxlength="30" placeholder="请输入fq_dd" />
<el-input v-model.trim="abandonFrom.fq_dd" :maxlength="100" placeholder="请输入fq_dd" />
</el-form-item>
<el-form-item label="fq_mcode" prop="fq_mcode">
<el-input v-model.trim="abandonFrom.fq_mcode" :maxlength="30" placeholder="请输入fq_mcode" />
<el-input v-model.trim="abandonFrom.fq_mcode" :maxlength="100" placeholder="请输入fq_mcode" />
</el-form-item>
<el-form-item label="fq_ys" prop="fq_ys">
<el-input v-model.trim="abandonFrom.fq_ys" :maxlength="30" placeholder="请输入fq_ys" />
<el-input v-model.trim="abandonFrom.fq_ys" :maxlength="100" placeholder="请输入fq_ys" />
</el-form-item>
<el-form-item label="fq_dbxi" prop="fq_dbxi">
<el-input v-model.trim="abandonFrom.fq_dbxi" :maxlength="30" placeholder="请输入fq_dbxi" />
<el-input v-model.trim="abandonFrom.fq_dbxi" :maxlength="100" placeholder="请输入fq_dbxi" />
</el-form-item>
......
src/views/equipment/income.vue
View file @ c2f29763
......@@ -2,32 +2,33 @@
<div class="app-container">
<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-row :gutter="40" style="padding-left: 8.6%;">
<el-col :span="12">
<el-form-item label="pn:" style="flex-basis: 50%;" prop="pn">
<el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(1,$event)" />
<el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :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="lot:" style="flex-basis: 50%;" prop="lot">
<el-input ref="input2" v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
<el-input ref="input2" v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="padding-left: 8.6%;">
<el-row :gutter="40" style="padding-left: 8.6%;">
<el-col :span="12">
<el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
<el-input ref="input3" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
<el-col :span="12" style="padding-left: 8.6%;">
<el-button type="primary" @click="handleConfirm">确认</el-button>
<el-col :span="12">
<el-form-item style="flex-basis: 50%;" >
<el-button ref="input4" type="primary" @click="handleConfirm">确认</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- <div class="mb12 font-small-bold" style="display: flex; padding-left: 12%;">设备入库列表</div>-->
<el-table border :data="tableData" style="width: 100%; ">
<el-table-column type="index" label="序号" width="80" />
<el-table border :data="tableData" style="width: 86.4%; padding-left: 13.6%;">
<el-table-column type="index" label="序号" width="50px"/>
<el-table-column label="pn" prop="businessId">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
......@@ -43,7 +44,7 @@
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="180px">
<el-table-column label="操作" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -61,17 +62,23 @@
</el-table-column>
</el-table>
<el-form ref="form" :model="form" :rules="rule" label-width="80px">
<el-row>
<el-col :span="12" style="padding-left: 8.6%;">
<el-row style="padding-left: 8.6%; padding-top: 1.5%">
<el-col :span="12">
<el-form-item label="位置:" style="flex-basis: 50%;" prop="plocation">
<el-input v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
<el-input v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="100" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-form label-width="80px">
<el-row style="padding-left: 8.6%; 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>
</el-form>
<div class="button">
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</div>
</template>
......@@ -97,10 +104,19 @@ export default {
showForm: false, // 控制表单显示与隐藏
selectedItem: null, // 存储当前被选中的表格行数据
rule: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
lot: [{ required: true, message: '请输入lot', trigger: 'blur' }],
plocation: [{ required: true, message: '请输入位置', trigger: 'blur' }],
phd: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }]
pn: [
{ required: true, message: '请输入pn', trigger: 'blur' },
{ max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
],
lot: [
{ required: true, message: '请输入lot', trigger: 'blur' },
{ max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
],
plocation: [
{ required: true, message: '请输入位置', trigger: 'blur' },
{ max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
],
phd: [{ pattern: /^\d+$/, message: '仅能输入整数', trigger: 'change' }]
}
}
},
......@@ -147,7 +163,6 @@ export default {
const {
pn,
lot,
plocation,
phd
} = this.form
......@@ -155,8 +170,7 @@ export default {
const newRow = {
pn,
lot,
phd,
plocation
phd
}
if (this.form.index === undefined) {
if (this.tableData.length) {
......@@ -176,7 +190,6 @@ export default {
this.form.pn = ''
this.form.lot = ''
this.form.phd = ''
this.form.plocation = ''
}
} else {
this.tableData.push(newRow)
......@@ -184,7 +197,6 @@ export default {
this.form.pn = ''
this.form.lot = ''
this.form.phd = ''
this.form.plocation = ''
}
} else {
let number = 0
......@@ -205,7 +217,6 @@ export default {
this.form.pn = ''
this.form.lot = ''
this.form.phd = ''
this.form.plocation = ''
this.form.index = undefined
}
}
......@@ -246,28 +257,44 @@ export default {
},
// 提交时要调的接口
submitForm() {
const {
plocation
} = this.form
if (this.tableData.length === 0) {
this.$message.warning('请先确定表格数据')
return
}
this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const newRow = {
plocation
}
this.$refs.form.validate((valid) => {
if (valid) {
console.log('form', this.form)
this.tableData.forEach(item => {
item.plocation = this.form.plocation
})
console.log('tableData', this.tableData)
add(this.tableData).then(res => {
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
this.tableData = []
this.form.plocation = ''
} else if (res.code === null) {
this.$message.error(res.message)
this.tableData = []
this.form.plocation = ''
}
})
} else {
this.tableData = []
this.tableData.push(newRow)
// 清空输入框
this.from.plocation = ''
// 校验失败，显示错误信息或进行其他操作
}
})
......
src/views/processManagement/inventoryRecord/index.vue
View file @ c2f29763
......@@ -9,7 +9,7 @@
v-model="queryEntity.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="20"
:maxlength="inputMaxLength"
size="small"
@keyup.enter.native="handleQuery"
/>
......@@ -20,7 +20,7 @@
v-model="queryEntity.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="20"
:maxlength="inputMaxLength"
size="small"
@keyup.enter.native="handleQuery"
/>
......@@ -31,7 +31,7 @@
v-model="queryEntity.entity.plocation"
placeholder="请输入plocation"
clearable
:maxlength="20"
:maxlength="inputMaxLength"
size="small"
@keyup.enter.native="handleQuery"
/>
......@@ -234,6 +234,9 @@ export default {
delIcon: 'el-icon-delete',
exportIcon: 'el-icon-download',
// TODO: 限制搜索输入框的最大能输入数
inputMaxLength: 100,
// TODO:遮罩层
loading: true,
// 非多个禁用
......@@ -599,8 +602,6 @@ export default {
}
}
/* TODO: 专门用来解决el-input边框的问题 */
.aboutSingleDetails{
.el-form{
......
src/views/sample/basicInformation/index.vue
View file @ c2f29763
......@@ -30,13 +30,14 @@
<div style="float: right">
<el-form-item>
<el-button
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
@click="handleAdd"
>新增</el-button>
<el-button
style="padding: 8px 7px; width: 79px"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
......
src/views/sample/correctionLibrary/index.vue
View file @ c2f29763
......@@ -25,7 +25,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</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>-->
......
src/views/sample/inventoryRecord/index.vue
View file @ c2f29763
......@@ -9,7 +9,7 @@
v-model="queryEntity.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="20"
:maxlength="inputMaxLength"
size="small"
@keyup.enter.native="handleQuery"
/>
......@@ -20,7 +20,7 @@
v-model="queryEntity.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="20"
:maxlength="inputMaxLength"
size="small"
@keyup.enter.native="handleQuery"
/>
......@@ -180,7 +180,8 @@ export default {
exportSize: 'small',
delIcon: 'el-icon-delete',
exportIcon: 'el-icon-download',
// TODO: 限制搜索输入框的最大能输入数
inputMaxLength: 100,
// TODO:遮罩层
loading: true,
// 非多个禁用
......@@ -414,23 +415,17 @@ export default {
}
this.getList()
},
/* TODO: 获取详情信息*/
handleDetail: function(row) {
/* TODO: 如果库状态为‘废弃’，即为‘4’时，则可以进入 */
if (row.poperate !== '4') {
this.singleDetails = { ...row }
} else {
/* TODO: 设置单项详情的查询的条件 */
this.singleLogIdAndPn['businessId'] = row.businessId
this.singleLogIdAndPn['pn'] = row.pn
/* TODO: 进行单项详情的查询 */
findSingleLogDetail(this.singleLogIdAndPn).then(
response => {
this.title = '记录详情'
this.singleDetails = Object.assign({}, response.data, { ...row })
}
)
}
this.singleDetails = { ...row }
/* TODO: 设置单项详情的查询的条件 */
this.singleLogIdAndPn['businessId'] = row.businessId
this.singleLogIdAndPn['pn'] = row.pn
/* TODO: 进行单项详情的查询 */
findSingleLogDetail(this.singleLogIdAndPn).then(
response => {
this.singleDetails = Object.assign({}, response.data, { ...row })
}
)
this.title = '记录详情'
this.openDetails = true
},
......
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