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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 86 deletions
src/views/production/craftsmanship/index.vue
View file @ c3381046
<template> <template>
<el-form ref="form" :model="form" label-width="80px"> <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-select v-model="form.region" placeholder="请选择活动区域"> <el-row :gutter="40">
<el-option label="区域一" value="shanghai" /> <el-col :span="12" style="padding-left: 16%;">
<el-option label="区域二" value="beijing" /> <el-form-item label="生产工艺">
</el-select> <el-select v-model="form.region" placeholder="请选择活动区域">
</el-form-item> <el-option label="工艺一" value="shanghai" />
<el-option label="工艺二" value="beijing" />
<el-form style="display: flex; flex-wrap: wrap;"> </el-select>
<el-form-item label="文本框1" style="flex-basis: 50%;"> </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="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-input ref="input1" v-model="form.name" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item> </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-input ref="input2" v-model="form.date1" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item> </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-input ref="input3" v-model="form.date2" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item> </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-input ref="input4" v-model="form.type" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item> </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-input ref="input5" v-model="form.resource" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item> </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-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form-item style="width: 100%;"> <el-form-item style="width: 100%;">
<el-button type="primary" @click="submitForm">提交</el-button> <el-button type="primary" @click="submitForm">提交</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form> -->
</template> </template>
...@@ -45,12 +92,12 @@ export default { ...@@ -45,12 +92,12 @@ export default {
date2: '', date2: '',
type: '', type: '',
resource: '', resource: '',
desc: '' desc: '',
region: 'shanghai'
} }
} }
}, },
methods: { methods: {
handelTab(i, e) { handelTab(i, e) {
const that = this const that = this
if (!that.$refs['input' + i]) { if (!that.$refs['input' + i]) {
...@@ -65,3 +112,20 @@ export default { ...@@ -65,3 +112,20 @@ export default {
} }
} }
</script> </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> <template>
<div class="app-container"> <div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <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 <el-input
v-model="queryParams.roleName" v-model="queryParams.number"
placeholder="请输入工艺名称" placeholder="请输入单号"
clearable clearable
:maxlength="30" :maxlength="30"
size="small" size="small"
style="width: 150px" style="width: 225px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
...@@ -35,8 +68,7 @@ ...@@ -35,8 +68,7 @@
<!-- icon="el-icon-download"--> <!-- icon="el-icon-download"-->
<!-- @click="handleExport"--> <!-- @click="handleExport"-->
<!-- >导出</el-button>--> <!-- >导出</el-button>-->
<coolbutton style="padding: 8px 7px;" :type="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" /> </el-form-item>
</el-form-item>
</div> </div>
</el-form> </el-form>
<!-- 这里是列表了，注意，这是分割线 --> <!-- 这里是列表了，注意，这是分割线 -->
...@@ -47,43 +79,49 @@ ...@@ -47,43 +79,49 @@
<div class="placeholder" /> <div class="placeholder" />
<div style="padding:5px 10px"> <div style="padding:5px 10px">
<div class="mb12 font-small-bold">生产数据列表</div> <div class="mb12 font-small-bold">生产数据列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="simulateProcessList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="index" label="序号" width="380" /> --> <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"> <template slot-scope="scope">
{{ scope.row.xxx || '-' }} {{ scope.row.name || '-' }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.xxx || '-' }} {{ scope.row.number || '-' }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.xxx || '-' }} {{ scope.row.code1 || '-' }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.xxx || '-' }} {{ scope.row.code2 || '-' }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.xxx || '-' }} {{ scope.row.code3 || '-' }}
</template> </template>
</el-table-column> </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"> <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> </template>
</el-table-column> </el-table-column>
...@@ -102,9 +140,9 @@ ...@@ -102,9 +140,9 @@
/> />
</template> </template>
</el-table-column> --> </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"> <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> </template>
</el-table-column> </el-table-column>
...@@ -254,6 +292,19 @@ export default { ...@@ -254,6 +292,19 @@ export default {
components: { Coolbutton }, components: { Coolbutton },
data() { data() {
return { 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', typeParent: 'text',
typePrimary: 'primary', typePrimary: 'primary',
typeSuccess: 'success', typeSuccess: 'success',
...@@ -310,6 +361,7 @@ export default { ...@@ -310,6 +361,7 @@ export default {
dictValue: '0' dictValue: '0'
} }
], ],
// 数据范围选项 // 数据范围选项
dataScopeOptions: [ dataScopeOptions: [
{ {
...@@ -347,7 +399,7 @@ export default { ...@@ -347,7 +399,7 @@ export default {
}, },
// 表单参数 // 表单参数
form: { form: {
region: 'shanghai'
}, },
defaultProps: { defaultProps: {
children: 'children', 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