景聚庭-商品管理新版需求完善

src/views/psiManagement/wareHouseSummary/WareHouseHistory.vue

@@ -234,16 +234,19 @@ export default {
 			lossList: [],
 			searchForm: {
 				tradeName: '',
+				wareHouseType: '',
 				wareHouseNumber: '',
 				wareHouseDates: []
 			},
 			searchForm2: {
 				tradeName: '',
+				wareHouseType: '',
 				collectNo: '',
 				collectDates: []
 			},
 			searchForm3: {
 				goodsName: '',
+				collectType: '',
 				lossNo: '',
 				lossDates: []
 			},
@@ -279,9 +282,8 @@ export default {
 			this.wareHouseType = wareHouseType
 			this.tradeName = tradeName
 			this.searchForm.wareHouseType = wareHouseType
-			this.searchForm.tradeName = tradeName
-			this.searchForm2.tradeName = tradeName
-			this.searchForm3.goodsName = tradeName
+			this.searchForm2.wareHouseType = wareHouseType
+			this.searchForm3.collectType = wareHouseType
 			if (this.commonJS.isNotEmpty(detailId)) {
 				this.detailId = detailId
 			} else {
@@ -352,19 +354,19 @@ export default {
 		resetSearch() {
 			this.$refs.searchForm.resetFields()
 			this.tablePage.currentPage = 1
-			this.searchForm.tradeName = this.tradeName
+			this.searchForm.wareHouseType = this.wareHouseType
 			this.list()
 		},
 		resetSearch2() {
 			this.$refs.searchForm2.resetFields()
 			this.tablePage2.currentPage = 1
-			this.searchForm2.tradeName = this.tradeName
+			this.searchForm2.wareHouseType = this.wareHouseType
 			this.list2()
 		},
 		resetSearch3() {
 			this.$refs.searchForm3.resetFields()
 			this.tablePage3.currentPage = 1
-			this.searchForm3.goodsName = this.tradeName
+			this.searchForm3.collectType = this.wareHouseType
 			this.list3()
 		},
 		close() {

src/views/psiManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -9,7 +9,11 @@
 			<el-form-item label="商品名称" prop="tradeName">
 				<el-input v-model="searchForm.tradeName" placeholder="请输入商品名称" clearable></el-input>
 			</el-form-item>
-			<el-form-item label="入库类型" prop="wareHouseType">
+
+			<el-form-item label="品牌" prop="brand">
+				<el-input v-model="searchForm.brand" placeholder="请输入品牌" clearable></el-input>
+			</el-form-item>
+			<!-- <el-form-item label="商品类型" prop="wareHouseType">
 				<SelectTree ref="areaTree" :props="{
 					value: 'id',             // ID字段名
 					label: 'name',         // 显示名称
@@ -17,11 +21,11 @@
 				}" url="/psi-management-server/psi/materialType/summaryTreeData?type=last" :value="searchForm.wareHouseType"
 					:clearable="true" :accordion="true" size="default"
 					@getValue="(value, label) => { searchForm.wareHouseType = value }" />
-			</el-form-item>
-			<el-form-item label="供应商" prop="supplierName">
+			</el-form-item>-->
+			<!--	<el-form-item label="供应商" prop="supplierName">
 				<el-input v-model="searchForm.supplierName" placeholder="请选择供应商" :readonly="true"
 					@focus="openSupplierChoose"></el-input>
-			</el-form-item>
+			</el-form-item>-->
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="el-icon-search">查询</el-button>
 				<el-button @click="resetSearch()" icon="el-icon-refresh-right">重置</el-button>
@@ -172,6 +176,7 @@ export default {
 			searchForm: {
 				wareHouseType: '',
 				tradeName: '',
+				brand: '',
 				wareHouseNumber: '',
 				wareHouseMan: '',
 				wareHouseManOffice: '',