purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化商品导入模板和增加状态查询条件

Browse Source
This commit is contained in:
季圣华
2022-05-14 23:46:35 +08:00
parent 72a2614864
commit b4db7c6722
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
jshERP-web/public/doc/goods_template.xls
View File

Binary file not shown.

38
jshERP-web/src/views/material/MaterialList.vue
View File

@@ -16,13 +16,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="条码" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="关键词" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入条码查询" v-model="queryParam.barCode"></a-input> <a-input placeholder="请输入条码、名称、规格、型号查询" v-model="queryParam.materialParam"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input> <a-input placeholder="请输入颜色查询" v-model="queryParam.color"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -36,21 +36,7 @@
</a-col> </a-col>
</span> </span>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :md="6" :sm="24">
<a-form-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入规格查询" v-model="queryParam.standard"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入型号查询" v-model="queryParam.model"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入颜色查询" v-model="queryParam.color"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="基础重量" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="基础重量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number style="width: 100%" placeholder="请输入基础重量查询" v-model="queryParam.weight"></a-input-number> <a-input-number style="width: 100%" placeholder="请输入基础重量查询" v-model="queryParam.weight"></a-input-number>
@@ -61,6 +47,14 @@
<a-input-number style="width: 100%" placeholder="请输入保质期查询" v-model="queryParam.expiryNum"></a-input-number> <a-input-number style="width: 100%" placeholder="请输入保质期查询" v-model="queryParam.expiryNum"></a-input-number>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24">
<a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="请选择状态" v-model="queryParam.enabled">
<a-select-option value="1">启用</a-select-option>
<a-select-option value="0">禁用</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="序列号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="序列号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="有无序列号" v-model="queryParam.enableSerialNumber"> <a-select placeholder="有无序列号" v-model="queryParam.enableSerialNumber">
@@ -203,13 +197,11 @@
// 查询条件 // 查询条件
queryParam: { queryParam: {
categoryId:'', categoryId:'',
barCode:'', materialParam:'',
name:'',
standard:'',
model:'',
color:'', color:'',
weight:'', weight:'',
expiryNum:'', expiryNum:'',
enabled: '',
enableSerialNumber:'', enableSerialNumber:'',
enableBatchNumber:'', enableBatchNumber:'',
remark:'', remark:'',