Explorar o código

fix:修改bug

wuguojie hai 1 ano
pai
achega
191e9c6e4c

+ 1 - 1
src/api/modules/operation.ts

@@ -51,7 +51,7 @@ export interface OperationSearch {
   typeAttr?: string,
   deptName?: string,
   status?: string,
-  isEnable?: string,
+  isEnable?: number,
   leaderId?: string,
   [key: string]: any
 }

+ 4 - 2
src/views/additionalOrder/additional/modules/insuranceSelect.vue

@@ -61,8 +61,10 @@ const handleSubType =( item, sub, index) => {
 
 // 取消
 const handleCancel = () => {
+  let list = [...insuranceTypeList.value]
+  let checkedList = list.filter(a => a.checked)
   emits('close', {
-    list: []
+    list: checkedList
   })
 }
 // 保存
@@ -91,7 +93,7 @@ const initEditData = (data, type) => {
         typeList.value = JSON.parse(JSON.stringify(res.data))
         if(data && data.length > 0) {
           data.forEach(item => {
-            res.data.forEach(sub => {
+              typeList.value.forEach(sub => {
               if(item.id === sub.id) {
                 sub.checked = true
                 if(item.unitAmount) {

+ 11 - 7
src/views/additionalOrder/additional/modules/salesmanSelect.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="salesmanSelect">
     <div class="search">
-      <el-input v-model="searchValue" prefix-icon="Search" placeholder="请输入负责人姓名,工号,手机号查找" clearable></el-input>
-      <el-button class="btn" link type="primary" @click="handleSearch">搜索</el-button>
+      <el-input v-model="searchValue" prefix-icon="Search" placeholder="请输入负责人姓名,手机号查找" clearable>
+          <template #append>
+              <el-button class="btn" link type="primary" @click="handleSearch">搜索</el-button>
+          </template>
+      </el-input>
     </div>
     <div class="salesman">
       <div class="salesman-item" :class="{'active': item.checked}" v-for="(item, index) in newList" @click="handleSelect(item, index)">
@@ -69,6 +72,7 @@ const handleConfirm = () => {
 const initData = () => {
   api.operationApi.operationList({
     isMember: 2,
+    isEnable: 0
   }).then((res: any) => {
     if(res.code == 200) {
       if(res.data.records) {
@@ -105,11 +109,8 @@ onMounted(() => {
 .salesmanSelect{
   .search{
     width: 100%;
-    position: relative;
     .btn{
-      position: absolute;
-      top: 6px;
-      right: 10px;
+      padding: 0 20px;
     }
   }
   .salesman{
@@ -132,7 +133,10 @@ onMounted(() => {
         span:nth-child(1) {
           font-size: 16px;
           color: black;
-          width: 60px;
+          width: 80px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
       }
       &:hover{

+ 35 - 17
src/views/additionalOrder/order/index.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane name="first">
         <template #label>
-          待审核(12
+          待审核({{ total1 }}
         </template>
         <el-form label-width="100" label-position="left" :model="form">
           <el-row :gutter="20">
@@ -61,7 +61,7 @@
           </el-row>
         </el-form>
         <el-table
-          :data="tableData"
+          :data="tableData1"
           style="margin-top: 24px"
           hight="500"
         >
@@ -95,7 +95,7 @@
             v-model:page-size="size"
             :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
+            :total="total1"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
           ></el-pagination>
@@ -103,7 +103,7 @@
       </el-tab-pane>
       <el-tab-pane name="second">
         <template #label>
-          审核通过(12
+          审核通过({{ total2 }}
         </template>
         <el-form label-width="100" label-position="left" :model="form">
           <el-row :gutter="20">
@@ -161,7 +161,7 @@
           </el-row>
         </el-form>
         <el-table
-          :data="tableData"
+          :data="tableData2"
           style="margin-top: 24px"
           hight="500"
         >
@@ -195,7 +195,7 @@
             v-model:page-size="size"
             :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
+            :total="total2"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
           ></el-pagination>
@@ -203,7 +203,7 @@
       </el-tab-pane>
       <el-tab-pane name="third">
         <template #label>
-          审核不通过(12
+          审核不通过({{ total3 }}
         </template>
         <el-form label-width="100" label-position="left" :model="form">
           <el-row :gutter="20">
@@ -261,7 +261,7 @@
           </el-row>
         </el-form>
         <el-table
-          :data="tableData"
+          :data="tableData3"
           style="margin-top: 24px"
           height="500"
         >
@@ -295,7 +295,7 @@
             v-model:page-size="size"
             :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
+            :total="total3"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
           ></el-pagination>
@@ -317,7 +317,7 @@ let type = ref('first')
 const handleClick = (e) => {
   pages.value = 1
   size.value = 10
-  reset()
+  form.value = {}
   type.value = e.props.name
   switch (e.props.name) {
     case 'first':
@@ -363,7 +363,9 @@ const reset = () => {
 }
 
 // 列表
-let tableData = ref([])
+let tableData1 = ref([])
+let tableData2 = ref([])
+let tableData3 = ref([])
 const handleDetail = (row) => {
   myRouter.push({
     path: '/additionalOrder/order/orderDetail',
@@ -421,14 +423,16 @@ const handleDel = (row) => {
 // 分页
 let pages = ref(1)
 let size = ref(10)
-let total = ref(0)
+let total1 = ref(0)
+let total2 = ref(0)
+let total3 = ref(0)
 const handleSizeChange = (size) => {
   size.value = size
   initData(type.value)
 }
 const handleCurrentChange = (page) => {
-  pages.value = page
-  initData(type.value)
+    pages.value = page
+    initData(type.value)
 }
 
 const initData = (type) => {
@@ -445,8 +449,20 @@ const initData = (type) => {
     recordingTime: form.value.recordingTime
   }).then((res: any) => {
     if(res.code == 200) {
-      tableData.value = res.data.records
-      total.value = res.data.total
+        switch (type) {
+            case 0:
+                tableData1.value = res.data.records
+                total1.value = res.data.total
+                break;
+            case 1:
+                tableData2.value = res.data.records
+                total2.value = res.data.total
+                break;
+            case 2:
+                tableData3.value = res.data.records
+                total3.value = res.data.total
+                break;
+        }
     } else {
       ElMessage({
         message: res.msg,
@@ -467,7 +483,9 @@ const initCompany = () => {
 }
 
 onMounted(() => {
-  initData(0);
+    initData(0);
+    initData(1);
+    initData(2);
     initCompany();
 })
 

+ 58 - 54
src/views/insurancePolicy/index.vue

@@ -904,7 +904,7 @@
                         <el-table
                           :data="scope.row.projectList[productIndex].drivings"
                         >
-                          <el-table-column width="50" align="center">
+                          <el-table-column width="50" align="center" v-if="scope.row.projectList[productIndex].schemeType !='1'">
                             <template #header>
                               <el-icon @click="handleDriving(scope)"><CirclePlus /></el-icon>
                             </template>
@@ -919,7 +919,7 @@
                           </el-table-column>
                           <el-table-column label="数量" align="center">
                             <template #default="props">
-                              <el-input v-model="props.row.quantity" style="width: 140px">
+                              <el-input :disabled="scope.row.projectList[productIndex].schemeType === '1'" v-model="props.row.quantity" style="width: 140px">
                                 <template #append>
                                   <span>份</span>
                                 </template>
@@ -1041,7 +1041,7 @@
                 </div>
               </template>
               <template #default="scope">
-                <div class="result" v-if="currentRow.some(a => a.id === scope.row.id)&&!loading">
+                <div class="result" v-if="currentRow.some(a => a.id === scope.row.id)">
                   <span class="resultItem">
                     <span v-if="scope.row.quoteResult?.costs?.sumPremium">总保费:{{ scope.row.quoteResult?.costs?.sumPremium }}</span>
 <!--                    <span class="resultTips">
@@ -1283,6 +1283,12 @@ const handleFocus = () => {
 const handleSalesmanSelect = (data) => {
   salesmanShow.value = false
   if(data) {
+    if(insurancePolicyForm.value.salesman&&insurancePolicyForm.value.mobile&&insurancePolicyForm.value.deptId&&insurancePolicyForm.value.productId) {
+      quoteData.value = []
+      ruleFilterCompany({
+          value: insurancePolicyForm.value.productId
+      })
+    }
     insurancePolicyForm.value.salesman = data.name
     insurancePolicyForm.value.mobile = data.mobile
     insurancePolicyForm.value.deptId = data.deptId
@@ -1993,7 +1999,6 @@ const SYChange = (item) => {
 let currentRow = ref([])
 let quoteData = ref([])
 const handleSelect = (a, b) => {
-  // console.log(123, a, b)
   // currentRow.value = a
   // insurancePolicyForm.value.order.insuranceCompanyCode = a[0].id
 }
@@ -2124,7 +2129,6 @@ const handleCount = (scope) => {
 // 提交核保
 let underwritingShow = ref(false)
 const handleUnderwriting = (scope) => {
-  console.log(scope.row)
   underwritingShow.value = true
   let data = {
 
@@ -2267,6 +2271,55 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope
         //   })
         // })
       }
+      let obj1 = btns.value.owner1.find(a => a.checked)
+      btns.value.owner1Text = obj1.text
+      if(obj1.text === '同车主') {
+          insurancePolicyForm.value.name2 = insurancePolicyForm.value.name1
+          insurancePolicyForm.value.mobile2 = insurancePolicyForm.value.mobile1
+          insurancePolicyForm.value.identifyType2 = insurancePolicyForm.value.identifyType1
+          insurancePolicyForm.value.identifyNumber2 = insurancePolicyForm.value.identifyNumber1
+          insurancePolicyForm.value.identifyValidDate2 = insurancePolicyForm.value.identifyValidDate1
+          insurancePolicyForm.value.identifyValidEndDate2 = insurancePolicyForm.value.identifyValidEndDate1
+          insurancePolicyForm.value.addr2 = insurancePolicyForm.value.addr1
+          insurancePolicyForm.value.telephone2 = insurancePolicyForm.value.telephone1
+          insurancePolicyForm.value.person2 = insurancePolicyForm.value.person1
+          insurancePolicyForm.value.age2 = insurancePolicyForm.value.age1
+          insurancePolicyForm.value.address2 = insurancePolicyForm.value.address1
+          insurancePolicyForm.value.registeredCapital2 = insurancePolicyForm.value.registeredCapital1
+          insurancePolicyForm.value.email2 = insurancePolicyForm.value.email1
+      }
+      let obj2 = btns.value.owner2.find(a => a.checked)
+      btns.value.owner2Text = obj2.text
+      if(obj2.text === '同车主') {
+          insurancePolicyForm.value.name3 = insurancePolicyForm.value.name1
+          insurancePolicyForm.value.mobile3 = insurancePolicyForm.value.mobile1
+          insurancePolicyForm.value.identifyType3 = insurancePolicyForm.value.identifyType1
+          insurancePolicyForm.value.identifyNumber3 = insurancePolicyForm.value.identifyNumber1
+          insurancePolicyForm.value.identifyValidDate3 = insurancePolicyForm.value.identifyValidDate1
+          insurancePolicyForm.value.identifyValidEndDate3 = insurancePolicyForm.value.identifyValidEndDate1
+          insurancePolicyForm.value.addr3 = insurancePolicyForm.value.addr1
+          insurancePolicyForm.value.telephone3 = insurancePolicyForm.value.telephone1
+          insurancePolicyForm.value.person3 = insurancePolicyForm.value.person1
+          insurancePolicyForm.value.age3 = insurancePolicyForm.value.age1
+          insurancePolicyForm.value.address3 = insurancePolicyForm.value.address1
+          insurancePolicyForm.value.registeredCapital3 = insurancePolicyForm.value.registeredCapital1
+          insurancePolicyForm.value.email3 = insurancePolicyForm.value.email1
+      }
+      if(obj2.text === '同投保人') {
+          insurancePolicyForm.value.name3 = insurancePolicyForm.value.name2
+          insurancePolicyForm.value.mobile3 = insurancePolicyForm.value.mobile2
+          insurancePolicyForm.value.identifyType3 = insurancePolicyForm.value.identifyType2
+          insurancePolicyForm.value.identifyNumber3 = insurancePolicyForm.value.identifyNumber2
+          insurancePolicyForm.value.identifyValidDate3 = insurancePolicyForm.value.identifyValidDate2
+          insurancePolicyForm.value.identifyValidEndDate3 = insurancePolicyForm.value.identifyValidEndDate2
+          insurancePolicyForm.value.addr3 = insurancePolicyForm.value.addr2
+          insurancePolicyForm.value.telephone3 = insurancePolicyForm.value.telephone2
+          insurancePolicyForm.value.person3 = insurancePolicyForm.value.person2
+          insurancePolicyForm.value.age3 = insurancePolicyForm.value.age2
+          insurancePolicyForm.value.address3 = insurancePolicyForm.value.address2
+          insurancePolicyForm.value.registeredCapital3 = insurancePolicyForm.value.registeredCapital2
+          insurancePolicyForm.value.email3 = insurancePolicyForm.value.email2
+      }
       let data = {
         systemType: '2',
         order: {
@@ -2372,55 +2425,6 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope
         kindInfoVo: [...arr],
         accidentalDrivings: [...brr]
       }
-      let obj1 = btns.value.owner1.find(a => a.checked)
-      btns.value.owner1Text = obj1.text
-      if(obj1.text === '同车主') {
-          insurancePolicyForm.value.name2 = insurancePolicyForm.value.name1
-          insurancePolicyForm.value.mobile2 = insurancePolicyForm.value.mobile1
-          insurancePolicyForm.value.identifyType2 = insurancePolicyForm.value.identifyType1
-          insurancePolicyForm.value.identifyNumber2 = insurancePolicyForm.value.identifyNumber1
-          insurancePolicyForm.value.identifyValidDate2 = insurancePolicyForm.value.identifyValidDate1
-          insurancePolicyForm.value.identifyValidEndDate2 = insurancePolicyForm.value.identifyValidEndDate1
-          insurancePolicyForm.value.addr2 = insurancePolicyForm.value.addr1
-          insurancePolicyForm.value.telephone2 = insurancePolicyForm.value.telephone1
-          insurancePolicyForm.value.person2 = insurancePolicyForm.value.person1
-          insurancePolicyForm.value.age2 = insurancePolicyForm.value.age1
-          insurancePolicyForm.value.address2 = insurancePolicyForm.value.address1
-          insurancePolicyForm.value.registeredCapital2 = insurancePolicyForm.value.registeredCapital1
-          insurancePolicyForm.value.email2 = insurancePolicyForm.value.email1
-      }
-      let obj2 = btns.value.owner2.find(a => a.checked)
-      btns.value.owner2Text = obj2.text
-      if(obj2.text === '同车主') {
-          insurancePolicyForm.value.name3 = insurancePolicyForm.value.name1
-          insurancePolicyForm.value.mobile3 = insurancePolicyForm.value.mobile1
-          insurancePolicyForm.value.identifyType3 = insurancePolicyForm.value.identifyType1
-          insurancePolicyForm.value.identifyNumber3 = insurancePolicyForm.value.identifyNumber1
-          insurancePolicyForm.value.identifyValidDate3 = insurancePolicyForm.value.identifyValidDate1
-          insurancePolicyForm.value.identifyValidEndDate3 = insurancePolicyForm.value.identifyValidEndDate1
-          insurancePolicyForm.value.addr3 = insurancePolicyForm.value.addr1
-          insurancePolicyForm.value.telephone3 = insurancePolicyForm.value.telephone1
-          insurancePolicyForm.value.person3 = insurancePolicyForm.value.person1
-          insurancePolicyForm.value.age3 = insurancePolicyForm.value.age1
-          insurancePolicyForm.value.address3 = insurancePolicyForm.value.address1
-          insurancePolicyForm.value.registeredCapital3 = insurancePolicyForm.value.registeredCapital1
-          insurancePolicyForm.value.email3 = insurancePolicyForm.value.email1
-      }
-      if(obj2.text === '同投保人') {
-          insurancePolicyForm.value.name3 = insurancePolicyForm.value.name2
-          insurancePolicyForm.value.mobile3 = insurancePolicyForm.value.mobile2
-          insurancePolicyForm.value.identifyType3 = insurancePolicyForm.value.identifyType2
-          insurancePolicyForm.value.identifyNumber3 = insurancePolicyForm.value.identifyNumber2
-          insurancePolicyForm.value.identifyValidDate3 = insurancePolicyForm.value.identifyValidDate2
-          insurancePolicyForm.value.identifyValidEndDate3 = insurancePolicyForm.value.identifyValidEndDate2
-          insurancePolicyForm.value.addr3 = insurancePolicyForm.value.addr2
-          insurancePolicyForm.value.telephone3 = insurancePolicyForm.value.telephone2
-          insurancePolicyForm.value.person3 = insurancePolicyForm.value.person2
-          insurancePolicyForm.value.age3 = insurancePolicyForm.value.age2
-          insurancePolicyForm.value.address3 = insurancePolicyForm.value.address2
-          insurancePolicyForm.value.registeredCapital3 = insurancePolicyForm.value.registeredCapital2
-          insurancePolicyForm.value.email3 = insurancePolicyForm.value.email2
-      }
       api.insurancePolicyApi.imageSave({
         order: {
           quoteNo: insurancePolicyForm.value.order.quoteNo

+ 6 - 3
src/views/insurancePolicy/modules/recognition.vue

@@ -55,7 +55,7 @@
             <el-input v-model="carForm.carOwner" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item class="m-b-5" label="住址">
-            <el-input placeholder="请填写" v-model="carForm.addr"></el-input>
+            <el-input placeholder="请填写" v-model="carForm.address"></el-input>
           </el-form-item>
           <el-form-item class="m-b-5" label="品牌型号">
             <el-input v-model="carForm.brandName" placeholder="请填写"></el-input>
@@ -92,7 +92,7 @@
             </el-input>
           </el-form-item>
           <el-form-item class="m-b-5" label="总质量">
-            <el-input placeholder="请填写">
+            <el-input placeholder="请填写" v-model="carForm.grossMass">
               <template #append>
                 <span>KG</span>
               </template>
@@ -106,7 +106,7 @@
             </el-input>
           </el-form-item>
           <el-form-item class="m-b-5" label="外廓尺寸">
-            <el-input placeholder="请填写"></el-input>
+            <el-input placeholder="请填写" v-model="carForm.overallDimensions"></el-input>
           </el-form-item>
         </el-form>
       </el-col>
@@ -611,11 +611,13 @@ const uploadImage = async (file, type) => {
               carForm.value.licenseNo = data.plateNo // 车牌号
               carForm.value.vinNo = data.vin // 车架号
               carForm.value.carOwner = data.carOwner // 所有人
+              carForm.value.address = data.address // 住址
               carForm.value.brandName = data.backOcrID // 品牌型号
               carForm.value.engineNo = data.engine // 发动机
               // carForm.value.carYear = data.carYear // 年款
               carForm.value.seatCount = data.approvedPassengersCapacity // 座位数
               carForm.value.completeKerbMass = data.unladenMass // 整备质量
+              carForm.value.grossMass = data.grossMass // 总质量
               carForm.value.limitLoad = data.limitLoad // 核定载质量
               // carForm.value.displacement = data.displacement // 排量
               carForm.value.powerScale = data.powerScale // 功率
@@ -637,6 +639,7 @@ const uploadImage = async (file, type) => {
                 data.issueDate.substring(4, 6) +
                 "-" +
                 data.issueDate.substring(6, 8);
+              carForm.value.overallDimensions = data.overallDimensions // 外廓尺寸
             } else {
               ElMessage({
                 message: res.msg,

+ 1 - 1
src/views/operationManagement/channel.vue

@@ -362,7 +362,7 @@ const tableDataCommand = (scope, e) => {
     case '编辑':
       dialogShow.value = true
       nextTick(() => {
-        AddOperationRef.value.initEditData(scope.row.userId)
+        AddOperationRef.value.initEditData(scope.row.userId,scope.row.id)
       })
       title.value = '编辑'
       break;

+ 27 - 17
src/views/operationManagement/modules/addOperation.vue

@@ -992,23 +992,33 @@ const imageView = (type) => {
 
 // 图片下载
 const download = (url, name) => {
-  let image = new Image();
-  // 解决跨域 Canvas 污染问题
-  image.setAttribute("crossOrigin", "anonymous");
-  image.onload = function () {
-    let canvas = document.createElement("canvas");
-    canvas.width = image.width;
-    canvas.height = image.height;
-    let context = canvas.getContext("2d");
-    context.drawImage(image, 0, 0, image.width, image.height);
-    let url = canvas.toDataURL("image/png"); //得到图片的base64编码数据
-    let a = document.createElement("a"); // 生成一个a元素
-    let event = new MouseEvent("click"); // 创建一个单击事件
-    a.download = name; // 设置图片名称
-    a.href = url; // 将生成的URL设置为a.href属性
-    a.dispatchEvent(event); // 触发a的单击事件
-  }
-  image.src = url
+    let a_link = document.createElement('a')
+    fetch(url).then((res) => res.blob())
+        .then((blob) => {
+            // 将链接地址字符内容转变成blob地址
+            a_link.href = URL.createObjectURL(blob)
+            console.log(a_link.href)
+            a_link.download = name //下载的文件的名字
+            document.body.appendChild(a_link)
+            a_link.click()
+        })
+    // let image = new Image();
+    // // 解决跨域 Canvas 污染问题
+    // image.setAttribute("crossOrigin", "anonymous");
+    // image.onload = function () {
+    //     let canvas = document.createElement("canvas");
+    //     canvas.width = image.width;
+    //     canvas.height = image.height;
+    //     let context = canvas.getContext("2d");
+    //     context.drawImage(image, 0, 0, image.width, image.height);
+    //     let url = canvas.toDataURL("image/png"); //得到图片的base64编码数据
+    //     let a = document.createElement("a"); // 生成一个a元素
+    //     let event = new MouseEvent("click"); // 创建一个单击事件
+    //     a.download = name; // 设置图片名称
+    //     a.href = url; // 将生成的URL设置为a.href属性
+    //     a.dispatchEvent(event); // 触发a的单击事件
+    // }
+    // image.src = url
 }
 const downloadImage = (type) => {
   switch (type) {

+ 12 - 7
src/views/operationManagement/modules/allocation.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="allocation">
-    <el-input v-model="searchValue" style="width: 240px" placeholder="输入姓名、手机号、工号查找" clearable>
+    <el-input v-model="searchValue" style="width: 240px" placeholder="输入姓名、手机号、工号查找" clearable @change="handleFilter">
       <template #prefix>
         <el-icon class="el-input__icon"><Search /></el-icon>
       </template>
@@ -15,12 +15,11 @@
           :default-expanded-keys="expandedKeys"
           :default-checked-keys="checkedKeys"
           @node-click="handleNodeClick"
-          :filter-node-method="filterNode"
         />
       </el-col>
       <el-col :span="12" style="padding: 10px; box-sizing: border-box;border-left: 1px solid #ccc;">
         <el-radio-group v-if="userList?.length>0" v-model="radioValue" class="allocation-radio">
-          <el-radio v-for="item in userList" :value="item.id" size="large">
+          <el-radio v-for="item in userListSelect" :value="item.id" size="large">
             <template #default>
               <div>{{ item.name }}</div>
               <div>{{ item.id }}</div>
@@ -52,12 +51,14 @@ let emits = defineEmits(['closeDialog'])
 
 // 初始化负责人
 let userList = ref([])
+let userListSelect = ref([])
 const initUser = (id) => {
   api.operationApi.getUser({
       deptId: id
   }).then(res => {
     if(res.code == 200) {
-      userList.value = res.data
+        userList.value = res.data
+        userListSelect.value = res.data
     } else {
       ElMessage({
         message: res.msg,
@@ -67,6 +68,10 @@ const initUser = (id) => {
   })
 }
 
+const handleFilter = (e) => {
+    userListSelect.value = userList.value.filter(a => a.id.includes(e) || a.mobile.includes(e) || a.name.includes(e))
+}
+
 // 初始化默认选中的数据
 let checkedKeys = ref([])
 let selectedIds = ref([])
@@ -86,9 +91,9 @@ const initCheckedKeys = (id, type, ids) => {
 // 搜索过滤
 let searchValue = ref('')
 const treeRef = ref(null)
-watch(searchValue, (val) => {
-  treeRef.value!.filter(val);
-});
+// watch(searchValue, (val) => {
+//   treeRef.value!.filter(val);
+// });
 const handleSearch = () => {
   filterNode(searchValue.value, options.value)
 }

+ 1 - 1
src/views/operationManagement/operation.vue

@@ -119,7 +119,7 @@
       <el-table-column label="所属机构" prop="deptName" width="200"></el-table-column>
       <el-table-column label="人员状态" prop="status" width="150">
         <template #default="scope">
-          {{ scope.row.status == '0'?'待认证':scope.row.status == '1'?'已认证':scope.row.status == '2'?'待提交资料':scope.row.status == '3'?'已入职':'' }}
+          {{ scope.row.status == '0'?'未认证':scope.row.status == '1'?'实名认证中':scope.row.status == '2'?'实名认证失败':scope.row.status == '3'?'待入职':scope.row.status == '4'?'入司审核中':scope.row.status == '5'?'入司审核失败':scope.row.status == '6'?'已入职':scope.row.status == '7'?'离职待审核':scope.row.status == '8'?'离职': '' }}
         </template>
       </el-table-column>
       <el-table-column label="账号状态" prop="isEnable" width="150">

+ 1 - 1
src/views/operationManagement/operationDetail.vue

@@ -42,7 +42,7 @@
         <el-descriptions-item label="类型:" width="33%">{{  dataDetail?.typeAttr == '6'?'个代': dataDetail?.typeAttr == '8'?'渠道': dataDetail?.typeAttr == '5'?'团队': dataDetail?.typeAttr == '7'?'电销组': '' }}</el-descriptions-item>
         <el-descriptions-item label="所属团队:" width="33%">{{ dataDetail?.organizationName }}</el-descriptions-item>
         <el-descriptions-item label="创建人:" width="33%">{{ dataDetail?.updateBy }}</el-descriptions-item>
-        <el-descriptions-item label="创建时间:" width="33%">{{ dataDetail?.updateTime }}</el-descriptions-item>
+        <el-descriptions-item label="创建时间:" width="33%">{{ dataDetail?.createTime }}</el-descriptions-item>
       </el-descriptions>
     </div>
     <div class="message">

+ 1 - 1
src/views/operationManagement/team.vue

@@ -362,7 +362,7 @@ const tableDataCommand = (scope, e) => {
     case '编辑':
       dialogShow.value = true
       nextTick(() => {
-        AddOperationRef.value.initEditData(scope.row.userId)
+        AddOperationRef.value.initEditData(scope.row.userId, scope.row.id)
       })
       title.value = '编辑'
       break;

+ 1 - 1
src/views/operationManagement/telemarketing.vue

@@ -362,7 +362,7 @@ const tableDataCommand = (scope, e) => {
     case '编辑':
       dialogShow.value = true
       nextTick(() => {
-        AddOperationRef.value.initEditData(scope.row.userId)
+        AddOperationRef.value.initEditData(scope.row.userId, scope.row.id)
       })
       title.value = '编辑'
       break;

+ 2 - 0
src/views/personnel/institutionManage.vue

@@ -506,6 +506,8 @@ const remove = (node: Node, data: Tree) => {
 };
 const reset = (item: any) => {
   // ElMessage({})
+    info.value.name = ''
+    getInstitutionList()
 };
 
 onMounted(() => {

+ 27 - 17
src/views/personnel/modules/addOperation.vue

@@ -1117,23 +1117,33 @@ const uploadImage = (file, type) => {
 
 // 图片下载
 const download = (url, name) => {
-  let image = new Image();
-  // 解决跨域 Canvas 污染问题
-  image.setAttribute("crossOrigin", "anonymous");
-  image.onload = function () {
-    let canvas = document.createElement("canvas");
-    canvas.width = image.width;
-    canvas.height = image.height;
-    let context = canvas.getContext("2d");
-    context.drawImage(image, 0, 0, image.width, image.height);
-    let url = canvas.toDataURL("image/png"); //得到图片的base64编码数据
-    let a = document.createElement("a"); // 生成一个a元素
-    let event = new MouseEvent("click"); // 创建一个单击事件
-    a.download = name; // 设置图片名称
-    a.href = url; // 将生成的URL设置为a.href属性
-    a.dispatchEvent(event); // 触发a的单击事件
-  }
-  image.src = url
+    let a_link = document.createElement('a')
+    fetch(url).then((res) => res.blob())
+        .then((blob) => {
+            // 将链接地址字符内容转变成blob地址
+            a_link.href = URL.createObjectURL(blob)
+            console.log(a_link.href)
+            a_link.download = name //下载的文件的名字
+            document.body.appendChild(a_link)
+            a_link.click()
+        })
+  // let image = new Image();
+  // // 解决跨域 Canvas 污染问题
+  // image.setAttribute("crossOrigin", "anonymous");
+  // image.onload = function () {
+  //   let canvas = document.createElement("canvas");
+  //   canvas.width = image.width;
+  //   canvas.height = image.height;
+  //   let context = canvas.getContext("2d");
+  //   context.drawImage(image, 0, 0, image.width, image.height);
+  //   let url = canvas.toDataURL("image/png"); //得到图片的base64编码数据
+  //   let a = document.createElement("a"); // 生成一个a元素
+  //   let event = new MouseEvent("click"); // 创建一个单击事件
+  //   a.download = name; // 设置图片名称
+  //   a.href = url; // 将生成的URL设置为a.href属性
+  //   a.dispatchEvent(event); // 触发a的单击事件
+  // }
+  // image.src = url
 }
 
 const downloadImage = (type) => {

+ 2 - 2
src/views/quoteConfig/agreement/agreementIndex.vue

@@ -30,8 +30,8 @@
           </el-dropdown>
         </template>
         <template v-slot:operation="scope">
-          <el-button type="primary" link @click="agreemenUpdate(scope.operationData)"> 详情
-          </el-button>
+            <el-button type="primary" link @click="agreemenUpdate(scope.operationData)"> 详情
+            </el-button>
           <el-dropdown placement="bottom-start" trigger="click">
             <span class="el-dropdown-link">
               更 多