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

src/views/finance/index.vue

@@ -396,6 +396,7 @@
           <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="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>

src/views/platform/ticket.vue

@@ -390,6 +390,7 @@ const uploadJYFile = async (file) => {
   let files = file.raw
   const params = new FormData(); // 声明formData数据类型
   params.append("file", files);
+  params.append("type", '20')
   const { code, data, msg } = await api.financeApi.importPlatformReceivableInvoice(params)
   if (code == 200) {
     importModifyCallback.value = data

src/views/receivable/handingFee/ticket.vue

@@ -514,7 +514,8 @@ const uploadJYFile = async (file) => {
   let files = file.raw
   const params = new FormData(); // 声明formData数据类型
   params.append("file", files);
-  const { code, data, msg } = await api.financeApi.importAccountsReceivableInvoice(params)
+  params.append("type", activeindex.value==1?'11':'12')
+  const { code, data, msg } = await api.financeApi.importPlatformReceivableInvoice(params)
   if (code == 200) {
     importModifyCallback.value = data
     if (data.orderNos.length > 0) {

src/views/representative/externalCostApproval.vue

@@ -217,6 +217,8 @@ const columns = [
       }
     }
   },
+  { prop: "costDescribe", label: "费用描述", width: '500', },
+  { prop: "priorityLevel", label: "优先级", width: '120', },
   {
     prop: "isEnabled", label: "费用状态", width: '100', component: "Tag",
     formatter: (row: any) => {

src/views/representative/quoteApproval.vue

@@ -304,9 +304,11 @@ const columns = [
     prop: "ruleDescription", label: "承保规则", component: 'customSlot', width: '500'
   },
   { prop: "productName", label: "险种", width: '120', },
+  { prop: "costDescribe", label: "费用描述", width: '500', },
   {
     prop: "costRules", label: "费用规则", component: 'customSlot', width: '500',
   },
+  { prop: "priorityLevel", label: "优先级", width: '120', },
   {
     prop: "ruleConditions", label: "交强费用", width: '300', formatter: (row: any) => {
       let info = row.ruleConditions.find((val: any) => val.costType == '交强险');
@@ -597,6 +599,7 @@ const handleClick = (pane: any) => {
     formInline.auditStatus = '2';
     findpage("2");
   }
+  resetForm();
 }
 
 </script>