lilei 2 yıl önce
ebeveyn
işleme
7f7d2e8431

+ 6 - 6
src/views/salesManagement/salesQuery/edit.vue

@@ -52,6 +52,11 @@
             <div class="table-page-search-wrapper" style="position: relative;width: 100%;">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                 <a-row :gutter="15">
+                  <a-col :md="5" :sm="24">
+                    <a-form-item label="出库仓库" prop="warehouseSn">
+                      <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                    </a-form-item>
+                  </a-col>
                   <a-col :md="5" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
                       <a-input id="salesEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
@@ -62,11 +67,6 @@
                       <a-input id="salesEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="5" :sm="24">
-                    <a-form-item label="出库仓库" prop="warehouseSn">
-                      <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-                    </a-form-item>
-                  </a-col>
                   <a-col :md="3" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
                     <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
@@ -89,7 +89,7 @@
                         style="margin:0 15px;"
                         type="primary"
                         ghost
-                        id="salesEdit-plDel-btn"> 仓库设置 <a-icon type="down" /> </a-button>
+                        id="salesEdit-plDel-btn"> 批量操作 <a-icon type="down" /> </a-button>
                     </a-dropdown>
                     <a-button
                       type="default"

+ 17 - 9
src/views/salesManagement/salesQuery/queryPart.vue

@@ -2,8 +2,13 @@
   <div class="productInfoList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+      <a-form layout="inline" @keyup.enter.native="searchForm">
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+              <a-form-item label="出库仓库" prop="warehouseSn" required>
+                <chooseWarehouse ref="warehouse" :allowClear="false" v-model="queryParam.warehouseSn"></chooseWarehouse>
+              </a-form-item>
+            </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="产品编码">
               <a-input id="productInfoList-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
@@ -14,17 +19,12 @@
               <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
             <a-form-item label="原厂编码">
               <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-item>
           </a-col>
-          <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="出库仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -37,7 +37,7 @@
             </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="productInfoList-refresh">查询</a-button>
+            <a-button type="primary" @click="searchForm" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin: 0 5px">
               {{ advanced ? '收起' : '展开' }}
@@ -198,6 +198,14 @@ export default {
         }
       }
     },
+    // 查询
+    searchForm(){
+      if(this.queryParam.warehouseSn){
+        this.$refs.table.refresh(true)
+      }else{
+        this.$message.info('请选择仓库')
+      }
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.productCode = ''