Просмотр исходного кода

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

祁鹏飞 1 месяц назад
Родитель
Сommit
f153774d98

+ 1 - 0
src/views/finance/index.vue

@@ -397,6 +397,7 @@
           <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>
           <el-table-column prop="equityAmount" label="权益金额" width="120"></el-table-column>

+ 1 - 1
src/views/platform/platformReport.vue

@@ -80,7 +80,7 @@
             <el-col :span="8">
               <el-form-item prop="settlementStatus" label="结算状态">
                 <el-select v-model="recordForm1.settlementStatus" placeholder="请选择">
-                  <el-option :value="0" label="未结清"></el-option>
+                  <el-option :value="2" label="未结清"></el-option>
                   <el-option :value="1" label="已结清"></el-option>
                 </el-select>
               </el-form-item>

+ 10 - 3
src/views/receivable/handingFee/invoiceRecord.vue

@@ -14,7 +14,8 @@
         </el-col>
         <el-col :span="8">
           <el-form-item prop="companyId" label="保险公司">
-            <el-select v-model="form.companyId" placeholder="请选择" clearable filterable @change="companyChange">
+            <el-select v-model="form.companyId" placeholder="请选择" clearable filterable @change="companyChange"
+              @clear="clearCompany">
               <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
             </el-select>
           </el-form-item>
@@ -535,17 +536,23 @@ const initOption = () => {
 }
 // 获取保险公司下的客户
 const companyChange = (e) => {
-  console.log(e)
+  if (!e) {
+    return
+  }
   let name = companyList.value.find(item => item.id == e).name;
   if (name) {
     company(name)
   }
 }
+const clearCompany = () => {
+  company('')
+
+}
 const getSummaries = (param) => {
   const { columns, data } = param
   const sums: (string | VNode)[] = []
   // 指定需要计算的字段列表(可根据需求添加字段名)
-  const specifiedFields = ['taxPoint', 'actualReceivedAmount','receivableAmount'] // 替换为您需要的字段名
+  const specifiedFields = ['taxPoint', 'actualReceivedAmount', 'receivableAmount'] // 替换为您需要的字段名
 
   columns.forEach((column, index) => {
     if (index === 0) {