Browse Source

更改盘点查询条件

chenrui 3 years ago
parent
commit
68026c8a62

+ 23 - 9
src/views/inventoryManagement/inventoryChecking/detailModal.vue

@@ -72,8 +72,13 @@
         <div class="table-page-search-wrapper">
         <div class="table-page-search-wrapper">
           <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="7" :sm="24">
-                <a-form-item label="产品编码/产品名称" prop="productName">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品编码" prop="productCode">
+                  <a-input id="inventoryCheckMakeInventoryList-productCode" v-model="queryParam.productCode" placeholder="请输入" allowClear />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品名称" prop="productName">
                   <a-input id="inventoryCheckMakeInventoryList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
                   <a-input id="inventoryCheckMakeInventoryList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
@@ -82,16 +87,22 @@
                   <ProductType id="inventoryCheckMakeInventoryList-productType" @change="changeProductType" v-model="productType"></ProductType>
                   <ProductType id="inventoryCheckMakeInventoryList-productType" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="6" :sm="24" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
-                <a-form-item label="仓库">
-                  <a-select id="inventoryCheckMakeInventoryList-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>
-                </a-form-item>
-              </a-col>
+              <template v-if="advanced && (basicInfoData&&basicInfoData.warehouseFlag=='1')">
+                <a-col :md="6" :sm="24" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
+                  <a-form-item label="仓库">
+                    <a-select id="inventoryCheckMakeInventoryList-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>
+                  </a-form-item>
+                </a-col>
+              </template>
               <a-col :md="5" :sm="24" style="margin-bottom: 10px;">
               <a-col :md="5" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckMakeInventoryList-refresh">查询</a-button>
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckMakeInventoryList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckMakeInventoryList-reset">重置</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckMakeInventoryList-reset">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 5px" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
               </a-col>
               </a-col>
             </a-row>
             </a-row>
           </a-form>
           </a-form>
@@ -151,8 +162,10 @@ export default {
       spinning: false,
       spinning: false,
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       disabled: false,
+      advanced: false,
       queryParam: {
       queryParam: {
         productName: '',
         productName: '',
+        productCode: '',
         productTypeSn1: undefined,
         productTypeSn1: undefined,
         productTypeSn2: undefined,
         productTypeSn2: undefined,
         productTypeSn3: undefined,
         productTypeSn3: undefined,
@@ -229,6 +242,7 @@ export default {
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
       this.queryParam.productName = ''
       this.queryParam.productName = ''
+      this.queryParam.productCode = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn2 = undefined

+ 24 - 10
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -73,8 +73,13 @@
             <a-col :span="19">
             <a-col :span="19">
               <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="8" :sm="24">
-                    <a-form-item label="产品编码/产品名称" prop="productName">
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="产品编码" prop="productCode">
+                      <a-input id="inventoryCheckMakeInventoryList-productCode" v-model="queryParam.productCode" placeholder="请输入" allowClear />
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="产品名称" prop="productName">
                       <a-input id="inventoryCheckMakeInventoryList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
                       <a-input id="inventoryCheckMakeInventoryList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
                     </a-form-item>
                     </a-form-item>
                   </a-col>
                   </a-col>
@@ -83,16 +88,22 @@
                       <ProductType id="inventoryCheckMakeInventoryList-productType" @change="changeProductType" v-model="productType"></ProductType>
                       <ProductType id="inventoryCheckMakeInventoryList-productType" @change="changeProductType" v-model="productType"></ProductType>
                     </a-form-item>
                     </a-form-item>
                   </a-col>
                   </a-col>
-                  <a-col :md="5" :sm="24" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
-                    <a-form-item label="仓库">
-                      <a-select id="inventoryCheckMakeInventoryList-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>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="5" :sm="24" style="margin-bottom: 10px;">
+                  <template v-if="advanced && (basicInfoData&&basicInfoData.warehouseFlag=='1')">
+                    <a-col :md="6" :sm="24" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
+                      <a-form-item label="仓库">
+                        <a-select id="inventoryCheckMakeInventoryList-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>
+                      </a-form-item>
+                    </a-col>
+                  </template>
+                  <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckMakeInventoryList-refresh">查询</a-button>
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckMakeInventoryList-refresh">查询</a-button>
                     <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckMakeInventoryList-reset">重置</a-button>
                     <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckMakeInventoryList-reset">重置</a-button>
+                    <a @click="advanced=!advanced" style="margin-left: 5px" v-if="basicInfoData&&basicInfoData.warehouseFlag=='1'">
+                      {{ advanced ? '收起' : '展开' }}
+                      <a-icon :type="advanced ? 'up' : 'down'"/>
+                    </a>
                   </a-col>
                   </a-col>
                 </a-row>
                 </a-row>
               </a-form>
               </a-form>
@@ -169,8 +180,10 @@ export default {
     return {
     return {
       spinning: false,
       spinning: false,
       disabled: false,
       disabled: false,
+      advanced: false,
       queryParam: {
       queryParam: {
         productName: '',
         productName: '',
+        productCode: '',
         productTypeSn1: undefined,
         productTypeSn1: undefined,
         productTypeSn2: undefined,
         productTypeSn2: undefined,
         productTypeSn3: undefined,
         productTypeSn3: undefined,
@@ -226,6 +239,7 @@ export default {
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
       this.queryParam.productName = ''
       this.queryParam.productName = ''
+      this.queryParam.productCode = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn2 = undefined

+ 8 - 1
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -36,7 +36,12 @@
           <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="8" :sm="24">
               <a-col :md="8" :sm="24">
-                <a-form-item label="产品编码/产品名称" prop="productName">
+                <a-form-item label="产品编码" prop="productCode">
+                  <a-input id="inventoryCheckOverallList-productCode" v-model="queryParam.productCode" placeholder="请输入" allowClear />
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="产品名称" prop="productName">
                   <a-input id="inventoryCheckOverallList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
                   <a-input id="inventoryCheckOverallList-productName" v-model="queryParam.productName" placeholder="请输入" allowClear />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
@@ -84,6 +89,7 @@ export default {
       spinning: false,
       spinning: false,
       disabled: false,
       disabled: false,
       queryParam: {
       queryParam: {
+        productCode: '',
         productName: ''
         productName: ''
       },
       },
       basicInfoData: null, // 基础信息
       basicInfoData: null, // 基础信息
@@ -118,6 +124,7 @@ export default {
   methods: {
   methods: {
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.queryParam.productCode = ''
       this.queryParam.productName = ''
       this.queryParam.productName = ''
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },

+ 30 - 16
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -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,7 @@ export default {
       disabled: false,
       disabled: false,
       chooseDisabled: false,
       chooseDisabled: false,
       queryParam: {
       queryParam: {
+        productCode: '',
         productName: '',
         productName: '',
         warehouseSn: undefined,
         warehouseSn: undefined,
         brandSn: undefined,
         brandSn: undefined,
@@ -253,6 +264,7 @@ export default {
         })
         })
       },
       },
       chooseQueryParam: {
       chooseQueryParam: {
+        productCode: '',
         productName: '',
         productName: '',
         warehouseSn: undefined,
         warehouseSn: undefined,
         brandSn: undefined,
         brandSn: undefined,
@@ -323,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
@@ -486,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