Skip to content

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

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

parents 33aa2aef ee44182c
Hide whitespace changes
Inline Side-by-side
Showing with 735 additions and 530 deletions
src/api/magnagement.js
View file @ 2c664b3c
...@@ -34,4 +34,18 @@ export function add(data) { ...@@ -34,4 +34,18 @@ export function add(data) {
} }
}) })
} }
// 逻辑删除基础信息接口
export function deletedevice(id) {
return request({
url: '/wbwarehouse/delete/' + id,
method: 'delete'
})
}
// 导出
export function exportdevice() {
return request({
url: '/wbwarehouse/export',
method: 'get',
responseType: 'blob'
})
}
src/api/processMangement/InventoryRecord.js
View file @ 2c664b3c
import request from '@/utils/request' import request from '@/utils/request'
// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询 // TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
export function listLog(queryParams) { export function listLog(queryParams, queryMaps) {
return request({ return request({
url: '/wbwarehouselog/queryWbWarehouseLogByPagination', url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
method: 'get', method: 'post',
params: queryParams params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
}) })
} }
......
src/api/sample/inventoryRecord.js 0 → 100644
View file @ 2c664b3c
import request from '@/utils/request'
// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
export function listLog(queryParams, queryMaps) {
return request({
url: '/wbchemistrylog/queryWbChemistryLogByPagination',
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
/* TODO: 用来查询单项出入库记录的废弃详情信息 */
export function findSingleLogDetail(singleLogIdAndUser) {
return request({
url: '/wbchemistrylog/detail',
method: 'post',
data: singleLogIdAndUser,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
/* TODO: 用来导出表单信息 */
export function exportInventoryRecord() {
return request({
url: '/wbchemistrylog/export',
method: 'get',
responseType: 'blob'
})
}
src/components/Table/AllTableArguments/BaseTableArguments.js
View file @ 2c664b3c
...@@ -81,32 +81,10 @@ export function BaseTableArguments(selection, loading, processList, queryParams, ...@@ -81,32 +81,10 @@ export function BaseTableArguments(selection, loading, processList, queryParams,
} }
// TODO: 组件表单所需的所有参数 // TODO: 组件表单所需的所有参数
export function BaseTableArgumentsTest(nIndex, selection, loading, List, queryParams, columnData) { export function BaseTableArgumentsTest(listName, loading, List, queryParams, columObj) {
// TODO: 选择框是否需要存在 (selection判断表单选择框是否需要存在) this.listName = listName
if (typeof selection !== 'boolean') { this.loading = loading
console.warn('selection下拉框参数的type类型错误!请检查后重新赋值')
} else {
this.selection = selection
// TODO: 选择框 (根据条件是否可选)
this.selectable = (row, index) => {
if (row.isSwitch) {
return true
}
}
}
// TODO: 加载进度 (判断是否显示加载进度)
if (typeof loading !== 'boolean') {
console.warn('loading进度条参数的type类型错误!请检查后重新赋值')
} else {
this.loading = loading
}
// TODO: 查询参数 (判断查询条件是否符合类型)
if (queryParams instanceof queryParamsType) {
this.queryParams = queryParamsType
}
this.columnData = columnData
this.List = List this.List = List
this.queryParams = queryParams
this.columObj = columObj
} }
src/components/Table/BaseTable/index.vue
View file @ 2c664b3c
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
border border
:data="allTableArguments.List" :data="allTableArguments.List"
style="width: 100%;" style="width: 100%;"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange(row)"
> >
<el-table-column type="index" label="序号" width="50" /> <el-table-column type="index" label="序号" width="50" />
...@@ -46,17 +46,17 @@ ...@@ -46,17 +46,17 @@
<!-- 图片展示 --> <!-- 图片展示 -->
<el-popover trigger="hover" placement="top" popper-class="popper"> <el-popover trigger="hover" placement="top" popper-class="popper">
<img v-if="column.image" :src="viewUrl + row[column.prop]" alt=""> <img v-if="column.image" :src="viewUrl + row[column.prop]" alt="">
<el-image v-if="column.image" slot="reference" :src="viewUrl + row[column.prop]" /> <el-image v-if="column.image" :src="viewUrl + row[column.prop]" />
</el-popover> </el-popover>
<!-- 图片数组 --> <!-- 图片数组 -->
<el-popover v-if="column.imageArr" trigger="hover" placement="top" popper-class="popper"> <el-popover v-if="column.imageArr" trigger="hover" placement="top" popper-class="popper">
<img v-if="row[column.prop].length>0" :src="row[column.prop][0]" alt=""> <img v-if="row[column.prop].length>0" :src="row[column.prop][0]" alt="">
<el-image v-if="row[column.prop].length >0" slot="reference" :src="row[column.prop][0]" :preview-src-list="row[column.prop]" /> <el-image v-if="row[column.prop].length >0" :src="row[column.prop][0]" :preview-src-list="row[column.prop]" />
</el-popover> </el-popover>
<!-- 可编辑input，仅在text默认展示类型才可编辑--> <!-- 可编辑input，仅在text默认展示类型才可编辑-->
<el-input v-if="column.editRow === $index" v-model="row[column.prop]" v-focus @blur="editInputBlur(row,$index,column.prop,columIndex)" /> <el-input v-if="column.editRow === $index" v-model="row[column.prop]" @blur="editInputBlur(row,$index,column.prop,columIndex)" />
<!-- 操作按钮 --> <!-- 操作按钮 -->
<span v-if="column.isOperation" class="processListBtns"> <span v-if="column.isOperation" class="processListBtns">
<span v-for="(operations, index) in column.operation" :key="index"> <span v-for="(operations, index) in column.operation" :key="index">
...@@ -84,13 +84,7 @@ export default { ...@@ -84,13 +84,7 @@ export default {
allTableArguments: { allTableArguments: {
type: BaseTableArgumentsTest, type: BaseTableArgumentsTest,
default: () => { default: () => {
return { return new BaseTableArgumentsTest()
selection: Boolean,
loading: Boolean,
queryParams: Object,
List: Array,
columnData: Array
}
} }
}, },
nIndex: { nIndex: {
...@@ -107,6 +101,9 @@ export default { ...@@ -107,6 +101,9 @@ export default {
} }
}, },
methods: { methods: {
handleSelectionChange(row) {
this.$emit('handle-selection-change', row)
},
handleDetail(row) { handleDetail(row) {
this.$emit('handle-detail', row) this.$emit('handle-detail', row)
}, },
......
src/views/equipment/basicInfo.vue
View file @ 2c664b3c
...@@ -12,20 +12,20 @@ ...@@ -12,20 +12,20 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="ptype" prop="pgx"> <el-form-item label="pgx" prop="pgx">
<el-input <el-input
v-model="queryParams.ptype" v-model="queryParams.pgx"
placeholder="请输入ptype" placeholder="请输入pgx"
clearable clearable
size="small" size="small"
style="width: 150px" style="width: 150px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="pgx" prop="pgx"> <el-form-item label="prank" prop="prank">
<el-input <el-input
v-model="queryParams.pgx" v-model="queryParams.prank"
placeholder="请输入pgx" placeholder="请输入prank"
clearable clearable
size="small" size="small"
style="width: 150px" style="width: 150px"
...@@ -56,11 +56,6 @@ ...@@ -56,11 +56,6 @@
{{ scope.row.pn || '-' }} {{ scope.row.pn || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.ptype || '-' }}
</template>
</el-table-column>
<el-table-column label="pgx" prop="pgx"> <el-table-column label="pgx" prop="pgx">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.pgx || '-' }} {{ scope.row.pgx || '-' }}
...@@ -236,11 +231,11 @@ export default { ...@@ -236,11 +231,11 @@ export default {
pgx: [ pgx: [
{ required: true, message: '请输入pgx', trigger: 'blur' } { required: true, message: '请输入pgx', trigger: 'blur' }
], ],
prank: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }], prank: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
pissb: [ pissb: [
{ required: true, message: '请输入pissb', trigger: 'blur' } { required: true, message: '请输入pissb', trigger: 'blur' }
], ],
psm: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }], psm: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
psy: [ psy: [
{ required: true, message: '请输入psy', trigger: 'blur' } { required: true, message: '请输入psy', trigger: 'blur' }
] ]
......
src/views/equipment/boundManagement.vue
View file @ 2c664b3c
...@@ -69,9 +69,9 @@ ...@@ -69,9 +69,9 @@
{{ scope.row.createName || '-' }} {{ 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="updateDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="110px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="110px">
...@@ -99,27 +99,27 @@ ...@@ -99,27 +99,27 @@
<!-- 添加或修改设备配置对话框 --> <!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
<el-form-item label="pn" prop="pn"> <el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" /> <el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="lot" prop="lot"> <el-form-item label="lot" prop="lot">
<el-input v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" /> <el-input ref="input2" v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="plocation" prop="plocation"> <el-form-item label="plocation" prop="plocation">
<el-input v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" /> <el-input ref="input3" v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="厚度" prop="phd"> <el-form-item label="厚度" prop="phd">
<el-input v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" /> <el-input ref="input4" v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="psm" prop="psm"> <el-form-item label="psm" prop="psm">
<el-input v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" /> <el-input ref="input5" v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="pzl" prop="pzl"> <el-form-item label="pzl" prop="pzl">
<el-input v-model.trim="form.pzl" :maxlength="30" placeholder="请输入pzl" /> <el-input ref="input6" v-model.trim="form.pzl" :maxlength="30" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="parnk" prop="prank"> <el-form-item label="parnk" prop="prank">
<el-input v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" /> <el-input ref="input7" v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -176,8 +176,8 @@ ...@@ -176,8 +176,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate"> <el-form-item label=" 操作时间：" prop="updateDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -327,6 +327,11 @@ export default { ...@@ -327,6 +327,11 @@ export default {
formData: {} formData: {}
} }
}, },
mounted() {
this.$nextTick(() => {
this.$refs.input1.$refs.input.focus()
})
},
/** 路由离开前存储筛选条件*/ /** 路由离开前存储筛选条件*/
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
this.$store.dispatch('searchSave/searchParamsSet', { this.$store.dispatch('searchSave/searchParamsSet', {
...@@ -346,6 +351,17 @@ export default { ...@@ -346,6 +351,17 @@ export default {
this.getList() this.getList()
}, },
methods: { 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()
})
},
// TODO: 获取所选行详情信息操作 // TODO: 获取所选行详情信息操作
handleDetail(row) { handleDetail(row) {
this.singleDetails = this.formReset this.singleDetails = this.formReset
......
src/views/equipment/income.vue
View file @ 2c664b3c
...@@ -5,47 +5,47 @@ ...@@ -5,47 +5,47 @@
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;"> <el-col :span="12" style="padding-left: 10%;">
<el-form-item label="pn:" style="flex-basis: 50%;" prop="pn"> <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" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="lot:" style="flex-basis: 50%;" prop="lot"> <el-form-item label="lot:" style="flex-basis: 50%;" prop="lot">
<el-input v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="10" /> <el-input ref="input2" v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;"> <el-col :span="12" style="padding-left: 10%;">
<el-form-item label="位置:" style="flex-basis: 50%;" prop="plocation"> <el-form-item label="位置:" style="flex-basis: 50%;" prop="plocation">
<el-input v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="50" /> <el-input ref="input3" v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd"> <el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
<el-input v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="10" /> <el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;"> <el-col :span="12" style="padding-left: 10%;">
<el-form-item label="psm:" style="flex-basis: 50%;" prop="psm"> <el-form-item label="psm:" style="flex-basis: 50%;" prop="psm">
<el-input v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="50" /> <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="50" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl"> <el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
<el-input v-model="form.pzl" placeholder="请输入pzl" :style="{ width: '400px', height: '30px' }" :maxlength="10" /> <el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" style="padding-left: 8.6%;"> <el-col :span="12" style="padding-left: 8.6%;">
<el-form-item label="prank:" style="flex-basis: 50%;" prop="prank"> <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="input7" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(7,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="button" > <div class="button">
<el-button type="primary" @click="submitForm">提交</el-button> <el-button type="primary" @click="submitForm">提交</el-button>
</div> </div>
</el-form> </el-form>
...@@ -81,10 +81,31 @@ export default { ...@@ -81,10 +81,31 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$refs.input1.$refs.input.focus()
})
},
created() { created() {
this.init() this.init()
}, },
methods: { methods: {
focusNextInput(refName) {
this.$nextTick(() => {
this.$refs[refName].$refs.input.focus()
})
},
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() { resetFrom() {
this.form = { this.form = {
...@@ -160,11 +181,12 @@ export default { ...@@ -160,11 +181,12 @@ export default {
.title{ .title{
color: #333; color: #333;
font-weight: 700; font-weight: 700;
font-size: 16px;
} }
} }
.button{ .button{
margin-top: 7%; margin-top: 7%;
margin-left: 11%; margin-left: 15.6%;
} }
} }
......
src/views/equipment/management.vue
View file @ 2c664b3c
...@@ -38,6 +38,17 @@ ...@@ -38,6 +38,17 @@
<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-search" size="small" @click="handleQuery">查询</el-button>
<el-button 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> </el-form-item>
<el-form-item style="float: right">
<el-button
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
@click="handleExport"
>导出</el-button>
</el-form-item>
</el-form> </el-form>
<div class="placeholder" /> <div class="placeholder" />
<div style="padding:5px 10px"> <div style="padding:5px 10px">
...@@ -69,16 +80,22 @@ ...@@ -69,16 +80,22 @@
{{ scope.row.createName || '-' }} {{ 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="updateDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="80px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)"> <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情 详情
</el-button> </el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -174,7 +191,7 @@ ...@@ -174,7 +191,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate"> <el-form-item label=" 入库日期：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -189,15 +206,12 @@ import { ...@@ -189,15 +206,12 @@ import {
addRole, addRole,
changeRoleStatus, changeRoleStatus,
dataScope, dataScope,
delRole,
exportRole,
getRole, getRole,
updateRole updateRole
} from '@/api/system/role' } from '@/api/system/role'
import { listdevice } from '@/api/magnagement' import { listdevice, deletedevice, exportdevice } from '@/api/magnagement'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu' import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept' import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default { export default {
name: 'Role', name: 'Role',
data() { data() {
...@@ -306,7 +320,7 @@ export default { ...@@ -306,7 +320,7 @@ export default {
lot: undefined, lot: undefined,
plocation: undefined, plocation: undefined,
pstatus: 0, pstatus: 0,
ptype: 1, ptype: 2,
delFlag: 0 delFlag: 0
}, },
// 表单参数 // 表单参数
...@@ -648,41 +662,42 @@ export default { ...@@ -648,41 +662,42 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.businessId || this.ids const id = row.businessId
this.$confirm('是否确认操作？', '提示', { this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(res => {
return delRole(roleIds) deletedevice(id).then(res => {
}).then(() => { if (res.code === 200) {
this.getList() this.$message.success('操作成功')
this.$message({ this.getList()
message: '删除成功', }
type: 'success'
}) })
}).catch(function() {
}) })
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams this.$confirm('是否确认导出设备管理信息?', '警告', {
this.$confirm('是否确认操作?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(function() {
return exportRole(queryParams).then(response => { return exportdevice().then(response => {
const blob = new Blob([response]) const blob = new Blob([response])
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接 // TODO: 创建下载的链接
const href = window.URL.createObjectURL(blob)
downloadElement.href = href downloadElement.href = href
downloadElement.download = '角色信息' + '.xls' // 下载后文件名 // TODO: 下载后文件名
downloadElement.download = '设备管理信息' + '.xls'
document.body.appendChild(downloadElement) document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载 // TODO: 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素 downloadElement.click()
window.URL.revokeObjectURL(href)// 释放掉blob对象 // TODO: 下载完成移除元素
// this.download(response.msg); document.body.removeChild(downloadElement)
// TODO: 释放掉blob对象
window.URL.revokeObjectURL(href)
}) })
}) })
} }
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ 2c664b3c
...@@ -38,10 +38,19 @@ ...@@ -38,10 +38,19 @@
<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-search" size="small" @click="handleQuery">查询</el-button>
<el-button 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> </el-form-item>
<el-form-item style="float: right">
<el-button
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
@click="handleExport"
>导出</el-button>
</el-form-item>
</el-form> </el-form>
<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="equipmentList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="80" /> <el-table-column type="index" label="序号" width="80" />
<el-table-column label="pn" prop="businessId"> <el-table-column label="pn" prop="businessId">
...@@ -69,9 +78,9 @@ ...@@ -69,9 +78,9 @@
{{ scope.row.createName || '-' }} {{ 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="updateDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="80px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
...@@ -119,15 +128,6 @@ ...@@ -119,15 +128,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>
...@@ -183,8 +183,8 @@ ...@@ -183,8 +183,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate"> <el-form-item label=" 操作时间：" prop="updateDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -199,11 +199,10 @@ import { ...@@ -199,11 +199,10 @@ import {
changeRoleStatus, changeRoleStatus,
dataScope, dataScope,
delRole, delRole,
exportRole,
getRole, getRole,
updateRole updateRole
} from '@/api/system/role' } from '@/api/system/role'
import { listdevice } from '@/api/magnagement' import { listdevice, exportdevice } from '@/api/magnagement'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu' import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept' import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template' // import { getRolesByInsId } from '../../../api/businessManage/template'
...@@ -675,22 +674,26 @@ export default { ...@@ -675,22 +674,26 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams this.$confirm('是否确认导出工序库信息?', '警告', {
this.$confirm('是否确认操作?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(function() {
return exportRole(queryParams).then(response => { return exportdevice().then(response => {
const blob = new Blob([response]) const blob = new Blob([response])
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接 // TODO: 创建下载的链接
const href = window.URL.createObjectURL(blob)
downloadElement.href = href downloadElement.href = href
downloadElement.download = '角色信息' + '.xls' // 下载后文件名 // TODO: 下载后文件名
downloadElement.download = '设备工序库信息' + '.xls'
document.body.appendChild(downloadElement) document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载 // TODO: 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素 downloadElement.click()
window.URL.revokeObjectURL(href)// 释放掉blob对象 // TODO: 下载完成移除元素
document.body.removeChild(downloadElement)
// TODO: 释放掉blob对象
window.URL.revokeObjectURL(href)
// this.download(response.msg); // this.download(response.msg);
}) })
}) })
...@@ -699,7 +702,6 @@ export default { ...@@ -699,7 +702,6 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/* TODO: 专门用来解决input 的边框问题 */
.aboutSingleDetails{ .aboutSingleDetails{
.el-form-item{ .el-form-item{
.el-input >>> .el-input__inner { .el-input >>> .el-input__inner {
......
src/views/processManagement/inventoryRecord/index.vue
View file @ 2c664b3c
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="ToolBar"> <div class="ToolBar">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form-item label="pn" prop="pn"> <el-form-item label="pn" prop="pn">
<el-input <el-input
v-model="queryParams.pn" v-model="queryEntity.entity.pn"
placeholder="请输入pn" placeholder="请输入pn"
clearable clearable
:maxlength="20" :maxlength="20"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-form-item label="lot" prop="lot"> <el-form-item label="lot" prop="lot">
<el-input <el-input
v-model="queryParams.lot" v-model="queryEntity.entity.lot"
placeholder="请输入lot" placeholder="请输入lot"
clearable clearable
:maxlength="20" :maxlength="20"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-form-item label="plocation" prop="plocation"> <el-form-item label="plocation" prop="plocation">
<el-input <el-input
v-model="queryParams.plocation" v-model="queryEntity.entity.plocation"
placeholder="请输入plocation" placeholder="请输入plocation"
clearable clearable
:maxlength="20" :maxlength="20"
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-form-item label="库类型" prop="ptype"> <el-form-item label="库类型" prop="ptype">
<el-select <el-select
v-model="queryParams.ptype" v-model="queryEntity.entity.ptype"
placeholder="请选择库类型" placeholder="请选择库类型"
filterable filterable
clearable clearable
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<el-form-item label="库状态" prop="poperate"> <el-form-item label="库状态" prop="poperate">
<el-select <el-select
v-model="queryParams.poperate" v-model="queryEntity.entity.poperate"
placeholder="请选择库状态" placeholder="请选择库状态"
filterable filterable
clearable clearable
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
<component <component
:is="BaseTable" :is="BaseTable"
:key="queryParams.rows" :key="queryParams.rows"
:n-index="nIndex"
:all-table-arguments="allTableArguments" :all-table-arguments="allTableArguments"
@handle-detail="handleDetail" @handle-detail="handleDetail"
/> />
...@@ -164,7 +163,6 @@ ...@@ -164,7 +163,6 @@
<!-- TODO: 这里是 库状态为废弃时才会触发显示的模块 --> <!-- TODO: 这里是 库状态为废弃时才会触发显示的模块 -->
<transition name="fade-transform" mode="out-in"> <transition name="fade-transform" mode="out-in">
<el-row v-if=" activateAbandonedState " style="height: 160px"> <el-row v-if=" activateAbandonedState " style="height: 160px">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="fq_ys：" prop="fq_ys"> <el-form-item label="fq_ys：" prop="fq_ys">
...@@ -189,31 +187,32 @@ ...@@ -189,31 +187,32 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<transition /> </transition>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作员：" prop="userName"> <el-form-item label="操作员：" prop="userName">
<el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" /> <el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作时间：" prop="createDate"> <el-form-item label="操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" /> <el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</transition></el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listLog, findSingleLogDetail, exportInventoryRecord } from '@/api/processMangement/InventoryRecord' import { exportInventoryRecord, findSingleLogDetail, listLog } from '@/api/processMangement/InventoryRecord'
import BaseTable from '@/components/Table/BaseTable/index.vue' import BaseTable from '@/components/Table/BaseTable/index.vue'
import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
export default { export default {
name: 'InventoryRecord', name: 'InventoryRecord',
...@@ -278,18 +277,24 @@ export default { ...@@ -278,18 +277,24 @@ export default {
dateRange: [], dateRange: [],
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10
// TODO: 设备编码 },
pn: undefined, queryEntity: {
// TODO: lot entity: {
lot: undefined, // TODO: 设备编码
// TODO: 位置 pn: '',
plocation: undefined, // TODO: lot
// TODO: 库状态 1 入，2出，3修正，4废弃 lot: '',
poperate: undefined, // TODO: 位置
// TODO: 库类型 1设备库 2工序库 plocation: '',
ptype: undefined // TODO: 库状态 1 入，2出，3修正，4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
}, },
// TODO: list记录表名
listName: '出入库记录列表',
// TODO: 用来接收数据源 // TODO: 用来接收数据源
inventoryRecordList: [], inventoryRecordList: [],
// TODO: 用来说明每一列的类型 // TODO: 用来说明每一列的类型
...@@ -394,13 +399,13 @@ export default { ...@@ -394,13 +399,13 @@ export default {
}, },
// TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件 // TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
allTableArguments() { allTableArguments() {
return { const baseTableArgumentsTest = new BaseTableArgumentsTest()
listName: '出入库记录列表', baseTableArgumentsTest.listName = this.listName
loading: this.loading, baseTableArgumentsTest.loading = this.loading
List: this.inventoryRecordList, baseTableArgumentsTest.List = this.inventoryRecordList
queryParams: this.queryParams, baseTableArgumentsTest.queryParams = this.queryParams
columObj: this.columObj baseTableArgumentsTest.columObj = this.columObj
} return baseTableArgumentsTest
} }
}, },
/** 路由离开前存储筛选条件*/ /** 路由离开前存储筛选条件*/
...@@ -421,7 +426,7 @@ export default { ...@@ -421,7 +426,7 @@ export default {
/** TODO:查询工序库的出入库记录列表 */ /** TODO:查询工序库的出入库记录列表 */
getList() { getList() {
this.loading = true this.loading = true
listLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
this.inventoryRecordList = response.rows this.inventoryRecordList = response.rows
this.total = response.total this.total = response.total
// 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate // 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate
......
src/views/sample/inventoryRecord/index.vue
View file @ 2c664b3c
<template> <template>
<div class="basicInformation-module app-container"> <div class="app-container">
<!-- 搜索区 --> <div class="ToolBar">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input <el-form-item label="pn" prop="pn">
v-model="queryParams.pn" <el-input
placeholder="请输入pn" v-model="queryEntity.entity.pn"
clearable placeholder="请输入pn"
:maxlength="30" clearable
size="small" :maxlength="20"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="name" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</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-form-item>
<div style="float: right">
<el-form-item>
<el-button
type="primary"
size="small" size="small"
icon="el-icon-plus" @keyup.enter.native="handleQuery"
@click="handleAdd" />
>新增</el-button> </el-form-item>
<el-button
style="padding: 8px 7px;" <el-form-item label="lot" prop="lot">
type="success" <el-input
v-model="queryEntity.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="20"
size="small" size="small"
icon="el-icon-download" @keyup.enter.native="handleQuery"
@click="handleExport" />
>导出</el-button>
</el-form-item> </el-form-item>
</div>
</el-form> <el-form-item label="库类型" prop="ptype">
<!-- 分割线 --> <el-select
<div class="placeholder" /> v-model="queryEntity.entity.ptype"
<!-- 表单区 --> placeholder="请选择库类型"
<div style="padding:5px 10px"> filterable
<div class="mb12 font-small-bold">基础样式列表</div> clearable
<el-table v-loading="loading" border :data="basicinfoMationList"> @keyup.enter.native="handleQuery"
<el-table-column type="index" label="序号" width="50" /> >
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true"> <el-option
<template slot-scope="scope"> v-for="option in selectOptionsAboutPtype"
{{ scope.row.pn || '-' }} :key="option.value"
</template> :label="option.label"
</el-table-column> :value="option.value"
<el-table-column label="qty" prop="qty" :show-overflow-tooltip="true"> />
<template slot-scope="scope"> </el-select>
{{ scope.row.qty || '-' }} </el-form-item>
</template>
</el-table-column> <el-form-item label="操作时间" prop="date">
<el-table-column label="name" prop="name" :show-overflow-tooltip="true"> <div class="block">
<template slot-scope="scope"> <el-date-picker
{{ scope.row.name || '-' }} v-model="dateRange"
</template> value-format="yyyy-MM-dd"
</el-table-column> style="width: 250px"
<el-table-column label="max_qty" prop="max_qty" :show-overflow-tooltip="true"> type="daterange"
<template slot-scope="scope"> range-separator="-"
{{ scope.row.max_qty || '-' }} start-placeholder="开始日期"
</template> end-placeholder="结束日期"
</el-table-column> />
<el-table-column label="min_qty" prop="min_qty" :show-overflow-tooltip="true"> </div>
<template slot-scope="scope"> </el-form-item>
{{ scope.row.min_qty || '-' }}
</template> <el-form-item>
</el-table-column> <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-table-column label="unit" prop="unit" :show-overflow-tooltip="true"> <el-button size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<template slot-scope="scope"> </el-form-item>
{{ scope.row.unit || '-' }}
</template> <!--TODO: 导出和盘点按钮所在 -->
</el-table-column> <el-row :gutter="10" class="mb8" justify="start">
<el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true"> <el-col :span="1.5">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" prop="create_date" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.create_date || '-' }}
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <el-button-->
<!-- v-hasPermi="['sys:role:update']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-circle-check"-->
<!-- @click="handleMenu(scope.row)"-->
<!-- >数据权限</el-button>-->
<el-button <el-button
size="mini" type="success"
type="text" size="small"
icon="el-icon-delete" icon="el-icon-download"
@click="handleDelete(scope.row)" @click="handleExport"
>删除</el-button> >导出
</template> </el-button>
</el-table-column> </el-col>
</el-table> </el-row>
</el-form>
</div> </div>
<!-- 分页区-->
<!-- TODO: 分隔符-->
<div class="placeholder" />
<!--TODO: Table表单-->
<transition name="fade-transform" mode="out-in">
<component
:is="BaseTable"
:key="queryParams.rows"
:all-table-arguments="allTableArguments"
@handle-detail="handleDetail"
/>
</transition>
<!--TODO: 分页组件-->
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.page" :page.sync="queryParams.page"
:limit.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList" @pagination="getList"
/> />
<!-- 新增修改弹出 -->
<!-- TODO: 单项详情信息表单配置 -->
<el-dialog
class="aboutSingleDetails"
:title="title"
:visible.sync="openDetails"
:close-on-click-modal="false"
width="800px"
append-to-body
@closed="handleClose"
>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row :gutter="10" justify="start" align="middle">
<el-col :span="12">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="lot：" prop="lot">
<el-input v-model.trim="singleDetails.lot" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="plocation：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="库类型：" prop="ptype">
{{ selectedPtype(singleDetails.ptype) }}
</el-form-item>
<el-form-item label="库状态：" prop="poperate">
{{ selectedPoperate(singleDetails.poperate) }}
</el-form-item>
</el-col>
</el-row>
<!-- TODO: 这里是 库状态为废弃时才会触发显示的模块 -->
<transition name="fade-transform" mode="out-in">
<el-row v-if=" activateAbandonedState " style="height: 160px">
<el-col :span="12">
<el-form-item label="fq_ys：" prop="fq_ys">
{{ singleDetails.fq_ys }}
</el-form-item>
<el-form-item label="fq_bz：" prop="fq_bz">
{{ singleDetails.fq_bz }}
</el-form-item>
<el-form-item label="fq_dbxi：" prop="fq_dbxi">
{{ singleDetails.fq_dbxi }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="fq_dd：" prop="fq_dd">
{{ singleDetails.fq_dd }}
</el-form-item>
<el-form-item label="fq_mcode：" :label-width="10" prop="fq_mcode">
{{ singleDetails.fq_mcode }}
</el-form-item>
<el-form-item label="fq_yy：" prop="fq_yy">
{{ singleDetails.fq_yy }}
</el-form-item>
</el-col>
</el-row>
</transition>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="userName">
<el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {queryList} from '@/api/sample/basicInformation' import { exportInventoryRecord, findSingleLogDetail, listLog } from '@/api/sample/inventoryRecord'
import BaseTable from '@/components/Table/BaseTable/index.vue'
import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
export default { export default {
name: 'Index', name: 'InventoryRecord',
components: [
BaseTable
],
data() { data() {
return { return {
textPrimary: 'text',
deleteName: '删除',
deleteSize: 'mini',
deleteDisabled: 'multiple',
cleanName: '清空',
cleanSize: 'small',
exportName: '导出',
exportSize: 'small',
delIcon: 'el-icon-delete',
exportIcon: 'el-icon-download',
// TODO:遮罩层
loading: true,
// 非多个禁用
multiple: true,
// TODO: 显示搜索条件
showSearch: true,
// TODO: 数据总条数
total: 0, total: 0,
loading: false,
// TODO: 关于 Ptype的数据字典
selectOptionsAboutPtype: [
{
value: '1',
label: '设备库'
}, {
value: '2',
label: '工序库'
}
],
// TODO: 查询参数
// TODO: 时间日期范围 调用全局方法来输入进去
dateRange: [],
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10
pn: '',
name: ''
}, },
statusOptions: {}, queryEntity: {
basicinfoMationList: [] entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
},
// TODO: list记录表名
listName: '出入库记录列表',
// TODO: 用来接收数据源
inventoryRecordList: [],
// TODO: 用来说明每一列的类型
columObj: {
// 选择框
selection: false,
// 选择框根据条件是否可选
selectable: (row, index) => {
if (row.switchs) {
return true
}
},
// TODO: column列,columType(列类型,可选text(默认为普通文字模式),input(input可编辑框),switch(switch开关),image(图片),operation(操作按钮))
// TODO: :prop(参数),label(列名),width(宽度),align(对齐方式),sortable(是否支持排序)
columnData: [
{
text: true,
prop: 'pn',
label: 'pn'
},
{
text: true,
prop: 'lot',
label: 'lot'
},
{
text: true,
prop: 'qty',
label: 'qty',
width: '180px',
ownDefinedReturn: (row, $index) => {
return this.selectedPoperate(row.poperate)
}
},
{
ownDefined: true,
prop: 'ptype',
label: '库类型',
ownDefinedReturn: (row, $index) => {
return this.selectedPtype(row.ptype)
}
},
{
text: true,
prop: 'producer',
label: 'producer',
sortable: false,
width: '150px'
},
{
text: true,
prop: 'userName',
label: '操作员',
sortable: false,
width: '150px'
},
{
time: true,
prop: 'createDate',
label: '操作时间',
align: 'center'
},
/* TODO: 如果为操作列,则需要填写需要的操作按钮,类型为Object。operation(操作类型,可选edit,delete,see),type(按钮样式,参考el—botton类型),label(按钮文字)icon(参考el-icon),color(字体颜色)
* clickType 1为详情 2为修改 3为删除
* */
{
isOperation: true,
label: '操作',
width: '80px',
align: 'center',
sortable: false,
operation: [{
clickType: '1',
label: '详情',
icon: '',
color: '',
size: this.size
}]
}
]
},
title: '',
openDetails: false,
isReadOnly: true,
// TODO: 表单里的单项详情参数
singleDetails: {},
// TODO: 获取表单单项详情的参数
singleLogIdAndFqYs: {},
activateAbandonedState: false
} }
}, },
computed: {
BaseTable() {
return BaseTable
},
/* TODO:自定义分页索引，实现索引继承 */
nIndex(index) {
// TODO: 当前页数 - 1 * 每页数据条数 + 1
const page = this.queryParams.page // TODO: 当前页码
const rows = this.queryParams.rows // TODO: 每页条数
return index + 1 + (page - 1) * rows
},
// TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
allTableArguments() {
const baseTableArgumentsTest = new BaseTableArgumentsTest()
baseTableArgumentsTest.listName = this.listName
baseTableArgumentsTest.loading = this.loading
baseTableArgumentsTest.List = this.inventoryRecordList
baseTableArgumentsTest.queryParams = this.queryParams
baseTableArgumentsTest.columObj = this.columObj
return baseTableArgumentsTest
}
},
/** 路由离开前存储筛选条件*/
beforeRouteLeave(to, from, next) {
this.$store.dispatch('searchSave/searchParamsSet', {
path: this.$route.path,
param: {
...this.queryParams
}
})
next()
},
created() { created() {
this.getList() this.getList()
}, },
methods: { methods: {
handleDelete() {
},
handleUpdate() {
}, /** TODO:查询工序库的出入库记录列表 */
// 初始化获取数据
getList() { getList() {
this.loading = true this.loading = true
queryList(this.queryParams).then(res => { listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
console.log('res', res) this.inventoryRecordList = response.rows
this.total = res.total this.total = response.total
this.basicinfoMationList = res.rows // 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate
// this.selectOptionsAboutPtype = selectOptionsAboutPtype
this.loading = false this.loading = false
}) })
}, },
// 查询
/* TODO: ptype 库类型判断的公用方法 */
selectedPtype(ptype) {
switch (ptype) {
case '1':
return '设备库'
case '2':
return '工序库'
default:
return ''
}
},
/* TODO: poperate的库状态判断的公用方法 */
selectedPoperate(poperate) {
switch (poperate) {
case '1':
return '入库'
case '2':
return '出库'
case '3':
return '修正'
case '4':
return '废弃'
default:
return ''
}
},
/** TODO: 查询按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.page = 1 this.queryParams.page = 1
this.getList() this.getList()
}, },
// 重置 /** TODO: 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = { this.resetForm('queryForm')
page: 1, this.handleQuery()
rows: 10,
pn: '',
name: ''
}
this.getList()
}, },
handleAdd() {
/* TODO: 控制单项表单关闭的详情 */
handleClose() {
this.activateAbandonedState = false
this.singleLogIdAndFqYs = {}
},
/* TODO: 获取详情信息*/
handleDetail: function(row) {
/* TODO: 如果库状态为‘废弃’，即为‘4’时，则可以进入 */
if (row.poperate !== '4') {
this.singleDetails = { ...row }
} else {
/* TODO: 设置单项详情的查询的条件 */
this.singleLogIdAndFqYs['businessId'] = row.businessId
this.singleLogIdAndFqYs['fqYs'] = row.fqYs
/* TODO: 进行查询，如果返回的code为200，则表示返回的值成功 */
findSingleLogDetail(this.singleLogIdAndFqYs).then(
response => {
if (response.code === 200) {
this.singleDetails = Object.assign({}, response.data, { ...row })
/* TODO: 如果库状态==='4' 并且返回的状态码为200的时候，才会将可变的详情字段设置为true，去激活并打开 */
this.activateAbandonedState = true
} else {
/* TODO: 如果状态码不对则不会激活可变字段，只会对普通字段进行赋值,并且抛出错误信息response.message */
this.$message({
showClose: true,
message: response.message,
type: 'warning'
})
this.singleDetails = { ...row }
}
}
)
}
this.title = '记录详情'
this.openDetails = true
}, },
handleExport() { handleExport() {
this.$confirm('是否确认导出所有出入库记录信息?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return exportInventoryRecord().then(response => {
const blob = new Blob([response])
const downloadElement = document.createElement('a')
// TODO: 创建下载的链接
const href = window.URL.createObjectURL(blob)
downloadElement.href = href
// TODO: 下载后文件名
downloadElement.download = '出入库记录' + '.xls'
document.body.appendChild(downloadElement)
// TODO: 点击下载
downloadElement.click()
// TODO: 下载完成移除元素
document.body.removeChild(downloadElement)
// TODO: 释放掉blob对象
window.URL.revokeObjectURL(href)
// this.download(response.msg);
})
})
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.basicInformation-module{ .app-container {
font-size: 18px; padding: 0;
padding: 0; font-size: 18px;
.placeholder{ .placeholder{
height: 1.3vh; height:1.3vh;
background-color: #F4F4F4; background-color: #F4F4F4;
margin-bottom: 10px margin-bottom:10px
}
/*TODO: 这里是调整ToolBar的样式的噢！*/
.ToolBar{
.el-form{
.el-form-item{
.el-select{
width: 160px
}
.el-input{
width: 180px
}
}
} }
} }
}
/* TODO: 专门用来解决el-input边框的问题 */
.aboutSingleDetails{
.el-form{
.el-form-item{
.el-input >>> .el-input__inner {
-webkit-appearance: none;
background-color: #FFF;
background-image: none;
border-radius: 4px;
border: 0;
width: 100%;
}
}
}
}
</style> </style>
src/views/sample/sampleLibrary/index.vue deleted 100644 → 0
View file @ 33aa2aef
<template>
<div class="basicInformation-module app-container">
<!-- 搜索区 -->
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="name" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</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-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" />
<!-- 表单区 -->
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">基础样式列表</div>
<el-table v-loading="loading" border :data="basicinfoMationList">
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="name" prop="name" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.name || '-' }}
</template>
</el-table-column>
<el-table-column label="max_qty" prop="max_qty" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.max_qty || '-' }}
</template>
</el-table-column>
<el-table-column label="min_qty" prop="min_qty" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.min_qty || '-' }}
</template>
</el-table-column>
<el-table-column label="unit" prop="unit" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.unit || '-' }}
</template>
</el-table-column>
<el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" prop="create_date" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.create_date || '-' }}
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <el-button-->
<!-- v-hasPermi="['sys:role:update']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-circle-check"-->
<!-- @click="handleMenu(scope.row)"-->
<!-- >数据权限</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 分页区-->
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.page"
@pagination="getList"
/>
<!-- 新增修改弹出 -->
</div>
</template>
<script>
import {queryList} from '@/api/sample/basicInformation'
export default {
name: 'Index',
data() {
return {
total: 0,
loading: false,
queryParams: {
page: 1,
rows: 10,
pn: '',
name: ''
},
statusOptions: {},
basicinfoMationList: []
}
},
created() {
this.getList()
},
methods: {
handleDelete() {
},
handleUpdate() {
},
// 初始化获取数据
getList() {
this.loading = true
queryList(this.queryParams).then(res => {
console.log('res', res)
this.total = res.total
this.basicinfoMationList = res.rows
this.loading = false
})
},
// 查询
handleQuery() {
this.queryParams.page = 1
this.getList()
},
// 重置
resetQuery() {
this.queryParams = {
page: 1,
rows: 10,
pn: '',
name: ''
}
this.getList()
},
handleAdd() {
},
handleExport() {
}
}
}
</script>
<style lang="scss" scoped>
.basicInformation-module{
font-size: 18px;
padding: 0;
.placeholder{
height: 1.3vh;
background-color: #F4F4F4;
margin-bottom: 10px
}
}
</style>
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