其他出库-筛选条件修改

src/views/inventiry/otherOut/components/SelectStaningStockModal.vue

@@ -14,43 +14,70 @@
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="仓库(warehouse)">
-                            <a-input placeholder="请输入" v-model:value="queryParams.warehouse" :disabled="fatherWarehouse!==''"></a-input>
+                            <JDictSelectTag v-model:value="queryParams.warehouse" placeholder="请选择" dictCode="warehouse" :disabled="fatherWarehouse!==''"/>
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="货位(goods allocation)">
-                            <a-input placeholder="请输入" v-model:value="queryParams.goodsAllocation" :disabled="fatherGoodsAllocation!==''"></a-input>
+                        <a-form-item label="货位(goods allocation)"  :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <JDictSelectTag v-model:value="queryParams.goodsAllocation" placeholder="请选择" dictCode="goods_allocation" :disabled="fatherGoodsAllocation!==''"/>
                         </a-form-item>
                     </a-col> 
                     <template v-if="toggleSearchStatus">
                         <a-col :md="6" :sm="8">
                             <a-form-item label="项目(project)">
                                 <ApiSelect
-                                    :api="projectListList"
+                                    :api="ProjectOption"
                                     showSearch
                                     v-model:value="queryParams.project"
-                                    optionFilterProp="label"
+                                    :filterOption="false"
                                     resultField="records"
                                     labelField="name"
                                     valueField="id"
+                                    :params='{pageSize:-1}'
                                     :disabled="fatherProject!==''"
-                                    />
+                                />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="供应商(supplier)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.supplierName"></a-input>
+                                <ApiSelect
+                                    :api="supplierOption"
+                                    showSearch
+                                    v-model:value="queryParams.supplier"
+                                    :filterOption="false"
+                                    resultField="records"
+                                    labelField="name"
+                                    valueField="id"
+                                    :params='{pageSize:-1}'
+                                />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="客户(customer)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.customerName"></a-input>
+                                <ApiSelect
+                                    :api="CustomerOption"
+                                    showSearch
+                                    v-model:value="queryParams.customer"
+                                    :filterOption="false"
+                                    resultField="records"
+                                    labelField="abbreviation"
+                                    valueField="id"
+                                    :params='{pageSize:-1}'
+                                />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
-                                <!-- <a-input placeholder="请输入" v-model:value="queryParams.classId"></a-input> -->
-                                <JSelectInput   v-model:value="queryParams.productionClass"  placeholder="请选择" :options="classOption" ></JSelectInput>
+                                <ApiSelect
+                                    :api="ClassList"
+                                    showSearch
+                                    v-model:value="queryParams.productionClass"
+                                    :filterOption="false"
+                                    resultField="records"
+                                    labelField="name"
+                                    valueField="id"
+                                    :params='{pageSize:-1}'
+                                />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
@@ -61,19 +88,20 @@
                        
                         <a-col :md="6" :sm="8">
                             <a-form-item label="机型(model)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.headModel"></a-input>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="产品编码(product code)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.productCode"></a-input>
+                                <JDictSelectTag v-model:value="queryParams.headModel" placeholder="请选择" dictCode="model_typer" style="width: 100%;"/>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="编号(batch code)">
                                 <a-input placeholder="请输入" v-model:value="queryParams.batchCode"></a-input>
                             </a-form-item>
-                        </a-col>                        
+                        </a-col>   
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="产品编码(product code)"  :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                                <a-input placeholder="请输入" v-model:value="queryParams.productCode"></a-input>
+                            </a-form-item>
+                        </a-col>
+                                             
                     </template>
                     <a-col :md="6" :sm="8">
                         <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -124,11 +152,9 @@
     import { defHttp} from '/@/utils/http/axios';
     import { message } from 'ant-design-vue';
     import { filterObj, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-    import { JDictSelectTag} from '/@/components/Form';
-     import {  ApiSelect, } from '/@/components/Form/index';
-    import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+    import { JDictSelectTag,ApiSelect} from '/@/components/Form';
+    import {CustomerOption,ClassList,supplierOption,ProjectOption} from '../otherOutForm.api';
     const emit = defineEmits([ 'SelectStaningStock']); //定义emit
-    let classOption = ref([])
     var visible = ref(false)
     var fatherProject = ref('')
     var fatherWarehouse = ref('')
@@ -330,29 +356,6 @@
         pagination.value.pageSize = paginations.pageSize;
         loadData()
     };
-    function projectListList(){
-        let params = {pageSize:-1}
-        return defHttp.get({url:'/baseCode/baseProjectArchive/list',params});
-    }
-    function getOptiom(){
-    defHttp
-        .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })
-        .then((res) => {
-            if (res.success) {
-              classOption.value = []
-              res.result.records.forEach(element => {
-                  var obj = {
-                    label: element.name?element.name:'无名称请维护',
-                    value: element.name?element.name:''
-                  };
-                  classOption.value.push( obj)
-              });    
-            }
-        })
-        .finally(() => {
-            // loading.value = false;
-        });
-  }
     function searchQuery(){
         loadData();
     }
@@ -439,7 +442,6 @@
             fatherGoodsAllocation.value = ''
         }
         loadData()
-        getOptiom()
     }
     defineExpose({
       getTable

src/views/inventiry/otherOut/otherOutForm.api.ts

@@ -15,7 +15,10 @@ enum Api {
   stockOutFormProductList = '/storeCode/storeOtherOut/queryStoreOtherOutDetailsByMainId',
   submitBatch='/storeCode/storeOtherOut/submitBatch',
   cancelSubmitBatch='/storeCode/storeOtherOut/returnSubmitBatch',
-  classList='baseCode/baseProductClass/list'
+  classList='baseCode/baseProductClass/list',
+  customerList='/cuspCode/cuspCustomerProfile/list',
+  projectList='/baseCode/baseProjectArchive/list',
+  supplierList='/cuspCode/cuspSupplierProfile/list',
 }
 /**
  * 导出api
@@ -118,4 +121,11 @@ export const cancelBatchSubmit = (params, handleSuccess) => {
       });
     }
   });
-}
+}
+//获取客户下拉框列表
+export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });
+
+//获取项目下拉框列表
+export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });
+//获取供应商列表
+export const supplierOption = (params) => defHttp.get({url: Api.supplierList, params});

src/views/inventiry/otherOut/otherOutList.vue

@@ -20,25 +20,43 @@
               <a-col :lg="8">
                 <a-form-item name="project">
                   <template #label><span title="项目(project)">项目(project)</span></template>
-                  <a-input v-model:value="queryParam.project" placeholder="请选择"/>
+                  <ApiSelect
+                    :api="ProjectOption"
+                    showSearch
+                    v-model:value="queryParam.project"
+                    :filterOption="false"
+                    resultField="records"
+                    labelField="name"
+                    valueField="id"
+                    :params='{pageSize:-1}'
+                  />
                 </a-form-item>
               </a-col>
               <a-col :lg="8">
                 <a-form-item name="customer">
                   <template #label><span title="客户(customer)">客户(customer)</span></template>
-                  <a-input placeholder="请输入客户(customer)" v-model:value="queryParam.customer" allow-clear ></a-input>
+                  <ApiSelect
+                    :api="CustomerOption"
+                    showSearch
+                    v-model:value="queryParam.customer"
+                    :filterOption="false"
+                    resultField="records"
+                    labelField="abbreviation"
+                    valueField="id"
+                    :params='{pageSize:-1}'
+                  />
                 </a-form-item>
               </a-col>
               <a-col :lg="8">
                 <a-form-item name="warehouse">
                   <template #label><span title="仓库(warehouse)">仓库(warehouse)</span></template>
-                  <a-input placeholder="请输" v-model:value="queryParam.warehouse" allow-clear ></a-input>
+                  <JDictSelectTag v-model:value="queryParam.warehouse" placeholder="请选择" dictCode="warehouse"/>
                 </a-form-item>
               </a-col>
               <a-col :lg="8">
                 <a-form-item name="goodsAllocation">
                   <template #label><span title="货位(goods allocation)">货位(goods allocation)</span></template>
-                  <a-input placeholder="请输" v-model:value="queryParam.goodsAllocation" allow-clear ></a-input>
+                  <JDictSelectTag v-model:value="queryParam.goodsAllocation" placeholder="请选择" dictCode="goods_allocation"/>
                 </a-form-item>
               </a-col>          
               <a-col :lg="8">
@@ -112,9 +130,9 @@
     import {useModal} from '/@/components/Modal';
     import otherOutFormModal from './components/otherOutFormModal.vue'
     import {columns} from './otherOutForm.data';
-    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './otherOutForm.api';
+    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit,ProjectOption,CustomerOption} from './otherOutForm.api';
     import { cloneDeep } from "lodash-es";
-    import { JDictSelectTag} from '/@/components/Form';
+    import { JDictSelectTag,ApiSelect} from '/@/components/Form';
     import { message } from 'ant-design-vue';
     const formRef = ref();
     const queryParam = reactive<any>({});
@@ -152,17 +170,7 @@
       })
   
     const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-  
-    /**
-     * 高级查询事件
-     */
-    function handleSuperQuery(params) {
-      Object.keys(params).map((k) => {
-        queryParam[k] = params[k];
-      });
-      reload();
-    }
-  
+
      /**
       * 新增事件
       */