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

src/views/additionalOrder/additional/index.vue

@@ -1322,6 +1322,7 @@
                               <div class="time">
                                   <el-form-item prop="jqStart" label="">
                                       <el-date-picker
+                                          @change="jqChange"
                                           v-model="additionalForm.jqStart"
                                           type="datetime"
                                           placeholder="请选择"
@@ -1347,6 +1348,7 @@
                               <div class="time">
                                   <el-form-item prop="syStart" label="">
                                       <el-date-picker
+                                          @change="syChange"
                                           v-model="additionalForm.syStart"
                                           type="datetime"
                                           placeholder="请选择"
@@ -2549,6 +2551,10 @@ const JQChange = (item) => {
     additionalForm.value.jqEnd = oneYearPast1(additionalForm.value.jqStart)
   }
 }
+const jqChange = (e: any) => {
+  additionalForm.value.jqEnd = oneYearPast1(e)
+}
+
 // 商业即时生效
 let syWork = ref([
   { text: '即时生效', checked: false }
@@ -2567,7 +2573,9 @@ const SYChange = (item) => {
     additionalForm.value.syEnd = oneYearPast1(additionalForm.value.syStart)
   }
 }
-
+const syChange = (e: any) => {
+  additionalForm.value.syEnd = oneYearPast1(e)
+}
 // 根据保险公司获取协议
 let agreementList = ref([])
 const handleSelectCompany = (e) => {
@@ -3354,9 +3362,10 @@ const handleCarTypeSelect = (data) => {
   carTypeShow.value = false
     additionalForm.value.carYear = data.marketYear
     additionalForm.value.brandName = data.modelName
-    additionalForm.value.completeKerbMass = data.wholeWeight
+    // additionalForm.value.completeKerbMass = data.wholeWeight
     additionalForm.value.displacement = data.displacement
     additionalForm.value.purchasePrice = data.replacementValue
+    additionalForm.value.seatCount = data.ratedPassengerCapacity
     additionalForm.value.energyTypeCode = additionalForm.value.licenseNo && additionalForm.value.length == 7?data.energyTypes: '0'
     additionalForm.value.energyTypeCode = additionalForm.value.licenseNo && additionalForm.value.length == 7?data.energyTypes: '0'
 }

src/views/insurancePolicy/index.vue

@@ -3667,10 +3667,6 @@ const ruleFilterCompany = (item: any) => {
       })
     } else {
       quoteData.value = []
-      ElMessage({
-        message: res.msg,
-        type: 'warning'
-      })
     }
   })
 }

src/views/receivable/handingFee/index.vue

@@ -833,7 +833,7 @@ let invoiceShow = ref(false)
 let invoiceRadio = ref(null)
 const handleInvoiceSubmit = () => {
     myRouter.push({
-        name: 'Ticket',
+        name: 'HandingFeeTicket',
         query: {
             id: invoiceRadio.value,
             selectedList: JSON.stringify(selectedList.value),