fix: 添加车牌识别码、品牌型号识别，修改报价投保信息时间的交互问题

src/views/additionalOrder/additional/index.vue

@@ -99,7 +99,7 @@
                     <el-form-item label="车牌识别代码" prop="vinNo">
                       <el-input v-model="carForm.vinNo" placeholder="请输入车辆识别代码">
                         <template #append>
-                          <el-button icon="Search" @click="handleCarType" />
+                          <el-button icon="Search" @click="handleCarType(1)" />
                         </template>
                       </el-input>
                     </el-form-item>
@@ -108,7 +108,7 @@
                     <el-form-item label="品牌型号" prop="brandName">
                       <el-input v-model="carForm.brandName" placeholder="请输入品牌型号">
                         <template #append>
-                          <el-button icon="Search" @click="handleCarType" />
+                          <el-button icon="Search" @click="handleCarType(2)" />
                         </template>
                       </el-input>
                     </el-form-item>
@@ -183,7 +183,7 @@
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="使用性质" prop="carNatureCode">
                       <el-select v-model="carForm.carNatureCode" placeholder="请选择">
-                        <el-option v-for="(item, index) in optionObj.natureOfVehicleUse" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                        <el-option v-for="(item, index) in optionObj.car_nature_code" :label="item.label" :value="item.value" :key="item.value"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -191,21 +191,21 @@
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="车辆用途" prop="vehicleUseCode">
                       <el-select v-model="carForm.vehicleUseCode" placeholder="请选择">
-                        <el-option v-for="(item, index) in optionObj.outOfBusinessVehicleUse" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                        <el-option v-for="(item, index) in optionObj.vehicle_use_code" :label="item.label" :value="item.value" :key="item.value"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="车辆类型" prop="carTypeCode">
                       <el-select v-model="carForm.carTypeCode" placeholder="请选择">
-                        <el-option v-for="(item, index) in optionObj.trafficManagementVehicleType" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                        <el-option v-for="(item, index) in optionObj.car_type_code" :label="item.label" :value="item.value" :key="item.value"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col class="col-m-b-6" :span="8">
                     <el-form-item label="能源种类" prop="energyTypeCode">
                       <el-select v-model="carForm.energyTypeCode" placeholder="请选择">
-                        <el-option v-for="(item, index) in optionObj.energyType" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                        <el-option v-for="(item, index) in optionObj.energy_type_code" :label="item.label" :value="item.value" :key="item.value"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -224,7 +224,6 @@
                         type="date"
                         placeholder="请选择"
                         value-format="YYYY-MM-DD"
-                        :disabled-date="disabledDateStart"
                         style="width: 100%"
                       />
                     </el-form-item>
@@ -236,7 +235,6 @@
                         type="date"
                         placeholder="请选择"
                         value-format="YYYY-MM-DD"
-                        :disabled-date="disabledDateStart"
                         style="width: 100%"
                       />
                     </el-form-item>
@@ -348,28 +346,28 @@
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item class="white-m-p24" label="使用性质" prop="carNatureCode">
                   <el-select v-model="writeCarForm.carNatureCode" placeholder="请选择">
-                    <el-option v-for="(item, index) in optionObj.natureOfVehicleUse" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                    <el-option v-for="(item, index) in optionObj.car_nature_code" :label="item.lable" :value="item.value" :key="item.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item label="车辆用途" prop="vehicleUseCode">
                   <el-select v-model="writeCarForm.vehicleUseCode" placeholder="请选择">
-                    <el-option v-for="(item, index) in optionObj.outOfBusinessVehicleUse" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                    <el-option v-for="(item, index) in optionObj.vehicle_use_code" :label="item.label" :value="item.value" :key="item.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item label="车辆类型" prop="carTypeCode">
                   <el-select v-model="writeCarForm.carTypeCode" placeholder="请选择">
-                    <el-option v-for="(item, index) in optionObj.trafficManagementVehicleType" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                    <el-option v-for="(item, index) in optionObj.car_type_code" :label="item.label" :value="item.value" :key="item.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="col-m-b-6" :span="6">
                 <el-form-item label="能源种类" prop="energyTypeCode">
                   <el-select v-model="writeCarForm.energyTypeCode" placeholder="请选择">
-                    <el-option v-for="(item, index) in optionObj.energyType" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                    <el-option v-for="(item, index) in optionObj.energy_type_code" :label="item.label" :value="item.value" :key="item.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -388,7 +386,6 @@
                     type="date"
                     placeholder="请选择"
                     value-format="YYYY-MM-DD"
-                    :disabled-date="disabledDateStart"
                     style="width: 100%"
                   />
                 </el-form-item>
@@ -400,7 +397,6 @@
                     type="date"
                     placeholder="请选择"
                     value-format="YYYY-MM-DD"
-                    :disabled-date="disabledDateStart"
                     style="width: 100%"
                   />
                 </el-form-item>
@@ -1158,7 +1154,7 @@
                   <el-col v-if="insuranceForm.taxRelifFlag === '1'" :span="6">
                     <el-form-item label="证件类型" prop="taxpayerIdentifier">
                       <el-select v-model="insuranceForm.taxpayerIdentifier" placeholder="请选择">
-                        <el-option v-for="(item, index) in optionObj.taxpayerIdentifier" :label="item.dictTag" :value="item.dictValue" :key="item.dictValue"></el-option>
+                        <el-option v-for="(item, index) in optionObj.taxpayerIdentifier" :label="item.label" :value="item.value" :key="item.value"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -1432,9 +1428,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="非现询费用" prop="c">
-                  <el-select v-model="historyForm.c">
-                    <el-option label="费用1" value="1" key="1"></el-option>
-                  </el-select>
+                  <el-input placeholder="请输入" v-model="historyForm.c"></el-input>
                 </el-form-item>
               </el-col>
 
@@ -1664,21 +1658,21 @@ const quoteFormRefs = ref() // 投保信息
 
 // 使用性质，车辆用途，车辆类型，能源种类，车辆种类
 let optionObj = ref({
-  outOfBusinessVehicleUse: [], // 车辆用途
-  natureOfVehicleUse: [], // 使用性质
-  energyType: [], // 能源种类
-  trafficManagementVehicleType: [], // 车辆类型
-  vehicleType: [], // 车辆种类
+  vehicle_use_code: [], // 车辆用途
+  car_nature_code: [], // 使用性质
+  energy_type_code: [], // 能源种类
+  car_type_code: [], // 车辆类型
+  car_kind_code: [], // 车辆种类
   taxpayerIdentifier: [], // 证件类型
   insuranceType: [], // 险种类型
 })
 const initOption = () => {
-  let list = ['outOfBusinessVehicleUse', 'natureOfVehicleUse', 'energyType', 'trafficManagementVehicleType', 'vehicleType', 'taxpayerIdentifier']
+  let list = ['vehicle_use_code', 'car_nature_code', 'energy_type_code', 'car_type_code', 'car_kind_code', 'taxpayerIdentifier']
   list.forEach(item => {
     api.additionalApi.dictDetails(item).then((res: any) => {
       if(res.code == 200) {
         if(res.data) {
-          optionObj.value[item] = res.data.ddList
+          optionObj.value[item] = res.data
         }
       }
     })
@@ -2394,20 +2388,41 @@ let insuranceRules = ref({
   taxRelifFlag: [
     { required: true, message: "请选择纳税类型", trigger: "change" }
   ],
-  b: [
-    { required: true, message: "请选择险种", trigger: "change" }
+    identifyNumber: [
+    { required: true, message: "请输入纳税人识别号", trigger: "blur" }
+  ],
+  organizationCode: [
+    { required: true, message: "请输入纳税人识别号", trigger: "blur" }
+  ],
+  taxpayerName: [
+    { required: true, message: "请输入纳税人名称", trigger: "blur" }
+  ],
+  taxpayerIdentifier: [
+    { required: true, message: "请选择证件类型", trigger: "change" }
   ],
-  c: [
-    { required: true, message: "请选择险种", trigger: "change" }
+  extendChar2: [
+      { required: true, message: "请输入减免税凭证号", trigger: "blur" }
   ],
-  d: [
-    { required: true, message: "请选择险种", trigger: "change" }
+  relifReason: [
+      { required: true, message: "请输入减免税原因", trigger: "blur" }
   ],
-  e: [
-    { required: true, message: "请选择险种", trigger: "change" }
+  paidFreeCertificate: [
+      { required: true, message: "请输入完税凭证号", trigger: "blur" }
   ],
-  f: [
-    { required: true, message: "请选择险种", trigger: "change" }
+  taxComCode:[
+      { required: true, message: "请输入税务机关代码", trigger: "blur" }
+  ],
+  taxComName: [
+      { required: true, message: "请输入税务机关名称", trigger: "blur" }
+  ],
+  taxRelief: [
+      { required: true, message: "请输入减税比例", trigger: "blur" }
+  ],
+  taxDocumentDate: [
+      { required: true, message: "请选择完税凭证填发日期", trigger: "change" }
+  ],
+  taxPaidAreaCode: [
+      { required: true, message: "请选择完税凭证地区", trigger: "change" }
   ],
 })
 // 列表
@@ -2439,6 +2454,42 @@ const getAgeByIdCard = (idCard: any, type?: any) => {
   type.age = age
   return age
 }
+const noeYearPast = (time) => {
+  let strYear: any = time.getFullYear();
+  let strDay: any = time.getDate();
+  let strMonth: any = time.getMonth() + 1;
+  let hh: any = time.getHours();
+  let minutes: any = time.getMinutes(); // 分
+  let Seconds: any = time.getSeconds();
+  if (hh < 10) {
+    hh = "0" + hh;
+  }
+  if (minutes < 10) {
+    minutes = "0" + minutes;
+  }
+  if (Seconds < 10) {
+    Seconds = "0" + Seconds;
+  }
+  if (strMonth < 10) {
+    strMonth = "0" + strMonth;
+  }
+  if (strDay < 10) {
+    strDay = "0" + strDay;
+  }
+  let datastr =
+    strYear +
+    "-" +
+    strMonth +
+    "-" +
+    strDay +
+    " " +
+    hh +
+    ":" +
+    minutes +
+    ":" +
+    Seconds;
+  return datastr;
+}
 const oneYearPast1 = (time) => {
   //明年减一秒
   let date = new Date(time);
@@ -2508,7 +2559,7 @@ const JQChange = (item) => {
     date.setHours(date.getHours() + 2);
     date.setMinutes(0);
     date.setSeconds(0);
-    insuranceForm.value.jqStart = date
+    insuranceForm.value.jqStart = noeYearPast(date)
     insuranceForm.value.jqEnd = oneYearPast1(date)
   } else {
     insuranceForm.value.jqStart = transformTime1()
@@ -2521,12 +2572,12 @@ let syWork = ref([
 ])
 const SYChange = (item) => {
   item.checked = !item.checked
-  if(jqWork.value.some( a => a.checked )) {
+  if(syWork.value.some( a => a.checked )) {
     let date: any = new Date();
     date.setHours(date.getHours() + 2);
     date.setMinutes(0);
     date.setSeconds(0);
-    insuranceForm.value.syStart = date
+    insuranceForm.value.syStart = noeYearPast(date)
     insuranceForm.value.syEnd = oneYearPast1(date)
   } else {
     insuranceForm.value.syStart = transformTime1()
@@ -2696,7 +2747,7 @@ const uploadImage = async (file, type) => {
               carForm.value.carNatureCode = data.useNature // 使用性质
               carForm.value.vehicleUseCode = data.vehicleUse // 车辆用途
               carForm.value.carTypeCode = data.category // 车辆类型
-              carForm.value.energyTypeCode = data.plateType // 能源种类
+              carForm.value.energyTypeCode = carForm.value.licenseNo && carForm.value.length == 7?data.plateType: '0' // 能源种类
               carForm.value.registerDate = data.registerDate // 注册日期
               carForm.value.issueDate = data.issueDate // 发证日期
             } else {
@@ -3182,14 +3233,20 @@ const initDept = () => {
 
 // 选择车型
 let carTypeShow = ref(false)
-const handleCarType = () => {
+const handleCarType = (type) => {
   carTypeShow.value = true
   nextTick(() => {
-    CarTypeSelectRef.value
+    CarTypeSelectRef.value.initData(type === 1?carForm.value.vinNo:carForm.value.brandName, type)
   })
 }
 const handleCarTypeSelect = (data) => {
   carTypeShow.value = false
+  carForm.value.carYear = data.marketYear
+  carForm.value.completeKerbMass = data.wholeWeight
+  carForm.value.displacement = data.displacement
+  carForm.value.purchasePrice = data.replacementValue
+  carForm.value.energyTypeCode = carForm.value.licenseNo && carForm.value.length == 7?data.energyTypes: '0'
+  writeCarForm.value.energyTypeCode = writeCarForm.value.licenseNo && writeCarForm.value.length == 7?data.energyTypes: '0'
 }
 
 // 选择险种

src/views/additionalOrder/additional/modules/carTypeSelect.vue

@@ -16,13 +16,13 @@
       @select="handleSelect"
     >
       <el-table-column type="selection" width="80"></el-table-column>
-      <el-table-column label="厂牌型号代码" prop="a"></el-table-column>
-      <el-table-column label="厂牌型号" prop="b"></el-table-column>
-      <el-table-column label="新车购置价" prop="c"></el-table-column>
-      <el-table-column label="年款" prop="d"></el-table-column>
-      <el-table-column label="座位数" prop="e"></el-table-column>
-      <el-table-column label="排量" prop="f"></el-table-column>
-      <el-table-column label="配置" prop="g"></el-table-column>
+      <el-table-column prop="modelCode" label="厂牌型号代码"></el-table-column>
+      <el-table-column prop="modelName" label="厂牌型号"></el-table-column>
+      <el-table-column prop="replacementValue" label="新车购置价"></el-table-column>
+      <el-table-column prop="marketYear" label="年款"></el-table-column>
+      <el-table-column prop="ratedPassengerCapacity" label="座位数"></el-table-column>
+      <el-table-column prop="displacement" label="排量"></el-table-column>
+      <el-table-column prop="vehicleDescription" label="配置"></el-table-column>
     </el-table>
     <div class="footer">
       <el-button plain @click="handleCancel">取消</el-button>
@@ -33,6 +33,9 @@
 
 <script setup lang="ts">
 
+import api from "@/api";
+import {ElMessage} from "element-plus";
+
 const emits = defineEmits(['close'])
 const CarTypeRef = ref()
 
@@ -44,15 +47,7 @@ const handleSearch = () => {
 
 // 列表
 let selectItem = ref(null)
-let tableData = ref([
-  {
-    a: 1
-  },{
-    a: 2
-  },{
-    a: 3
-  }
-])
+let tableData = ref([])
 const handleSelect = (val, row) => {
   selectItem.value = row
   if(val.length > 1) {
@@ -69,6 +64,39 @@ const handleCancel = () => {
 const handleConfirm = () => {
   emits('close', selectItem.value)
 }
+const initData = (data, type) => {
+  tableData.value = []
+  if(type === 1) {
+    api.additionalApi.vinSearch(data).then((res: any) => {
+      if(res.code == 200) {
+        tableData.value = res.data
+      } else {
+        ElMessage({
+          message: res.msg,
+          type: 'warning'
+        })
+      }
+    })
+  }
+  if(type === 2) {
+    api.additionalApi.licenseSearch({
+      modelName: data.replace(/[^u4e00-u9fa5|,]+/gi, "")
+    }).then((res: any) => {
+      if(res.code == 200) {
+        tableData.value = res.data
+      } else {
+        ElMessage({
+          message: res.msg,
+          type: 'warning'
+        })
+      }
+    })
+  }
+}
+
+defineExpose({
+  initData
+})
 
 </script>
 

src/views/insurancePolicy/index.vue

@@ -2339,14 +2339,14 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined) => {
           email: insurancePolicyForm.value.email3,
         },
 
-        ciRiskInfoVo: insurancePolicyForm.value.JQStartDate&&insurancePolicyForm.value.JQEndDate?{
+        ciRiskInfoVo: insurancePolicyForm.value.productId === '0330' || insurancePolicyForm.value.productId === '0330034002' || insurancePolicyForm.value.productId === '0330034001'&&insurancePolicyForm.value.JQStartDate&&insurancePolicyForm.value.JQEndDate?{
           riskCode: '0507',
           startDate: insurancePolicyForm.value.JQStartDate,
           endDate: insurancePolicyForm.value.JQEndDate,
           instantFlag: false
         }: null,
 
-        biRiskInfoVo: insurancePolicyForm.value.SYStartDate&&insurancePolicyForm.value.SYEndDate?{
+        biRiskInfoVo: insurancePolicyForm.value.productId === '034001' || insurancePolicyForm.value.productId === '034002' || insurancePolicyForm.value.productId === '0330034002' || insurancePolicyForm.value.productId === '0330034001'&&insurancePolicyForm.value.SYStartDate&&insurancePolicyForm.value.SYEndDate?{
           riskCode: '0510',
           startDate: insurancePolicyForm.value.SYStartDate,
           endDate: insurancePolicyForm.value.SYEndDate,

src/views/operationManagement/channel.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20" style="width: 100%; overflow:hidden;">
       <el-col :span="4">
         <div class="teamTree">
-          <el-input class="search-input" v-model="treeValue" placeholder="团队名称查找" prefix-icon="Search" @keyup.enter="initTeam"></el-input>
+          <el-input class="search-input" v-model="treeValue" placeholder="渠道名称查找" prefix-icon="Search" @keyup.enter="initTeam"></el-input>
           <div class="custom-tree-node" v-for="item in teamData" :key="item.id" @click.stop="initList(item)">
             <span class="custom-tree-node-label">{{ item.name }}</span>
             <el-dropdown class="custom-tree-node-more" @command="treeNodeCommend(item, $event)">
@@ -17,7 +17,7 @@
             </el-dropdown>
           </div>
         </div>
-        <el-button class="add-btn" icon="plus" @click="addTeamDraw">添加团队</el-button>
+        <el-button class="add-btn" icon="plus" @click="addTeamDraw">添加渠道</el-button>
       </el-col>
       <el-col :span="20">
         <el-row :gutter="20">

src/views/operationManagement/telemarketing.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20" style="width: 100%; overflow:hidden;">
       <el-col :span="4">
         <div class="teamTree">
-          <el-input class="search-input" v-model="treeValue" placeholder="团队名称查找" prefix-icon="Search" @keyup.enter="initTeam"></el-input>
+          <el-input class="search-input" v-model="treeValue" placeholder="电销组名称查找" prefix-icon="Search" @keyup.enter="initTeam"></el-input>
           <div class="custom-tree-node" v-for="item in teamData" :key="item.id" @click.stop="initList(item)">
             <span class="custom-tree-node-label">{{ item.name }}</span>
             <el-dropdown class="custom-tree-node-more" @command="treeNodeCommend(item, $event)">
@@ -17,7 +17,7 @@
             </el-dropdown>
           </div>
         </div>
-        <el-button class="add-btn" icon="plus" @click="addTeamDraw">添加团队</el-button>
+        <el-button class="add-btn" icon="plus" @click="addTeamDraw">添加电销组</el-button>
       </el-col>
       <el-col :span="20">
         <el-row :gutter="20">

src/views/quoteConfig/project/modules/projectAdd.vue

@@ -441,7 +441,6 @@ const handleDriving = (item, index) => {
   drivingShow.value = true
   nextTick(() => {
     DrivingTypeRef.value.initEditData(item.drivingList, index, myRoute.query.companyId)
-    DrivingTypeRef.value.initEditData(item.drivingList, index, projectAddFrom.value.companyId)
   })
 }
 const handleDrivingClose = ( obj ) => {