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

src/views/platform/index.vue

@@ -553,13 +553,13 @@
       </template>
     </el-dialog>
   </PageMain>
-  <!-- <ticket ref="ticketRef" /> -->
+  <ticket ref="ticketRef" />
 </template>
 
 <script setup lang="ts">
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useRouter } from 'vue-router'
-// import ticket from "./ticket.vue";
+import ticket from "./ticket.vue";
 import api from '@/api'
 
 let myRouter = useRouter()
@@ -573,10 +573,8 @@ const handleTabsClick = (e) => {
   activeName.value = e.props.name
   if (e.props.name == '1') {
     getPlatFormReceivableList()
-    getreceivedAmountTotal()
   } else if (e.props.name == '2') {
     getPlatformReceivableList()
-    getreceivedAmountTotal()
   }
   isTrue.value = false
   receivableForm.value = {}
@@ -612,43 +610,12 @@ const reset = () => {
   size.value = 10
   if (activeName.value == '1') {
     getPlatFormReceivableList()
-    getreceivedAmountTotal()
   } else if (activeName.value == '2') {
     getPlatformReceivableList()
-    getreceivedAmountTotal()
   }
 
 }
-const  getreceivedAmountTotal = () => {
-  let params = {
-    licenseNo: receivableForm.value?.licenseNo,
-    typeAttr: receivableForm.value?.typeAttr,
-    companyId: receivableForm.value?.companyId,
-    signingStartTime: receivableForm.value?.signingTime?.[0],
-    signingEndTime: receivableForm.value?.signingTime?.[1],
-    orderNo: receivableForm.value?.orderNo,
-    agreementId: receivableForm.value?.agreementId,
-    deptId: receivableForm.value?.deptId,
-    riskCode: receivableForm.value?.riskCode,
-    orderType: receivableForm.value?.orderType,
-    insuredName: receivableForm.value?.insuredName,
-    jqPolicyNo: receivableForm.value?.jqPolicyNo,
-    syPolicyNo: receivableForm.value?.syPolicyNo,
-    dockingPerson: receivableForm.value?.dockingPerson,
-    jqStartDate: receivableForm.value?.jqDate?.[0],
-    jqEndDate: receivableForm.value?.jqDate?.[1],
-    syStartDate: receivableForm.value?.syDate?.[0],
-    syEndDate: receivableForm.value?.syDate?.[1],
-    pages: pages.value,
-    size: size.value
-  }
 
-  api.financeApi.getPlatformReceivableTotalAmount(params).then((res: any) => {
-    if (res.code == 200) {
-      receivedAmountTotal.value = res.data
-    }
-  })
-}
 let ReceiveDataRef1 = ref()
 // 选中的数据
 let selectedList = ref([])
@@ -778,7 +745,6 @@ const exportData = () => {
   })
 }
 // 批量操作数据导入
-let selectData = ref([])
 let selectingData = ref([])
 let selectedData = ref([])
 
@@ -790,10 +756,6 @@ const handleToAdd = (row) => {
       selectedData.value.push(row)
     }
   }
-  // ElMessage({
-  //     message: '该订单已被xxx添加到应收开票中',
-  //     type: 'warning'
-  // })
 }
 const handleDel = (row) => {
   selectedData.value = selectedData.value.filter(item => item.id != row.id)
@@ -849,13 +811,6 @@ const handleSelectChange1 = (row: any) => {
     selectedList.value = []
   }
 }
-const handleSelectChange2 = (row: any) => {
-  if (row.length > 0) {
-    selectedList.value = row
-  } else {
-    selectedList.value = []
-  }
-}
 const handleSelectAll1 = (row: any) => {
   if (row.length > 0) {
     selectedList.value = row
@@ -863,13 +818,6 @@ const handleSelectAll1 = (row: any) => {
     selectedList.value = []
   }
 }
-const handleSelectAll2 = (row: any) => {
-  if (row.length > 0) {
-    selectedList.value = row
-  } else {
-    selectedList.value = []
-  }
-}
 
 // 批量修改比例
 let batchEditShow = ref(false)
@@ -936,20 +884,16 @@ const handleSizeChange = (val) => {
   size.value = val
   if (activeName.value == '1') {
     getPlatFormReceivableList()
-    getreceivedAmountTotal()
   } else if (activeName.value == '2') {
     getPlatformReceivableList()
-    getreceivedAmountTotal()
   }
 }
 const handleCurrentChange = (val) => {
   pages.value = val
   if (activeName.value == '1') {
     getPlatFormReceivableList()
-    getreceivedAmountTotal()
   } else if (activeName.value == '2') {
     getPlatformReceivableList()
-    getreceivedAmountTotal()
   }
 }
 
@@ -1020,6 +964,7 @@ const getPlatFormReceivableList = () => {
     size: size.value
   }).then((res: any) => {
     if (res.code == 200) {
+      receivedAmountTotal.value = res.data.allAmount
       receiveData.value = res.data.insPlyIncomePage.records
       allData.value = res.data.insPlyIncomeOrders
       total1.value = res.data.insPlyIncomePage.total
@@ -1133,7 +1078,6 @@ onMounted(() => {
   initCompany();
   initDept();
   getPlatFormReceivableList();
-  getreceivedAmountTotal();
 })
 </script>
 

src/views/platform/ticket.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ticket">
+  <div class="ticket" v-if="showTicket">
     <div class="search-list">
       <div class="search-left">
         <el-select v-model="logicJudge">
@@ -289,6 +289,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()
     }
   })
 }
@@ -321,7 +322,7 @@ let searchList = ref([
 // 保险公司
 const initCompany = () => {
   api.financeApi.queryReceivableContact({
-    incomeIds: selectedList.value.map((item: any) => item.id)
+    incomeIds: tableData.value.map((item: any) => item.id)
   }).then((res: any) => {
     if (res.code == 200) {
       options.value = res.data
@@ -331,15 +332,15 @@ const initCompany = () => {
 
 const showTicket = ref(false)
 const contactPersonPhone = ref('')
-if (route.query?.contactPersonPhone) {
-  console.log(route.query)
+if (route.query?.invoiceType) {
   showTicket.value = true
   selectedList.value = JSON.parse(route.query.selectedList || '[]')
   searchList.value[0].search = route.query.contactPersonPhone || ''
   contactPersonPhone.value = route.query.contactPersonPhone || ''
   getByCompanyId()
-  initCompany()
   initData()
+} else {
+  showTicket.value = false
 }
 const downloadTemplate = () => {
   api.financeApi.exportAccountsReceivableInvoiceTemplate({}).then((res: any) => {
@@ -365,7 +366,7 @@ const uploadJYFile = async (file) => {
   const { code, data, msg } = await api.financeApi.importAccountsReceivableInvoice(params)
   if (code == 200) {
     importModifyCallback.value = data
-    if(data.orderNos.length>0){
+    if (data.orderNos.length > 0) {
       api.financeApi.getSelectedReceivableList({ orderNos: data.orderNos }).then((res: any) => {
         if (res.code == 200) {
           tableData.value = res.data
@@ -563,7 +564,7 @@ const uploadImage = async (file, fileList) => {
 
 
 const handleChange = async () => {
-  const num = await calSub(receivablePremium.value, countForm.value.actualReceivedAmount)
+  const num = await calSub(countForm.value.actualReceivedAmount, receivablePremium.value)
   countForm.value.paymentDifference = num
 }
 
@@ -582,7 +583,6 @@ const openSettlement = (list, id) => {
   contactPersonPhone.value = id
   selectedList.value = list
   handleSettlement()
-  initCompany()
 }
 
 defineExpose({
@@ -696,5 +696,4 @@ defineExpose({
     color: #ccc;
   }
 }
-
 </style>

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -184,6 +184,9 @@
             <el-date-picker v-model="rulesAttrListInfo.endTime" value-format="YYYY-MM-DD HH:mm:ss" type="datetime"
               placeholder="生效终止时间" />
           </el-form-item>
+          <el-form-item prop="inputDescription" label="规则描述">
+            <el-input v-model="rulesAttrListInfo.inputDescription" type="textarea" placeholder="请输入规则描述" />
+          </el-form-item>
         </el-form>
         <div class="flex a-c j-s ">
           <span class="strong title" style="margin-right: 20px;">规则条件</span>
@@ -497,6 +500,7 @@ const addUnderwritingRule = () => {
   addUnderwritingRuleShow.value = true;
   rulesAttrListInfo.startTime = ''
   rulesAttrListInfo.endTime = ''
+  rulesAttrListInfo.inputDescription = ''
   rulesAttrListInfo.rulesAttrList = []
 }
 //承保规则保存事件
@@ -852,6 +856,7 @@ interface rulesAttrListInfo {
   agreementId: string,
   startTime: string,
   endTime: string,
+  inputDescription: string,
   rulesAttrList: any[],
 }
 const ruleConditionVisible = ref(false);//规则条件弹窗
@@ -860,6 +865,7 @@ const rulesAttrListInfo = reactive<rulesAttrListInfo>({
   agreementId: "",
   startTime: "",
   endTime: "",
+  inputDescription: "",
   rulesAttrList: []
 });//规则条件列表数据
 const rulesAttrListInfoRules = ref<FormRules>({

src/views/receivable/documentary/index.vue

@@ -549,7 +549,7 @@ let myRouter = useRouter()
 
 let activeName = ref('1')
 let subActiveName = ref('1')
-const  receivedAmountTotal = ref(0)
+const receivedAmountTotal = ref(0)
 const handleTabsClick = (e) => {
   activeName.value = e.props.name
   if (e.props.name == '1') {
@@ -618,7 +618,7 @@ const selectAll = (type: boolean) => {
     selectedList.value = []
   }
 }
-const  getreceivedAmountTotal = () => {
+const getreceivedAmountTotal = () => {
   let params = {
     licenseNo: receivableForm.value?.licenseNo,
     typeAttr: receivableForm.value?.typeAttr,
@@ -674,11 +674,11 @@ let options = ref([])
 const handleInvoice = () => {
   if (selectedList.value.length < 1) {
     myRouter.push({
-    name: 'HandingFeeTicket',
-    query: {
-      invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
-    }
-  })
+      name: 'HandingFeeTicket',
+      query: {
+        invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
+      }
+    })
   } else {
     if (selectedList.value.some((item: any) => item.invoiceStatusName == '已开票')) {
       ElMessage({
@@ -793,6 +793,7 @@ const handleAddSubmit = () => {
       })
       addShow.value = false
       getOtherReceivableList()
+      getreceivedAmountTotal()
       getJyOtherReceivableList()
     }
   })

src/views/receivable/handingFee/index.vue

@@ -112,7 +112,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-row  class="flex a-c " style="margin: 20px 0">
+        <el-row class="flex a-c " style="margin: 20px 0">
           <span class="flex col-160 m-r-8 bg-F9">
             <el-checkbox class="p-w-12" @change="selectAll" v-model="selectAllValue"></el-checkbox>&nbsp;
             <el-select class="select-all width-100" placeholder="全选" v-model="selectType" @change="selectTypeChange">
@@ -437,7 +437,8 @@
         <el-button type="primary" @click="handleAddSubmit">确定</el-button>
       </template>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" v-model="batchShow" width="800" :title="`选中修改（已选${selectedData.length}条数据）`">
+    <el-dialog :close-on-click-modal="false" v-model="batchShow" width="800"
+      :title="`选中修改（已选${selectedData.length}条数据）`">
       <div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
         下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
         <el-button link type="primary">下载模板</el-button>
@@ -459,7 +460,7 @@
         <el-button type="primary" @click="handleInvoiceSubmit">确定</el-button>
       </template>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow"  width="700">
+    <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow" width="700">
       <el-tabs v-model="subActiveName" class="demo-tabs">
         <el-tab-pane label="User" name="first">
           <template #label>选中修改（{{ selectedList.length }}）</template>
@@ -551,10 +552,11 @@ let myRouter = useRouter()
 
 let activeName = ref('1')
 let subActiveName = ref('first')
-const  receivedAmountTotal = ref(0)//应收金额总计
+const receivedAmountTotal = ref(0)//应收金额总计
 const handleTabsClick = (e) => {
   if (e.props.name == '1') {
     getCommissionReceivableList()
+    getreceivedAmountTotal()
   } else if (e.props.name == '2') {
     getJyReceivableList()
   }
@@ -791,6 +793,7 @@ const handleAddSubmit = () => {
       })
       addShow.value = false
       getCommissionReceivableList()
+      getreceivedAmountTotal()
       getJyReceivableList()
     }
   })
@@ -954,7 +957,7 @@ const search = () => {
     getJyReceivableList()
   }
 }
-const  getreceivedAmountTotal = () => {
+const getreceivedAmountTotal = () => {
   let params = {
     invoiceId: receivableForm.value?.invoiceId,
     licenseNo: receivableForm.value?.licenseNo,