祁鹏飞 5 ماه پیش
والد
کامیت
590bc13281

+ 7 - 6
src/components/ruleCondition/index.vue

@@ -5,8 +5,8 @@
       <div class="Container flex f-c">
         <div class="flex ">
           <el-input v-model="attrName" style="margin-right: 20px;" clearable placeholder="搜索"
-            @keydown.enter="handleEnter" @clear="ruleAttr" />
-          <el-button @click="ruleAttr" type="primary">查找</el-button>
+            @keydown.enter="handleEnter" @clear="ruleAttr()" />
+          <el-button @click="ruleAttr()" type="primary">查找</el-button>
         </div>
         <div class="conditionSet flex " v-if="searchShow">
           <div class="tabLeft">
@@ -118,6 +118,7 @@ const save = () => {
     ...checkeddata.InsuredInformation,
     ...checkeddata.InsuranceInformation,
     ...checkeddata.InsuranceCostFactor,
+    ...checkeddata.SearchDataStore,
   ]
     let arr = props.attrIdList?[...props.attrIdList, ...mergedData]: mergedData
     // console.log('原有的', props.attrIdList)
@@ -265,15 +266,15 @@ onMounted(() => {
 
 
 let searchShow = ref(true)
-const ruleAttr = (id) => {
-  console.log(id);
-
+let companyId = ref('')
+const ruleAttr = (id='') => {
+  if(id) companyId.value=id
     if(attrName.value) {
         searchShow.value = false
     } else {
         searchShow.value = true
     }
-  api.agreementApi.ruleAttrGroup({ attrName: attrName.value, companyId: id }).then((res: any) => {
+  api.agreementApi.ruleAttrGroup({ attrName: attrName.value, companyId: companyId.value }).then((res: any) => {
     if (res.code == '200') {
       dataStore.VehicleInformation = res.data.VehicleInformation ? processArray(res.data.VehicleInformation) : [];
       dataStore.VehicleOwnerInformation = res.data.VehicleOwnerInformation ? processArray(res.data.VehicleOwnerInformation) : [];

+ 2 - 2
src/views/additionalOrder/additional/index.vue

@@ -1657,7 +1657,7 @@
                   </template>
               </el-collapse-item>
           </div>
-          <div id="equities">
+          <!-- <div id="equities">
               <el-collapse-item name="equities">
                   <template #title>
                       <span class="title">权益信息</span>
@@ -1702,7 +1702,7 @@
                     </span>
                   </template>
               </el-collapse-item>
-          </div>
+          </div> -->
       </el-form>
     </el-collapse>
     <div class="footer">

+ 2 - 2
src/views/additionalOrder/order/index.vue

@@ -9,7 +9,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="订单号">
-                <el-input v-model="form.orderNo" placeholder="请输入订单号查找"></el-input>
+                <el-input v-model="form.id" placeholder="请输入订单号查找"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -67,7 +67,7 @@
         >
           <el-table-column label="订单号" prop="a" width="200">
             <template #default="scope">
-              <el-button link type="primary" @click="handleDetail(scope.row)">{{ scope.row.quoteNo }}</el-button>
+              <el-button link type="primary" @click="handleDetail(scope.row)">{{ scope.row.id }}</el-button>
             </template>
           </el-table-column  >
           <el-table-column label="业务员信息" prop="realQuoteUserName" width="120"></el-table-column>

+ 1 - 1
src/views/additionalOrder/temporarily/index.vue

@@ -4,7 +4,7 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="订单号">
-            <el-input v-model="form.orderNo" placeholder="请输入订单号查找"></el-input>
+            <el-input v-model="form.id" placeholder="请输入订单号查找"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">