Skip to content

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

库存管理3

parent b77595aa
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 81 deletions
src/views/equipment/boundManagement.vue
View file @ 297aae15
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
{{ scope.row.phd || '-' }} {{ scope.row.phd || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作员" prop="createBy"> <el-table-column label="操作员" prop="createName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.createBy || '-' }} {{ scope.row.createName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate"> <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
...@@ -168,8 +168,8 @@ ...@@ -168,8 +168,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作员：" prop="createBy"> <el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createBy" :readonly="true" /> <el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -178,20 +178,6 @@ ...@@ -178,20 +178,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态：" prop="flag">
<el-input v-model.trim="singleDetails.flag" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="psm：" prop="psm"> <el-form-item label="psm：" prop="psm">
...@@ -204,8 +190,8 @@ ...@@ -204,8 +190,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="备注：" prop="remarks"> <el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.remarks" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
...@@ -237,14 +223,12 @@ export default { ...@@ -237,14 +223,12 @@ export default {
lot: '', lot: '',
location: '', location: '',
thickness: '', thickness: '',
createBy: '', createName: '',
createTime: '' createTime: ''
}, },
// 是否显示弹出层（数据详情） // 是否显示弹出层（数据详情）
openDetails: false, openDetails: false,
// // TODO: 模拟测试数据 // // TODO: 模拟测试数据
// equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
// check: '开始盘点',
typeParent: 'text', typeParent: 'text',
typePrimary: 'primary', typePrimary: 'primary',
typeSuccess: 'success', typeSuccess: 'success',
......
src/views/equipment/management.vue
View file @ 297aae15
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-form-item> </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>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="placeholder" /> <div class="placeholder" />
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
{{ scope.row.phd || '-' }} {{ scope.row.phd || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作员" prop="createBy"> <el-table-column label="操作员" prop="createName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.createBy || '-' }} {{ scope.row.createName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate"> <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
...@@ -119,15 +119,6 @@ ...@@ -119,15 +119,6 @@
@check-change="handleMenuCheckChange" @check-change="handleMenuCheckChange"
/> />
</el-form-item> </el-form-item>
<el-form-item label="备注">
<el-input
v-model.trim="form.remark"
maxlength="200"
show-word-limit
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
...@@ -165,8 +156,8 @@ ...@@ -165,8 +156,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作员：" prop="createBy"> <el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createBy" :readonly="true" /> <el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -175,20 +166,6 @@ ...@@ -175,20 +166,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态：" prop="flag">
<el-input v-model.trim="singleDetails.flag" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="psm：" prop="psm"> <el-form-item label="psm：" prop="psm">
...@@ -201,8 +178,8 @@ ...@@ -201,8 +178,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="备注：" prop="remarks"> <el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.remarks" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
...@@ -234,14 +211,12 @@ export default { ...@@ -234,14 +211,12 @@ export default {
lot: '', lot: '',
location: '', location: '',
thickness: '', thickness: '',
createBy: '', createName: '',
createTime: '' createTime: ''
}, },
// 是否显示弹出层（数据详情） // 是否显示弹出层（数据详情）
openDetails: false, openDetails: false,
// // TODO: 模拟测试数据 // // TODO: 模拟测试数据
// equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
// check: '开始盘点',
typeParent: 'text', typeParent: 'text',
typePrimary: 'primary', typePrimary: 'primary',
typeSuccess: 'success', typeSuccess: 'success',
...@@ -331,7 +306,9 @@ export default { ...@@ -331,7 +306,9 @@ export default {
rows: 10, rows: 10,
pn: undefined, pn: undefined,
lot: undefined, lot: undefined,
snapLocation: undefined plocation: undefined,
pstatus: 1,
ptype: 1
}, },
// 表单参数 // 表单参数
form: { form: {
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ 297aae15
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
{{ scope.row.phd || '-' }} {{ scope.row.phd || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作员" prop="createBy"> <el-table-column label="操作员" prop="createName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.createBy || '-' }} {{ scope.row.createName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate"> <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
...@@ -165,8 +165,8 @@ ...@@ -165,8 +165,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作员：" prop="createBy"> <el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createBy" :readonly="true" /> <el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -175,20 +175,6 @@ ...@@ -175,20 +175,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态：" prop="flag">
<el-input v-model.trim="singleDetails.flag" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="psm：" prop="psm"> <el-form-item label="psm：" prop="psm">
...@@ -201,8 +187,8 @@ ...@@ -201,8 +187,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="备注：" prop="remarks"> <el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.remarks" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
...@@ -234,14 +220,12 @@ export default { ...@@ -234,14 +220,12 @@ export default {
lot: '', lot: '',
location: '', location: '',
thickness: '', thickness: '',
createBy: '', createName: '',
createTime: '' createTime: ''
}, },
// 是否显示弹出层（数据详情） // 是否显示弹出层（数据详情）
openDetails: false, openDetails: false,
// // TODO: 模拟测试数据 // // TODO: 模拟测试数据
// equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
// check: '开始盘点',
typeParent: 'text', typeParent: 'text',
typePrimary: 'primary', typePrimary: 'primary',
typeSuccess: 'success', typeSuccess: 'success',
...@@ -331,7 +315,9 @@ export default { ...@@ -331,7 +315,9 @@ export default {
rows: 10, rows: 10,
pn: undefined, pn: undefined,
lot: undefined, lot: undefined,
snapLocation: undefined plocation: undefined,
pstatus: 1,
ptype: 2
}, },
// 表单参数 // 表单参数
form: { form: {
......
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