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

src/views/finance/modules/auditDetail.vue

@@ -93,11 +93,13 @@
           <span class="words">{{ detailData?.order?.agreementTypeName || '--' }}</span>
         </el-col>
       </el-row>
-      <div class="tipsList">
-        <div class="tipsItem" :class="{ 'active': tipsIndex === index }" v-for="(item, index) in tipsList" :key="index"
-          @click="handleTipsIndexChange(item, index)">
-          <img :src="getAssetsFile(item.url + (tipsIndex === index ? 'Active' : ''))" />
-          <span class="tipsName">{{ item.name }}</span>
+      <div class="p-[0_24px]">
+        <div class="tipsList">
+          <div class="tipsItem" :class="{ 'active': tipsIndex === index }" v-for="(item, index) in tipsList"
+            :key="index" @click="handleTipsIndexChange(item, index)">
+            <img :src="getAssetsFile(item.url + (tipsIndex === index ? 'Active' : ''))" />
+            <span class="tipsName">{{ item.name }}</span>
+          </div>
         </div>
       </div>
     </div>
@@ -870,7 +872,10 @@
                   Number(detailData?.insFeeOrders?.jyAdditionalPremium)).toFixed(5) }}</div>
               </th>
               <th colspan="2">
-                <div>小计： ￥{{ (new Decimal(detailData?.insFeeOrders?.jqExportPremium || 0).add(detailData?.insFeeOrders?.syExportPremium || 0).add(detailData?.insFeeOrders?.jyExportPremium || 0).mul(100).floor().div(100).toFixed(2)) || '--' }}</div>
+                <div>小计： ￥{{ (new Decimal(detailData?.insFeeOrders?.jqExportPremium ||
+                  0).add(detailData?.insFeeOrders?.syExportPremium || 0).add(detailData?.insFeeOrders?.jyExportPremium
+                    ||
+                    0).mul(100).floor().div(100).toFixed(2)) || '--' }}</div>
               </th>
               <th colspan="2">
                 <div>小计： ￥{{ (Number(detailData?.insFeeOrders?.jqKeepPointPremium) +
@@ -889,6 +894,82 @@
           </tbody>
         </table>
       </div>
+      <div id="salesChannelMsg" class="costMsg">
+        <div class="title special">
+          <div>分销信息</div>
+          <div class="btns">
+            <el-button size="small" type="primary" plain @click="handleCostView">查看出单费用</el-button>
+          </div>
+        </div>
+        <table class="costTable" cellpadding="0" cellspacing="0">
+          <thead>
+            <tr>
+              <th>
+                <div>等级</div>
+              </th>
+              <th>
+                <div>分销员</div>
+              </th>
+              <th>
+                <div>分销金额</div>
+              </th>
+              <th>
+                <div>分销比例</div>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <th>
+                <div>一级分销</div>
+              </th>
+              <th>
+                <div>{{ detailData?.insFeeOrders?.firstDistributionMember }}</div>
+              </th>
+              <th>
+                <div>￥{{ detailData?.insFeeOrders?.firstDistributionPremium }}</div>
+              </th>
+
+              <th>
+                <div>{{ detailData?.insFeeOrders?.firstDistributionRatio }}%</div>
+              </th>
+
+            </tr>
+            <tr>
+              <th>
+                <div>二级分销</div>
+              </th>
+              <th>
+                <div>{{ detailData?.insFeeOrders?.secondDistributionMember }}</div>
+              </th>
+              <th>
+                <div>￥{{ detailData?.insFeeOrders?.secondDistributionPremium }}</div>
+              </th>
+
+              <th>
+                <div>{{ detailData?.insFeeOrders?.secondDistributionRatio }}%</div>
+              </th>
+
+
+            </tr>
+            <tr>
+              <th>
+                <div>三级分销</div>
+              </th>
+              <th>
+                <div>{{ detailData?.insFeeOrders?.thirdDistributionMember }}</div>
+              </th>
+              <th>
+                <div>￥{{ detailData?.insFeeOrders?.thirdDistributionPremium }}</div>
+              </th>
+
+              <th>
+                <div>{{ detailData?.insFeeOrders?.thirdDistributionRatio }}%</div>
+              </th>
+            </tr>
+          </tbody>
+        </table>
+      </div>
       <div id="fileMsg" class="fileMsg">
         <div class="title">影像资料</div>
         <div class="information">
@@ -1068,6 +1149,11 @@ let tipsList = ref([
     name: '费用信息',
     id: 'costMsg',
     url: 'feiyong'
+  },
+  {
+    name: '分销信息',
+    id: 'salesChannelMsg',
+    url: 'feiyong'
   }, {
     name: '附件信息',
     id: 'fileMsg',
@@ -1457,7 +1543,7 @@ const handleAudit = (type) => {
     api.financeApi.verifyOrder({
       orderNo: myRoute.query.id,
       auditStatus: type,
-      refuse:refuse.value
+      refuse: refuse.value
     }).then((res: any) => {
       if (res.code == 200) {
         ElMessage({
@@ -1602,7 +1688,7 @@ onUnmounted(() => {
       width: 100%;
 
       .tipsItem {
-        width: 14%;
+        width: 10%;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -2040,4 +2126,4 @@ onUnmounted(() => {
     }
   }
 }
-</style>
+</style>

src/views/insurancePolicy/orderDetail.vue

@@ -79,7 +79,7 @@
           <span class="label">出单协议</span>
           <span class="words" style="color: #00a0f4" @click="toAgreementDetail">{{ detailData?.order?.agreementName ||
             '--'
-          }}</span>
+            }}</span>
         </el-col>
         <el-col :span="6">
           <span class="label">协议类型</span>
@@ -215,7 +215,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in taxList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20">
@@ -370,12 +370,12 @@
           <el-col :span="6" class="carMsgItem">
             <span class="label">使用性质</span>
             <span class="value">{{ dictChange(optionObj['car_nature_code'], detailData?.carInfoVo?.carNatureCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆用途</span>
             <span class="value">{{ dictChange(optionObj['vehicle_use_code'], detailData?.carInfoVo?.vehicleUseCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆种类</span>
@@ -384,12 +384,12 @@
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆类型</span>
             <span class="value">{{ dictChange(optionObj['car_type_code'], detailData?.carInfoVo?.carTypeCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">能源种类</span>
             <span class="value">{{ dictChange(optionObj['energy_type_code'], detailData?.carInfoVo?.energyTypeCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">注册日期</span>
@@ -495,7 +495,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in tbList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20" v-if="!tbList[0].bool">
@@ -559,7 +559,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in bbList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20" v-if="!bbList[0].bool && !bbList[1].bool">
@@ -978,6 +978,83 @@
           </tbody>
         </table>
       </div>
+      <div id="salesChannelMsg" class="costMsg">
+        <div class="title special">
+          <div>分销信息</div>
+          <div class="btns">
+            <el-button size="small" type="primary" plain @click="handleCostView">查看出单费用</el-button>
+          </div>
+        </div>
+        <table class="costTable" cellpadding="0" cellspacing="0">
+          <thead>
+            <tr>
+              <th>
+                <div>等级</div>
+              </th>
+              <th>
+                <div>分销员</div>
+              </th>
+              <th>
+                <div>分销金额</div>
+              </th>
+              <th>
+                <div>分销比例</div>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <th>
+                <div>一级分销</div>
+              </th>
+              <th>
+                <div>{{detailData?.insFeeOrders?.firstDistributionMember}}</div>
+              </th>
+              <th>
+                <div>￥{{ detailData?.insFeeOrders?.firstDistributionPremium }}</div>
+              </th>
+
+              <th>
+                <div>{{ detailData?.insFeeOrders?.firstDistributionRatio }}%</div>
+              </th>
+
+            </tr>
+            <tr>
+              <th>
+                <div>二级分销</div>
+              </th>
+              <th>
+                <div>{{detailData?.insFeeOrders?.secondDistributionMember}}</div>
+              </th>
+              <th>
+                <div>￥{{ detailData?.insFeeOrders?.secondDistributionPremium }}</div>
+              </th>
+
+              <th>
+                <div>{{ detailData?.insFeeOrders?.secondDistributionRatio }}%</div>
+              </th>
+
+
+            </tr>
+            <tr>
+              <th>
+                <div>三级分销</div>
+              </th>
+              <th>
+                <div>{{detailData?.insFeeOrders?.thirdDistributionMember}}</div>
+              </th>
+              <th>
+                <div>￥{{ detailData?.insFeeOrders?.thirdDistributionPremium }}</div>
+              </th>
+
+              <th>
+                <div>{{ detailData?.insFeeOrders?.thirdDistributionRatio }}%</div>
+              </th>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
       <div id="lineMsg" class="lineMsg">
         <div class="title">订单轨迹</div>
         <el-table :data="orderData" height="300">
@@ -1153,6 +1230,11 @@ let tipsList = ref([
     name: '费用信息',
     id: 'costMsg',
     url: 'feiyong'
+  },
+  {
+    name: '分销信息',
+    id: 'salesChannelMsg',
+    url: 'feiyong'
   }, {
     name: '订单轨迹',
     id: 'lineMsg',

src/views/receivable/documentary/documentaryReport.vue

@@ -168,7 +168,7 @@
             @current-change="handleCurrentChange($event, '2')"></el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane style="height: 100%" name="3" label="车险结算明细">
+      <!-- <el-tab-pane style="height: 100%" name="3" label="车险结算明细">
         <el-form v-model="recordForm2" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
@@ -311,7 +311,7 @@
             @size-change="handleSizeChange($event, '4')"
             @current-change="handleCurrentChange($event, '4')"></el-pagination>
         </div>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
   </PageMain>
   <el-dialog :close-on-click-modal="false" v-model="viewCredential" title="查看凭证" width="400">

src/views/receivable/documentary/ticket.vue

@@ -90,7 +90,7 @@
         </el-form-item> -->
         <el-form-item v-if="isSettlement" prop="actualReceivedAmount" label="实收金额">
           <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0"
-            :max="countForm.receivableSupervisePremium" :precision="2" controls-position="right"
+            :precision="2" controls-position="right"
             @change="handleChange" />
         </el-form-item>
         <el-form-item v-if="isSettlement" prop="settlementPaymentDifference" label="回款差额">