Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/index.vue

@@ -291,7 +291,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="审核人">
-                <el-input v-model="firstForm.auditUser" placeholder="请输入" clearable></el-input>
+                <el-input v-model="firstForm.auditUserName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -396,7 +396,6 @@
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
           <el-table-column prop="payTime" label="支付时间" width="120"></el-table-column>
           <el-table-column prop="quotationTime" label="报价时间" width="120"></el-table-column>
-          <el-table-column prop="auditUser" label="审核人" width="120"></el-table-column>
           <el-table-column prop="auditUserName" label="审核人名称" width="120"></el-table-column>
           <el-table-column prop="auditTime" label="审核时间" width="120"></el-table-column>
           <el-table-column prop="auditType" label="审核方式" width="120"></el-table-column>
@@ -470,7 +469,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="审核人">
-                <el-input v-model="firstForm.auditUser" placeholder="请输入" clearable></el-input>
+                <el-input v-model="firstForm.auditUserName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -506,7 +505,7 @@
           <el-table-column prop="auditTime" label="驳回时间" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
           <el-table-column prop="payTime" label="支付时间" width="120"></el-table-column>
-          <el-table-column prop="auditUser" label="审核人" width="120"></el-table-column>
+          <el-table-column prop="auditUserName" label="审核人名称" width="120"></el-table-column>
           <el-table-column prop="quotationTime" label="报价时间" width="120"></el-table-column>
           <el-table-column label="操作" fixed="right" width="300">
             <template #default="scope">
@@ -581,7 +580,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="审核人">
-                <el-input v-model="firstForm.auditUser" placeholder="请输入" clearable></el-input>
+                <el-input v-model="firstForm.auditUserName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -642,7 +641,7 @@
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="productName" label="投保险种" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>
-          <el-table-column prop="auditingUserName" label="审核人" width="120"></el-table-column>
+          <el-table-column prop="auditUserName" label="审核人名称" width="120"></el-table-column>
           <el-table-column prop="problemReason" label="疑问原因" width="120"></el-table-column>
           <el-table-column prop="problemTime" label="疑问时间" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>