Merge branch 'main' of https://gitlab.365jft.com/wml/jft-vue-platform

src/views/bill/details.vue

@@ -49,6 +49,28 @@
             @pagination="getList"
         />
         <el-dialog v-model="dialogFormVisible" title="明细" width="1000">
+          <el-form :inline="true">
+            <el-form-item label="姓名" prop="name">
+              <el-input
+                  v-model="detailQueryParams.name"
+                  placeholder="请输入姓名"
+                  style="width: 220px"
+                  @keyup.enter="getDetailList"
+              />
+            </el-form-item>
+            <el-form-item label="证件号码" prop="idNo">
+              <el-input
+                  v-model="detailQueryParams.idNo"
+                  placeholder="请输入证件号码"
+                  style="width: 220px"
+                  @keyup.enter="getDetailList"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="getDetailList">搜索</el-button>
+              <el-button icon="Refresh" @click="resetDetailQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
           <el-table v-loading="detailLoading" :data="detailList">
             <el-table-column label="姓名" align="left" prop="name" width="140" />
             <el-table-column label="证件号码" align="center" prop="id_no" />
@@ -80,7 +102,7 @@
   import { billProjectList,queryallproject,billDetail } from "@/api/bill"
   const list = ref([]);
   const loading = ref(false);
-  const options = ref([]); // 项目下拉
+  const options = ref([]);
   const total = ref(0);
   const queryParams = ref({
     billDate:  proxy.$route.query.billDate,
@@ -97,6 +119,8 @@
   const detailQueryParams = ref({
     page: 1,
     limit: 10,
+    name: '',
+    idNo: '',
     proId: '',
     billDate: '',
     baseCode: ''
@@ -109,6 +133,8 @@
     detailQueryParams.value.proId = row.proId;
     detailQueryParams.value.billDate = row.billYM;
     detailQueryParams.value.baseCode = row.baseCode;
+    detailQueryParams.value.name = '';
+    detailQueryParams.value.idNo = '';
     detailTotal.value = 0;
     detailList.value = [];
     getDetailList()
@@ -137,6 +163,12 @@
     }
     handleQuery();
   }
+    // 重置弹窗明细查询条件
+    function resetDetailQuery() {
+        detailQueryParams.value.name = '';
+        detailQueryParams.value.idNo = '';
+        getDetailList()
+    }
   /** 查询预支工资账单列表 */
   function getList() {
     loading.value = true;