给单据增加查询条件

jshERP-web/src/views/bill/AssembleList.vue

@@ -29,10 +29,34 @@
                   />
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="仓库名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择仓库" showSearch optionFilterProp="children" v-model="queryParam.depotId">
+                      <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
+                        {{ depot.depotName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </template>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </a-col>
               </span>
             </a-row>
@@ -105,10 +129,12 @@
         // 查询条件
         queryParam: {
           number: "",
-          searchMaterial: "",
+          materialParam: "",
           type: "其它",
           subType: "组装单",
-          roleType: Vue.ls.get('roleType')
+          roleType: Vue.ls.get('roleType'),
+          depotId: "",
+          creator: ""
         },
         labelCol: {
           span: 5
@@ -163,10 +189,12 @@
       }
     },
     computed: {
-
+    },
+    created() {
+      this.getDepotData()
+      this.initUser()
     },
     methods: {
-
     }
   }
 </script>