fix

CMS1.0/src/components/main/drawer-phone/cpns/page-phone.vue

@@ -7,7 +7,7 @@
           <el-radio-button label="通讯录" />
         </el-radio-group>
       </div>
-      <div class="contentBox">
+      <div class="contentBox" ref="scrollDivUser" v-if="radio2==='通讯录'" @scroll="handleScrollUser">
         <el-input
           v-if="radio2==='通讯录'"
           v-model="addressBookSearch"
@@ -16,6 +16,36 @@
           placeholder="请输入姓名"
           :suffix-icon="Search"
         />
+        <div class="contentList" v-for="item in addressBookData">
+          
+          <div class="leftBox">
+            <div class="telPhoneBox">
+              <span>{{item.dept.deptName}} -- </span>
+              <span>{{item.nickName}}</span>
+              <!-- <span>({{item.nickName}})</span> -->
+              <!-- {{
+                item.callType
+                  ? getUnprefixNuber(item.callee)
+                  : getUnprefixNuber(item.caller)
+              }} -->
+            </div>
+            <div class="remarkBox">
+              <span style="margin-right: 15px">{{ item.phonenumber }}</span>
+              <!-- <span>{{ getCallSate(item.callType, item.endTime) }}</span> -->
+            </div>
+          </div>
+          <div class="rightBox">
+            <el-icon
+              color="#409EFC"
+              class="no-inherit"
+              @click="phoneIconHandle(item)"
+            >
+              <Phone />
+            </el-icon>
+          </div>
+        </div>
+      </div>
+      <div class="contentBox" ref="scrollDivCall" v-if="radio2==='通话记录'" @scroll="handleScrollCall">
         <div class="contentList" v-for="item in tableData" v-if="radio2==='通话记录'">
           <div class="leftBox">
             <div class="telPhoneBox">
@@ -46,16 +76,9 @@
             <div class="telPhoneBox">
               <span>{{item.dept.deptName}} -- </span>
               <span>{{item.nickName}}</span>
-              <!-- <span>({{item.nickName}})</span> -->
-              <!-- {{
-                item.callType
-                  ? getUnprefixNuber(item.callee)
-                  : getUnprefixNuber(item.caller)
-              }} -->
             </div>
             <div class="remarkBox">
               <span style="margin-right: 15px">{{ item.phonenumber }}</span>
-              <!-- <span>{{ getCallSate(item.callType, item.endTime) }}</span> -->
             </div>
           </div>
           <div class="rightBox">
@@ -68,21 +91,8 @@
             </el-icon>
           </div>
         </div>
-        <div style="margin-top: 15px" v-if="tableCount">
-          <el-pagination
-            v-model:page-size="pageSize4"
-            :small="small"
-            :disabled="disabled"
-            :background="background"
-            layout="total, prev, jumper, next"
-            :total="tableCount"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
       </div>
-    </div>
-
+  </div>
     <div v-if="callOrListState">
       <div class="plate" v-if="getCallState === '2'">
         <el-input
@@ -176,42 +186,44 @@
           </el-row>
         </div>
       </div>
-
-      <el-button
-        size="large"
-        type="danger"
-        :icon="Phone"
-        circle
-        v-if="getCallState === '1'"
-        :disabled="dropCallState"
-        class="btnHangUp"
-        @click="dropCall"
-      />
-      <el-button
-        size="large"
-        type="success"
-        :icon="Phone"
-        circle
-        v-if="getCallState === '2'"
-        class="btnCall"
-        @click="btnCallType"
-      />
-      <el-button
-        size="large"
-        :icon="Edit"
-        circle
-        type="primary"
-        class="btnCut"
-        @click="btnTellState"
-      />
-      <el-button
-        size="large"
-        :icon="ArrowDownBold"
-        circle
-        type="primary"
-        class="btnPage"
-        @click="btnCutPage"
-      />
+      <div class="btnBox">
+        <el-button
+          size="large"
+          type="danger"
+          :icon="Phone"
+          circle
+          v-if="getCallState === '1'"
+          :disabled="dropCallState"
+          class="btnHangUp"
+          @click="dropCall"
+        />
+        <el-button
+          size="large"
+          type="success"
+          :icon="Phone"
+          circle
+          v-if="getCallState === '2'"
+          class="btnCall"
+          @click="btnCallType"
+        />
+        <el-button
+          size="large"
+          :icon="Edit"
+          circle
+          type="primary"
+          class="btnCut"
+          @click="btnTellState"
+        />
+        <el-button
+          size="large"
+          :icon="ArrowDownBold"
+          circle
+          type="primary"
+          class="btnPage"
+          @click="btnCutPage"
+        />
+      </div>
+      
     </div>
 
     <el-button
@@ -245,8 +257,12 @@ import { Send, ws } from '@/utils/telWebsocket'
 import useSocketStore from '@/store/modules/socket'
 import useSelectStore from '@/store/commonSelect/common';
 import { Search } from '@element-plus/icons-vue'
+import { onMounted, ref, watch, nextTick } from 'vue';
 
 const { proxy } = getCurrentInstance()
+const scrollDivUser = ref(null)
+const scrollDivCall = ref(null)
+
 
 const radio2 = ref('通话记录')
 const scoketDatas = ref({})
@@ -259,7 +275,7 @@ const telNumber = ref('')
 const getCallState = ref('')
 const getCallData = ref({})
 
-const pageSize4 = ref(7)
+const pageSize4 = ref(15)
 const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
@@ -304,9 +320,11 @@ const props = defineProps({
 function aaaa(e) {
   console.log(e)
   // if (e == '通话记录') {
-  //   tableCount.value = tableRecordCount.value
+  //   paramsSearch.value.pageNum = 1
+  //   getUserData()
   // } else if(e == '通讯录'){
-  //   tableCount.value = addressBookCount.value
+  //   paramsSearch.value.pageNum = 1
+        // getCustomeData()
   // }
 }
 watch(
@@ -429,12 +447,35 @@ onMounted(() => {
   paramsSearch.value.pageSize = pageSize4.value
   getCustomeData()
   getUserData()
+ 
+
 })
+const handleScrollUser = () => {
+  const container = scrollDivUser.value
+  if (container.scrollTop + container.clientHeight >= container.scrollHeight) {
+    // loadMore()
+    console.log('通讯录到底了');
+    paramsSearch.value.pageNum +=1
+    getUserData()
+    
+  }
+}
+const handleScrollCall = () => {
+  const container = scrollDivCall.value
+  if (container.scrollTop + container.clientHeight >= container.scrollHeight) {
+    // loadMore()
+    console.log('通话记录到底了');
+    paramsSearch.value.pageNum +=1
+    getCustomeData()
+  }
+}
 function getCustomeData() {
   delete paramsSearch.value.nickName
   getPageListData('/call/calllog', paramsSearch.value).then(
     ({ data, total }) => {
-      tableData.value = data
+      console.log(data);
+      const newArray = data
+      tableData.value =  tableData.value.concat(newArray)
       tableRecordCount.value = total
     }
   )
@@ -448,8 +489,9 @@ function getUserData() {
  
   getPageListData('/system/user', paramsSearch.value).then(
     ({ data, total }) => {
-      addressBookData.value = data
-      console.log(data,total)
+      console.log(data);
+      const newArray = data
+      addressBookData.value =  addressBookData.value.concat(newArray)
       addressBookCount.value = total
       
     }
@@ -547,10 +589,14 @@ function retrieveBack() {
       width: 162px;
       margin: 0 auto;
     }
-
+    .contentBox::-webkit-scrollbar {
+      display: none; /* Chrome Safari */
+    }
     .contentBox {
       border-top: 1px solid #999;
       margin-top: 15px;
+      height: 590px;
+      overflow-y: auto;
 
       .contentList {
         width: 100%;
@@ -607,7 +653,14 @@ function retrieveBack() {
     right: 30px;
     z-index: 2;
   }
-
+  .btnBox{
+    width: 100%; 
+    height: 60px; 
+    background-color: #ffffff;
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+  }
   .btnHangUp {
     position: absolute;
     bottom: 30px;

CMS1.0/src/components/main/drawer-phone/index.vue

@@ -60,7 +60,7 @@ function showPhone() {
   drawerPhoneID.value = document.getElementById('drawerPhone')
   drawerPhoneID.value.style.width = '360px'
   drawerPhoneID.value.style.left = defaultLeft.value + 'px'
-  drawerPhoneID.value.style.top = window.innerHeight - 650 + 'px'
+  drawerPhoneID.value.style.top = window.innerHeight - 790 + 'px'
 }
 //隐藏
 function hidePhone() {
@@ -161,7 +161,7 @@ const handleRemove = (e) => {
 
 .drawerPhoneBox {
   width: 100%;
-  height: 610px;
+  height: 750px;
   background: #fff;
   z-index: 4;
 }

CMS1.0/src/router/index.js

@@ -57,31 +57,16 @@ export const constantRoutes = [
     component: () => import('@/views/LeaveAmessage'),
     hidden: true
   },
-  // {
-  //   path: '/redirect',
-  //   component: Layout,
-  //   hidden: true,
-  //   children: [
-  //     {
-  //       path: '/redirect/:path(.*)',
-  //       component: () => import('@/views/redirect/index.vue')
-  //     }
-  //   ]
-  // },
   {
-    path: '/login',
-    component: () => import('@/views/login/login'),
-    hidden: true
-  },
-  {
-    path: '/:pathMatch(.*)*',
-    component: () => import('@/views/error/404'),
-    hidden: true
-  },
-  {
-    path: '/401',
-    component: () => import('@/views/error/401'),
-    hidden: true
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/redirect/:path(.*)',
+        component: () => import('@/views/redirect/index.vue')
+      }
+    ]
   },
   {
     path: '',
@@ -97,6 +82,22 @@ export const constantRoutes = [
     ]
   },
   {
+    path: '/login',
+    component: () => import('@/views/login/login'),
+    hidden: true
+  },
+  {
+    path: '/:pathMatch(.*)*',
+    component: () => import('@/views/error/404'),
+    hidden: true
+  },
+  {
+    path: '/401',
+    component: () => import('@/views/error/401'),
+    hidden: true
+  },
+  
+  {
     path: '/user',
     component: Layout,
     hidden: true,

CMS1.0/src/store/modules/tagsView.js

@@ -57,6 +57,7 @@ const useTagsViewStore = defineStore('tags-view', {
     },
     delIframeView(view) {
       return new Promise((resolve) => {
+        console.log(view.path);
         this.iframeViews = this.iframeViews.filter(
           (item) => item.path !== view.path
         )

CMS1.0/src/utils/commonDic.js

@@ -178,17 +178,17 @@ export const sex = [
   {
     title: '未知',
     color: '',
-    value: '0',
+    value: 0,
   },
   {
     title: '男',
     color: '',
-    value: '1',
+    value: 1,
   },
   {
     title: '女',
     color: '',
-    value: '2',
+    value: 2,
   },
 ];
 

CMS1.0/src/views/main/followUp/addFollowUpPlan/addFollowUpPlan.vue

@@ -365,6 +365,8 @@ watch(getPlanId, (nweProps) => {
     if (router.query.planState) {
       state.value = router.query.planState
     }
+  }else{
+    cleanForm()
   }
 });
 
@@ -564,6 +566,13 @@ function getPlanDetail(planId) {
       if (screenData.value.length>0) {
         filterData.value = []
         screenData.value.forEach(ele => {
+          if (ele.field =='sex') {
+            if (ele.value == '1') {
+              ele.value = '男'
+            }else if (ele.value == '2') {
+              ele.value = '女'
+            }
+          }
           const obj = {
               officeItem:{
                 type: 'select',

CMS1.0/src/views/main/followUp/addFollowUpPlan/cpns/patientList/patientList.vue

@@ -123,6 +123,7 @@ function initMethod(data) {
 function getPlanpatient() {
   queryParams.value.plId = planId.value
   getPageListData('/SfPlanPatient/sfplanpatient',queryParams.value).then((res)=>{
+    tableData.value = []
     if (res.data.length>0) {
       tableData.value = res.data
       total.value = res.total

CMS1.0/src/views/main/followUp/followUpPlan/cpns/dataBoard.vue

@@ -40,17 +40,17 @@
         <div class="page-content">
             <el-row :gutter="20">
                 <el-col :span="24">
-                    <el-card class="page-card" v-if="listeningStatusData.length||sfCompleteData.length">
+                    <el-card class="page-card">
                         <template #header>
                             <div class="card-header">
                                 <span>完成量统计</span>
                             </div>
                         </template>
                         <el-row>
-                            <el-col :span="16" v-if="listeningStatusData.length">
+                            <el-col :span="16">
                                 <div id="mainEcharts1" style="width: 100%; height: 300px;"></div>
                             </el-col>
-                            <el-col :span="8" v-if="sfCompleteData.length">
+                            <el-col :span="8">
                                 <div>
                                     <div class="card-title">坐席完成量排名</div>
                                     <el-row v-for="(item,index) in sfCompleteData" :key="index" class="card-list">
@@ -60,6 +60,7 @@
                                         <el-col :span="8">{{item.name}}</el-col>
                                         <el-col :span="8">{{item.number}}</el-col>
                                     </el-row>
+                                    <el-empty :image-size="50" v-if="!sfCompleteData.length"/>
                                 </div>
                             </el-col>
                         </el-row>

CMS1.0/src/views/main/followUp/followUpPlan/cpns/patientFileList/patientFileList.vue

@@ -152,6 +152,7 @@ function initMethod(data) {
 function getPlanpatient() {
   queryParams.value.plId = planId.value
   getPageListData('/SfPlanPatient/sfplanpatient',queryParams.value).then((res)=>{
+    tableData.value = []
     if (res.data.length>0) {
       tableData.value = res.data
       total.value = res.total

CMS1.0/src/views/main/followUp/followUpPlan/followUpPlan.vue

@@ -191,7 +191,7 @@ onActivated(() => {
   geFollowUpList();
 })
 onMounted(() => {
-  // geFollowUpList()
+  geFollowUpList()
 });
 function handleKeyUpEnter() {
   console.log('回车');

CMS1.0/src/views/main/followUp/followUpTask/cpns/visitDetails.vue

@@ -108,6 +108,7 @@ const props = defineProps({
     },
 });
 watch(props, (nweProps) => {
+    
     initMethod(props)
 });
 
@@ -163,6 +164,7 @@ async function initMethod(props) {
                     form.value.state = taskDetail.value.callState;
                     form.value.desc = taskDetail.value.sfResult;
                 } else {
+                    form.value.desc = '';
                     const initStatus = taskResults.find((o) => { return !!o.checked });
                     if (initStatus) form.value.state = initStatus.value
                 }
@@ -363,6 +365,9 @@ const callPhone = () => {
             .content-submit {
                 margin: 0 auto;
                 text-align: center;
+                position: absolute;
+                bottom: 12px;
+                width: 45%;
             }
 
         }

CMS1.0/src/views/main/homePage/cpns/followUpReport.vue

@@ -210,10 +210,17 @@ function geFollowSituation() {
 }
 // 随访接通率
 function getCallDuration() {
-    const params = {
-        beginTime :dateRange.value && moment(dateRange.value[0]).format('YYYY-MM-DD'),
-        endTime : dateRange.value && moment(dateRange.value[1]).format('YYYY-MM-DD'),
-        type:dateType.value,
+    let params = {}
+    if (dateType.value) {
+        params = {
+            type:dateType.value,
+        }
+    }else{
+        params = {
+            beginTime :dateRange.value && moment(dateRange.value[0]).format('YYYY-MM-DD'),
+            endTime : dateRange.value && moment(dateRange.value[1]).format('YYYY-MM-DD'),
+            type:dateType.value,
+        }
     }
     getPageListData("/SfPlanReport/getSfCallState",params).then((res)=>{ 
         if (res.data) {
@@ -232,10 +239,17 @@ function getCallDuration() {
 }
 // 坐席完成量
 function getSfComplete() {
-    const params = {
-        beginTime :dateRange.value && moment(dateRange.value[0]).format('YYYY-MM-DD'),
-        endTime : dateRange.value && moment(dateRange.value[1]).format('YYYY-MM-DD'),
-        type:dateType.value,
+    let params = {}
+    if (dateType.value) {
+        params = {
+            type:dateType.value,
+        }
+    }else{
+        params = {
+            beginTime :dateRange.value && moment(dateRange.value[0]).format('YYYY-MM-DD'),
+            endTime : dateRange.value && moment(dateRange.value[1]).format('YYYY-MM-DD'),
+            type:dateType.value,
+        }
     }
     getPageListData("/SfPlanReport/selectComplete",params).then((res)=>{ 
         if (res.data) {
@@ -246,10 +260,17 @@ function getSfComplete() {
 
 // 随访量
 function selectPlComplete() {
-    const params = {
-        beginTime :dateRange.value && moment(dateRange.value[0]).format('YYYY-MM-DD'),
-        endTime : dateRange.value && moment(dateRange.value[1]).format('YYYY-MM-DD'),
-        type:dateType.value,
+    let params = {}
+    if (dateType.value) {
+        params = {
+            type:dateType.value,
+        }
+    }else{
+        params = {
+            beginTime :dateRange.value && moment(dateRange.value[0]).format('YYYY-MM-DD'),
+            endTime : dateRange.value && moment(dateRange.value[1]).format('YYYY-MM-DD'),
+            type:dateType.value,
+        }
     }
     getPageListData("/SfPlanReport/getSfNumber",params).then((res)=>{
         if (res.data) {
@@ -328,9 +349,10 @@ function optionData1(xData,yData) {
     return resultData
 }
 function optionData2() {
+
     let resultData = {
         tooltip: {
-            trigger: 'axis'
+            trigger: 'item'
         },
         grid: {
             left: '2%',

CMS1.0/src/views/redirect/index.vue

@@ -0,0 +1,14 @@
+<template>
+  <div></div>
+</template>
+
+<script setup>
+import { useRoute, useRouter } from 'vue-router'
+
+const route = useRoute()
+const router = useRouter()
+const { params, query } = route
+const { path } = params
+
+router.replace({ path: '/' + path, query })
+</script>