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

src/views/insurancePolicy/index.vue

@@ -1318,9 +1318,9 @@
       <driving ref="DrivingTypeRef" @close="handleDrivingClose"></driving>
     </el-dialog>
     <el-dialog v-model="licenseNoShow" width="900" title="车型查询">
-      <el-table ref="LicenseNoTable" :data="licenseNoData" row-key="id" @select="handleSelectedChange"
-        @row-dblclick="handleSelectedRow">
-        <el-table-column type="selection"></el-table-column>
+      <span class="flex a-c  mb-2" style="color: #409eff;font-size: 13px;">（单击后确定 或 双击选中车型）</span>
+      <el-table ref="LicenseNoTable" :data="licenseNoData" row-key="id"  highlight-current-row
+        @row-dblclick="handleSelectedRow" @current-change="handleCurrentChange" >
         <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>
@@ -2029,7 +2029,7 @@ const getAreaList = () => {
 
 // 车牌识别
 let licenseNoShow = ref(false)
-let licenseNoData = ref([])
+let licenseNoData = ref([])//
 const handleCarNumber = () => {
   api.additionalApi.vinSearch(insurancePolicyForm.value.vinNo).then((res: any) => {
     if (res.code == 200) {
@@ -2044,19 +2044,13 @@ const handleCarNumber = () => {
   })
 }
 let selectRowData = ref<CarInfo | {}>({})
+  // 车型双击事件
 const handleSelectedRow = (row: any, column: any) => {
-  licenseNoData.value.forEach((item) => {
-    LicenseNoTable.value.toggleRowSelection(item, false)
-  })
-  LicenseNoTable.value.toggleRowSelection(row, true)
   selectRowData.value = row
   licenseNoDataSubmit()
 }
-const handleSelectedChange = (rows: any, row: any) => {
-  licenseNoData.value.forEach((item) => {
-    LicenseNoTable.value.toggleRowSelection(item, false)
-  })
-  LicenseNoTable.value.toggleRowSelection(row, true)
+  // 车型选中事件
+const handleCurrentChange = (row: any) => {
   selectRowData.value = row
 }
 const licenseNoDataCancel = () => {
@@ -2738,11 +2732,12 @@ let tableData = ref([])
 let shareShow = ref(false)
 let shareImageUrl = ref('')
 const handleShare = async (scope: any) => {
-  shareShow.value = true
-  shareImageUrl.value = await QRCode.toDataURL(`http://test-tennat.baoxianzhanggui.com/h5/#/pages/quote/paymentCode?ordersNo=${scope.row.quoteResult.ordersNo}`, {
+  shareImageUrl.value = await QRCode.toDataURL(`http://test-tennat.baoxianzhanggui.com/h5/#/pages/quote/paymentCode?ordersNo=${scope}`, {
     width: 150,
     margin: 2
   });
+  console.log(shareImageUrl.value)
+  shareShow.value = true
 }
 const handleSaveImage = () => {
   shareShow.value = false
@@ -2884,7 +2879,7 @@ const handleUnderwriting = (scope: any) => {
   // insurancePolicyForm.value.imageVoList
   let data = {
     // ordersNo: '1915570359429222400'
-    ordersNo: scope.row.orderNo,
+    ordersNo: scope.row.quoteResult.ordersNo,
     quoteNo: insurancePolicyForm.value.order.quoteNo,
     imageVoList: images.value
   }
@@ -2925,6 +2920,8 @@ const handleUnderwritingClose = (bool: any, dataObj: any) => {
         message: bool.msg,
         type: 'success'
       })
+    quoteData.value[underwritingIndex.value].underwritingMsg = "";
+
     underwritingMsgShow.value = true
   }else{
     ElMessage({

src/views/personnel/wechatService.vue

@@ -40,7 +40,7 @@
         <template v-slot:customSlot="scope">
           <div class="flex a-c j-c " @click="goSupportStaff(scope.data)">
             <el-tag :type="scope.data.scheduling ? 'primary' : 'danger'">{{ scope.data.scheduling ? '已配置' : '未配置'
-              }}</el-tag>
+            }}</el-tag>
             <el-icon class="m-left-10" v-if="!scope.data.scheduling && isHovered[scope.data.userId]">
               <Edit />
             </el-icon>
@@ -126,7 +126,7 @@ interface ServiceForm {
 }
 const dialogTitle = ref('添加客服账号');
 const dialogType = ref('add');
-const id=ref();
+const id = ref();
 const ServiceFormRef = ref<FormInstance>()
 //客服新增表单
 const ServiceForm = reactive<ServiceForm>({
@@ -158,8 +158,8 @@ const imageUrl = ref('')//图片回显
 //图片上传事件
 const beforeAvatarUpload = (file: any) => {
 
-  if (file.raw.type !== 'image/jpeg') {
-    ElMessage.error('只读取，png，jeg格式的图片')
+  if (file.raw.type !== 'image/jpeg' && file.raw.type !== 'image/png' && file.raw.type !== 'image/jpg') {
+    ElMessage.error('只读取，png，jpg，jpeg格式的图片')
     return false
   } else if (file.raw.size / 1024 / 1024 > 2) {
     ElMessage.error('请上传小于2MB的图片')
@@ -257,7 +257,7 @@ function ServiceUpdate(item: any) {
   dialogTitle.value = '编辑'
   dialogType.value = 'edit'
   imageUrl.value = item.avatar;
-  id.value=item.id;
+  id.value = item.id;
   api.wechatApi.wechatServiceDetail(item.id).then((res: any) => {
     if (res.code == 200) {
       ServiceForm.nickname = res.data.nickname;
@@ -304,12 +304,12 @@ function ServiceDel(item: any) {
     })
 }
 //跳转节假日配置页
-const goSupportStaff = (row:any) => {
+const goSupportStaff = (row: any) => {
   router.push({
     name: 'personnelHolidaySchedule',
     query: {
       id: row.id,
-      name:row.nickname,
+      name: row.nickname,
     }
   })
 }
@@ -372,7 +372,7 @@ const ServiceSave = async (formEl: FormInstance | undefined) => {
           }
         })
       } else {
-        api.wechatApi.wechatServicePut(id.value,ServiceForm).then((res: any) => {
+        api.wechatApi.wechatServicePut(id.value, ServiceForm).then((res: any) => {
           if (res.code == 200) {
             ElMessage({
               type: 'success',

src/views/quoteConfig/project/index.vue

@@ -196,7 +196,8 @@ const handleEdit = (row) => {
       path: '/quoteConfig/agreement/project/projectAdd',
       query: {
         id: row.id,
-        companyId: companyId.value
+        companyId: companyId.value,
+        productId: row.productId
       }
     })
 }

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

@@ -548,7 +548,6 @@ const initType = () => {
     if(res.code == 200) {
       insuranceType.value = res.data
       projectAddFrom.value.productId = insuranceType.value[0].value
-      initInsurance()
     } else {
       ElMessage({
         message: res.msg,
@@ -654,14 +653,17 @@ const initAttr = () => {
 }
 
 // 编辑
-const initEdit = () => {
-  api.projectApi.getScheme(myRoute.query.id).then(res => {
+const initEdit =async  () => {
+  initInsurance()
+  await  api.projectApi.getScheme(myRoute.query.id).then(res => {
     if(res.code == 200) {
       if(res.data && res.data.schemeList.length > 0) {
         res.data.schemeList.forEach(item => {
           item.drivingList = item.drivingIntentionList
           item.tableData = item.schemeInsuranceList.map(sub => {
+            console.log(insuranceTypeList.value)
             let obj = insuranceTypeList.value.find(a => a.id == sub.insuranceId)
+            console.log(obj)
             return {
               ...sub,
               optionId: res.data.schemeType===1?`${sub.optionId[0]}`:sub.optionId,
@@ -773,12 +775,14 @@ onMounted(() => {
   if(myRoute.query.id) {
     isEdit.value = true
     projectAddFrom.value.id = myRoute.query.id
+    projectAddFrom.value.productId = myRoute.query.productId
     initEdit()
   } else {
     isEdit.value = false
     initAttr()
+  initInsurance()
+
   }
-  // initInsurance()
 })
 
 </script>