增加查询

src/views/finance/query/index.vue

@@ -97,7 +97,7 @@
                   v-model="queryParams.fBillstatus"
                   clearable
                   filterable
-                  placeholder="请选择"
+                  placeholder="请选择费用状态"
                   style="width: 100%"
                 >
                   <el-option
@@ -127,6 +127,44 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="12" :sm="6">
+              <el-form-item label="费用名称">
+                <el-select
+                  v-model="queryParams.fFeeids"
+                  clearable
+                  filterable
+                  multiple
+                  collapse-tags
+                  placeholder="请选择费用名称"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="(dict, index) in fNameOptions"
+                    :key="dict.fId"
+                    :label="dict.fName"
+                    :value="dict.fId"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="12" :sm="6">
+              <el-form-item label="结算方式">
+                <el-select
+                  v-model="queryParams.fStltypeid"
+                  clearable
+                  filterable
+                  placeholder="请选择结算方式"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="(item, index) in fStltypeOptions"
+                    :key="index.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
       </el-collapse-transition>
@@ -270,6 +308,9 @@
           <span v-else-if="item.label == 'fBilltype'">
             {{ scope.row.fBilltype | billTypeFormat(billTypeList) }}
           </span>
+          <span v-else-if="item.label == 'fStltypeid'">
+            {{ scope.row.fStltypeid | fStltypeFormat(fStltypeOptions) }}
+          </span>
           <span v-else>{{ scope.row[item.label] }}</span>
         </template>
       </el-table-column>
@@ -290,6 +331,7 @@ import draggable from "vuedraggable";
 import { addSet, resetModule, select } from '@/api/system/set';
 import {listCorps} from "@/api/basicdata/corps";
 import {getList, exportList} from "@/api/finance/query";
+import {listFees} from "@/api/basicdata/fees";
 
 export default {
   name: "index",
@@ -448,6 +490,13 @@ export default {
           width: 100,
         },
         {
+          surface: "18",
+          label: "fStltypeid",
+          name: "结算方式",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "19",
           label: "fProductName",
           name: "货物名称",
@@ -468,6 +517,8 @@ export default {
       loading: false,
       dataList: [],
       billTypeList: [],
+      fNameOptions:[],
+      fStltypeOptions: [],
     }
   },
   created() {
@@ -478,12 +529,18 @@ export default {
     listCorps({type: 1}).then((response) => {
       this.fMblnoOptions = response.rows;
     });
+    listFees().then((response) => {
+      this.fNameOptions = response.rows;
+    });
     this.getDicts("data_unitfees").then((response) => {
       this.fFeetUnitOptions = response.data;
     });
     this.getDicts("data_billtype_type").then((response) => {
       this.billTypeList = response.data;
     });
+    this.getDicts("data_stltype_type").then((response) => {
+      this.fStltypeOptions = response.data;
+    });
   },
   mounted() {
     this.$nextTick(() => {
@@ -519,6 +576,15 @@ export default {
       });
       return type;
     },
+    fStltypeFormat(row, fStltypeOptions) {
+      let name;
+      fStltypeOptions.map(e => {
+        if (row == e.dictValue) {
+          name = e.dictLabel
+        }
+      });
+      return name;
+    },
   },
   methods: {
     getList() {