fix: 对接权益

src/api/modules/additional.ts

@@ -21,6 +21,11 @@ const additionalApi = (axiosInstance: ApiInstance) => ({
   deleteById: (data: string) => axiosInstance.get(`/supplementOrder/deleteById?id=${data}`), // 订单删除
   selectById: (data: string) => axiosInstance.get(`/supplementOrder/selectById?id=${data}`), // 详情
   updateOrders: (data: any) => axiosInstance.post('/supplementOrder/updateOrders', data), // 编辑
+  getContactAgreement: (id: string) => axiosInstance.get(`agreement/getContactAgreement?companyId=${id}`), // 获取外部协议
+  getContactAgreementCost: (data: { agreementId: string, productId: string, isInquiry: string | number }) => axiosInstance.get(`agreement/getContactAgreementCost?agreementId=${data.agreementId}&&productId=${data.productId}&&isInquiry=${data.isInquiry}`),
+  rightsGrantList: (data: any) => axiosInstance.post('/rightsGrant/package/list', data), // 权益套餐分页查询
+  rightsGrant: (data: string) => axiosInstance.get(`/rightsGrant/package/detail/${data}`), // 补录订单权益详情
+  rightsList: (data: any) => axiosInstance.post('/rightsGrant/rights/list', data), // 权益券分页查询
 })
 
 export default additionalApi

src/api/modules/agreement.ts

@@ -25,7 +25,7 @@ const agreementApi = (axiosInstance: ApiInstance) => ({
   agreementDelete: (ids: any) => axiosInstance.delete(`/agreement/agreementDelete?ids=${ids}`),
   // 新的费用批量删除
   deleteByIds: (data: any) => axiosInstance.post('/ptlAgreementCost/deleteByIds', data),
-//获取保险公司数结构
+  //获取保险公司数结构
   findTree: (data: any) => axiosInstance.post('esmInsCompany/findTree', data),
   //复制协议
   agreementCopy: (data: any) => axiosInstance.post('/agreement/agreementCopy', data),

src/components/Equities/index.vue

@@ -21,35 +21,35 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+<!--                    <el-col :span="4">
                         <el-button type="primary" @click="handleEquitiesSearch">查询</el-button>
-                    </el-col>
+                    </el-col>-->
                 </el-row>
             </el-form>
             <div class="change">
-                <span class="common" :class="{ 'changeActive': changeIndex === index }" v-for="(item, index) in ['权益套餐', '权益单品']" @click="changeIndex = index">{{ item }}</span>
+                <span class="common" :class="{ 'changeActive': changeIndex === index }" v-for="(item, index) in ['权益套餐', '权益单品']" @click="initEquities(item, index)">{{ item }}</span>
             </div>
             <div class="combo" v-show="changeIndex == 0">
                 <el-row :gutter="10">
                     <el-col :span="6">
                         <div class="comboList">
-                            <div class="comboItem" :class="{'comboActive': comboIndex == index}" v-for="(item, index) in comboList" @click="handleCombo(item, index)">{{ item.name }}</div>
+                            <div class="comboItem" :class="{'comboActive': comboIndex == index}" v-for="(item, index) in comboList" @click="handleCombo(item, index)">{{ item.equityPackageName }}</div>
                         </div>
-                        <div class="tips">1年12次洗车，2次救援，3次小保养</div>
+<!--                        <div class="tips">1年12次洗车，2次救援，3次小保养</div>-->
                     </el-col>
                     <el-col :span="12">
                         <div>套餐明细</div>
                         <div class="count">
-                            <span>数量：12张</span>
-                            <span>价格：200.00元</span>
+                            <span>数量：{{ comboList?.[comboIndex]?.rightsCount }}张</span>
+                            <span>价格：{{ comboList?.[comboIndex]?.packagePrice }}元</span>
                             <span style="width: 60px; display: flex; align-items: center">
-                              <span class="countIcon">
+                              <span class="countIcon" @click="handleSubtract">
                                   <el-icon size="small" color="#0083FF">
                                       <Minus />
                                   </el-icon>
                               </span>
-                              <span style="width: calc(100% - 32px); text-align: center">1</span>
-                              <span class="countIcon">
+                              <span style="width: calc(100% - 32px); text-align: center">{{ comboList?.[comboIndex]?.countOne }}</span>
+                              <span class="countIcon" @click="handleAdd">
                                   <el-icon size="small" color="#0083FF">
                                       <Plus />
                                   </el-icon>
@@ -61,14 +61,14 @@
                             :data="comboData"
                             style="width: 100%"
                         >
-                            <el-table-column prop="a"></el-table-column>
-                            <el-table-column prop="b"></el-table-column>
-                            <el-table-column prop="c"></el-table-column>
+                            <el-table-column prop="rightsName"></el-table-column>
+                            <el-table-column prop="rightsCount"></el-table-column>
+                            <el-table-column prop="marketPrice"></el-table-column>
                         </el-table>
                     </el-col>
                     <el-col :span="6">
                         <div class="chosed">
-                            <span>已选择：3分驾意险</span>
+                            <span>已选择：{{ chosedList.length }}份驾意险</span>
                             <span style="display: flex; align-items: center; cursor: pointer; color: #0083FF;">
                               <el-icon size="small" color="#0083FF">
                                   <Delete />
@@ -79,12 +79,12 @@
                         <div class="chosedList">
                             <div class="chosedItem" v-for="(item, index) in chosedList">
                                 <div class="top">
-                                    <span>xxx权益xxx权益xxx权益xxx权益xxx权益</span>
-                                    <span>x2</span>
+                                    <span>{{ item.equityPackageName }}</span>
+                                    <span>x{{ item.countOne }}</span>
                                 </div>
                                 <div class="bottom">
-                                    <span>数量：12张</span>
-                                    <span>价格：200.00元</span>
+                                    <span>数量：{{ item.rightsCount }}张</span>
+                                    <span>价格：{{ item.packagePrice }}元</span>
                                     <span style="display: flex; align-items: center; cursor: pointer; color: #0083FF;">
                                       <el-icon>
                                           <Delete />
@@ -103,19 +103,21 @@
                             :data="comboData"
                             style="width: 100%"
                         >
-                            <el-table-column prop="a" label="权益名称"></el-table-column>
-                            <el-table-column prop="b" label="单价"></el-table-column>
-                            <el-table-column prop="c" label="发放数量">
-                                <template #default>
-                                    <el-input-number></el-input-number>
+                            <el-table-column prop="rightsName" label="权益名称"></el-table-column>
+                            <el-table-column prop="marketPrice" label="单价"></el-table-column>
+                            <el-table-column prop="rightsCount" label="发放数量">
+                                <template #default="scope">
+                                    <el-input-number v-model="scope.row.rightsCount" />
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="d" label="总价"></el-table-column>
+                            <el-table-column prop="settlePrice" label="总价">
+                                <template #default=""></template>
+                            </el-table-column>
                         </el-table>
                     </el-col>
                     <el-col :span="6">
                         <div class="chosed">
-                            <span>已选择：3分驾意险</span>
+                            <span>已选择：{{ chosedList.length }}份驾意险</span>
                             <span style="display: flex; align-items: center; cursor: pointer; color: #0083FF;">
                               <el-icon size="small" color="#0083FF">
                                   <Delete />
@@ -124,7 +126,7 @@
                           </span>
                         </div>
                         <div class="chosedList">
-                            <div class="chosedItem" v-for="(item, index) in chosedList">
+                            <div class="chosedItem" v-for="(item, index) in singleList">
                                 <div class="top">
                                     <span>xxx权益xxx权益xxx权益xxx权益xxx权益</span>
                                     <span>x2</span>
@@ -155,6 +157,9 @@
 
 <script setup lang="ts">
 
+import api from '@/api'
+import {ElMessage} from "element-plus";
+
 let props = defineProps({
     show: {
         type: Boolean,
@@ -168,35 +173,62 @@ let equitiesForm = ref({
     area: ''
 })
 let changeIndex = ref(0)
-const handleEquitiesSearch = ()=> {
-
-}
+// const handleEquitiesSearch = ()=> {
+//
+// }
 
-let comboList = ref([
-    {
-        id: 1,
-        name: 'xxx套餐xxx套餐xxx套餐xxx套餐xxx套餐'
-    },{
-        id: 2,
-        name: 'xxx套餐xxx套餐xxx套餐xxx套餐xxx套餐'
-    }
-])
+let comboList = ref([])
 let comboIndex = ref(0)
 const handleCombo = (item, index) => {
     comboIndex.value = index
+    api.additionalApi.rightsGrant(item.rightsId).then((res: any) => {
+        if(res.code == 200) {
+            comboData.value = res.data
+        } else {
+            ElMessage({
+                message: res.msg,
+                type: 'warning'
+            })
+        }
+    })
+}
+
+const mergeArrays = (originalArr, newArr, key) => {
+    // 创建 Map 存储原始数组，以指定键为索引
+    const map = new Map();
+    originalArr.forEach(item => {
+        map.set(item[key], item);
+    });
+
+    // 遍历新数组，替换或添加
+    newArr.forEach(item => {
+        map.set(item[key], item);
+    });
+
+    // 返回合并后的数组
+    return Array.from(map.values());
 }
-let comboData = ref([
-    {
-        a: 1,
-        b: 2,
-        c: 3
+
+const handleAdd = () => {
+    comboList.value[comboIndex.value].countOne += 1
+    let list = comboList.value.filter(item => item.countOne > 0)
+    if(list.length > 0) {
+        chosedList.value = mergeArrays(chosedList.value, list, 'rightsId')
+        console.log(21312321321, chosedList.value)
     }
-])
-let chosedList = ref([
-    {
-        id: 1
+}
+const handleSubtract = () => {
+    if(comboList.value[comboIndex.value].countOne > 0) {
+        comboList.value[comboIndex.value].countOne -= 1
+    } else {
+        comboList.value[comboIndex.value].countOne = 0
     }
-])
+}
+
+let comboData = ref([])
+let chosedList = ref([]) // 已选的套餐
+let singleList = ref([]) // 已选的单品
+
 
 const handelCancel = () => {
     emits('close', false)
@@ -205,6 +237,49 @@ const handelConfirm = () => {
     emits('close', false)
 }
 
+const initEquities = (str, index) => {
+    changeIndex.value = index
+    if(index === 0) {
+        api.additionalApi.rightsGrantList({
+            pageNo: 1,
+            pageSize: 1000
+        }).then((res: any) => {
+            if(res.code == 200) {
+                comboList.value = res.data.records?.map(item => {
+                    return {
+                        ...item,
+                        countOne: 0
+                    }
+                })
+                handleCombo(comboList.value[0], 0)
+            } else {
+                ElMessage({
+                    message: res.msg,
+                    type: 'warning'
+                })
+            }
+        })
+    } else if (index === 1) {
+        api.additionalApi.rightsList({
+            pageNo: 1,
+            pageSize: 1000
+        }).then((res: any) => {
+            if(res.code == 200) {
+                comboData.value = res.data.records
+            } else {
+                ElMessage({
+                    message: res.msg,
+                    type: 'warning'
+                })
+            }
+        })
+    }
+}
+
+onMounted(() => {
+    initEquities('', 0)
+})
+
 </script>
 
 <style scoped lang="scss">
@@ -228,7 +303,7 @@ const handelConfirm = () => {
     max-height: 400px;
     .comboList{
         width: 100%;
-        height: calc(100% - 20px);
+        height: 100%;
         overflow-y: auto;
         .comboItem{
             width: 100%;
@@ -273,6 +348,7 @@ const handelConfirm = () => {
             background: #F7F7F7;
             padding: 10px;
             border-radius: 4px;
+            margin-bottom: 10px;
             .top{
                 display: flex;
                 align-items: flex-start;

src/views/additionalOrder/additional/index.vue

@@ -1391,7 +1391,7 @@
                       </el-col>
                       <el-col :span="6">
                           <el-form-item class="white-m-p24" label="保险公司" prop="companyId">
-                              <el-select v-model="additionalForm.companyId" placeholder="请选择" filterable>
+                              <el-select v-model="additionalForm.companyId" placeholder="请选择" filterable @change="handleSelectCompany">
                                   <el-option v-for="item in bankOption" :key="item.id" :value="item.id" :label="item.name"></el-option>
                               </el-select>
                           </el-form-item>
@@ -1500,23 +1500,23 @@
                   </template>
                   <el-row :gutter="20">
                       <el-col :span="8">
-                          <el-form-item class="white-m-p24" label="报价协议" prop="a">
-                              <el-select v-model="additionalForm.a">
-                                  <el-option label="协议1" value="1" key="1"></el-option>
+                          <el-form-item class="white-m-p24" label="报价协议" prop="agreementId">
+                              <el-select v-model="additionalForm.agreementId" @change="handleAgreementSelect">
+                                  <el-option v-for="(item, index) in agreementList" :label="item.agreementName" :value="item.id" key="1"></el-option>
                               </el-select>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="是否现询" prop="costFlag">
-                              <el-select v-model="additionalForm.costFlag">
+                          <el-form-item label="是否现询" prop="isInquiry">
+                              <el-select v-model="additionalForm.isInquiry">
                                   <el-option label="是" value="1" key="1"></el-option>
                                   <el-option label="否" value="2" key="2"></el-option>
                               </el-select>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="非现询费用" prop="c" v-if="additionalForm.costFlag == '2'">
-                              <el-input placeholder="请输入" v-model="additionalForm.c"></el-input>
+                          <el-form-item label="非现询费用" prop="c" v-if="additionalForm.isInquiry == '2'">
+                              <el-input placeholder="请输入" v-model="additionalForm.isInquiry"></el-input>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
@@ -1535,7 +1535,7 @@
                       </el-col>
                       <el-col :span="8">
                           <el-form-item label="驾意险总比例" prop="f">
-                              <el-input  v-model="additionalForm.f" >
+                              <el-input  v-model="additionalForm.jyOtherCostsProportion" >
                                   <template #append>%</template>
                               </el-input>
                           </el-form-item>
@@ -1543,21 +1543,21 @@
 
                       <el-col :span="8">
                           <el-form-item class="white-m-p24" label="交强险出口比例" prop="g">
-                              <el-input  v-model="additionalForm.g" >
+                              <el-input  v-model="additionalForm.jqExportRadio" >
                                   <template #append>%</template>
                               </el-input>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
                           <el-form-item label="商业险出口比例" prop="h">
-                              <el-input  v-model="additionalForm.h" >
+                              <el-input  v-model="additionalForm.syExportRadio" >
                                   <template #append>%</template>
                               </el-input>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
                           <el-form-item label="驾意险出口比例" prop="i">
-                              <el-input  v-model="additionalForm.i" >
+                              <el-input  v-model="additionalForm.jyExportRadio" >
                                   <template #append>%</template>
                               </el-input>
                           </el-form-item>
@@ -1778,6 +1778,7 @@ import salesmanSelect from './modules/salesmanSelect.vue'
 import carTypeSelect from './modules/carTypeSelect.vue'
 import insuranceSelect from './modules/insuranceSelect.vue'
 import imageData from './modules/imageData.vue'
+import agreement from "@/api/modules/agreement.ts";
 // import { Search } from '@element-plus/icons-vue'
 
 const myRouter = useRouter()
@@ -2023,9 +2024,14 @@ let additionalForm = ref({
     sumPremium: '',
 
     // 保费信息
-    costFlag: null,
+    agreementId: '',
+    isInquiry: null,
     jqOtherCostsProportion: '',
     syOtherCostsProportion: '',
+    jyOtherCostsProportion: '',
+    jqExportRadio: '',
+    syExportRadio: '',
+    jyExportRadio: '',
 })
 let additionalRules = ref({
   licenseNo:[
@@ -2567,6 +2573,36 @@ let quoteRules = ref({
     { required: true, message: "请选择签单日期", trigger: "change" }
   ]
 })
+
+// 根据保险公司获取协议
+let agreementList = ref([])
+const handleSelectCompany = (e) => {
+    api.additionalApi.getContactAgreement(e).then((res: any) => {
+        if(res.code == 200) {
+            agreementList.value = res.data
+        } else {
+            agreementList.value = []
+        }
+    })
+}
+// 根据协议获取费用
+const handleAgreementSelect = (e) => {
+    api.additionalApi.getContactAgreementCost({
+        agreementId: e,
+        productId: additionalForm.value.productId,
+        isInquiry: additionalForm.value.isInquiry
+    }).then((res: any) => {
+        if(res.code == 200) {
+
+        } else {
+            ElMessage({
+                message: res.msg,
+                type: 'warning'
+            })
+        }
+    })
+}
+
 // 影像上传
 let uploadShow = ref(false)
 let fileList = ref([])

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -202,7 +202,7 @@
       :RulesInfo="RulesInfo" @save="ruleFeeSave" @cancel="ruleFeeVisible = false" />
     <!-- 规则费用编辑组件 -->
     <ruleFeeDialogEdit :ruleFeeVisible="ruleFeeEditVisible" :headerTitle="ruleFeeHeaderTitle"
-      :agreementInfo="agreementInfo" :RulesInfo="RulesInfo" :costitemEditInfo="costitemEditInfo" @save="ruleFeeEditSave"
+      :agreementInfo="agreementInfo" :RulesInfo="RulesInfo" operationType="audit" :costitemEditInfo="costitemEditInfo" @save="ruleFeeEditSave"
       @cancel="ruleFeeEditVisible = false" />
   </div>
 </template>

src/views/quoteConfig/agreement/components/ruleFeeDialogEdit.vue

@@ -148,7 +148,7 @@
         <div class="flex a-c j-c" v-if="!disabledShow">
           <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="save(editFormRefs)">提交审核</el-button>
-        </div> 0 未审核  1 待审通过 2 审核驳回
+        </div>
 <!--          <div class="flex f-c " v-if="!costitemEditInfo?.reviewDescription && props.operationType == 'audit'">-->
         <div class="flex f-c " v-if="!costitemEditInfo?.approved">
           <el-checkbox v-model="automatic" label="审核后，自动跳支审核下一条费用" size="large" />