Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/cw/reimbursementApproval/info/InfoList.vue

src/views/ccpm/reimbursement/info/InfoList.vue

@@ -176,7 +176,7 @@
           <vxe-column width="100" title="经办人" field="userName" align="center"></vxe-column>
           <vxe-column width="100" title="报销人" field="name" align="center"></vxe-column>
           <vxe-column width="100" title="报销部门" field="deptName" align="center"></vxe-column>
-          <vxe-column width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
+          <vxe-column width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
           <vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
           <vxe-column width="100" title="状态" fixed="right" align="center" field="type">
             <template #default="scope">

src/views/consultancy/reimbursement/info/InfoList.vue

@@ -176,7 +176,7 @@
           <vxe-column width="100" title="经办人" field="userName" align="center"></vxe-column>
           <vxe-column width="100" title="报销人" field="name" align="center"></vxe-column>
           <vxe-column width="100" title="报销部门" field="deptName" align="center"></vxe-column>
-          <vxe-column width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
+          <vxe-column width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
           <vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
           <vxe-column width="100" title="状态" fixed="right" align="center" field="type">
             <template #default="scope">

src/views/flowable/task/TodoList.vue

@@ -53,7 +53,7 @@
 				custom
 			>
 				<template #buttons>
-					<el-button v-if="hasPermission('approval:info:edit')"  type="primary" icon="el-icon-plus" @click="approval()" :disabled="$refs.todoTable && $refs.todoTable.getCheckboxRecords().length === 0">批量审核(所长,总经办报销)</el-button>
+					<el-button v-if="hasPermission('approval:info:edit')"  type="primary" icon="el-icon-plus" @click="approval()" :disabled="$refs.todoTable && $refs.todoTable.getCheckboxRecords().length === 0">批量审核</el-button>
 				</template>
 				<template #tools>
 					<vxe-button

src/views/reimbursement/info/InfoList.vue

@@ -25,10 +25,10 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="经办人" prop="handled">
-        <UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = label}'></UserSelect>
+		  <UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="报销人" prop="reimBy">
-        <UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = label}'></UserSelect>
+		  <UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="报销项" prop="reimbursementType">
         <el-select v-model="searchForm.reimbursementType" placeholder="请选择" style="width:100%;" clearable>
@@ -167,7 +167,7 @@
           <vxe-column min-width="100" title="经办人" field="userName" align="center"></vxe-column>
           <vxe-column min-width="100" title="报销人" field="name" align="center"></vxe-column>
           <vxe-column min-width="100" title="报销部门" field="deptName" align="center"></vxe-column>
-          <vxe-column min-width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
           <vxe-column min-width="150" title="报销金额(元)" field="number" align="center"></vxe-column>
           <vxe-column min-width="100" title="状态" fixed="right" align="center" field="type">
             <template #default="scope">

src/views/zs/reimbursement/info/InfoList.vue

@@ -176,7 +176,7 @@
           <vxe-column width="100" title="经办人" field="userName" align="center"></vxe-column>
           <vxe-column width="100" title="报销人" field="name" align="center"></vxe-column>
           <vxe-column width="100" title="报销部门" field="deptName" align="center"></vxe-column>
-          <vxe-column width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
+          <vxe-column width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
           <vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
           <vxe-column width="100" title="状态" fixed="right" align="center" field="type">
             <template #default="scope">