jsk 领料退料查询完善

src/views/material/back/inQuery/index.vue

@@ -29,7 +29,23 @@
                 style="width: 130px"
                 />
             </el-form-item>
-
+          <el-form-item prop="jijuType">
+                <el-select
+                    v-model="queryParams.jijuType"
+                    placeholder="请选择状态"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <!-- v-for 和 v-if 尽量不要同时使用 -->
+                    <el-option
+                        v-for="dict in jijuTypes"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item prop="keyWord">
                 <el-input
                     v-model="queryParams.keyWord"
@@ -60,6 +76,26 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
+            <el-form-item prop="typeName">
+                <el-input
+                    v-model="queryParams.typeName"
+                    placeholder="请输入物资名称"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item prop="modelType">
+                <el-input
+                    v-model="queryParams.modelType"
+                    placeholder="请输入规格型号"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
 <!--
             <el-form-item prop="leaseUnitId">
                 <treeselect
@@ -160,6 +196,7 @@ export default {
             open: false,
             // 选中数组
             ids: [],
+             jijuTypes:[{value:"1",label:"机具"},{value:"2",label:"安全工器具"}],
             // 非单个禁用
             single: true,
             // 非多个禁用

src/views/material/lease/outQuery/index.vue

@@ -29,7 +29,23 @@
                 style="width: 130px"
                 />
             </el-form-item>
-
+            <el-form-item prop="jijuType">
+                <el-select
+                    v-model="queryParams.jijuType"
+                    placeholder="请选择状态"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <!-- v-for 和 v-if 尽量不要同时使用 -->
+                    <el-option
+                        v-for="dict in jijuTypes"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item prop="keyWord">
                 <el-input
                     v-model="queryParams.keyWord"
@@ -60,6 +76,26 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
+            <el-form-item prop="typeName">
+                <el-input
+                    v-model="queryParams.typeName"
+                    placeholder="请输入物资名称"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item prop="modelType">
+                <el-input
+                    v-model="queryParams.modelType"
+                    placeholder="请输入规格型号"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
             <el-form-item prop="leasePerson">
                 <el-input
                     v-model="queryParams.leasePerson"
@@ -172,6 +208,7 @@ export default {
             open: false,
             // 选中数组
             ids: [],
+            jijuTypes:[{value:"1",label:"机具"},{value:"2",label:"安全工器具"}],
             // 非单个禁用
             single: true,
             // 非多个禁用