|
@@ -31,6 +31,15 @@
|
|
|
<productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="shelfNoMan-productType"></productTypeAll>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="仓库">
|
|
|
+ <warehouse
|
|
|
+ v-model="queryParam.product.warehouseSn"
|
|
|
+ id="shelfNoMan-warehouseSn"
|
|
|
+ placeholder="请选择仓库"
|
|
|
+ />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
|
<a-form-item label="产品状态">
|
|
|
<v-select code="PRODUCT_STATUS" id="shelfNoMan-state" v-model="queryParam.product.state" allowClear placeholder="请选择产品状态"></v-select>
|
|
@@ -138,11 +147,12 @@ import productTypeAll from '@/views/common/productTypeAll.js'
|
|
|
import { exportExcel } from '@/libs/JGPrint.js'
|
|
|
import ImportGuideModal from './importGuideModal.vue'
|
|
|
import changeRecordModal from './changeRecordModal.vue'
|
|
|
+import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
import { queryStackPlaceQueryPage, stackPlaceExport, stackPlaceInsertImport } from '@/api/product'
|
|
|
export default {
|
|
|
name: 'ProductInfoList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, editHwModal, ProductBrand, productTypeAll, ImportGuideModal, changeRecordModal },
|
|
|
+ components: { STable, VSelect, editHwModal, ProductBrand, productTypeAll, ImportGuideModal, changeRecordModal, warehouse },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -160,6 +170,7 @@ export default {
|
|
|
productTypeSn1: '', // 产品一级分类
|
|
|
productTypeSn2: '', // 产品二级分类
|
|
|
productTypeSn3: '', // 产品三级分类
|
|
|
+ warehouseSn: undefined, // 仓库
|
|
|
state: undefined // 产品状态
|
|
|
}
|
|
|
},
|
|
@@ -169,10 +180,11 @@ export default {
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'productVO.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'productVO.name', align: 'center', width: '30%', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productVO.name', align: 'center', width: '20%', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
|
{ title: '原厂编码', dataIndex: 'productVO.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品品牌', dataIndex: 'productVO.productBrandName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
|
|
|
+ { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品状态', dataIndex: 'productVO.stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '货位编号', dataIndex: 'stackPlaceCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
|
|
@@ -226,6 +238,7 @@ export default {
|
|
|
productTypeSn1: '', // 产品一级分类
|
|
|
productTypeSn2: '', // 产品二级分类
|
|
|
productTypeSn3: '', // 产品三级分类
|
|
|
+ warehouseSn: undefined, // 仓库
|
|
|
state: undefined // 产品状态
|
|
|
}
|
|
|
}
|