fix: 修改bug

src/components/ruleCondition/index.vue

@@ -81,6 +81,7 @@ watch(props, () => {
     attractivelist.value = props.attrIdList;//获取编辑数据
     const matchedid = matchDataByIds(attractivelist.value);//
     const matchedinfo = matchDataByInfos(attractivelist.value)
+      console.log('编辑的数据', attractivelist.value)
     Object.keys(checked).forEach(key => { //复选框回显
       checked[key as keyof checkeddata] = matchedid[key] || [];
     });
@@ -101,27 +102,27 @@ const save = () => {
     ...checkeddata.InsuranceInformation,
     ...checkeddata.InsuranceCostFactor,
   ]
-    // let arr = [...props.attrIdList, ...mergedData]
+    let arr = props.attrIdList?[...props.attrIdList, ...mergedData]: mergedData
     // console.log('原有的', props.attrIdList)
     // console.log('新选的', mergedData)
     // console.log('合并的', arr)
-    // let brr = arr.reduce((acc, current) => {
-    //     const a = acc.find(item => item.id === current.id)
-    //     if(!a) {
-    //         return acc.concat([current])
-    //     } else {
-    //         return acc
-    //     }
-    // }, [])
+    let brr = arr.reduce((acc, current) => {
+        const a = acc.find(item => item.attrCode === current.attrCode)
+        if(!a) {
+            return acc.concat([current])
+        } else {
+            return acc
+        }
+    }, [])
     // console.log('去重的', brr)
-  if (mergedData.length == 0) {
+  if (brr.length == 0) {
     return ElMessage({
       type: 'error',
       message: '至少选一个',
       plain: true,
     })
   }
-  emits("save", mergedData)// 返回已选集合
+  emits("save", brr)// 返回已选集合
 }
 const attractivelist = ref();
 const attrName = ref();

src/layouts/components/ruleSelect/index.vue

@@ -123,7 +123,16 @@ const handleSubmit = () => {
             }
         })
     })
-    emit('close', arr)
+    let brr = [...selectedList.value, ...arr]
+    let crr = brr.reduce((acc, current) => {
+        const a = acc.find(item => item.attrCode === current.attrCode)
+        if(!a) {
+            return acc.concat([current])
+        } else {
+            return acc
+        }
+    }, [])
+    emit('close', crr)
 }
 
 const initEditData = (data) => {

src/views/insurancePolicy/index.vue

@@ -1365,9 +1365,9 @@
       <el-table
         ref="LicenseNoTable"
         :data="licenseNoData"
-        @row-click="handleSelectedRow"
         row-key="id"
         @select="handleSelectedChange"
+        @row-dblclick="handleSelectedRow"
       >
         <el-table-column type="selection"></el-table-column>
         <el-table-column prop="modelCode" label="厂牌型号代码"></el-table-column>
@@ -1950,6 +1950,7 @@ const handleSelectedRow = (row: any, column: any) => {
   })
   LicenseNoTable.value.toggleRowSelection(row, true)
   selectRowData.value = row
+    licenseNoDataSubmit()
 }
 const handleSelectedChange = (rows: any, row: any) => {
   licenseNoData.value.forEach((item) => {
@@ -1963,7 +1964,6 @@ const licenseNoDataCancel = () => {
   licenseNoShow.value = false
 }
 const licenseNoDataSubmit = () => {
-    console.log(123123123, selectRowData.value)
   insurancePolicyForm.value.seatCount = selectRowData.value.ratedPassengerCapacity
     insurancePolicyForm.value.brandName = selectRowData.value.modelName
   insurancePolicyForm.value.carYear = selectRowData.value.marketYear
@@ -2967,9 +2967,9 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope
         order: {
           insuranceCompanyCode: quoteData.value[scope.$index].id,
           quoteNo: insurancePolicyForm.value.order.quoteNo,
-          agreementId: quoteData.value[scope.$index].isDispatch?quoteData.value[scope.$index].dispatchAgreementId:quoteData.value[scope.$index].agreement
+          agreementId: quoteData.value[scope.$index].isDispatch?quoteData.value[scope.$index].dispatchAgreementId:quoteData.value[scope.$index].agreement,
+          productId: insurancePolicyForm.value.productId,
         },
-        productId: insurancePolicyForm.value.productId,
         carInfoVo: {
           licenseKindCode: '02',
           propertyCode: insurancePolicyForm.value.propertyCode,

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

@@ -226,7 +226,9 @@ const rulesAttrselectChange = (item: any) => {
 }
 //获取到的规则条件列表数据
 const ruleConditionSave = (list: string[]) => {//获取规则条件选中集合
+  console.log('选中的数据', list)
   costitemEditInfo.value.ruleConditions = list;
+  ruleConditions.value = list
   ruleConditionVisible.value = false;
 }
 const cancel = () => {

src/views/receivable/documentary/index.vue

@@ -116,8 +116,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
-                            <el-button type="primary">搜索</el-button>
-                            <el-button plain>重置</el-button>
+                            <el-button type="primary" @click="search">搜索</el-button>
+                            <el-button plain @click="reset">重置</el-button>
                             <span class="icon_s">
                                 <span @click="isTrue = !isTrue">高级搜索</span>
                                 <el-icon class="is_icon" :class="{ 'is_down': isTrue }"><ArrowDown /></el-icon>
@@ -319,8 +319,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
-                            <el-button type="primary">搜索</el-button>
-                            <el-button plain>重置</el-button>
+                            <el-button type="primary" @click="search">搜索</el-button>
+                            <el-button plain @click="reset">重置</el-button>
                             <span class="icon_s">
                                 <span @click="isTrue = !isTrue">高级搜索</span>
                                 <el-icon class="is_icon" :class="{ 'is_down': isTrue }"><ArrowDown /></el-icon>
@@ -916,6 +916,23 @@ const handleCurrentChange = (page) => {
     pages.value = page
 }
 
+const search = () => {
+    pages.value = 1
+    size.value = 10
+    if(activeName.value == '1') {
+        getOtherReceivableList()
+    }
+    if(activeName.value == '2') {
+        getJyOtherReceivableList()
+    }
+}
+const reset = () => {
+    receivableForm.value = {}
+    pages.value = 1
+    size.value = 10
+    search()
+
+}
 const getOtherReceivableList = () => {
     let params = {
         licenseNo: receivableForm.value?.licenseNo,

src/views/receivable/handingFee/index.vue

@@ -116,8 +116,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
-                            <el-button type="primary">搜索</el-button>
-                            <el-button plain>重置</el-button>
+                            <el-button type="primary" @click="search">搜索</el-button>
+                            <el-button plain @click="reset">重置</el-button>
                             <span class="icon_s">
                                 <span @click="isTrue = !isTrue">高级搜索</span>
                                 <el-icon class="is_icon" :class="{ 'is_down': isTrue }"><ArrowDown /></el-icon>
@@ -317,8 +317,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
-                            <el-button type="primary">搜索</el-button>
-                            <el-button plain>重置</el-button>
+                            <el-button type="primary" @click="search">搜索</el-button>
+                            <el-button plain @click="reset">重置</el-button>
                             <span class="icon_s">
                                 <span @click="isTrue = !isTrue">高级搜索</span>
                                 <el-icon class="is_icon" :class="{ 'is_down': isTrue }"><ArrowDown /></el-icon>
@@ -608,6 +608,7 @@ const handleTabsClick = (e) => {
     isTrue.value = false
     receivableForm.value = {}
     selectedList.value = []
+    activeName.value = e
 }
 
 let isTrue = ref(false)
@@ -959,6 +960,23 @@ const initDept = () => {
     })
 }
 
+const search = () => {
+    pages.value = 1
+    size.value = 10
+    if(activeName.value == '1') {
+        getCommissionReceivableList()
+    }
+    if(activeName.value == '2') {
+        getJyReceivableList()
+    }
+}
+const reset = () => {
+    receivableForm.value = {}
+    pages.value = 1
+    size.value = 10
+    search()
+
+}
 // 车险列表
 const getCommissionReceivableList = () => {
     let params = {