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

src/views/platform/platformReport.vue

@@ -108,8 +108,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceParty" label="对接人">
-                <el-input v-model="recordData2.a"></el-input>
+              <el-form-item prop="contactPerson" label="对接人">
+                <el-input v-model="recordForm2.contactPerson"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/views/receivable/handingFee/invoiceRecord.vue

@@ -102,7 +102,7 @@
       </el-table-column>
       <!-- <el-table-column prop="paymentReason" label="回款差额原因" width="120"></el-table-column> -->
       <el-table-column prop="createBy" label="开票人" width="120"></el-table-column>
-      <el-table-column prop="createTime" label="开票时间" width="150"></el-table-column>
+      <el-table-column prop="invoiceTime" label="开票时间" width="150"></el-table-column>
       <el-table-column label="操作" width="300" fixed="right" align="center">
         <template #default="scope">
           <div class="flex a-c ">

src/views/receivable/handingFee/ticket.vue

@@ -35,10 +35,9 @@
             <el-option value="不在固定范围" label="不在固定范围"></el-option>
             <el-option value="为空" label="为空"></el-option>
           </el-select>
-          <el-select class="w-350px" v-if="item.name == 'companyId'" v-model="item.search" placeholder="请选择" clearable
-            filterable :disabled="item.type == '为空'">
-            <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
-          </el-select>
+          <el-cascader class="w-350px" filterable clearable :disabled="item.type == '为空'"
+            v-if="item.name == 'companyId'" placeholder="请选择" v-model="item.search" :options="companyList"
+            :props="companyIdprops" @change="handleCompanyChange(index, $event)" />
           <el-date-picker style="width: 350px" v-model="datesearch" v-if="item.name == 'signDate'"
             :type="item.type == '大于等于' || item.type == '小于等于' ? 'date' : 'daterange'" placeholder="请选择"
             :disabled="item.type == '为空'" @change="handlePtlAgreementChange(index, $event)" value-format="YYYY-MM-DD" />
@@ -284,6 +283,12 @@ const countShow = ref(false)
 const countForm = ref({
   attachmentIds: [],
 })
+const companyIdprops = {
+  expandTrigger: 'hover' as const,
+  value: 'id',
+  label: 'name',
+  checkStrictly: true,
+}
 //获取保险公司协议
 const getByCompanyId = () => {
   api.dispatchApi.getByCompanyIdt(route.query.id).then((res: any) => {
@@ -700,7 +705,9 @@ const handelComfirm = () => {
     }
   })
 }
-
+const handleCompanyChange = (index: any, e: any) => {
+  searchList.value[index].search = e[e.length - 1] || ''
+}
 const initData = () => {
   // router
   if (selectedList.value.length < 1) return
@@ -712,7 +719,7 @@ const initData = () => {
 }
 // 保险公司
 const initCompany = () => {
-  api.insuranceApi.leftList('').then((res: any) => {
+  api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
     if (res.code == 200) {
       companyList.value = res.data
     }