完善履历

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -4,12 +4,17 @@
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
                 <a-input v-model.trim="queryParam.keyword" placeholder="请输入单号"/>
               </a-form-item>
             </a-col>
-            <!--            <a-col :md="8" :sm="24">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="友单号">
+                <a-input v-model.trim="queryParam.yyId" placeholder="请输入友单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
               <a-form-item label="出库类型">
                 <a-select v-model="queryParam.type" placeholder="请选择">
                   <a-select-option
@@ -20,8 +25,42 @@
                   </a-select-option>
                 </a-select>
               </a-form-item>
-            </a-col>-->
-            <a-col :md="8 || 24" :sm="24">
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="申请部门">
+                <a-select v-model="queryParam.applyDept" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in deptYYMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="出库状态">
+                <a-select v-model="queryParam.status" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in statusMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="开始时间">
+                <a-date-picker style="width:100%" v-model.trim="queryParam.searchStartTime" placeholder="请选择开始时间"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="结束时间">
+                <a-date-picker style="width:100%" v-model.trim="queryParam.searchEndTime" placeholder="请选择结束时间"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6 || 24" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
@@ -192,6 +231,12 @@ export default {
       deptYYMap: {},
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
+        if (this.queryParam.searchStartTime) {
+          this.queryParam.searchStartTime = this.BaseTool.Date.formatter(this.queryParam.searchStartTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) + ' 00:00:00'
+        }
+        if (this.queryParam.searchEndTime) {
+          this.queryParam.searchEndTime = this.BaseTool.Date.formatter(this.queryParam.searchEndTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) + ' 23:59:59'
+        }
         parameter = {
           ...parameter,
           ...this.queryParam,