|
@@ -32,22 +32,27 @@
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="产品编码/产品名称" prop="productName">
|
|
|
|
- <a-input id="inventoryCheckSelfDiskList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
|
|
|
|
|
|
+ <a-form-item label="产品编码" prop="productCode">
|
|
|
|
+ <a-input id="inventoryCheckSelfDiskList-productCode" v-model="queryParam.productCode" placeholder="请输入" allowClear />
|
|
</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="产品品牌">
|
|
|
|
- <ProductBrand id="inventoryCheckSelfDiskList-productBrand" v-model="queryParam.brandSn"></ProductBrand>
|
|
|
|
|
|
+ <a-form-item label="产品名称" prop="productName">
|
|
|
|
+ <a-input id="inventoryCheckSelfDiskList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
|
|
</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="产品分类">
|
|
|
|
- <ProductType id="inventoryCheckSelfDiskList-productType" @change="changeProductType" v-model="productType"></ProductType>
|
|
|
|
|
|
+ <a-form-item label="产品品牌">
|
|
|
|
+ <ProductBrand id="inventoryCheckSelfDiskList-productBrand" v-model="queryParam.brandSn"></ProductBrand>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <template v-if="advanced && basicInfoData&&basicInfoData.warehouseFlag=='1'">
|
|
|
|
|
|
+ <template v-if="advanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="产品分类">
|
|
|
|
+ <ProductType id="inventoryCheckSelfDiskList-productType" @change="changeProductType" v-model="productType"></ProductType>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
|
|
<a-form-item label="仓库">
|
|
<a-form-item label="仓库">
|
|
<a-select id="inventoryCheckSelfDiskList-warehouseSn" allowClear placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
|
|
<a-select id="inventoryCheckSelfDiskList-warehouseSn" allowClear placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
|
|
<a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
<a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
@@ -58,7 +63,7 @@
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckSelfDiskList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckSelfDiskList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckSelfDiskList-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckSelfDiskList-reset">重置</a-button>
|
|
- <a v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'" @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
{{ advanced ? '收起' : '展开' }}
|
|
{{ advanced ? '收起' : '展开' }}
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
</a>
|
|
</a>
|
|
@@ -123,22 +128,27 @@
|
|
<a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="产品编码/产品名称" prop="productName">
|
|
|
|
- <a-input id="inventoryCheckSelfDiskList-productName" v-model="chooseQueryParam.productName" placeholder="请输入" allowClear />
|
|
|
|
|
|
+ <a-form-item label="产品编码" prop="productCode">
|
|
|
|
+ <a-input id="inventoryCheckSelfDiskList-productCode" v-model="chooseQueryParam.productCode" placeholder="请输入" allowClear />
|
|
</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="产品品牌">
|
|
|
|
- <ProductBrand id="inventoryCheckSelfDiskList-productBrand" v-model="chooseQueryParam.brandSn"></ProductBrand>
|
|
|
|
|
|
+ <a-form-item label="产品名称" prop="productName">
|
|
|
|
+ <a-input id="inventoryCheckSelfDiskList-productName" v-model="chooseQueryParam.productName" placeholder="请输入" allowClear />
|
|
</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="产品分类">
|
|
|
|
- <ProductType id="inventoryCheckSelfDiskList-productType" @change="changeChooseProductType" v-model="chooseProductType"></ProductType>
|
|
|
|
|
|
+ <a-form-item label="产品品牌">
|
|
|
|
+ <ProductBrand id="inventoryCheckSelfDiskList-productBrand" v-model="chooseQueryParam.brandSn"></ProductBrand>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <template v-if="chooseAdvanced && basicInfoData&&basicInfoData.warehouseFlag=='1'">
|
|
|
|
|
|
+ <template v-if="chooseAdvanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="产品分类">
|
|
|
|
+ <ProductType id="inventoryCheckSelfDiskList-productType" @change="changeChooseProductType" v-model="chooseProductType"></ProductType>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
|
|
<a-form-item label="仓库">
|
|
<a-form-item label="仓库">
|
|
<a-select id="inventoryCheckSelfDiskList-warehouseSn" allowClear placeholder="请选择仓库" v-model="chooseQueryParam.warehouseSn" >
|
|
<a-select id="inventoryCheckSelfDiskList-warehouseSn" allowClear placeholder="请选择仓库" v-model="chooseQueryParam.warehouseSn" >
|
|
<a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
<a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
@@ -149,7 +159,7 @@
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="inventoryCheckSelfDiskList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="inventoryCheckSelfDiskList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="inventoryCheckSelfDiskList-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="inventoryCheckSelfDiskList-reset">重置</a-button>
|
|
- <a v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'" @click="chooseAdvanced=!chooseAdvanced" style="margin-left: 5px">
|
|
|
|
|
|
+ <a @click="chooseAdvanced=!chooseAdvanced" style="margin-left: 5px">
|
|
{{ chooseAdvanced ? '收起' : '展开' }}
|
|
{{ chooseAdvanced ? '收起' : '展开' }}
|
|
<a-icon :type="chooseAdvanced ? 'up' : 'down'"/>
|
|
<a-icon :type="chooseAdvanced ? 'up' : 'down'"/>
|
|
</a>
|
|
</a>
|
|
@@ -227,6 +237,8 @@ export default {
|
|
disabled: false,
|
|
disabled: false,
|
|
chooseDisabled: false,
|
|
chooseDisabled: false,
|
|
queryParam: {
|
|
queryParam: {
|
|
|
|
+ productCode: '',
|
|
|
|
+ productName: '',
|
|
warehouseSn: undefined,
|
|
warehouseSn: undefined,
|
|
brandSn: undefined,
|
|
brandSn: undefined,
|
|
productTypeSn1: undefined,
|
|
productTypeSn1: undefined,
|
|
@@ -252,6 +264,8 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
chooseQueryParam: {
|
|
chooseQueryParam: {
|
|
|
|
+ productCode: '',
|
|
|
|
+ productName: '',
|
|
warehouseSn: undefined,
|
|
warehouseSn: undefined,
|
|
brandSn: undefined,
|
|
brandSn: undefined,
|
|
productTypeSn1: undefined,
|
|
productTypeSn1: undefined,
|
|
@@ -285,9 +299,9 @@ export default {
|
|
computed: {
|
|
computed: {
|
|
columns () {
|
|
columns () {
|
|
const arr = [
|
|
const arr = [
|
|
- { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '产品品牌', dataIndex: 'brandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '12%' : '22%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '15%' : '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '产品品牌', dataIndex: 'brandName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '9%' : '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '14%' },
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '14%' },
|
|
{ title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '库存数量', dataIndex: 'currentQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '库存数量', dataIndex: 'currentQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -302,9 +316,9 @@ export default {
|
|
},
|
|
},
|
|
chooseColumns () {
|
|
chooseColumns () {
|
|
const arr = [
|
|
const arr = [
|
|
- { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '产品品牌', dataIndex: 'brandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '12%' : '22%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '15%' : '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '产品品牌', dataIndex: 'brandName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '9%' : '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '14%', align: 'center' },
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '14%', align: 'center' },
|
|
{ title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -321,6 +335,7 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
|
|
+ this.queryParam.productCode = ''
|
|
this.queryParam.productName = ''
|
|
this.queryParam.productName = ''
|
|
this.queryParam.warehouseSn = undefined
|
|
this.queryParam.warehouseSn = undefined
|
|
this.queryParam.brandSn = undefined
|
|
this.queryParam.brandSn = undefined
|
|
@@ -484,6 +499,7 @@ export default {
|
|
},
|
|
},
|
|
// 已选产品 重置
|
|
// 已选产品 重置
|
|
chooseResetSearchForm () {
|
|
chooseResetSearchForm () {
|
|
|
|
+ this.chooseQueryParam.productCode = ''
|
|
this.chooseQueryParam.productName = ''
|
|
this.chooseQueryParam.productName = ''
|
|
this.chooseQueryParam.warehouseSn = undefined
|
|
this.chooseQueryParam.warehouseSn = undefined
|
|
this.chooseQueryParam.brandSn = undefined
|
|
this.chooseQueryParam.brandSn = undefined
|