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

src/views/payCredit/myTask.vue

@@ -578,4 +578,12 @@ onMounted(() => {
   display: flex;
   justify-content: flex-end;
 }
+:deep(.el-badge__content.is-fixed) {
+  right: calc(var(--el-badge-size) / 2 - 10px);
+  top: 50%;
+}
+
+:deep(.el-badge__content--danger) {
+  background-color: #D40000;
+}
 </style>

src/views/platform/ticket.vue

@@ -517,7 +517,7 @@ const handleSettlement = () => {
   // 查应收金额
   api.financeApi.getPlatformSettlementReceivableAmount({
     invoiceType: "5",
-    orderNos: selectedList.value.map(item => item.orderNo),
+    orderNos: tableData.value.map(item => item.orderNo),
   }).then((res: any) => {
     if (res.code == 200) {
       receivablePremium.value = res.data

src/views/receivable/documentary/documentaryRecord.vue

@@ -57,11 +57,14 @@
     </el-form>
     <el-table :data="tableData" style="height: calc(100% - 192px)" show-summary :summary-method="getSummaries">
       <el-table-column prop="id" label="开票记录编号" width="200"></el-table-column>
-      <el-table-column prop="companyAllName" label="保险公司" width="150">
-      </el-table-column>
+      <el-table-column prop="companyAllName" label="保险公司" width="100"></el-table-column>
+      <el-table-column prop="partnerCompanyName" label="支公司" width="350" align="center"></el-table-column>
       <el-table-column prop="companyNameSimple" label="保险机构" width="150"></el-table-column>
       <el-table-column prop="invoiceNo" label="发票号" width="150"></el-table-column>
+      <el-table-column prop="year" label="年份" width="150"></el-table-column>
+      <el-table-column prop="month" label="月份" width="150"></el-table-column>
       <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
+      <el-table-column prop="remainSettlementAmount" label="未结算金额" width="100"></el-table-column>
       <el-table-column prop="accountsReceivable" label="应收项" width="100"></el-table-column>
       <el-table-column prop="receivableAmount" label="应收金额" width="120"></el-table-column>
       <el-table-column prop="paymentReason" label="差额原因" width="120"></el-table-column>
@@ -114,6 +117,9 @@
         <!-- <el-form-item prop="overinflatedAmount" label="虚增金额">
           <el-input v-model="countForm.overinflatedAmount" disabled placeholder="请输入"></el-input>
         </el-form-item> -->
+        <el-form-item prop="remainSettlementAmount" label="未结算金额">
+          <el-input v-model="countForm.remainSettlementAmount" disabled placeholder="请输入"></el-input>
+        </el-form-item>
         <el-form-item prop="taxPoint" label="税点">
           <el-input v-model="countForm.taxPoint" disabled placeholder="请输入"></el-input>
         </el-form-item>

src/views/receivable/documentary/ticket.vue

@@ -379,7 +379,9 @@ const handelComfirm = async () => {
   let params: any = {
     details: selectedList.value,
     ...countForm.value,
-    attachmentIds
+    attachmentIds,
+    invoiceType: "2"
+
   }
   let apiFn = api.financeApi.followInvoicing
   if (isSettlement.value) {
@@ -387,7 +389,8 @@ const handelComfirm = async () => {
     params = {
       invoiceVO: params,
       ...countForm.value,
-      attachmentIds
+      attachmentIds,
+      invoiceType: "2"
     }
   }
   apiFn(params).then((sub: any) => {

src/views/sale/list.vue

@@ -148,15 +148,15 @@
       <el-table
         :data="relationTreeData"
         style="width: 100%; margin-bottom: 20px"
-        row-key="id"
+        row-key="name"
         default-expand-all
         :indent="16"
         :tree-props="{ children: 'children' }"
         :row-class-name="getRowClassName"
       >
-        <el-table-column prop="name" label="姓名" sortable> </el-table-column>
-        <el-table-column prop="mobile" label="手机号" sortable />
-        <el-table-column prop="distributionTime" label="加入时间" sortable />
+        <el-table-column prop="name" label="姓名" sortable align="conter"> </el-table-column>
+        <el-table-column prop="mobile" label="手机号" sortable  align="conter"/>
+        <el-table-column prop="distributionTime" label="加入时间" sortable align="conter"/>
       </el-table>
     </el-dialog>
   </div>
@@ -521,9 +521,9 @@ watch(
 .el-inputs {
   width: 100% !important;
 }
-::v-deep.el-table td.el-table__cell div i {
-  display: none;
-}
+// ::v-deep.el-table td.el-table__cell div i {
+//   display: none;
+// }
 ::v-deep.el-table .caret-wrapper {
   display: none;
 }