Merge remote-tracking branch 'origin/master'

src/api/modules/project/cost.js

@@ -97,5 +97,21 @@ export default {
             params: form
         }, msg);
     },
+    //获取费用支出所属分类
+    async getCostType(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-control/projectCostBudget/getCostType',
+            method: 'get',
+            params: form
+        }, msg);
+    },
+    //获取参建方
+    async getUnitType(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-control/projectCostBudget/getUnitType',
+            method: 'get',
+            params: form
+        }, msg);
+    },
 }
 

src/views/project/cost/data.vue

@@ -11,13 +11,13 @@
         </template>
         <template #extra>
             <div class="w-44">
-                <el-select block clearable placeholder="费用支出所属分类" size="large">
-                    <el-option v-for="item in projectType" :label="item.name" :value="item.key"/>
+                <el-select block clearable placeholder="费用支出所属分类" size="large"  v-model="costTypeval" @change="changeCost">
+                    <el-option v-for="item in costTypeList" :label="item.dictName" :value="item.dictValue"/>
                 </el-select>
             </div>
             <div class="w-40 ml-2">
-                <el-select block clearable placeholder="请选择参建方" size="large">
-                    <el-option v-for="item in projectType" :label="item.name" :value="item.key"/>
+                <el-select block clearable placeholder="请选择参建方" size="large"  v-model="unitTypeval"  @change="changeUnit">
+                    <el-option v-for="item in unitType" :label="item.dictName" :value="item.dictValue"/>
                 </el-select>
             </div>
         </template>
@@ -75,8 +75,36 @@ onActivated(() => {
     dataId.value = useRoutes?.query?.id ?? ''
     console.log(useRoutes.query)
     getTableData()
+    getCostType()
+    getUnitType()
 })
+//获取岗位分类postTypeList
+const costTypeList=ref([])
+const costTypeval=ref(null)
+const getCostType=async(type)=>{
+    const {error, code, data} = await costApi.getCostType()
+    if (!error && code === 200) {
+        costTypeList.value=getArrValue(data)
+     
+
+
+    } else {
+        costTypeList.value=[]
+    }
+}
+const unitType=ref([])
+const unitTypeval=ref(null)
+const getUnitType=async(type)=>{
+    const {error, code, data} = await costApi.getCostType()
+    if (!error && code === 200) {
+        unitType.value=getArrValue(data)
+     
+
 
+    } else {
+        unitType.value=[]
+    }
+}
 const projectType = ref([
     {key: '1', name: '选项1'},
     {key: '2', name: '选项2'},
@@ -84,16 +112,18 @@ const projectType = ref([
 
 //表格数据
 const tableData = ref([
-    {id: '1', key1: '选项1', key2: 'xxxx'},
-    {id: '2', key1: '选项2', key2: 'xxxx'},
-    {id: '3', key1: '选项3', key2: 'xxxx'},
+ 
 ])
 const tableLoading=ref(false)
 const projectName=ref('')
 const previewTotalCost=ref('')
 const getTableData = async() => {
     tableLoading.value = true
-    const {error, code, data} = await costApi.getBudgetList({projectId:dataId.value})
+    const {error, code, data} = await costApi.getBudgetList({
+        projectId:dataId.value,
+        costType:costTypeval.value,
+        unitType:unitTypeval.value
+    })
     tableLoading.value = false
     if (!error && code === 200) {
         tableData.value = getArrValue(data['previewList'])
@@ -105,6 +135,12 @@ const getTableData = async() => {
     
     }
 }
+const changeUnit=()=>{
+    getTableData()
+}
+const changeCost=()=>{
+    getTableData()
+}
 //自定义表头样式
 const tableHeaderCellStyle = ({column}) => {
     if (column.property === 'key6' || column.property === 'key14') {