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

src/api/home/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询所有项目
 export function projectSelect(query) {
     return request({
-        url: '/djl-recruit/releasedproject/queryallproject',
+        url: '/djl-recruit/releasedproject/queryallproject/plat',
         method: 'get',
         params: query
     })

src/views/bill/electronicContractBill/index.vue

@@ -18,6 +18,13 @@
             <el-table-column label="账单年月" prop="billYM" />
             <el-table-column label="累计签订电子合同份数" prop="totalTimes" />
             <el-table-column label="服务费总额" prop="totalFee" />
+            <el-table-column label="状态" align="center">
+                <template #default="{ row }">
+                    <el-tag type="warning" v-if="row.state == 'none'">未结算</el-tag>
+                    <el-tag v-if="row.state == 'settle'">已结算</el-tag>
+                    <el-tag type="success" v-if="row.state == 'payment'">已付款</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
                 <template #default="{ row }">
                     <el-button v-if="row.state == 'none'" link type="primary" icon="Memo"
@@ -32,12 +39,27 @@
         <pagination v-show="total > 0" :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.limit"
             @pagination="getList" />
         <el-dialog v-model="dialogFormVisible" title="明细" width="1000">
-            <!-- <el-form :inline="true">
+            <el-form :inline="true">
+                <el-form-item label="项目名称" prop="proId">
+                    <el-select
+                        v-model="detailQueryParams.proId"
+                        placeholder="请选择"
+                        filterable
+                        style="width: 300px"
+                    >
+                    <el-option
+                        v-for="item in projectData"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                    </el-select>
+                </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-form>
             <el-table v-loading="detailLoading" :data="detailList">
                 <el-table-column label="账单年月" align="center" prop="billYM" />
                 <el-table-column label="项目" align="center" prop="project" />
@@ -59,7 +81,9 @@
 <script setup>
 import { ref } from "vue";
 import { contractBillList, proContractBillList, contractBillPayment, contractBillSettle, queryAllDispatch } from "@/api/bill"
+import { projectSelect } from "@/api/home/index";
 const { proxy } = getCurrentInstance();
+const projectData = ref([])
 const list = ref([{}]);
 const loading = ref(false);
 const options = ref([]); // 派遣下拉
@@ -81,6 +105,19 @@ const detailQueryParams = ref({
     baseCode: '',
     billDate: '',
 }) // 弹窗列表查询条件
+//查询所有项目
+projectSelect().then(res => {
+  projectData.value  = [{
+    id:'',
+    name: '请选择'
+  },...res.data.map(item => {
+    return {
+      id:item.id,
+      name: item.name,
+      state: item.state
+    }
+  })]
+})
 /** 查询明细 */
 function handleDetails(row) {
     dialogFormVisible.value = true;
@@ -91,6 +128,7 @@ function handleDetails(row) {
     detailQueryParams.value.limit = 10;
     detailQueryParams.value.billDate = row.billYM;
     detailQueryParams.value.baseCode = row.baseCode;
+    detailQueryParams.value.proId = ''
     getDetailList()
 }
 /** 查询明细 */