祁鹏飞 3 месяцев назад
Родитель
Сommit
4ae443ddf1
2 измененных файлов с 44 добавлено и 6 удалено
  1. 40 6
      src/views/finance/index.vue
  2. 4 0
      src/views/receivable/handingFee/ticket.vue

+ 40 - 6
src/views/finance/index.vue

@@ -46,6 +46,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="险种">
+                <el-select v-model="firstForm.productName" placeholder="请选择" clearable>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.value"
+                    :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
                 <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
@@ -85,7 +93,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
+            <el-col :span="16" style="display: flex; align-items: center; justify-content: flex-end">
               <el-button plain @click="handleExport('0')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -98,7 +106,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="firstData" :height="isTrue ? 'calc(100% - 294px)' : 'calc(100% - 194px)'"
+        <el-table :data="firstData" :height="isTrue ? 'calc(100% - 312px)' : 'calc(100% - 212px)'"
           style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
@@ -182,6 +190,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="险种">
+                <el-select v-model="firstForm.productName" placeholder="请选择" clearable>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.value"
+                    :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
                 <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
@@ -221,7 +237,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
+            <el-col :span="16" style="display: flex; align-items: center; justify-content: flex-end">
               <el-button plain @click="handleExport('1')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -234,7 +250,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="secondData" :height="isTrue ? 'calc(100% - 294px)' : 'calc(100% - 194px)'"
+        <el-table :data="secondData" :height="isTrue ? 'calc(100% - 312px)' : 'calc(100% - 212px)'"
           style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
@@ -319,6 +335,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="险种">
+                <el-select v-model="firstForm.productName" placeholder="请选择" clearable>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.value"
+                    :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
                 <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
@@ -358,7 +382,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
+            <el-col :span="16" style="display: flex; align-items: center; justify-content: flex-end">
               <el-button plain @click="handleExport('2')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -371,7 +395,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="thirdData" :height="isTrue ? 'calc(100% - 294px)' : 'calc(100% - 194px)'"
+        <el-table :data="thirdData" :height="isTrue ? 'calc(100% - 312px)' : 'calc(100% - 212px)'"
           style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
@@ -654,8 +678,18 @@ const handleExport = (type: any) => {
   })
 }
 
+const riskType = ref([])
+const dictRisk = () => {
+  api.additionalApi.dictDetails('report_risk_code').then((res: any) => {
+    if (res.code == 200) {
+      riskType.value = res.data
+    }
+  })
+}
+
 onMounted(() => {
   institutionList();
+  dictRisk();
   initCompany();
   initData('0')
   initData('1')

+ 4 - 0
src/views/receivable/handingFee/ticket.vue

@@ -420,6 +420,10 @@ const handelComfirm = () => {
       invoiceType: route.query.invoiceType
     },
     ...countForm.value,
+    incomeIds: selectedList.value.map(v => v.id),
+    orderNos: selectedList.value.map(v => v.orderNo),
+    companyId: route.query.id,
+    invoiceType: route.query.invoiceType
   }
   apiFn(params).then((sub: any) => {
     if (sub.code == 200) {