结算

src/api/modules/finance.ts

@@ -27,7 +27,9 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     //金额总计
     queryTotalWithdrawalAmount: (data: any) => axiosInstance.post('/amountAuditing/queryTotalWithdrawalAmount', data),
     // 结算
-    settlement: (data: any) => axiosInstance.post('/receivable/invoiceAndSettlement', data),
+    invoiceAndSettlement: (data: any) => axiosInstance.post('/receivable/invoiceAndSettlement', data),
+    // 结算
+    settlement: (data: any) => axiosInstance.post('/receivable/settlement', data),
     // 非车险应收
     exportSuperviseJyExcel: (data: any) => axiosInstance.post('/receivable/exportSuperviseJyExcel', data, {responseType: 'blob'}),
     // 非车险应收导出

src/views/finance/audit.vue

@@ -46,6 +46,15 @@
                 </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 label="全部" value=" "></el-option>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.label"
+                    :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"
@@ -69,7 +78,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </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>
@@ -82,7 +91,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="firstData" height="calc(100% - 244px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -171,6 +180,15 @@
                 </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 label="全部" value=" "></el-option>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.label"
+                    :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"
@@ -194,7 +212,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </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: start; 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>
@@ -207,7 +225,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="secondData" height="calc(100% - 244px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="secondData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -297,6 +315,15 @@
                 </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 label="全部" value=" "></el-option>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.label"
+                    :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"
@@ -320,7 +347,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </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: start; 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>
@@ -333,7 +360,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="thirdData" height="calc(100% - 244px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="thirdData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -427,6 +454,15 @@
                 </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 label="全部" value=" "></el-option>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.label"
+                    :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"
@@ -450,7 +486,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </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: start; justify-content: flex-end">
               <el-button plain @click="handleExport('3')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -463,7 +499,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="forthData" height="calc(100% - 244px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="forthData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -759,7 +795,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.filter(v => v.value !== '0')
+    }
+  })
+}
+
 onMounted(() => {
+  dictRisk();
   initList('0');
   initList('1');
   initList('2');

src/views/finance/index.vue

@@ -49,7 +49,8 @@
             <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"
+                  <el-option label="全部" value=" "></el-option>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.label"
                     :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
@@ -93,7 +94,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex; align-items: center; justify-content: flex-end">
+            <el-col :span="16" style="display: flex;align-items: start; 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>
@@ -193,7 +194,8 @@
             <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"
+                  <el-option label="全部" value=" "></el-option>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.label"
                     :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
@@ -237,7 +239,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex; align-items: center; justify-content: flex-end">
+            <el-col :span="16" style="display: flex;align-items: start; 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>
@@ -338,7 +340,8 @@
             <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"
+                  <el-option label="全部" value=" "></el-option>
+                  <el-option v-for="item in riskType" :key="item.value" :value="item.label"
                     :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
@@ -382,7 +385,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex; align-items: center; justify-content: flex-end">
+            <el-col :span="16" style="display: flex;align-items: start; 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>
@@ -682,7 +685,7 @@ const riskType = ref([])
 const dictRisk = () => {
   api.additionalApi.dictDetails('report_risk_code').then((res: any) => {
     if (res.code == 200) {
-      riskType.value = res.data
+      riskType.value = res.data.filter(v=>v.value!=='0')
     }
   })
 }

src/views/quoteConfig/dispatch/index.vue

@@ -176,24 +176,25 @@
                   点击选择该情况下要执行的动作
                 </div>
                 <div class="condition" v-for="item in afterActions" :key="item.id">
-                  <div class="action" v-if="item.actionCode == 'send_notify_msg'">
-                    <div class="name">
-                      {{ item.actionName }}
-                    </div>
-                    <div>标题：{{ item.actionJson.title }}</div>
-                    <div>内容：{{ item.actionJson.content }}</div>
-                  </div>
-                  <div class="action" v-else-if="item.actionCode == 'supplementary_order'">
-                    <div class="name">
-                      {{ item.actionName }}
-                    </div>
-                    将该车辆的报价单，在后台自动生成为：暂存的补录订单
-                  </div>
-                  <div class="action" v-else>
-                    <div class="name">
+                  <div class="action">
+                    <div class="name flex justify-between items-center">
                       {{ item.actionName }}
+                      <el-popconfirm class="box-item" title="是否确定删除该动作？" placement="bottom" width="196px"
+                        confirm-button-text="确定删除" @confirm.stop.prevent="deleteActive(item.id)">
+                        <template #reference>
+                          <img src="@/assets/images/delete.png" class="w-20px h-20px" @click.stop /></template>
+                      </el-popconfirm>
                     </div>
-                    {{ item.actionJson.message || "未设置" }}
+                    <template v-if="item.actionCode == 'send_notify_msg'">
+                      <div>标题：{{ item.actionJson.title }}</div>
+                      <div>内容：{{ item.actionJson.content }}</div>
+                    </template>
+                    <template v-else-if="item.actionCode == 'supplementary_order'">
+                      将该车辆的报价单，在后台自动生成为：暂存的补录订单
+                    </template>
+                    <template v-else>
+                      {{ item.actionJson.message || "未设置" }}
+                    </template>
                   </div>
                 </div>
               </div>
@@ -304,9 +305,22 @@ const getRuleList = (companyId: string) => {
 // 删除规则
 const deleteRule = (id: string) => {
   api.dispatchApi.deleteAgreementDispatch(id).then((res) => {
-    ElMessage.success("删除成功");
-    // 重新加载当前租户的规则列表（自动重新分组）
-    getRuleList(currentId.value);
+    if (res.code === 200) {
+      ElMessage.success("删除成功");
+      // 重新加载当前租户的规则列表（自动重新分组）
+      getRuleList(currentId.value);
+    }
+  });
+};
+
+// 删除动作
+const deleteActive = (id: string) => {
+  api.dispatchApi.deleteAfterActionById(id).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success("删除成功");
+      // 重新加载当前租户的规则列表（自动重新分组）
+      getRuleList(currentId.value);
+    }
   });
 };
 

src/views/receivable/handingFee/ticket.vue

@@ -408,7 +408,7 @@ const openCountForm = () => {
 }
 const handelComfirm = () => {
   let apiFn = api.financeApi.commissionInvoicing
-  if (isSettlement.value) apiFn = api.financeApi.settlement
+  if (isSettlement.value) apiFn = api.financeApi.invoiceAndSettlement
   const attachmentIds = countForm.value.attachmentIds?.map(v => v.response.data.id)
   const params = {
     invoiceVO: {