Merge remote-tracking branch 'origin/master'

src/views/costManage/examineAndApprove/components/dailyReimburseApprove.vue

@@ -5,16 +5,16 @@
       <!-- 默认显示的查询条件 -->
       <el-form-item label="项目名称" prop="projectName">
         <el-select
-          v-model="queryParams.projectStatus"
+          v-model="queryParams.projectName"
           placeholder="请选择项目名称"
           style="width: 220px"
           clearable
         >
           <el-option
-            v-for="dict in project_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+            v-for="item in projectNameList"
+            :key="item"
+            :label="item"
+            :value="item"
           />
         </el-select>
       </el-form-item>
@@ -41,7 +41,7 @@
           clearable
         >
           <el-option
-            v-for="dict in project_status"
+            v-for="dict in cost_daily_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -51,7 +51,7 @@
       <!-- 操作按钮 -->
       <el-form-item style="padding-left: 5.4%">
         <el-button icon="Refresh" @click="reset" class="el-button-defalut">重置</el-button>
-        <el-button type="primary" icon="Search" @click="onSearch" class="el-button-primary">查询</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery" class="el-button-primary">查询</el-button>
         <el-button size="large" type="text" @click="toggleSearch">
           {{ isExpanded ? ' 收起' : ' 展开' }}
           <el-icon class="el-icon--right">
@@ -101,7 +101,7 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="申请人">
-            <el-input style="width: 220px" placeholder="请输入申请人姓名"/>
+            <el-input style="width: 220px" placeholder="请输入申请人姓名" v-model="queryParams.approvalUser"/>
           </el-form-item>
         </div>
       </transition>
@@ -142,8 +142,8 @@
 <!--      <el-table-column label="事业部负责人" align="center" prop="businessMan" width="150px"/>-->
       <el-table-column label="提交时间" align="center" prop="createTime" width="180px"/>
       <el-table-column label="报销月份" align="center" prop="reimbursementMonth"/>
-      <el-table-column label="餐饮费" align="center" prop="cateringExpenses" />
-      <el-table-column label="交通费" align="center" prop="transportExpense"/>
+      <el-table-column label="餐饮费" align="center" prop="cateringExpenses" v-if="isFoodType"/>
+      <el-table-column label="交通费" align="center" prop="transportExpense" v-if="isTaxiType"/>
       <el-table-column label="总额" align="center" prop="totalMoney" />
       <el-table-column label="整体审批状态" align="center" prop="approvalStatus" width="130px">
         <template #default="{ row }">
@@ -215,12 +215,16 @@ import {useRouter} from "vue-router";
 import { ref } from "vue";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { project_status,cost_daily_status ,project_type } = proxy.useDict('project_status','cost_daily_status' ,'project_type');
+const { cost_daily_type ,cost_daily_status } = proxy.useDict('cost_daily_type' ,'cost_daily_status');
 const list = ref([]) // 流程图内容,只有值
 const allList = ref([]) // 流程图内容,值和角色id
 const loading = ref(true);
 const total = ref(1);
 
+//控制报销类型显示
+const isFoodType = ref(true);
+const isTaxiType = ref(true);
+
 //当前登录用户角色组
 const currentUserRoleInfoList = ref([])
 
@@ -246,11 +250,13 @@ const isExpanded = ref(false);
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-    projectName: null,
+  projectName:null,
   // departmentLeaderId: null,
   // projectManagerId: null,
-    approvalStatus: null,
-    reimbursementMonth: null,
+  reimbursementType:null,
+  approvalStatus:null,
+  reimbursementMonth:null,
+  approvalUser:null,
 });
 
 //一键通过
@@ -276,6 +282,8 @@ const getAllProjectName=()=> {
 getAllProjectName()
 //  重置表单
 const reset = () => {
+  isFoodType.value = true;
+  isTaxiType.value = true;
   queryParams.projectName = null
   queryParams.approvalStatus = null
   getList()
@@ -475,11 +483,12 @@ const getNodeList = ()=>{
 const costManageList = reactive([]);
 const getList = () => {
   loading.value = true;
+  console.log("参数",queryParams);
   listDailyApprove(queryParams).then(res => {
     loading.value = false;
     total.value = res.total;
     Object.assign(costManageList,res.rows);
-    // console.log("审批页数据",costManageList);
+    console.log("审批页数据",costManageList);
     for(let i in costManageList){
       costManageList[i].currentStatus = approvalStatusChange(costManageList[i].approvalStatus,costManageList[i].currentAudiRoleId)
     }
@@ -488,6 +497,19 @@ const getList = () => {
   })
 }
 
+/** 搜索按钮操作 */
+function handleQuery() {
+  if(queryParams.reimbursementType === '1'){
+    isFoodType.value = false;
+    isTaxiType.value = true;
+  }else if(queryParams.reimbursementType === '2'){
+    isTaxiType.value = false;
+    isFoodType.value = true;
+  }
+  queryParams.pageNum = 1;
+  getList();
+}
+
 // 切换展开/折叠状态
 const toggleSearch = () => {
   isExpanded.value = !isExpanded.value;