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

src/views/finance/modules/auditDetail.vue

@@ -128,14 +128,6 @@
               <span>{{ detailData?.order?.signingTime || '--' }}</span>
             </span>
           </el-col>
-          <el-col :span="6" class="TBMsgItem">
-            <span class="label">车船税</span>
-            <span class="value">
-              <span>{{ detailData?.costs?.vvTax || '--' }}</span>
-            </span>
-          </el-col>
-
-
           <el-col :span="6" class="TBMsgItem">
             <span class="label">交强险续保</span>
             <span class="value">
@@ -147,6 +139,12 @@
             <span class="value">
               <span>{{ ['新保', '续保', '转保'][detailData?.scoreVo?.syRenewal] || '--' }}</span>
             </span>
+          </el-col>
+            <el-col :span="6" class="TBMsgItem">
+            <span class="label">车船税</span>
+            <span class="value">
+              <span>{{ detailData?.costs?.vvTax || '--' }}</span>
+            </span>
           </el-col>
           <el-col :span="6" class="TBMsgItem">
             <span class="label">交强险保费</span>

src/views/platform/index.vue

@@ -409,6 +409,8 @@
               条正常导入；<span style="color: red;">{{ importModifyCallback?.failedNumber || 0 }}</span> 条不符合要求无法导入。
             </div>
           </div>
+                   <div v-if="uploadMsg" class="text-red">上传错误信息：{{ uploadMsg }}</div>
+
         </el-tab-pane>
       </el-tabs>
       <template #footer>
@@ -810,6 +812,7 @@ const handleBatchEdit = (str: string) => {
   editForm.value = {}
   importModifyCallback.value = null
   batchEditShow.value = true
+  uploadMsg.value = ''
   subActiveName.value = str
 }
 
@@ -831,6 +834,8 @@ const handleBatchEditSubmit = async () => {
 }
 
 let importModifyCallback = ref()// 导入数据回调
+let uploadMsg = ref('')// 上传错误信息
+
 const uploadJYFile = async (file) => {
   let files = file.raw
   const params = new FormData(); // 声明formData数据类型
@@ -842,6 +847,11 @@ const uploadJYFile = async (file) => {
       message: msg,
       type: 'success'
     })
+    uploadMsg.value = msg
+    getPlatFormReceivableList()
+  } else {
+    uploadMsg.value = msg
+    getPlatFormReceivableList()
   }
 }
 // 下载导入失败文件

src/views/platform/platformReport.vue

@@ -111,7 +111,7 @@
                 <span class="el-dropdown-link">查看明细</span>
                 <template #dropdown>
                   <el-dropdown-menu>
-                    <el-dropdown-item @click="handleRecordDetail(scope.row)">开票明细</el-dropdown-item>
+                    <el-dropdown-item @click="handleRecordDetail(scope.row)">结算记录</el-dropdown-item>
                     <el-dropdown-item @click="receiverView(scope.row)">车险结算明细</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
@@ -173,7 +173,7 @@
           </el-row>
         </el-form>
         <el-table height="calc(100% - 192px)" :data="recordData2" show-summary
-          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jqPremium', 'syPremium', 'jyPremium', 'taxPremium', 'jqSuperviseCostsProportion', 'sySuperviseCostsProportion', 'jySuperviseCostsProportion'])">
+          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jqPremium', 'syPremium', 'jyPremium', 'taxPremium'])">
           <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="contactPerson" label="对接人" width="150"></el-table-column>

src/views/platform/ticket.vue

@@ -14,8 +14,9 @@
             <el-option value="signDate" label="签单时间"></el-option>
             <el-option value="ptlAgreement" label="出单协议"></el-option>
             <el-option value="orderType" label="订单类型"></el-option>
-            <el-option value="signYear" label="签单年份"></el-option>
+            <el-option value="signMonth" label="签单年月"></el-option>
             <el-option value="companyId" label="保险公司"></el-option>
+            <el-option value="licenseNo" label="车牌号"></el-option>
 
           </el-select>
           <el-select v-model="item.type" v-if="item.name != 'signDate'" style="margin-right: 20px; width: 150px"
@@ -34,6 +35,8 @@
             <el-option value="不在固定范围" label="不在固定范围"></el-option>
             <el-option value="为空" label="为空"></el-option>
           </el-select>
+          <el-input class="w-350px" v-if="item.name == 'licenseNo'" v-model="item.search" placeholder="请输入车牌号"
+            aria-label="Please click the Enter key after input" />
           <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"
@@ -57,19 +60,21 @@
             <el-option value="2" label="代客录单"></el-option>
             <el-option value="3" label="补录订单"></el-option>
           </el-select>
-          <el-date-picker v-if="item.name == 'signYear'" style="width: 350px" format="YYYY" value-format="YYYY"
-            v-model="yearrangesearch" type="yearrange" range-separator="-" :disabled="item.type == '为空'"
+          <el-date-picker v-if="item.name == 'signMonth'" style="width: 350px" format="YYYY-MM" value-format="YYYY-MM"
+            v-model="yearrangesearch" type="monthrange" range-separator="-" :disabled="item.type == '为空'"
             @change="handlePtlAgreementChange(index, $event)" />
           <!-- <el-icon style="margin-left: 20px; cursor:pointer;"><CircleClose /></el-icon> -->
         </div>
-        <el-button type="primary" @click="handleSearch">搜索</el-button>
+    <el-button type="primary" style="width: 100px;" @click="handleSearch">搜索</el-button>
+
       </div>
+
     </div>
     <div class="tips">
       <p>应收明细</p>
       <el-button type="primary" @click="addTicket">添加应收</el-button>
     </div>
-    <el-table :data="tableData" style="height: calc(100% - 380px)" show-summary :summary-method="getSummaries">
+    <el-table :data="tableData" style="height: calc(100% - 270px)" show-summary :summary-method="getSummaries">
       <template #empty>
         <div v-if="noData">暂无应收，点击<el-button link type="primary" @click="batchShow = true">导入应收</el-button></div>
         <div v-else>没有符合的应收单据~</div>
@@ -206,7 +211,8 @@
       下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
       <el-button link type="primary" @click="downloadTemplate">下载模板</el-button>
     </div>
-    <el-upload class="upload-demo " drag accept=".xls, .xlsx" :auto-upload="false" @change="uploadJYFile">
+    <el-upload class="upload-demo " drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false"
+      @change="uploadJYFile">
       <div class="flex f-c a-c">
         <el-icon class="el-icon--upload"><upload-filled /></el-icon>
         <div class="el-upload__text">
@@ -226,11 +232,12 @@
       </div>
       <el-button type="primary" link @click="downloadImportFailedData(importModifyCallback)">下载导入失败文件</el-button>
     </div>
-      <div v-if="uploadMsg" class="text-red">上传错误信息：{{ uploadMsg }}</div>
+    <div v-if="uploadMsg" class="text-red">上传错误信息：{{ uploadMsg }}</div>
 
     <template #footer>
-      <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="batchShow = false,uploadMsg = null">取消</el-button>
-      <el-button type="primary" @click="batchShow = false,uploadMsg = null">确定</el-button>
+      <el-button class="border-[#0083FF] color-[#0083FF]" plain
+        @click="batchShow = false, uploadMsg = null">取消</el-button>
+      <el-button type="primary" @click="batchShow = false, uploadMsg = null">确定</el-button>
     </template>
   </el-dialog>
   <el-image-viewer v-if="imageShow" :url-list="[bigImageUrl]" @close="imageShow = false" />
@@ -327,13 +334,17 @@ let searchList = ref([
     type: '等于',
     search: ''
   }, {
-    name: 'signYear',
+    name: 'signMonth',
     type: '等于',
     search: ''
   }, {
     name: 'companyId',
     type: '等于',
     search: ''
+  }, {
+    name: 'licenseNo',
+    type: '等于',
+    search: ""
   },
 ])
 
@@ -409,7 +420,7 @@ const uploadJYFile = async (file) => {
       message: msg,
       type: 'success'
     })
-  }else{
+  } else {
     uploadMsg.value = msg
     console.log(uploadMsg.value)
   }
@@ -719,7 +730,9 @@ defineExpose({
     }
 
     .search-right {
-      width: 700px;
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      gap: 0 12px;
 
       .search-type {
         display: flex;

src/views/receivable/documentary/index.vue

@@ -535,7 +535,7 @@
             下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
             <el-button link type="primary" @click="downloadImportTemplate">下载模板</el-button>
           </div>
-          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" @change="uploadJYFile">
+          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false" @change="uploadFile">
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
               点击或将文件拖拽到这里上传
@@ -880,16 +880,25 @@ const handleAddSubmit = () => {
 }
 
 let batchShow = ref(false)
+let uploadMsg = ref('')// 上传错误信息
+let importModifyCallback = ref()// 导入数据回调
 const uploadFile = async (file) => {
   let files = file.raw
   const params = new FormData(); // 声明formData数据类型
   params.append("file", files);
   const { code, data, msg } = await api.financeApi.importSuperviseExcel(params)
   if (code == 200) {
+    importModifyCallback.value = data
     ElMessage({
       message: msg,
       type: 'success'
     })
+    search()
+    uploadMsg.value = msg
+  } else {
+    search()
+    uploadMsg.value = msg
+
   }
 }
 
@@ -954,6 +963,7 @@ const handleBatchEdit = (str: string) => {
   }
   editForm.value = {}
   importModifyCallback.value = null
+  uploadMsg.value = ''
   batchEditShow.value = true
   subActiveName.value = str
 }
@@ -1038,20 +1048,7 @@ const downloadImportTemplate = () => {
     }
   })
 }
-let importModifyCallback = ref()// 导入数据回调
-const uploadJYFile = async (file) => {
-  let files = file.raw
-  const params = new FormData(); // 声明formData数据类型
-  params.append("file", files);
-  const { code, data, msg } = await api.financeApi.importReceivableListUpdate(params)
-  if (code == 200) {
-    importModifyCallback.value = data
-    ElMessage({
-      message: msg,
-      type: 'success'
-    })
-  }
-}
+
 // 下载导入失败文件
 const downloadImportFailedData = (item) => {
   const link = document.createElement('a');

src/views/receivable/handingFee/index.vue

@@ -1000,6 +1000,7 @@ const handleBatchEdit = (str: string) => {
   }
   editForm.value = {}
   importModifyCallback.value = null
+  uploadMsg.value = ''
   batchEditShow.value = true
   subActiveName.value = str
 }
@@ -1033,7 +1034,9 @@ const uploadJYFile = async (file) => {
       type: 'success'
     })
     uploadMsg.value = msg
+    search()
   } else {
+    search()
     uploadMsg.value = msg
   }
 }

src/views/receivable/handingFee/report.vue

@@ -242,7 +242,7 @@
           </el-row>
         </el-form>
         <el-table height="calc(100% - 192px)" :data="recordData2" show-summary
-          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jqPremium', 'taxPremium', 'syPremium', 'jqSuperviseCostsProportion', 'sySuperviseCostsProportion'])">
+          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jqPremium', 'taxPremium', 'syPremium'])">
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="100"></el-table-column>
@@ -319,7 +319,7 @@
           </el-row>
         </el-form>
         <el-table height="calc(100% - 192px)" :data="recordData3" show-summary
-          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jyPremium', 'jySuperviseCostsProportion'])">
+          :summary-method="val => getSummaries(val, ['jySuperviseCostsPremiums', 'jyPremium'])">
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="100"></el-table-column>

src/views/receivable/handingFee/ticket.vue

@@ -242,7 +242,7 @@
         下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
         <el-button link type="primary" @click="downloadTemplate">下载模板</el-button>
       </div>
-      <el-upload class="upload-demo " drag accept=".xls, .xlsx" :auto-upload="false" @change="uploadJYFile">
+      <el-upload class="upload-demo " drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false" @change="uploadJYFile">
         <div class="flex f-c a-c">
           <el-icon class="el-icon--upload"><upload-filled /></el-icon>
           <div class="el-upload__text">