样式完善

src/components/ruleConditionContainer/index.vue

@@ -2,12 +2,13 @@
 <template>
   <div>
     <div class="flex f-c a-start m-top-20" style="width: 100%;">
-      <el-row v-for="(item, index) in props.rulesAttrList" :key="index" class="roleClass flex a-c" style="width: 100%;">
+      <el-row v-for="(item, index) in props.rulesAttrList" :key="index" class="roleClass flex a-c" style="width: 100%;"
+      :gutter="10">
         <el-col :span="5">
           <el-input v-model="item.attrName" disabled />
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="item.operator" placeholder="运算符" style="width: 100px; margin: 0 10px;">
+        <el-col :span="4">
+          <el-select v-model="item.operator" placeholder="运算符">
             <template v-if="item.attrType == 'inputTag' || item.attrType == 'checkbox' || item.attrType == 'select'">
               <el-option label="包含" value="1"></el-option>
               <el-option label="不包含" value="2"></el-option>
@@ -18,7 +19,7 @@
             </template>
           </el-select>
         </el-col>
-        <el-col :span="13">
+        <el-col :span="12">
           <template v-if="item.attrType == 'radio'">
             <el-select v-model="item.min" placeholder="选择值" clearable filterable :disabled="disabled">
               <el-option v-for="dictLabalitem in item.dictLabal" :key="dictLabalitem.id" :label="dictLabalitem.name"
@@ -132,7 +133,7 @@
           </template>
         </el-col>
         <el-col :span="1">
-          <el-icon v-if="!disabled" color="#666" size="18" style="margin-left: 10px;" @click="attrDel(index)">
+          <el-icon v-if="!disabled" color="#666" size="18" @click="attrDel(index)">
             <Delete />
           </el-icon>
         </el-col>

src/views/finance/audit.vue

@@ -91,7 +91,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex; align-items: flex-start; justify-content: flex-end">
+            <el-col :span="24" style="display: flex; align-items: flex-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>
@@ -104,7 +104,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="firstData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData" height="calc(100% - 294px )" 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>
@@ -230,7 +230,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="24" style="display: flex;align-items: flex-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>
@@ -243,7 +243,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="secondData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="secondData" height="calc(100% - 294px )" 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>
@@ -370,7 +370,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="24" style="display: flex;align-items: flex-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>
@@ -383,7 +383,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="thirdData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="thirdData" height="calc(100% - 294px )" 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>
@@ -514,7 +514,7 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="24" style="display: flex;align-items: flex-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>
@@ -527,7 +527,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="forthData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="forthData" height="calc(100% - 294px )" 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>

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -29,7 +29,7 @@
             <el-tag type="primary" style="margin-right: 20px;">{{
               getDict('is_enable').find(val => val.value == agreementInfo.isEnable)?.label}}</el-tag>
             <el-tag type="success">{{getDict('valid_status').find(val => val.value == agreementInfo.validStatus)?.label
-            }}</el-tag>
+              }}</el-tag>
           </div>
         </div>
         <el-descriptions :column="3" style="margin-top: 10px;">
@@ -51,9 +51,9 @@
         <el-tab-pane label="协议信息" name="agreementInfo">
           <el-descriptions title="基本信息" class="m-top-20" :column="3">
             <el-descriptions-item label="协议名称：">{{ agreementInfo.agreementTitle
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
             <el-descriptions-item label="协议简称：">{{ agreementInfo.agreementAbbreviation
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
             <el-descriptions-item label="协议生效时间：">{{ agreementInfo.startDate }}</el-descriptions-item>
             <el-descriptions-item label="协议失效时间：">{{ agreementInfo.endDate }}</el-descriptions-item>
             <el-descriptions-item label="是否含增值税结算：">
@@ -117,7 +117,7 @@
                   <div class="flex a-c">
                     <img src="../../../assets/images/fee.png" alt="">
                     <span style="margin-right: 30px;font-size: 16px;" class="strong m-left-10">承保规则一{{ index + 1
-                    }}</span>
+                      }}</span>
                   </div>
                   <div class="flex">
                     <el-button link type="primary" :icon="Delete" @click="ruleDel(item.id)">删除</el-button>
@@ -147,7 +147,7 @@
                   <el-tab-pane v-for="(costitem, costindex) in item.costVoList" :key="costindex"
                     :label="costitem.productName" :name="costitem.productName">
                     <span class="strong">{{ costitem.productName }}费用（{{ costitem.ptlAgreementCostVoList.length
-                      }}条）</span>
+                    }}条）</span>
                     <ComplexTable :tableData="costitem.ptlAgreementCostVoList" :columns="columns" :maxHeight="250"
                       :showIndex="false" :columnwidth="200" :showSelect="false">
                       <template v-slot:operation="scope">
@@ -190,28 +190,31 @@
         </el-form>
         <div class="flex a-c j-s ">
           <span class="strong title" style="margin-right: 20px;">规则条件</span>
-          <el-button type="primary" link @click="addRules('or')">
-            添加或者条件
-            <template #icon>
-              <el-icon>
-                <Plus />
-              </el-icon>
-            </template>
-          </el-button>
+
         </div>
-        <div class="" v-for="rules in rulesAttrListInfo.rulesGroups" :key="rules.timeId">
+        <div class="bg-[#FAFAFA] p-20px m-t-20px" v-for="rules in rulesAttrListInfo.rulesGroups" :key="rules.timeId">
           <!-- 规则选择容器 -->
+          <div class="flex items-center justify-end">
+            <el-button type="primary" link @click="addRules('and', rules)">
+              添加条件
+              <template #icon>
+                <el-icon>
+                  <Plus />
+                </el-icon>
+              </template>
+            </el-button>
+          </div>
           <rule-Condition-Container :rulesAttrList="rules.rulesAttrList" @Del="(index) => rulesAttrDel(index, rules)"
             @selectChange="(index) => rulesAttrselectChange(index, rules)" />
-          <el-button type="primary" link @click="addRules('and', rules)">
-            添加并且条件
-            <template #icon>
-              <el-icon>
-                <Plus />
-              </el-icon>
-            </template>
-          </el-button>
         </div>
+        <el-button class="m-t-20px" plain type="primary" @click="addRules('or')">
+          添加组条件
+          <template #icon>
+            <el-icon>
+              <Plus />
+            </el-icon>
+          </template>
+        </el-button>
       </template>
       <template #footer>
         <div class="flex a-c j-c">

src/views/quoteConfig/dispatch/components/rule.vue

@@ -870,7 +870,6 @@ const regionLicenseNumber = (value: string) => {
         if (licenseNoItem) {
           licenseNoItem.dictLabal = data;
         }
-        console.log(dispatchList.value)
       }
       if (value == '0') {
         const licenseAreaItem = dispatchList.value.find((item: any) => item.attrCode == 'LicenseArea');

src/views/quoteConfig/dispatch/index.vue

@@ -16,7 +16,7 @@
             </template>
           </ElInput>
         </ElFormItem>
-        <div style="width: 100%; height: calc(100vh - 350px); overflow-y: auto" class="container">
+        <div style="width: 100%; height: calc(100% - 50px); overflow-y: auto" class="container">
           <div class="list-item" :class="currentIndex == index ? 'active' : ''" v-for="(item, index) in filterList"
             :key="item.id" @click="roleitemClick(item, index)">
             <span>{{ item.name }}</span>
@@ -25,8 +25,6 @@
       </div>
     </PageMain>
     <PageMain class="vh100 m-l-0" style="width: calc(100% - 250px);">
-      <ElRow class="vh99">
-        <ElCol :span="24">
           <div class="right">
             <div class="top">
               <span>调度规则</span>
@@ -200,8 +198,6 @@
               </div>
             </div>
           </div>
-        </ElCol>
-      </ElRow>
     </PageMain>
     <rule v-if="drawer" @close="handleClose" :editData="editData" :companyId="currentId" :editType="editType" />
     <other v-if="isother" :companyId="companyId" @close="closeOther"></other>
@@ -463,7 +459,6 @@ getCompanyList();
   .rule-item {
     min-width: 423px;
     max-width: 423px;
-    height: 100%;
     border-radius: 4px;
     border: 1px solid #eeeeee;
     overflow-y: auto;
@@ -514,8 +509,9 @@ getCompanyList();
         margin-bottom: 12px;
 
         .opera {
-          // width: 62px;
+          width: 62px;
           height: 22px;
+          flex-shrink: 0;
           background: #f9f9f9;
           border-radius: 2px 2px 2px 2px;
           border: 1px solid #eeeeee;