Merge remote-tracking branch 'origin/dev' into dev

src/views/finance/modules/auditDetail.vue

@@ -20,7 +20,7 @@
               detailData?.order?.orderStatus
                 === '5' ? '已承保' : detailData?.order?.orderStatus === '6' ? '计算保费失败，请按要求修改订单' :
                 detailData?.order?.orderStatus ===
-                  '7' ? '核保不通过，请按意见修改订单' : detailData?.order?.orderStatus === '8'?'订单已关闭，有投保需求请重新报价':'--' }}</span>
+                  '7' ? '核保不通过，请按意见修改订单' : detailData?.order?.orderStatus === '8' ? '订单已关闭，有投保需求请重新报价' : '--' }}</span>
         </el-col>
       </el-row>
       <el-row :gutter="10">
@@ -37,8 +37,8 @@
           <span class="words">{{ detailData?.salesmanInfo?.typeAttr == '5' ? '团队' : detailData?.salesmanInfo?.typeAttr
             ==
             '6' ? '个代' : detailData?.salesmanInfo?.typeAttr == '7' ? '渠道' : detailData?.salesmanInfo?.typeAttr == '8'
-              ?'电销组':'--'
-            }}</span>
+              ? '电销组' : '--'
+          }}</span>
         </el-col>
         <el-col :span="6">
           <span class="label">归属</span>
@@ -214,7 +214,7 @@
             <span class="label">类型</span>
             <span class="value">{{ detailData?.carInfoVo?.isRegistered === '1' ? '已上牌' :
               detailData?.carInfoVo?.isRegistered
-                === '2' ?'未上牌':'--' }}</span>
+                === '2' ? '未上牌' : '--' }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车牌</span>
@@ -236,12 +236,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>
@@ -251,12 +251,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>
@@ -428,7 +428,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">
@@ -492,7 +492,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">
@@ -616,12 +616,12 @@
               </th>
 
               <th>
-                  <el-input-number v-model="detailData.costRatio.jqCommissionRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.jqCommissionRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.jqCommissionRatio }}%</div>
               </th>
               <th>
-                <div>￥{{ detailData?.insFeeOrders?.jqPayablePremium }}</div>
+                <div>￥{{ detailData?.insFeeOrders?.jqCommissionPremium }}</div>
               </th>
 
               <th>
@@ -634,8 +634,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.jqAdditionalRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.jqAdditionalRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.jqAdditionalRatio }}%</div>
               </th>
               <th>
@@ -661,8 +661,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.jqExportKeepPointRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.jqExportKeepPointRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.jqExportKeepPointRatio }}%</div>
               </th>
               <th>
@@ -687,8 +687,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.syCommissionRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.syCommissionRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.syCommissionRatio }}%</div>
               </th>
               <th>
@@ -705,8 +705,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.syAdditionalRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.syAdditionalRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.syAdditionalRatio }}%</div>
               </th>
               <th>
@@ -732,8 +732,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.syExportKeepPointRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.syExportKeepPointRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.syExportKeepPointRatio }}%</div>
               </th>
               <th>
@@ -758,8 +758,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.jyCommissionRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.jyCommissionRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.jyCommissionRatio }}%</div>
               </th>
               <th>
@@ -776,8 +776,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.jyAdditionalRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.jyAdditionalRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.jyAdditionalRatio }}%</div>
               </th>
               <th>
@@ -803,8 +803,8 @@
               </th>
 
               <th>
-                <el-input-number v-model="detailData.costRatio.jyExportKeepPointRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                <el-input-number v-model="detailData.costRatio.jyExportKeepPointRatio" controls-position="right"
+                  v-if="costShow" style="width: 80px" :min="0" :max="100" />
                 <div v-else>{{ detailData?.costRatio?.jyExportKeepPointRatio }}%</div>
               </th>
               <th>
@@ -884,7 +884,7 @@
                                               'C0507' ? '验车照（正后）' : sub.imageType === 'C0505' ? '验车照（人车合影）' : sub.imageType ===
                                                 'C0508' ? '验车照（地标合影）' : sub.imageType === 'C0509' ? '验车照（工作台）' : sub.imageType ===
                                                   'C0510' ? '验车照（天窗）' : sub.imageType
-                                                    === 'LAST_INSURANCE_POLICY' ? '上年商业险保单' :'--' }}</div>
+                                                    === 'LAST_INSURANCE_POLICY' ? '上年商业险保单' : '--' }}</div>
                 </el-col>
               </el-row>
             </el-tab-pane>
@@ -915,7 +915,7 @@
     </div>
     <div class="buttonList">
       <el-button v-if="isShow === '1'" type="primary" @click="handleAuditCancel">放弃审核</el-button>
-      <el-button v-if="isShow === '1'" type="primary" @click="handleUpdateToQuestionOrder">设为疑问订单</el-button>
+      <el-button v-if="isShow === '1'" type="primary" @click="openQuestionOrderDialog()">设为疑问订单</el-button>
       <el-button v-if="isShow === '1'" type="primary" @click="handleAudit(1)">审核通过</el-button>
       <el-popconfirm width="300" title="审核不通过">
         <template #reference>
@@ -939,6 +939,16 @@
       <vue-office-docx :src="fileUrl" style="height: 600px; margin: 0; padding: 0"></vue-office-docx>
     </el-dialog>
   </div>
+  <el-dialog v-model="questionOrderDialog" title="设为疑问订单" width="600">
+    <el-form>
+      <el-form-item label="疑问原因">
+        <el-input type="textarea" v-model="questionOrderValue" placeholder="输入疑问原因"></el-input>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button size="small" type="primary" @click="handleUpdateToQuestionOrder">确定</el-button>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -1275,14 +1285,28 @@ const convertedValue = (num) => {
     return (Math.floor(num / 100000000 * 10) / 10) + '亿';
   }
 }
+
+/** 问题排序对话框的显示状态 */
+const questionOrderDialog = ref(false)
+const questionOrderValue = ref('')
+const openQuestionOrderDialog = () => {
+  questionOrderValue.value = ''
+  questionOrderDialog.value = true
+}
 // 设为疑问订单
 const handleUpdateToQuestionOrder = () => {
-  api.financeApi.updateToQuestionOrder(myRoute.query.id).then((res: any) => {
+  const params = {
+    problemReason: questionOrderValue.value,
+    orderNo: myRoute.query.id,
+  }
+  api.financeApi.updateToQuestionOrder(params).then((res: any) => {
     if (res.code == 200) {
+      questionOrderDialog.value = false
       ElMessage({
         message: res.msg,
         type: 'success'
       })
+      initDetail()
     }
   })
 }

src/views/platform/index.vue

@@ -39,7 +39,10 @@
               </el-form-item>
             </el-col> <el-col :span="8">
               <el-form-item label="结算状态">
-                <el-input v-model="receivableForm.settlementStatus" placeholder="请输入" clearable></el-input>
+                <el-select v-model="receivableForm.settlementStatus" placeholder="请选择" clearable>
+                  <el-option label="未结算" value="0"></el-option>
+                  <el-option label="已结算" value="1"></el-option>
+                </el-select>
               </el-form-item>
             </el-col> <el-col :span="8">
               <el-form-item label="增加类型">
@@ -917,19 +920,7 @@ const toEdit = (row: any) => {
 const getPlatFormReceivableList = () => {
 
   let params = {
-    licenseNo: receivableForm.value?.licenseNo,
-    companyId: receivableForm.value?.companyId,
-    signingStartTime: receivableForm.value?.signingTime?.[0],
-    signingEndTime: receivableForm.value?.signingTime?.[1],
-    orderNo: receivableForm.value?.orderNo,
-    agreementId: receivableForm.value?.agreementId,
-    deptId: receivableForm.value?.deptId,
-    riskCode: receivableForm.value?.riskCode,
-    orderType: receivableForm.value?.orderType,
-    insuredName: receivableForm.value?.insuredName,
-    jqPolicyNo: receivableForm.value?.jqPolicyNo,
-    syPolicyNo: receivableForm.value?.syPolicyNo,
-    dockingPerson: receivableForm.value?.dockingPerson,
+    ...receivableForm.value,
     jqStartDate: receivableForm.value?.jqDate?.[0],
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],

src/views/receivable/handingFee/index.vue

@@ -129,6 +129,9 @@
           <div class="col-108 m-r-8">
             <el-button class="radius-2px width-100" type="primary" @click="handleExport">导出</el-button>
           </div>
+          <span class="col-108 m-r-8">
+            <el-button class="radius-2px width-100" @click="handleBatchEdit">批量修改比例</el-button>
+          </span>
           <span class="col-108 m-r-8">
             <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
               <el-button class="radius-2px width-100">

src/views/receivable/handingFee/ticket.vue

@@ -70,6 +70,7 @@
       <el-table-column prop="agreementName" label="协议名称"></el-table-column>
       <el-table-column prop="orderType" label="订单类型"></el-table-column>
       <el-table-column prop="signYear" label="签单年份"></el-table-column>
+      <el-table-column prop="orderNo" label="订单号"></el-table-column>
       <el-table-column prop="jqPolicyNo" label="交强保单号"></el-table-column>
       <el-table-column prop="syPolicyNo" label="商业保单号"></el-table-column>
       <el-table-column prop="jqPremium" label="交强险保费"></el-table-column>