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

src/api/modules/consoleManage.ts

@@ -138,9 +138,9 @@ const manageApi = (axiosInstance: ApiInstance) => ({
 
     // 订单审核
     feeAuditSummaryPageList: (params: any) => axiosInstance.post('/console/financeDataManage/feeAuditSummaryPageList',params),//列表接口
-    feeAuditSummaryToTask: (params: any) => axiosInstance.post('/console/financeDataManage/feeAuditSummaryToTask',params),//列表导出接口
+    feeAuditSummaryToTask: (params: any) => axiosInstance.post('/console/financeDataManage/exportFeeAuditSummary',params,{responseType: 'blob'}),//列表导出接口
     feeAuditDetailPageList: (params: any) => axiosInstance.post('/console/financeDataManage/feeAuditDetailPageList',params),//明细接口
-    feeAuditDetailToTask: (params: any) => axiosInstance.post('/console/financeDataManage/feeAuditDetailToTask',params),//明细出接口
+    feeAuditDetailToTask: (params: any) => axiosInstance.post('/console/financeDataManage/exportFeeAuditDetail',params,{responseType: 'blob'}),//明细导出接口
   })
 
 export default manageApi

src/views/consoleManage/financeDataManage/orderReviewData/index.vue

@@ -241,7 +241,7 @@ function getList(item: PageInfo) {
 //导出
 const downloadFile = async () => {
   let query = { ...queryFormRes.value };
-  const { data, msg } = await api.manageApi.personCheckDataToTask({
+  api.manageApi.feeAuditSummaryToTask({
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
@@ -250,12 +250,22 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
-  });
-  ElMessage({
-    message: msg,
-    type: "success",
-  });
-  userStore.count++;
+  }).then((res: any) => {
+    const blob = new Blob([res], { type: 'application/vnd.ms-excel' });
+    const fileName = '订单审核汇总报表' + new Date().getTime() + '.xlsx';
+    if ('download' in document.createElement('a')) {
+      const elink = document.createElement('a');
+      elink.download = fileName;
+      elink.style.display = 'none';
+      elink.href = URL.createObjectURL(blob);
+      document.body.appendChild(elink);
+      elink.click();
+      URL.revokeObjectURL(elink.href);
+      document.body.removeChild(elink);
+    } else {
+      navigator.msSaveBlob(blob, fileName);
+    }
+  })
 };
 
 const agreementEdit = (id) => {

src/views/consoleManage/financeDataManage/orderReviewData/orderReviewDataDetail.vue

@@ -226,7 +226,7 @@ function getList(item: PageInfo) {
 //导出
 const downloadFile = async () => {
   let query = { ...queryFormRes.value };
-  const { data, msg } = await api.manageApi.personCheckDataDetailToTa({
+  api.manageApi.feeAuditDetailToTask({
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
@@ -235,12 +235,22 @@ const downloadFile = async () => {
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
     ...query,
-  });
-  ElMessage({
-    message: msg,
-    type: "success",
-  });
-  userStore.count++;
+  }).then((res: any) => {
+    const blob = new Blob([res], { type: 'application/vnd.ms-excel' });
+    const fileName = '订单审核明细报表' + new Date().getTime() + '.xlsx';
+    if ('download' in document.createElement('a')) {
+      const elink = document.createElement('a');
+      elink.download = fileName;
+      elink.style.display = 'none';
+      elink.href = URL.createObjectURL(blob);
+      document.body.appendChild(elink);
+      elink.click();
+      URL.revokeObjectURL(elink.href);
+      document.body.removeChild(elink);
+    } else {
+      navigator.msSaveBlob(blob, fileName);
+    }
+  })
 };
 
 onMounted(() => {

src/views/platform/ticket.vue

@@ -15,6 +15,8 @@
             <el-option value="ptlAgreement" label="出单协议"></el-option>
             <el-option value="orderType" label="订单类型"></el-option>
             <el-option value="signYear" label="签单年份"></el-option>
+            <el-option value="companyId" label="保险公司"></el-option>
+
           </el-select>
           <el-select v-model="item.type" v-if="item.name != 'signDate'" style="margin-right: 20px; width: 150px"
             @change="val => signDateSelectChange(index, val)">
@@ -37,6 +39,10 @@
             <el-option v-for="item in options" :key="item.contactPerson" :value="item.contactPerson"
               :label="item.contactPerson"></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-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" />
@@ -63,7 +69,7 @@
       <p>应收明细</p>
       <el-button type="primary" @click="addTicket">添加应收</el-button>
     </div>
-    <el-table :data="tableData" style="height: calc(100% - 340px)">
+    <el-table :data="tableData" style="height: calc(100% - 380px)">
       <template #empty>
         <div v-if="noData">暂无应收，点击<el-button link type="primary" @click="batchShow = true">导入应收</el-button></div>
         <div v-else>没有符合的应收单据~</div>
@@ -236,7 +242,7 @@ import { ElMessage, FormInstance } from "element-plus";
 let route = useRoute()
 let router = useRouter()
 const previousRoute = ref(router.options.history.state.back)
-console.log(previousRoute.value)
+const companyList = ref()//保险公司
 const CountFormRef = ref<FormInstance>()
 const batchShow = ref(false)//数据导入弹窗
 const selectedList = ref([])//选中的应收单据
@@ -273,6 +279,15 @@ const getByCompanyId = () => {
     }
   })
 }
+// 保险公司
+const initCompany = () => {
+  api.insuranceApi.leftList('').then((res: any) => {
+    if (res.code == 200) {
+      companyList.value = res.data
+    }
+  })
+}
+
 //保险公司协议
 
 const initData = () => {
@@ -280,7 +295,7 @@ const initData = () => {
   api.financeApi.getSelectedReceivableList({ orderNos: selectedList.value.map(v => v.orderNo), searchList: searchList.value, logicJudge: logicJudge.value, }).then((res: any) => {
     if (res.code == 200) {
       tableData.value = res.data
-      initCompany()
+      initCompanyContact()
     }
   })
 }
@@ -307,11 +322,15 @@ let searchList = ref([
     name: 'signYear',
     type: '等于',
     search: ''
-  }
+  }, {
+    name: 'companyId',
+    type: '等于',
+    search: ''
+  },
 ])
 
 // 保险公司
-const initCompany = () => {
+const initCompanyContact = () => {
   api.financeApi.queryReceivableContact({
     incomeIds: tableData.value.map((item: any) => item.id)
   }).then((res: any) => {
@@ -588,7 +607,9 @@ const openSettlement = (list, name) => {
   handleSettlement()
   initData()
 }
-
+onMounted(() => {
+  initCompany()
+})
 defineExpose({
   openSettlement,
 });

src/views/receivable/documentary/index.vue

@@ -1082,8 +1082,8 @@ const getOtherReceivableList = () => {
     licenseNo: receivableForm.value?.licenseNo,
     typeAttr: receivableForm.value?.typeAttr,
     companyId: receivableForm.value?.companyId,
-    signingStartTime: receivableForm.value?.signingTime?.[0],
-    signingEndTime: receivableForm.value?.signingTime?.[1],
+    signingTimeStart: receivableForm.value?.signingTime?.[0],
+    signingTimeEnd: receivableForm.value?.signingTime?.[1],
     orderNo: receivableForm.value?.orderNo,
     agreementId: receivableForm.value?.agreementId,
     deptId: receivableForm.value?.deptId,