Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/components/ruleCondition/index.vue

@@ -81,7 +81,7 @@ const cancel = () => {
 const close = () => {
   emits("cancel")
 }
-watch(props, () => {
+watch(()=>props.attrIdList, () => {
   if (props.attrIdList && props.attrIdList.length) {
     Object.assign(checked, {  //清空历史数据
       VehicleInformation: [],
@@ -96,9 +96,6 @@ watch(props, () => {
     attractivelist.value = props.attrIdList;//获取编辑数据
     const matchedid = matchDataByIds(attractivelist.value);//
     const matchedinfo = matchDataByInfos(attractivelist.value)
-      console.log('编辑的数据: attractivelist', attractivelist.value)
-      console.log('编辑的数据: matchedid', matchedid)
-      console.log('编辑的数据: matchedinfo', matchedinfo)
     Object.keys(checked).forEach(key => { //复选框回显
       checked[key as keyof checkeddata] = matchedid[key] || [];
     });
@@ -269,6 +266,8 @@ onMounted(() => {
 
 let searchShow = ref(true)
 const ruleAttr = (id) => {
+  console.log(id);
+
     if(attrName.value) {
         searchShow.value = false
     } else {

src/views/additionalOrder/additional/index.vue

@@ -1509,15 +1509,17 @@
                       </el-col>
                       <el-col :span="8">
                           <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 v-model="additionalForm.isInquiry" @change="handleAgreementSelect">
+                                  <el-option label="是" value="0" key="0"></el-option>
+                                  <el-option label="否" value="1" key="1"></el-option>
                               </el-select>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="非现询费用" prop="costId" v-if="additionalForm.isInquiry == '2'">
-                              <el-input placeholder="请输入" v-model="additionalForm.costId"></el-input>
+                          <el-form-item label="非现询费用" prop="costId" v-if="additionalForm.isInquiry == '1'">
+                            <el-select v-model="additionalForm.costId">
+                                  <el-option v-for="(item, index) in selectList" :key="item.id" :label="item.productName" :value="item.id" ></el-option>
+                              </el-select>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
@@ -2028,12 +2030,12 @@ let additionalForm = ref({
     // 保费信息
     agreementId: '',
     isInquiry: null,
-    jqInletRatio: '',
-    syInletRatio: '',
-    jyInletRatio: '',
-    jqExportRatio: '',
-    syExportRatio: '',
-    jyExportRatio: '',
+    jqInletRatio: null,
+    syInletRatio: null,
+    jyInletRatio: null,
+    jqExportRatio: null,
+    syExportRatio: null,
+    jyExportRatio: null,
 })
 let additionalRules = ref({
   licenseNo:[
@@ -2577,15 +2579,19 @@ const handleSelectCompany = (e) => {
         }
     })
 }
+
+// 根据协议获取现循
+let selectList = ref([])
+
 // 根据协议获取费用
-const handleAgreementSelect = (e) => {
+const handleAgreementSelect = () => {
     api.additionalApi.getContactAgreementCost({
-        agreementId: e,
+        agreementId: additionalForm.value.agreementId,
         productId: additionalForm.value.productId,
         isInquiry: additionalForm.value.isInquiry
     }).then((res: any) => {
         if(res.code == 200) {
-
+            selectList.value = res.data
         } else {
             ElMessage({
                 message: res.msg,