Skip to content

T
template_vue
Commit c3381046 authored by 刘宇扬's avatar 刘宇扬
Browse files
Options

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

parents 0316de29 3fc72bb2
Show whitespace changes
Inline Side-by-side
Showing with 274 additions and 86 deletions
src/views/processManagement/basicProcessManagement/index.vue
View file @ c3381046
......@@ -41,8 +41,14 @@
<!-- TODO: 以下为基础工序管理列表 -->
<div class="mb12 font-small-bold">基础工序管理列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" />
<el-table
v-loading="loading"
class="processList"
border
:data="processList"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" label="序号" width="50"/>
<el-table-column label="工序名称" prop="processName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.processName || '-' }}
......@@ -53,18 +59,23 @@
{{ scope.row.workshop || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" prop="createBy">
<el-table-column label="操作人" prop="createBy">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="240px">
<el-table-column
label="操作"
class-name="small-padding fixed-width"
width="180px"
>
<template slot-scope="scope">
<div class="processListBtns">
<el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情
</el-button>
......@@ -75,7 +86,9 @@
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
>删除
</el-button>
</div>
</template>
</el-table-column>
</el-table>
......@@ -92,13 +105,13 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="名称" prop="processName">
<el-input v-model.trim="form.processName" show-word-limit :maxlength="30" placeholder="请输入工序名称" />
<el-input v-model.trim="form.processName" show-word-limit :maxlength="30" placeholder="请输入工序名称"/>
</el-form-item>
<el-form-item label="工厂车间" prop="workshop">
<el-input v-model.trim="form.workshop" show-word-limit :maxlength="30" placeholder="请输入工厂车间" />
<el-input v-model.trim="form.workshop" show-word-limit :maxlength="30" placeholder="请输入工厂车间"/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入创建人" />
<el-form-item label="操作人" prop="createBy">
<el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入操作人"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -111,16 +124,20 @@
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-form-item label="名称：" prop="processName">
<el-input v-model.trim="singleDetails.processName" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.processName" :readonly="isReadOnly"/>
</el-form-item>
<el-form-item label="工厂车间：" prop="workshop">
<el-input v-model.trim="singleDetails.workshop" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.workshop" :readonly="isReadOnly"/>
</el-form-item>
<el-form-item label="创建时间：" prop="createTime">
<el-form-item label="操作时间：" prop="createTime">
<!--
TODO: el-input 里不能调用全局日期过滤器 transformDateByFormat('YYYY-MM-DD HH:mm')
<el-input v-model.trim="singleDetails.createTime" :readonly="isReadOnly" />
-->
{{ singleDetails.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
</el-form-item>
<el-form-item label="创建人：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
<el-form-item label="操作人：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly"/>
</el-form-item>
</el-form>
</el-dialog>
......@@ -159,13 +176,15 @@ export default {
multiple: true,
// 总条数
total: 0,
// 角色表格数据
roleList: [],
// TODO: 工序表格数据
processList: [],
// TODO: 模拟数据中转表 (为了解决模拟数据的查询问题)
toList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
// TODO: 是否显示弹出层
open: false,
// 是否显示弹出层（数据详情）
// TODO: 是否显示弹出层（数据详情）
openDetails: false,
// 日期范围
// dateRange: [],
......@@ -175,13 +194,12 @@ export default {
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
// 查询参数
// TODO: 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
processName: undefined,
workshop: undefined,
flag: undefined
processName: '',
workshop: ''
},
defaultProps: {},
// TODO: 表单参数
......@@ -213,16 +231,33 @@ export default {
createBy: ''
},
// TODO: 模拟测试数据
simulateProcessList: [{ processName: '打磨', workshop: '车间1', flag: 1, createTime: new Date(), updataTime: new Date(), createBy: '张三' }, { processName: '焊接', workshop: '车间2', flag: 2, createTime: new Date(), updataTime: new Date(), createBy: '李四' }],
simulateProcessList: [
{
processName: '打磨',
workshop: '车间1',
flag: 1,
createTime: new Date(),
updataTime: new Date(),
createBy: '张三'
},
{
processName: '焊接',
workshop: '车间2',
flag: 2,
createTime: new Date(),
updataTime: new Date(),
createBy: '李四'
}
],
// 表单校验
// TODO: 表单校验
rules: {
processName: [
{ required: true, message: '请输入工序名称', trigger: 'blur' },
{ min: 2, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur' }
{required: true, message: '请输入工序名称', trigger: 'blur'},
{min: 2, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur'}
],
workshop: [
{ required: true, message: '请输入车间名称', trigger: 'blur' }
{required: true, message: '请输入车间名称', trigger: 'blur'}
],
createBy: [
{ required: true, message: '请输入创建人姓名', trigger: 'blur' }
......@@ -250,11 +285,37 @@ export default {
this.getList()
},
methods: {
/** 查询角色列表 */
/** TODO: 查询列表 */
getList() {
this.loading = true
this.roleList = this.simulateProcessList
console.log(this.roleList)
this.reset()
// TODO: 此处为模拟数据的，根据不同条件去查询的过滤方法，可以删除！
if (this.queryParams.workshop === '' && this.queryParams.processName !== '') {
for (const ps of this.simulateProcessList) {
if (ps.processName === this.queryParams.processName) {
this.toList.push(ps)
}
}
} else if (this.queryParams.workshop !== '' && this.queryParams.processName === '') {
for (const ps of this.simulateProcessList) {
if (ps.workshop === this.queryParams.workshop) {
this.toList.push(ps)
}
}
} else if (this.queryParams.workshop !== '' && this.queryParams.processName !== '') {
for (const ps of this.simulateProcessList) {
if (ps.workshop === this.queryParams.workshop && ps.processName === this.queryParams.processName) {
this.toList.push(ps)
}
}
} else {
this.toList = this.simulateProcessList
}
// DONE: 此上为模拟数据的，根据不同条件去查询的过滤方法，可以删除！
this.processList = this.toList
this.total = this.toList.length
console.log(this.processList)
this.loading = false
},
// 取消按钮
......@@ -265,6 +326,7 @@ export default {
// 表单重置
reset() {
// TODO: 将模拟数据的空对象赋值给表单对象，达成清空填写表单的效果
this.toList = []
this.form = {
processName: '',
workshop: '',
......@@ -278,6 +340,7 @@ export default {
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
console.log('this is queryParams', this.queryParams)
},
/** TODO: 重置按钮操作 */
resetQuery() {},
......@@ -399,14 +462,23 @@ export default {
margin-left: 15px;
}
}
.el-divider--vertical{
.el-divider--vertical {
height: 12em;
width: 4px;
}
.aboutSingleDetails{
.el-form-item{
.el-input >>> .el-input__inner {
//TODO: 这里是控制内容列表的样式
.processListBtns {
.el-button {
margin: 0 7px;
}
}
//TODO: readOnly里去删除el-input的边框样式
.aboutSingleDetails {
.el-form-item {
.el-input > > > .el-input__inner {
-webkit-appearance: none;
background-color: #FFF;
background-image: none;
......
src/views/production/craftsmanship/index.vue
View file @ c3381046
<template>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="活动区域">
<div class="info"><span style="color: #333; font-weight: 700;">基本信息</span></div>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 16%;">
<el-form-item label="生产工艺">
<el-select v-model="form.region" placeholder="请选择活动区域">
<el-option label="区域一" value="shanghai" />
<el-option label="区域二" value="beijing" />
<el-option label="工艺一" value="shanghai" />
<el-option label="工艺二" value="beijing" />
</el-select>
</el-form-item>
<el-form style="display: flex; flex-wrap: wrap;">
<el-form-item label="文本框1" style="flex-basis: 50%;">
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 16%;">
<el-form-item label="编码一" style="flex-basis: 50%;">
<el-input ref="input1" v-model="form.name" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="编码二" style="flex-basis: 50%;">
<el-input ref="input2" v-model="form.date1" :style="{ width: '400px', height: '30px' }" @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="编码三" style="flex-basis: 50%;">
<el-input ref="input3" v-model="form.date2" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.region === 'beijing'" label="编码四" style="flex-basis: 50%;">
<el-input ref="input4" v-model="form.type" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
<el-form-item v-else label="编码六" style="flex-basis: 50%;">
<el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 16%;">
<el-form-item v-if="form.region === 'beijing'" label="编码五" style="flex-basis: 50%;">
<el-input ref="input5" v-model="form.resource" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
</el-col>
<el-col :span="12" :style="form.region !== 'beijing'? 'padding-left: 16%;': 'padding-left: noset;'">
<el-form-item v-if="form.region === 'beijing'" label="编码六" style="flex-basis: 50%;">
<el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-col>
</el-row>
<div class="button">
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</el-form>
<!-- <el-form style="display: flex; flex-wrap: wrap;justify-content: center;">
<el-form-item label="编码一" style="flex-basis: 50%;">
<el-input ref="input1" v-model="form.name" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
<el-form-item label="文本框2" style="flex-basis: 50%;">
<el-form-item label="编码二" style="flex-basis: 50%;">
<el-input ref="input2" v-model="form.date1" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
<el-form-item label="文本框3" style="flex-basis: 50%;">
<el-form-item label="编码三" style="flex-basis: 50%;">
<el-input ref="input3" v-model="form.date2" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框4" style="flex-basis: 50%;">
<el-form-item v-if="form.region === 'beijing'" label="编码四" style="flex-basis: 50%;">
<el-input ref="input4" v-model="form.type" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框5" style="flex-basis: 50%;">
<el-form-item v-if="form.region === 'beijing'" label="编码五" style="flex-basis: 50%;">
<el-input ref="input5" v-model="form.resource" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
<el-form-item label="文本框6" style="flex-basis: 50%;">
<el-form-item label="编码六" style="flex-basis: 50%;">
<el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item>
</el-form>
<el-form-item style="width: 100%;">
<el-button type="primary" @click="submitForm">提交</el-button>
</el-form-item>
</el-form>
</el-form> -->
</template>
......@@ -45,12 +92,12 @@ export default {
date2: '',
type: '',
resource: '',
desc: ''
desc: '',
region: 'shanghai'
}
}
},
methods: {
handelTab(i, e) {
const that = this
if (!that.$refs['input' + i]) {
......@@ -65,3 +112,20 @@ export default {
}
}
</script>
<style scoped>
.left-margin {
margin-left: 20px;
}
.info{
height: 100px;
display: flex;
align-items: center;
justify-content: center;
}
.button{
margin-top: 11%;
margin-left: 20%;
}
</style>
\ No newline at end of file
src/views/production/data/index.vue
View file @ c3381046
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="工艺名称" prop="roleName">
<el-form-item label="生产工艺">
<el-select v-model="form.region" placeholder="请选择活动区域">
<el-option label="工艺一" value="shanghai" />
<el-option label="工艺二" value="beijing" />
</el-select>
</el-form-item>
<el-form-item label="单号" prop="">
<el-input
v-model="queryParams.roleName"
placeholder="请输入工艺名称"
v-model="queryParams.number"
placeholder="请输入单号"
clearable
:maxlength="30"
size="small"
style="width: 150px"
style="width: 225px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作员" prop="roleName">
<el-input
v-model="queryParams.createby"
placeholder="请输入操作员"
clearable
:maxlength="30"
size="small"
style="width: 225px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作时间">
<el-date-picker
v-model="form.date2"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
......@@ -35,7 +68,6 @@
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"-->
<!-- >导出</el-button>-->
<coolbutton style="padding: 8px 7px;" :type="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" />
</el-form-item>
</div>
</el-form>
......@@ -47,43 +79,49 @@
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">生产数据列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="index" label="序号" width="380" /> -->
<el-table v-loading="loading" border :data="simulateProcessList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="名称" prop="2222" :show-overflow-tooltip="true" width="222">
<el-table-column label="工艺名称" prop="2222" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
{{ scope.row.name || '-' }}
</template>
</el-table-column>
<el-table-column label="编码" prop="2222" :show-overflow-tooltip="true" width="222">
<el-table-column label="单号" prop="2222" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
{{ scope.row.number || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="xxx" :show-overflow-tooltip="true" width="222">
<el-table-column label="编码一" prop="xxx" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
{{ scope.row.code1 || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="xxx" :show-overflow-tooltip="true" width="222">
<el-table-column label="编码二" prop="xxx" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
{{ scope.row.code2 || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="xxx" :show-overflow-tooltip="true" width="222">
<el-table-column label="编码三" prop="xxx" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
{{ scope.row.code3 || '-' }}
</template>
</el-table-column>
<el-table-column label="创建人" prop="xxx" :show-overflow-tooltip="true" width="222">
<el-table-column label="编码四" prop="xxx" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.xxx || '-' }}
{{ scope.row.code4 || '-' }}
</template>
</el-table-column>
<el-table-column label="操作员" prop="xxx" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{ scope.row.createby || '-' }}
</template>
</el-table-column>
......@@ -102,9 +140,9 @@
/>
</template>
</el-table-column> -->
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="222">
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
......@@ -254,6 +292,19 @@ export default {
components: { Coolbutton },
data() {
return {
// TODO: 模拟测试数据
simulateProcessList: [
{ name: '归真', number: 'A01', code1: 42, code2: 11,code3: 35,code4: 1, createby: '柯泽宇', createTime: new Date(), }
,{ name: '揉捻', number: 'A02', code1: 54, code2: 18,code3: 34,code4: 9, createby: '刘宇杨', createTime: new Date(), }
,{ name: '发酵', number: 'A03', code1: 14, code2: 85,code3: 28,code4: 8, createby: '吴志坤', createTime: new Date(), }
,{ name: '干燥', number: 'A04', code1: 74, code2: 43,code3: 29,code4: 6, createby: '陈嘉佑', createTime: new Date(), }
,{ name: '掌天', number: 'A05', code1: 79, code2: 17,code3: 85,code4: 2, createby: '王鼎义', createTime: new Date(), }
,{ name: '虚极', number: 'A06', code1: 53, code2: 25,code3: 86,code4: 3, createby: '李万洋', createTime: new Date(), }
,{ name: '造化', number: 'A07', code1: 15, code2: 36,code3: 18,code4: 7, createby: '赵叶蕾', createTime: new Date(), }
,{ name: '超凡', number: 'A08', code1: 35, code2: 34,code3: 96,code4: 2, createby: '田安琪', createTime: new Date(), }
,{ name: '入圣', number: 'A09', code1: 45, code2: 39,code3: 69,code4: 5, createby: '岑歆奕', createTime: new Date(), }
,{ name: '登峰', number: 'A10', code1: 17, code2: 37,code3: 37,code4: 4, createby: '礼堂丁真', createTime: new Date(), }
],
typeParent: 'text',
typePrimary: 'primary',
typeSuccess: 'success',
......@@ -310,6 +361,7 @@ export default {
dictValue: '0'
}
],
// 数据范围选项
dataScopeOptions: [
{
......@@ -347,7 +399,7 @@ export default {
},
// 表单参数
form: {
region: 'shanghai'
},
defaultProps: {
children: 'children',
......
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