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

src/views/platform/ticket.vue

@@ -34,8 +34,8 @@
             <el-option value="不在固定范围" label="不在固定范围"></el-option>
             <el-option value="为空" label="为空"></el-option>
           </el-select>
-          <el-select class="w-350px" v-if="item.name == 'contactPerson'" v-model="item.search" placeholder="请选择" filterable
-            clearable :disabled="item.type == '为空'" @change="handleContactPersonChange(index, $event)">
+          <el-select class="w-350px" v-if="item.name == 'contactPerson'" v-model="item.search" placeholder="请选择"
+            filterable clearable :disabled="item.type == '为空'" @change="handleContactPersonChange(index, $event)">
             <el-option v-for="item in options" :key="item.contactPerson" :value="item.contactPerson"
               :label="item.contactPerson"></el-option>
           </el-select>
@@ -164,7 +164,7 @@
         <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0" :precision="5"
           controls-position="right" @change="handleChange" />
       </el-form-item>
-      <el-form-item prop="settlementPaymentDifference" label="回款差额" >
+      <el-form-item prop="settlementPaymentDifference" label="回款差额">
         <el-input v-model="countForm.settlementPaymentDifference" disabled></el-input>
       </el-form-item>
       <el-form-item prop="settlementPaymentReason" label="差额原因">
@@ -289,11 +289,11 @@ const initCompany = () => {
     }
   })
 }
-  // 对接人改变时 赋值
-  const handleContactPersonChange = (index: number, val: string) => {
-    contactPerson.value = val
-    searchList.value[index].search = val
-  }
+// 对接人改变时 赋值
+const handleContactPersonChange = (index: number, val: string) => {
+  contactPerson.value = val
+  searchList.value[index].search = val
+}
 //保险公司协议
 
 const initData = () => {
@@ -361,16 +361,16 @@ if (route.query?.invoiceType) {
   contactPerson.value = route.query.contactPerson || ''
   getByCompanyId()
   // 勾选数据查询对应对接人 未勾选查全部
-  if(selectedList.value.length > 0) {
+  if (selectedList.value.length > 0) {
     initData()
-  }else{
+  } else {
     getqueryContractVos()
   }
 } else {
   showTicket.value = false
 }
 const downloadTemplate = () => {
-  api.financeApi.exportAccountsReceivableInvoiceTemplate({type:'20'}).then((res: any) => {
+  api.financeApi.exportAccountsReceivableInvoiceTemplate({ type: '20' }).then((res: any) => {
     if (res.code == 200) {
       const link = document.createElement('a');
       fetch(res.msg).then((res) => res.blob())
@@ -395,6 +395,7 @@ const uploadJYFile = async (file) => {
   if (code == 200) {
     importModifyCallback.value = data
     if (data.orderNos.length > 0) {
+      batchShow.value = false;
       api.financeApi.getSelectedReceivableList({ orderNos: data.orderNos }).then((res: any) => {
         if (res.code == 200) {
           tableData.value = res.data
@@ -405,13 +406,18 @@ const uploadJYFile = async (file) => {
       message: msg,
       type: 'success'
     })
+  }else{
+    ElMessage({
+      message: msg,
+      type: 'error'
+    })
   }
 }
 const getSummaries = (param) => {
   const { columns, data } = param
   const sums: (string | VNode)[] = []
   // 指定需要计算的字段列表（可根据需求添加字段名）
-  const specifiedFields = ['jqPremium', 'jqSuperviseCostsProportion','syPremium','sySuperviseCostsProportion','receivableAmount'] // 替换为您需要的字段名
+  const specifiedFields = ['jqPremium', 'jqSuperviseCostsProportion', 'syPremium', 'sySuperviseCostsProportion', 'receivableAmount'] // 替换为您需要的字段名
 
   columns.forEach((column, index) => {
     if (index === 0) {
@@ -631,7 +637,7 @@ const handelComfirm = (formEl: FormInstance | undefined) => {
             setTimeout(() => {
               router.back()
             }, 1000)
-          }else{
+          } else {
             setTimeout(() => {
               window.location.reload()
             }, 1000)

src/views/receivable/handingFee/ticket.vue

@@ -519,6 +519,7 @@ const uploadJYFile = async (file) => {
   if (code == 200) {
     importModifyCallback.value = data
     if (data.orderNos.length > 0) {
+          batchShow.value = false;
       api.financeApi.getSelectedReceivableList({ orderNos: data.orderNos }).then((res: any) => {
         if (res.code == 200) {
           tableData.value = res.data
@@ -529,6 +530,11 @@ const uploadJYFile = async (file) => {
       message: msg,
       type: 'success'
     })
+  }else{
+    ElMessage({
+      message: msg,
+      type: 'error'
+    })
   }
 }
 // 下载导入失败文件

src/views/representative/quoteApproval.vue

@@ -184,6 +184,7 @@ const fields = ref([
   {
     label: "保险公司", model: "companyId", type: "cascader", placeholder: "选择保险公司", options: company_list, props: companyIdprops, placement: 'left', onChange: (value: any) => {
       formInline.companyId = value[value.length - 1];
+      getAgreement();
     }
   },
   {
@@ -284,7 +285,7 @@ function agreement() {
   });
 }
 const getAgreement = () => {
-  api.agreementApi.agreementList({ pages: 1, size: 1000 }).then((res: any) => {
+  api.agreementApi.agreementList({ pages: 1, size: 1000, companyId: formInline.companyId }).then((res: any) => {
     if (res.code == '200') {
       agreementListALL.value = res.data.records;
     } else {