祁鹏飞 2 недель назад
Родитель
Сommit
44156c47c2

+ 4 - 9
src/views/platform/index.vue

@@ -388,7 +388,8 @@
             下载「标准导入模板」,编辑后上传;系统将自动匹配相关字段
             <el-button link type="primary" @click="exportData">下载模板</el-button>
           </div>
-          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false" @change="uploadJYFile">
+          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false"
+            @change="uploadJYFile">
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
               点击或将文件拖拽到这里上传
@@ -880,14 +881,8 @@ const initDept = () => {
 }
 // 编辑
 const toEdit = (row: any) => {
-  console.log(row)
-  myRouter.push({
-    path: '/finance/auditOrderDetail',
-    query: {
-      id: row.orderNo,
-      jumpType: 'costMsg'
-    }
-  })
+  selectedList.value = [row.id]
+  handleBatchEdit()
 }
 // 车险列表
 const getPlatFormReceivableList = () => {

+ 11 - 2
src/views/platform/platformReport.vue

@@ -77,7 +77,7 @@
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-             <el-col :span="8">
+            <el-col :span="8">
               <el-form-item prop="receivePaymentDate" label="回款时间">
                 <el-date-picker v-model="recordForm1.receivePaymentDate" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
@@ -105,7 +105,11 @@
           <el-table-column prop="settledAmount" label="已结算总计"></el-table-column>
           <el-table-column prop="unSettledAmount" label="未结算总计"></el-table-column>
           <el-table-column prop="totalPaymentDifference" label="回款差额"></el-table-column>
-
+          <el-table-column label="操作" width="200" align="center" fixed="right">
+            <template #default="scope">
+              <el-button link type="primary" @click="receiverView(scope.row)">查看明细</el-button>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
@@ -447,6 +451,11 @@ const initOption = () => {
     })
   })
 }
+const receiverView = (row) => {
+  recordForm2.value.contactPerson = row.receiver
+  activeName.value = '3'
+  initData3()
+}
 const handleSettlementDetail = (row) => {
   activeName.value = '3'
   recordForm2.value.companyId = row.companyId

+ 11 - 5
src/views/receivable/handingFee/index.vue

@@ -140,7 +140,10 @@
           <span class="col-108 m-r-8">
             <el-button class="radius-2px width-100"
               :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')"
-              @click="handleBatchEdit">批量修改</el-button>
+              @click="handleBatchEdit('first')">批量修改</el-button>
+          </span>
+          <span class="col-108 m-r-8">
+            <el-button class="radius-2px width-100" @click="handleBatchEdit('second')">导入修改</el-button>
           </span>
           <span class="col-108 m-r-8">
             <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
@@ -334,7 +337,10 @@
             <el-button class="radius-2px width-100" type="primary" @click="handleExport1">导出</el-button>
           </div>
           <span class="col-108 m-r-8">
-            <el-button class="radius-2px width-100" @click="handleBatchEdit">批量修改</el-button>
+            <el-button class="radius-2px width-100" @click="handleBatchEdit('first')">批量修改</el-button>
+          </span>
+          <span class="col-108 m-r-8">
+            <el-button class="radius-2px width-100" @click="handleBatchEdit('second')">导入修改</el-button>
           </span>
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
@@ -954,8 +960,8 @@ let feeRate = ref(null)
 let signTime = ref(null)
 let people = ref(null)
 let editForm = ref({})
-const handleBatchEdit = () => {
-  if (selectedList.value.length < 1) {
+const handleBatchEdit = (str: string) => {
+  if (selectedList.value.length < 1 && str === 'first') {
     ElMessage({
       message: '请选择数据!',
       type: 'warning'
@@ -965,7 +971,7 @@ const handleBatchEdit = () => {
   editForm.value = {}
   importModifyCallback.value = null
   batchEditShow.value = true
-
+  subActiveName.value = str
 }
 
 const handleBatchEditSubmit = async () => {

+ 8 - 0
src/views/receivable/handingFee/invoiceRecord.vue

@@ -225,6 +225,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 const route = useRoute()
 const router = useRouter()
 
+
+
 const companyIdprops = {
   expandTrigger: 'hover' as const,
   value: 'id',
@@ -234,6 +236,11 @@ const companyIdprops = {
 let form = ref({})
 let tableData = ref([])
 
+const companyId = route.query.companyId
+if (companyId) {
+  form.value.companyId = companyId
+}
+
 let pages = ref(1)
 let size = ref(10)
 let total = ref(0)
@@ -266,6 +273,7 @@ const invoiceId = route.query.invoiceId
 if (invoiceId) {
   form.value.recordId = invoiceId
 }
+
 let countShow = ref(false)
 let countForm = ref({})
 let countRules = ref({

+ 13 - 3
src/views/receivable/handingFee/report.vue

@@ -83,9 +83,10 @@
                   <span class="el-dropdown-link">查看明细</span>
                   <template #dropdown>
                     <el-dropdown-menu>
-                      <el-dropdown-item @click="handleSettlementDetail(scope.row)">结算明细</el-dropdown-item>
-                      <el-dropdown-item @click="handleInvoiceRecord1(scope.row)">车险开票明细</el-dropdown-item>
-                      <el-dropdown-item @click="handleInvoiceRecord2(scope.row)">非车险开票明细</el-dropdown-item>
+                      <el-dropdown-item @click="handleSettlementDetail(scope.row)">开票明细</el-dropdown-item>
+                      <el-dropdown-item @click="handleRecordDetail(scope.row)">结算明细</el-dropdown-item>
+                      <el-dropdown-item @click="handleInvoiceRecord1(scope.row)">车险结算明细</el-dropdown-item>
+                      <el-dropdown-item @click="handleInvoiceRecord2(scope.row)">非车险结算明细</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
@@ -867,6 +868,15 @@ const handleOrderDetail = (type: any) => {
   })
 }
 
+const handleRecordDetail=(row)=>{
+  router.push({
+    path: '/receivable/private/invoiceRecord',
+    query: {
+      companyId: row.companyId
+    }
+  })
+}
+
 onMounted(() => {
   initOption();
   initCompany();