Skip to content

T
template_vue
Commit 79d3a174 authored by CenXinYi's avatar CenXinYi
Browse files
Options

初始化样品库查询功能 

Signed-off-by: 's avatarCenXinYi <2810162984@qq.com>
parent 3e0354d0
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 153 deletions
src/api/processMangement/InventoryRecord.js
View file @ 79d3a174
import request from '@/utils/request'
// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
export function listLog(queryParams) {
export function listLog(queryParams, queryMaps) {
return request({
url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
method: 'get',
params: queryParams
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
......
src/api/sample/inventoryRecord.js
View file @ 79d3a174
import request from '@/utils/request'
// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
export function listLog(queryParams) {
export function listLog(queryParams, queryMaps) {
return request({
url: '/wbchemistrylog/queryWbChemistryLogByPagination',
method: 'get',
params: queryParams
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
......
src/views/processManagement/inventoryRecord/index.vue
View file @ 79d3a174
<template>
<div class="app-container">
<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-input
v-model="queryParams.pn"
v-model="queryEntity.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="20"
......@@ -16,7 +16,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.lot"
v-model="queryEntity.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="20"
......@@ -27,7 +27,7 @@
<el-form-item label="plocation" prop="plocation">
<el-input
v-model="queryParams.plocation"
v-model="queryEntity.entity.plocation"
placeholder="请输入plocation"
clearable
:maxlength="20"
......@@ -38,7 +38,7 @@
<el-form-item label="库类型" prop="ptype">
<el-select
v-model="queryParams.ptype"
v-model="queryEntity.entity.ptype"
placeholder="请选择库类型"
filterable
clearable
......@@ -55,7 +55,7 @@
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryParams.poperate"
v-model="queryEntity.entity.poperate"
placeholder="请选择库状态"
filterable
clearable
......@@ -277,17 +277,21 @@ export default {
dateRange: [],
queryParams: {
page: 1,
rows: 10,
// TODO: 设备编码
pn: undefined,
// TODO: lot
lot: undefined,
// TODO: 位置
plocation: undefined,
// TODO: 库状态 1 入，2出，3修正，4废弃
poperate: undefined,
// TODO: 库类型 1设备库 2工序库
ptype: undefined
rows: 10
},
queryEntity: {
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 位置
plocation: '',
// TODO: 库状态 1 入，2出，3修正，4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
},
// TODO: list记录表名
listName: '出入库记录列表',
......@@ -422,7 +426,7 @@ export default {
/** TODO:查询工序库的出入库记录列表 */
getList() {
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.total = response.total
// 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate
......
src/views/sample/inventoryRecord/index.vue
View file @ 79d3a174
<template>
<div class="app-container">
<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-input
v-model="queryParams.pn"
v-model="queryEntity.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="20"
......@@ -16,7 +16,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.lot"
v-model="queryEntity.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="20"
......@@ -25,20 +25,9 @@
/>
</el-form-item>
<el-form-item label="plocation" prop="plocation">
<el-input
v-model="queryParams.plocation"
placeholder="请输入plocation"
clearable
:maxlength="20"
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库类型" prop="ptype">
<el-select
v-model="queryParams.ptype"
v-model="queryEntity.entity.ptype"
placeholder="请选择库类型"
filterable
clearable
......@@ -53,23 +42,6 @@
</el-select>
</el-form-item>
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryParams.poperate"
placeholder="请选择库状态"
filterable
clearable
@keyup.enter.native="handleQuery"
>
<el-option
v-for="option in selectOptionsAboutPoperate"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="操作时间" prop="date">
<div class="block">
<el-date-picker
......@@ -113,7 +85,6 @@
<component
:is="BaseTable"
:key="queryParams.rows"
:n-index="nIndex"
:all-table-arguments="allTableArguments"
@handle-detail="handleDetail"
/>
......@@ -164,7 +135,6 @@
<!-- 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">
......@@ -189,31 +159,32 @@
</el-form-item>
</el-col>
</el-row>
<transition />
</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-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-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>
</transition></el-form>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { listLog, findSingleLogDetail, exportInventoryRecord } from '@/api/processMangement/InventoryRecord'
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 {
name: 'InventoryRecord',
......@@ -244,24 +215,6 @@ export default {
// TODO: 数据总条数
total: 0,
// TODO: 关于 Ptype的数据字典
selectOptionsAboutPoperate: [
{
value: '1',
label: '入库'
}, {
value: '2',
label: '出库'
},
{
value: '3',
label: '修正'
}, {
value: '4',
label: '废弃'
}
],
// TODO: 关于 Ptype的数据字典
selectOptionsAboutPtype: [
{
......@@ -278,18 +231,20 @@ export default {
dateRange: [],
queryParams: {
page: 1,
rows: 10,
// TODO: 设备编码
pn: undefined,
// TODO: lot
lot: undefined,
// TODO: 位置
plocation: undefined,
// TODO: 库状态 1 入，2出，3修正，4废弃
poperate: undefined,
// TODO: 库类型 1设备库 2工序库
ptype: undefined
rows: 10
},
queryEntity: {
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
},
// TODO: list记录表名
listName: '出入库记录列表',
// TODO: 用来接收数据源
inventoryRecordList: [],
// TODO: 用来说明每一列的类型
......@@ -316,26 +271,26 @@ export default {
label: 'lot'
},
{
ownDefined: true,
prop: 'ptype',
label: '库类型',
text: true,
prop: 'qty',
label: 'qty',
width: '180px',
ownDefinedReturn: (row, $index) => {
return this.selectedPtype(row.ptype)
return this.selectedPoperate(row.poperate)
}
},
{
ownDefined: true,
prop: 'poperate',
label: '库状态',
width: '180px',
prop: 'ptype',
label: '库类型',
ownDefinedReturn: (row, $index) => {
return this.selectedPoperate(row.poperate)
return this.selectedPtype(row.ptype)
}
},
{
text: true,
prop: 'plocation',
label: 'plocation',
prop: 'producer',
label: 'producer',
sortable: false,
width: '150px'
},
......@@ -352,7 +307,9 @@ export default {
label: '操作时间',
align: 'center'
},
// TODO: 如果为操作列,则需要填写需要的操作按钮,类型为Object。operation(操作类型,可选edit,delete,see),type(按钮样式,参考el—botton类型),label(按钮文字)icon(参考el-icon),color(字体颜色)
/* TODO: 如果为操作列,则需要填写需要的操作按钮,类型为Object。operation(操作类型,可选edit,delete,see),type(按钮样式,参考el—botton类型),label(按钮文字)icon(参考el-icon),color(字体颜色)
* clickType 1为详情 2为修改 3为删除
* */
{
isOperation: true,
label: '操作',
......@@ -394,13 +351,13 @@ export default {
},
// TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
allTableArguments() {
return {
listName: '出入库记录列表',
loading: this.loading,
List: this.inventoryRecordList,
queryParams: this.queryParams,
columObj: this.columObj
}
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
}
},
/** 路由离开前存储筛选条件*/
......@@ -421,7 +378,7 @@ export default {
/** TODO:查询工序库的出入库记录列表 */
getList() {
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.total = response.total
// 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate
......@@ -533,47 +490,47 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container {
padding: 0;
font-size: 18px;
.placeholder{
height:1.3vh;
background-color: #F4F4F4;
margin-bottom:10px
}
<style lang="scss" scoped>
.app-container {
padding: 0;
font-size: 18px;
.placeholder{
height:1.3vh;
background-color: #F4F4F4;
margin-bottom:10px
}
/*TODO: 这里是调整ToolBar的样式的噢！*/
.ToolBar{
.el-form{
.el-form-item{
.el-select{
width: 160px
}
.el-input{
width: 180px
}
.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%;
}
/* 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>
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