随访管理

CMS1.0/src/views/main/chat/online/cpns/borderMiddle/borderMiddle.vue

@@ -268,8 +268,7 @@
     :modal="false"
     :show-close="true"
   >
-  <page-order></page-order>
-    ></add-order>
+    <page-order/>
   </el-dialog>
   <!-- 创建工单结束 -->
 </template>
@@ -703,7 +702,6 @@
     vertical-align: middle;
     border-radius: 10px;
     word-break: break-all;
-    // margin: 0px 0 0 10px;
     position: relative;
     border: 1px solid #f8f2f2;
     max-width: 590px;
@@ -714,9 +712,7 @@
     width: 8.3%;
   }
 
-  .chatWidth83 {
-    // width: 83%;
-  }
+
 
   .chatPop1 span::after {
     content: '';
@@ -792,19 +788,14 @@
 
   .primary-btn {
     width: 8%;
-    // font-family: 仿宋;
-    // font-weight: bold;
-    // font-style: italic;
     font-size: 16px;
     height: 30px;
     margin-top: 7px;
     border-radius: 5px;
     text-align: center;
     line-height: 30px;
-    // letter-spacing: 2px;
     cursor: pointer;
-    // 按钮效果
-    border: #cecece 1px solid; // 909090
+    border: #cecece 1px solid; 
     background: #cccccc;
     color: #ffffff;
   }
@@ -819,9 +810,6 @@
     width: 0;
   }
   .infinite-list .infinite-list-item {
-    // display: flex;
-    // align-items: center;
-    // justify-content: center;
     display: grid;
     grid-template-columns: 94% 4%;
     column-gap: 6px;

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

@@ -26,7 +26,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="选择模版" label-width="200px" v-if="workBasicData.way === '2'">
-              <el-select v-model="smsValue" placeholder="请选择模版" style="width: 240px">
+              <el-select v-model="message" placeholder="请选择模版" style="width: 240px">
                 <el-option v-for="item in smsData" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -63,8 +63,8 @@
             <div class="questionBox">
               <div class="questionBox">
                 <el-table :data="seatListData" border style="margin-bottom: 15px;">
-                  <el-table-column prop="usercode" label="成员"></el-table-column>
-                  <el-table-column prop="username" label="工号"></el-table-column>
+                  <el-table-column prop="username" label="成员"></el-table-column> 
+                  <el-table-column prop="usercode" label="工号"></el-table-column> 
                   <el-table-column prop="userdept" label="部门"></el-table-column>
                   <el-table-column label="比例" v-if="allocation==='2'">
                     <template #default="scope">
@@ -75,14 +75,12 @@
                       ></el-input>
                     </template>
                   </el-table-column>
-                  <el-table-column label="操作">
+                  <el-table-column label="操作" width="180" >
                     <template #default="{ row }">
                       <div style="display: flex;">
                         <el-button link @click="handleEdit(row)" v-if="allocation==='2'">编辑</el-button>
                         <el-button type="primary" link @click="handleSave" v-if="allocation==='2'">保存</el-button>
-                        <el-button type="danger" link @click="handleDelete(row)"
-                          >删除</el-button
-                        >
+                        <el-button type="danger" link @click="handleDelete(row)">删除</el-button>
                       </div>
                     </template>
                   </el-table-column>
@@ -100,7 +98,7 @@
         <template #header>
           <div class="card-header">
             <span class="card-title">患者匹配规则</span>
-            <a class="card-titleFr" v-if="matchingMethod === '1'">下载导入模版</a>
+            <a class="card-titleFr"  :href="downLoadUrl" download v-if="matchingMethod === '1'" >下载导入模版</a>
           </div>
 
         </template>
@@ -113,7 +111,7 @@
             </el-form-item>
             <el-form-item label="匹配方式" label-width="200px">
               <el-select v-model="matchingMethod" placeholder="请选择匹配方式" @change="changeSelect3" style="width: 240px">
-                <el-option v-for="item in matchMode" :key="item.value" :label="item.title" :value="item.value" :disabled="item.value=='1'" />
+                <el-option v-for="item in matchMode" :key="item.value" :label="item.title" :value="item.value"/>
               </el-select>
             </el-form-item>
             <el-form-item label="周期" label-width="200px" v-if="matchingMethod === '2'">
@@ -128,7 +126,6 @@
               <el-radio-group v-model="patientsNumRule"> 
                 <el-radio v-for="item in patientsData" :label="item.title" :value="item.value"/>
               </el-radio-group>
-              
             </el-form-item>
             <el-form-item label="" label-width="200px" v-if="patientsNumRule!=='1'">
               <el-input-number v-model="patientsNum" :min="1" :max="9999" />
@@ -138,8 +135,8 @@
           <el-col :span="12">
             <div class="questionBox">
               
-              <patient-list v-if="matchingMethod === '1'"></patient-list>
-              <div v-if="matchingMethod === '2'" style="position: relative;">
+              <patient-list :planId="planId" v-if="matchingMethod === '1' && planId "></patient-list>
+              <div v-if="matchingMethod === '2'" style="position: relative;width: 400px;">
                 <div>筛选条件</div>
                 <div v-for="( item , index ) in filterData" style="display: flex; margin-top: 15px;" >
                     <el-select class="formItem" v-model="item.officeItem.value" @change="officeItemChange($event,index)" placeholder="请选择" style="width: 120px">
@@ -175,7 +172,7 @@
         </el-row>
       </el-card>
       <div style="width: 100%; height: 50px;"></div>
-      <div class="box-btns" v-if="!planId">
+      <div class="box-btns" v-if="!isdetil">
         <el-button style="margin-right: 30px;" type="primary" @click="handleConfirmClick">确 定</el-button>
       </div>
 
@@ -188,7 +185,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item  label-width="150px" v-if="messageType === '1'">
-        <el-select v-model="questionnaire" placeholder="请选择模版" style="width: 240px">
+        <el-select v-model="questionnaireMsg" placeholder="请选择模版" style="width: 240px">
           <el-option v-for="item in questionnaireData" :key="item.value" :label="item.title" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -199,6 +196,7 @@
         <el-button type="primary" @click= "centerDialogVisibleQues = false">确定</el-button>
       </div>
     </el-dialog>
+
     <el-dialog
       v-model="centerDialogVisibleAddWorkorder"
       title="新增坐席"
@@ -207,29 +205,29 @@
       :modal="true"
       :show-close="true"
     >
-    <el-form-item label="请选择坐席" label-width="200px">
-      <el-select
-        v-model="seatSelectvalue"
-        multiple
-        filterable
-        remote
-        reserve-keyword
-        placeholder="Please enter a keyword"
-        :remote-method="remoteMethod"
-        :loading="loading"
-        style="width: 240px"
-      >
-        <el-option
-          v-for="item in rangeSeatData"
-          :key="item.value"
-          :label="item.title"
-          :value="item.value"
-        />
-      </el-select>
-    </el-form-item>
-    <div style="text-align: center;">
-      <el-button style="margin-right: 30px;" type="primary" @click="handleSeatTrue">确 定</el-button>
-    </div>
+      <el-form-item label="请选择坐席" label-width="200px">
+        <el-select
+          v-model="seatSelectvalue"
+          multiple
+          filterable
+          remote
+          reserve-keyword
+          placeholder="Please enter a keyword"
+          :remote-method="remoteMethod"
+          :loading="loading"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in rangeSeatData"
+            :key="item.value"
+            :label="item.title"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <div style="text-align: center;">
+        <el-button style="margin-right: 30px;" type="primary" @click="handleSeatTrue">确 定</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -240,19 +238,22 @@
     Minus
 } from '@element-plus/icons-vue'
 import moment from 'moment';
+
 import PageAdd from '@/components/page-add';
 import seatList from './cpns/seatList/seatList';
 import patientList from './cpns/patientList/patientList';
 import { modalConfig } from './config/modal.config';
 import { usePageModal } from '@/hooks/use-page-add';
 import useSelectStore from '@/store/commonSelect/common';
-import { createPageData, editPageData,getPageListData } from '@/api/main/system/system';
-
+import { createPageData, editPageData, getPageListData,getPageDetail } from '@/api/main/system/system';
+import { useRoute, useRouter } from 'vue-router';
 import { 
   followType,followWay,followExecution,allotMode,repetitionMode,
   matchMode,periodData,patientsData } from "@/utils/commonDic.js";
 
 import { onMounted, ref, watch } from 'vue';
+// import downLoadUrl from 'src/assets/downLoad/template.xlsx'
+
 const props = defineProps({
   getDefaultInfo: {
     type: Object,
@@ -261,15 +262,22 @@ const props = defineProps({
   planId: {
     type: String,
     default: ''
+  },
+  isdetil:{
+    type: String,
+    default: ''
   }
 });
 watch(props, (nweProps) => {
   planId.value = nweProps.planId
+  isdetil.value = nweProps.isdetil
   initMethod(nweProps);
 });
-
 const { proxy } = getCurrentInstance();
-const planId = ref('')
+
+const downLoadUrl = new URL('@/assets/downLoad/template.xlsx', import.meta.url).href
+const router = useRoute();
+const isdetil = ref('')
 const loading = ref(false)
 const seatSelectvalue = ref()
 const rangeSeatData = ref([])
@@ -297,18 +305,20 @@ const filterObjData = ref({
 })
 const filterLongData = ref([])
 const filterData = ref([])
+const screenData = ref([])
 
 
 const formData = ref({});
 const workBasicData = ref({});
+const questionnaireMsg = ref('')
 const questionnaire = ref('') // 问卷模版id
 const message = ref('') // 短信模版id
-const quesIput = ref('1') // 链接
+const quesIput = ref('') // 链接
 const messageType = ref('1') // 短信模版问卷id
 const allocation = ref('') // 分配方式 
 
 const deduplication = ref('') // 去重方式
-const matchingMethod = ref('2') // 匹配方式
+const matchingMethod = ref('1') // 匹配方式
 const cycle = ref('') // 周期
 const executionTime = ref('') // 时间
 const patientsNumRule = ref('1') // 患者规则
@@ -319,42 +329,70 @@ const questionnaireData = useSelectStore().questionnaireData
 const smsData = useSelectStore().templateNameListData
 
 const centerDialogVisibleQues = ref(false)
+const planId = ref(Number(router.query.planId || 0));
+const planDetailObj = ref({})
+
 function changeSelect3(data) {
   console.log(data)
 }
 onMounted(() => {
-  workBasicData.value.way = '1'
   initMethod(props);
 });
+
 function initMethod(data) {
+  if (planId.value) {
+    getPlanDetail(planId.value)
+  }
+  workBasicData.value.way = '1'
   getFilterList()
   getSeatList()
   seatData.value = useSelectStore().userListData
 }
 const centerDialogVisibleAddWorkorder = ref(false);
 const onAddItem = () => {
+  
   seatSelectvalue.value = []
   centerDialogVisibleAddWorkorder.value = true;
+
 }
 function handleSeatTrue() {
   centerDialogVisibleAddWorkorder.value = false;
-  console.log(seatSelectvalue.value)
-  console.log(seatDataList.value);
+  const newAway = []
   seatDataList.value.forEach(element => {
     const obj = {}
-    obj.username = element.nickName
+    const obj2= {}
+    obj.username = element.nickName  
     obj.usercode = element.userName
+    obj2.username = element.nickName
+    obj2.usercode = element.userName
     // obj.userdept = element.dept ?element.dept.deptName:''
     obj.proportion = ''
+    obj2.proportion = ''
+    obj2.seatsId = element.userId
     if (seatSelectvalue.value.indexOf(obj.usercode)!=-1) {
       seatResultData.value.push(obj)
-      // obj.userdept = element.dept ?element.dept.deptName:''
+      obj.userdept = element.dept ?element.dept.deptName:''
       seatListData.value.push(obj)
-     
+      newAway.push(obj2)
     }
-    
   });
-  console.log(seatListData.value)
+  if (planId.value) {
+    console.log(seatSelectvalue.value)
+    console.log(newAway);
+    newAway.forEach(element => {
+      const params = {
+        plId:planId.value,
+        proportion:element.proportion,
+        userName:element.username,
+        usercode:element.usercode,
+      }
+      createPageData('/SfPlanSeats/sfplanseats',params).then((data) => {
+            proxy.$modal.msgSuccess('新增成功！');
+      })
+    });
+    
+  }
+  
 
 }
 const remoteMethod = (query) => {
@@ -406,9 +444,9 @@ const handleConfirmClick = () => {
       formData.value.questionnaire = questionnaire.value
       formData.value.message = message.value
       formData.value.messageType = messageType.value
-      formData.value.messageParameter =  messageType.value==='1' ? questionnaire.value : quesIput.value
+      formData.value.messageParameter =  messageType.value==='1' ? questionnaireMsg.value : quesIput.value
       formData.value.allocation = allocation.value
-      formData.value.seats = seatResultData.value //seatResultData.value
+      formData.value.seats = seatResultData.value //seatResultData.value seatDataList
       formData.value.deduplication = deduplication.value
       formData.value.matchingMethod = matchingMethod.value
       formData.value.cycle = cycle.value
@@ -417,22 +455,126 @@ const handleConfirmClick = () => {
       formData.value.patientsNum = patientsNum.value
       formData.value.screen = JSON.stringify(filterResultData.value)
       console.log(formData.value)
-      createPageData('/SfPlan/sfPlan', formData.value).then((data) => {
+      if (planId.value) {
+        formData.value.plId = planId.value
+        editPageData('/SfPlan/sfPlan', formData.value).then((data) => {
+          proxy.$modal.msgSuccess('编辑成功！');
+        })
+      } else{
+        createPageData('/SfPlan/sfPlan', formData.value).then((data) => {
             proxy.$modal.msgSuccess('新增成功！');
-      })
+        })
+      }
+      
       // editPageData('/order/workorder', formData.value).then((data) => {})
     }
   });
 };
 
+function getPlanDetail(planId) {
+  getPageDetail("/SfPlan/sfPlan/"+planId).then((res)=>{
+    console.log(res.data)
+    if (res.data) {
+      planDetailObj.value = res.data
+      defaultInfo.value.name = planDetailObj.value.name
+      defaultInfo.value.type = planDetailObj.value.type.toString()
+      defaultInfo.value.way = planDetailObj.value.way.toString()
+      defaultInfo.value.executionMethod = planDetailObj.value.executionMethod
+      defaultInfo.value.indate = [ planDetailObj.value.beginEffective , planDetailObj.value.endEffective ]
+      defaultInfo.value.describes = planDetailObj.value.describes
+      if (planDetailObj.value.way.toString() === '1') {
+        questionnaire.value = planDetailObj.value.questionnaire
+      } else  if (planDetailObj.value.way.toString() === '2') {
+        message.value = planDetailObj.value.message
+        messageType.value = planDetailObj.value.messageType.toString()
+        if (planDetailObj.value.messageType == '1') {
+          questionnaireMsg.value = Number(planDetailObj.value.messageParameter)
+        }else if(planDetailObj.value.messageType == '2'){
+          quesIput.value = planDetailObj.value.messageParameter
+        }
+      }
+      allocation.value = planDetailObj.value.allocation.toString()
+      deduplication.value = planDetailObj.value.deduplication.toString()
+      cycle.value = planDetailObj.value.cycle.toString()
+      
+      executionTime.value = converTime(planDetailObj.value.executionTime)
+      patientsNumRule.value = planDetailObj.value.patientsNumRule.toString()
+      patientsNum.value = planDetailObj.value.patientsNum
+      screenData.value = JSON.parse(planDetailObj.value.screen)
+      if (screenData.value.length>0) {
+        console.log(screenData.value)
+        filterData.value = []
+        console.log(filterData.value);
+        screenData.value.forEach(ele => {
+          const obj = {
+              officeItem:{
+                type: 'select',
+                data: filterOfficeData.value,
+                value: ele.field
+              },
+              relationItem:{
+                type: 'select',
+                data: [],
+                value: ele.operate
+              },
+              numberItem: {
+                type: 'input',
+                value: ele.value
+              }
+          }
+          filterData.value.push(obj)
+        });
+        console.log(filterData.value);
+      }
+      // defaultInfo.value = planDetailObj.value.name
+      // defaultInfo.value = planDetailObj.value.name
+      // defaultInfo.value = planDetailObj.value.name
+
+    }
+    
+  })
+}
 
+const converTime = (arr) => {
+  const _arr = arr.split(":");
+  let result = new Date(2010, 10, 10, Number(_arr[0]), Number(_arr[1]), Number(_arr[2]))
+  return result
+};
+function getPlanSeatList(plId) {
+  const params = {plId}
+  getPageListData("/SfPlanSeats/sfplanseats",params).then((res)=>{
+    if (res.data.length>0) {
+      // seatListData.value = res.data
+      res.data.forEach((element,index) => {
+        const obj = {}
+        obj.username = element.userName   
+        obj.usercode = element.usercode
+        // obj.usercode = element.userName
+        // obj.userdept
+        seatDataList.value.find(function(ele){
+            if (ele.userName === element.usercode) {
+              obj.userdept = ele.dept.deptName
+            }
+        })
+        obj.proportion = '' 
+        seatResultData.value.push(obj)
+        seatListData.value.push(obj)
+      });
+      console.log(seatDataList.value)
+      console.log(seatListData.value)
+    //   res.data.forEach(ele => { 
+    //     seatListData.value.push(ele.userName?ele.userName:ele.usercode)
+    //   });
+    }
+    
+  })
+}
 const editIndex = ref(-1)
 const handleEdit = (row) => {
   editIndex.value = seatListData.value.indexOf(row)
 }
 const handleSave = () => {
   editIndex.value = -1
-  console.log(seatListData.value)
 }
 const handleDelete = (row) => {
   seatListData.value.splice(seatListData.value.indexOf(row), 1)
@@ -444,6 +586,9 @@ const props2 = {
 function getSeatList() {
   getPageListData('/system/user').then((res)=>{
     seatDataList.value = res.data
+    if (planId.value) {
+      getPlanSeatList(planId.value)
+    }
   })
 }
 function filterAddItem() {
@@ -466,11 +611,12 @@ function filterAddItem() {
   }
   filterData.value.push(newObj) 
 }
+
 function filterMinuItem() {
   filterData.value.pop()
 }
+
 function handleFilter() {
-  console.log(filterData.value); 
   filterResultData.value = [] 
   filterData.value.forEach(ele => {
     const obj = {}
@@ -479,10 +625,8 @@ function handleFilter() {
     obj.value = ele.numberItem.value
     filterResultData.value.push(obj)
   });
-  console.log(JSON.stringify(filterResultData.value));
 }
 function officeItemChange(value,index) {
-  console.log(value,index);
   filterLongData.value.forEach(ele => {
     if (ele.field.value === value) {
       filterData.value[index].relationItem.data = ele.operate
@@ -497,7 +641,6 @@ function officeItemChange(value,index) {
 }
 function getFilterList() {
   getPageListData('/SfPlan/sfPlan/option').then((res)=>{
-    console.log(res);
     if (res.data.length>0) {
       filterLongData.value = res.data
       res.data.forEach(ele => {
@@ -508,9 +651,12 @@ function getFilterList() {
         filterObjData.value.officeItem.data.push(obj)
         filterOfficeData.value.push(obj)
       });
-      filterData.value.push(filterObjData.value)
+      if (screenData.value.length<1) {
+        
+        filterData.value.push(filterObjData.value)
+      }
+      
     }
-   console.log(filterData.value);
   })
 }
 
@@ -536,8 +682,10 @@ const [pageModalRef, defaultInfo] = usePageModal(newCallback, editCallback);
   background-color: #ffffff;
   text-align: right;
   width: calc(100% - 200px);
+  background-color: #ffffff;
   position: fixed;
   bottom: 0px;
+  z-index: 1;
 }
 
 .card-header {
@@ -573,7 +721,6 @@ const [pageModalRef, defaultInfo] = usePageModal(newCallback, editCallback);
 }
 
 .questionBox {
-  width: 400px;
   .filterIcon{
     position: absolute;
     right: -70px;

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

@@ -1,23 +1,35 @@
 <template>
   <div class="app-container">
-    <div class="questionBox">
+    <div class="questionBox" style="width: 100%;">
         <el-table :data="tableData" style="width: 100%">
-          <el-table-column fixed prop="date" label="成员" width="150" />
-          <el-table-column prop="name" label="工号" width="120" />
-          <el-table-column prop="state" label="所属部门" width="120" />
-          <el-table-column prop="city" label="比例" width="120" />
-          <el-table-column fixed="right" label="操作" width="120">
-            <template #default>
-              <el-button link type="primary" size="small" @click="handleClick"
-                >Detail</el-button
-              >
-              <el-button link type="primary" size="small">Edit</el-button>
-            </template>
-          </el-table-column>
+          <el-table-column prop="name" label="姓名" />
+          <el-table-column prop="seatCode" label="工号"/>
+          <el-table-column prop="mobile" label="手机号"  />
         </el-table>
-        <el-button class="mt-4" style="width: 100%" @click="onAddItem">
-          导入患者
-        </el-button>
+        <el-pagination
+          style=" margin-top: 15px;"
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+        <el-upload
+            style="text-align: center; margin-top: 15px;"
+            accept=".xlsx"
+            v-model:file-list="fileList"
+            :headers="headers"
+            :data="upLoadParams" 
+            :show-file-list="false"
+            class="upload-demo"
+            :action="uploadURL+planId"
+            :on-success="handleExcelSuccess"
+          >
+            <el-button class="mt-4" style="width: 100%">
+              导入患者
+            </el-button>
+          </el-upload>
+        
     </div>
     <!-- 创建工单 -->
   <el-dialog
@@ -41,14 +53,38 @@ import { usePageModal } from '@/hooks/use-page-add';
 import useSelectStore from '@/store/commonSelect/common';
 import { createPageData, editPageData } from '@/api/main/system/system';
 import { onMounted, ref, watch } from 'vue';
+import { getToken } from '@/utils/auth';
+import { getPageListData } from '@/api/main/system/system';
 
 const { proxy } = getCurrentInstance();
-
+const props = defineProps({
+  planId: {
+    type: String,
+    default: ''
+  }
+});
+const planId = ref('')
+const total = ref(0)
 const formData = ref({});
 const workBasicData = ref({});
 const callId = ref({});
 const centerDialogVisibleAddWorkorder = ref(false);
+const fileList = ref([]);
+const headers = ref({
+    Authorization: 'Bearer ' + getToken(),
+  });
+const upLoadParams = ref({});
+const tableData = ref([])
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  plId: undefined,
 
+})
+const uploadURL = ref(import.meta.env.VITE_APP_BASE_API + '/SfPlanPatient/sfplanpatient/importExcel?plId=');
+const handleExcelSuccess = (response, uploadFile, uploadFiles) => {
+  console.log(response, uploadFile, uploadFiles);
+};
 const onAddItem = () => {
   console.log('新增')
   centerDialogVisibleAddWorkorder.value = true;
@@ -56,51 +92,6 @@ const onAddItem = () => {
 const handleClick = () => {
   console.log('click')
 }
-
-const tableData = [
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Home',
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Office',
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Home',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Office',
-  },
-]
-const props = defineProps({
-  getDefaultInfo: {
-    type: Object,
-    default: () => ({}),
-  }
-});
 watch(props, (nweProps) => {
   initMethod(nweProps);
 });
@@ -110,6 +101,20 @@ onMounted(() => {
 
 function initMethod(data) {
   console.log(data)
+  planId.value = data.planId
+  if (planId.value) {
+    getPlanpatient()
+  }
+  console.log(planId.value)
+}
+function getPlanpatient() {
+  queryParams.value.queryParams = planId.value
+  getPageListData('/SfPlanPatient/sfplanpatient',queryParams.value).then((res)=>{
+    if (res.data.length>0) {
+      tableData.value = res.data
+      total.value = res.total
+    }
+  })
 }
 const modalConfigRef = computed(() => {
   //  来源
@@ -127,24 +132,6 @@ const getWorkBasicData = (item) => {
 defineExpose({
   getWorkBasicData,
 });
-const handleConfirmClick = () => {
-  pageModalRef.value.formRef.ruleFormRef.validate((bool) => {
-    if (bool) {
-      if (JSON.stringify(props.getDefaultInfo) !== '{}') {
-        formData.value.workorderId = props.getDefaultInfo.workorderId;
-        editPageData('/order/workorder', formData.value).then((data) => {
-          proxy.$modal.msgSuccess('编辑成功！');
-        });
-      } else {
-        let creatUrl = '/order/workorder';
-          creatUrl = '/order/workorder?callid=' + callId.value;
-        createPageData(creatUrl, formData.value).then((data) => {
-          proxy.$modal.msgSuccess('新增成功！');
-        });
-      }
-    }
-  });
-};
 
 // 1.处理逻辑
 const newCallback = () => { };

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

@@ -4,34 +4,34 @@
             <el-row :gutter="20">
                 <el-col :span="6" style="padding: 30px 0px 30px 30px;">
                     <div class="header-text1">已完成数量</div>
-                    <div class="header-text2">3230</div>
+                    <div class="header-text2">{{boardObj.Complete}}</div>
                     <div class="header-text3">
                         <span>总数量</span>
-                        <span>4000</span>
+                        <span>{{boardObj.Total}}</span>
                     </div>
                 </el-col>
                 <el-col :span="6" style="padding: 30px 0px 30px 30px;">
-                    <div class="header-text1">已完成数量</div>
-                    <div class="header-text2">3230</div>
+                    <div class="header-text1">接通数量</div>
+                    <div class="header-text2">{{boardObj.Connected}}</div>
                     <div class="header-text3">
-                        <span>总数量</span>
-                        <span>4000</span>
+                        <span>接通率</span>
+                        <span>{{boardObj.ConnectedRate}}</span>
                     </div>
                 </el-col>
                 <el-col :span="6" style="padding: 30px 0px 30px 30px;">
-                    <div class="header-text1">已完成数量</div>
-                    <div class="header-text2">3230</div>
+                    <div class="header-text1">平均通话时长</div>
+                    <div class="header-text2">{{boardObj.longtimeAvg}}秒</div>
                     <div class="header-text3">
-                        <span>总数量</span>
-                        <span>4000</span>
+                        <span>总通话时长</span>
+                        <span>{{boardObj.longtime}}</span>
                     </div>
                 </el-col>
                 <el-col :span="6" style="padding: 30px 0px 30px 30px;">
-                    <div class="header-text1">已完成数量</div>
-                    <div class="header-text2">3230</div>
+                    <div class="header-text1">二次完成量</div>
+                    <div class="header-text2">{{boardObj.secondary}}</div>
                     <div class="header-text3">
-                        <span>总数量</span>
-                        <span>4000</span>
+                        <span>二次完成率</span>
+                        <span>{{boardObj.secondaryRate}}</span>
                     </div>
                 </el-col>
             </el-row>
@@ -53,12 +53,12 @@
                             <el-col :span="8">
                                 <div>
                                     <div class="card-title">坐席完成量排名</div>
-                                    <el-row v-for="o in 4" :key="o" class="card-list">
+                                    <el-row v-for="(item,index) in sfCompleteData" :key="index" class="card-list">
                                         <el-col :span="8">
-                                            <div :class="o<4?'titleRank-active':'titleRank'">{{ o }}</div>
+                                            <div :class="index<4?'titleRank-active':'titleRank'">{{ index+1 }}</div>
                                         </el-col>
-                                        <el-col :span="8">姓名</el-col>
-                                        <el-col :span="8">分数</el-col>
+                                        <el-col :span="8">{{item.name}}</el-col>
+                                        <el-col :span="8">{{item.number}}</el-col>
                                     </el-row>
                                 </div>
                             </el-col>
@@ -101,98 +101,315 @@
 </template>
 <script setup>
 import { onMounted, ref } from 'vue';
+import { getPageListData } from '@/api/main/system/system';
+
 import * as echarts from 'echarts';
 let chartDom1
 let chartDom2
 let chartDom3
 let chartDom4
-let optionData1 = {
-    xAxis: {
-        type: 'category',
-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-    },
-    yAxis: {
-        type: 'value'
-    },
-    series: [
-        {
-            data: [120, 200, 150, 80, 70, 110, 130],
-            type: 'bar'
+
+const boardObj = ref({})
+const completeData = ref()
+const sfCompleteData = ref([])
+const callDurationData = ref({})
+const dialogueRoundData = ref({})
+const listeningStatusData = ref([])
+
+onMounted(() => {
+    chartDom1 = document.getElementById('mainEcharts1');
+    chartDom2 = document.getElementById('mainEcharts2');
+    chartDom3 = document.getElementById('mainEcharts3');
+    chartDom4 = document.getElementById('mainEcharts4');
+    selectPlDataBoard()
+    selectPlComplete()
+    getSfComplete()
+    getCallDuration()
+    getDialogueRound()
+    getListeningStatus()
+})
+
+// 接听状态
+function getListeningStatus() {
+    const params = {
+        plId:2
+    }
+    getPageListData("/SfPlanReport/selectListeningStatus",params).then((res)=>{
+        if (res.data) {
+            listeningStatusData.value = res.data
+            const xData = [],yData = [],yData1 = [],yData2 = [],yData3 = [],yData4 = []
+            let eleData,number = 0
+            listeningStatusData.value.forEach((ele,index) => {
+                if (eleData !== ele.date) {
+                    xData.push(ele.date)
+                    yData.push(ele.callRate)
+                    number++
+                    ele.callState==='正常接听'?yData1.push(ele.connected):yData1.push(0)
+                    ele.callState==='无人接听'?yData2.push(ele.connected):yData2.push(0)
+                    ele.callState==='稍后拨打'?yData3.push(ele.connected):yData3.push(0)
+                    ele.callState==='号码错误'?yData4.push(ele.connected):yData4.push(0)
+                } else{
+                    if (ele.callState === '正常接听') {
+                        yData1[number-1] = ele.connected
+                    }else if (ele.callState === '无人接听'){
+                        yData2[number-1] = ele.connected
+                    }else if (ele.callState === '稍后拨打'){
+                        yData3[number-1] = ele.connected
+                    }else if (ele.callState === '号码错误'){
+                        yData4[number-1] = ele.connected
+                    }
+                }
+                eleData = ele.date
+            });
+            let myChart4 = echarts.init(chartDom4);
+            myChart4.setOption(optionData4(xData,yData,yData1,yData2,yData3,yData4));
         }
-    ]
+    })
 }
-let optionData2 = {
-  xAxis: {
-    type: 'category',
-    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-  },
-  yAxis: {
-    type: 'value'
-  },
-  series: [
-    {
-      data: [120, 200, 150, 80, 70, 110, 130],
-      type: 'bar',
-      showBackground: true,
-      backgroundStyle: {
-        color: 'rgba(180, 180, 180, 0.2)'
-      }
+
+// 对话次数
+function getDialogueRound() {
+    const numbers = "10,15,30,45,60"
+    const params = {
+        plId:2
     }
-  ]
+    getPageListData("/SfPlanReport/selectDialogueRound/"+numbers,params).then((res)=>{
+        if (res.data) {
+            dialogueRoundData.value = res.data
+            let xData =  []
+            let yData = []
+            xData= Object.keys(dialogueRoundData.value) 
+            yData= Object.values(dialogueRoundData.value) 
+            let myChart3 = echarts.init(chartDom3);
+            myChart3.setOption(optionData3(xData,yData)); 
+        }
+    })
 }
-let optionData3 = {
-    xAxis: {
-        type: 'category',
-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-    },
-    yAxis: {
-        type: 'value'
-    },
-    series: [
-        {
-            data: [120, 200, 150, 80, 70, 110, 130],
-            type: 'bar'
+// 坐席完成量
+function getCallDuration() {
+    const numbers = "10,15,30,45,60"
+    const params = {
+        plId:2
+    }
+    getPageListData("/SfPlanReport/selectCallDuration/"+numbers,params).then((res)=>{
+        if (res.data) {
+            callDurationData.value = res.data
+            let xData =  []
+            let yData = []
+            xData= Object.keys(callDurationData.value) 
+            yData= Object.values(callDurationData.value) 
+            let myChart2 = echarts.init(chartDom2);
+            myChart2.setOption(optionData2(xData,yData));
         }
-    ]
+    })
 }
-let optionData4 = {
-  xAxis: {
-    type: 'category',
-    boundaryGap: false,
-    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-  },
-  yAxis: {
-    type: 'value'
-  },
-  series: [
-    {
-      data: [820, 932, 901, 934, 1290, 1330, 1320],
-      type: 'line',
-      areaStyle: {}
+// 坐席完成量
+function getSfComplete() {
+    const params = {
+        plId:2
     }
-  ]
+    getPageListData("/SfPlanReport/selectSfComplete",params).then((res)=>{
+        if (res.data) {
+            sfCompleteData.value = res.data
+        }
+    })
 }
-onMounted(() => {
-    chartDom1 = document.getElementById('mainEcharts1');
-    chartDom2 = document.getElementById('mainEcharts2');
-    chartDom3 = document.getElementById('mainEcharts3');
-    chartDom4 = document.getElementById('mainEcharts4');
-    setEchats()
-})
-function setEchats() {
-    let myChart1 = echarts.init(chartDom1);
-    let myChart2 = echarts.init(chartDom2);
-    let myChart3 = echarts.init(chartDom3);
-    let myChart4 = echarts.init(chartDom4);
-
-    myChart1.setOption(optionData1);
-    myChart2.setOption(optionData2);
-    myChart3.setOption(optionData3);
-    myChart4.setOption(optionData4);
+
+// 完成量统计
+function selectPlComplete() {
+    const params = {
+        plId:2
+    }
+    getPageListData("/SfPlanReport/selectPlComplete",params).then((res)=>{
+        if (res.data) {
+            completeData.value = res.data
+            const xData = []
+            const yData = []
+            completeData.value.forEach(ele => {
+                xData.push(ele.date)
+                yData.push(ele.number)
+            });
+            let myChart1 = echarts.init(chartDom1);
+            myChart1.setOption(optionData1(xData,yData));
+        }
+    })
+}
+// 数据看板
+function selectPlDataBoard() {
+    const params = {
+        plId:2
+    }
+    getPageListData("/SfPlanReport/selectPlDataBoard",params).then((res)=>{
+        if (res.data) {
+            boardObj.value = res.data
+        }
+    })
 }
 
 
+function optionData1(xData,yData) {
+    let resultData = {
+        xAxis: {
+            type: 'category',
+            data: xData
+        },
+        yAxis: {
+            type: 'value'
+        },
+        series: [
+            {
+                data: yData,
+                barWidth : 30,
+                type: 'bar'
+            }
+        ]
+    }
+    return resultData
+}
+function optionData2(xData,yData) {
+    let resultData = {
+        xAxis: {
+            type: 'category',
+            data: xData
+        },
+        yAxis: {
+            type: 'value'
+        },
+        series: [
+            {
+            data: yData,
+            type: 'bar',
+            barWidth : 30,
+            showBackground: true,
+            backgroundStyle: {
+                color: 'rgba(180, 180, 180, 0.2)'
+            }
+            }
+        ]
+    }
+    return resultData
+}
+function optionData3(xData,yData) {
+    let resultData = {
+        xAxis: {
+            type: 'category',
+            data: xData
+        },
+        yAxis: {
+            type: 'value'
+        },
+        series: [
+            {
+                data: yData,
+                barWidth : 30,
+                type: 'bar'
+            }
+        ]
+    }
+    return resultData
+}
+function optionData4(xData,yData,yData1,yData2,yData3,yData4) {
+    let resultData = {
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'cross',
+                crossStyle: {
+                    color: '#999'
+                }
+            }
+        },
+        legend: {
+            data: ['接通率','正常接通', '无人接听', '稍后拨打', '号码错误']
+        },
+        xAxis: [
+            {
+            type: 'category',
+            data: xData,
+            axisPointer: {
+                type: 'shadow'
+            }
+            }
+        ],
+        yAxis: [
+            {
+                type: 'value',
+                name: '接通率',
+                min: 0,
+                max: 100,
+                axisLabel: {
+                    formatter: '{value} %'
+                }
+            },
+            {
+                type: 'value',
+                name: '次数',
+                axisLabel: {
+                    formatter: '{value}'
+                }
+            }
+        ],
+        series: [
+            {
+                name: '接通率',
+                type: 'line',
+                tooltip: {
+                    valueFormatter: function (value) {
+                    return value + ' %';
+                    }
+                },
+                data: yData
+            },
+            {
+                name: '正常接通',
+                type: 'line',
+                yAxisIndex: 1,
+                tooltip: {
+                    valueFormatter: function (value) {
+                    return value;
+                    }
+                },
+                data: yData1
+            },
+            {
+                name: '无人接听',
+                type: 'line',
+                yAxisIndex: 1,
+                tooltip: {
+                    valueFormatter: function (value) {
+                    return value;
+                    }
+                },
+                data: yData2
+            },
+            {
+                name: '稍后拨打',
+                type: 'line',
+                yAxisIndex: 1,
+                tooltip: {
+                    valueFormatter: function (value) {
+                    return value;
+                    }
+                },
+                data: yData3
+            },
+            {
+                name: '号码错误',
+                type: 'line',
+                yAxisIndex: 1,
+                tooltip: {
+                    valueFormatter: function (value) {
+                    return value;
+                    }
+                },
+                data: yData4
+            }
+        ]
+    };
+    return resultData
+}
 </script>
+
 <style scoped lang="scss">
 .wrap {
     .page-header {

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

@@ -1,54 +1,45 @@
 <template>
-    <div class="wrap">
-        <el-timeline style="max-width: 600px">
-    <el-timeline-item
-      v-for="(activity, index) in activities"
-      :key="index"
-      :icon="activity.icon"
-      :type="activity.type"
-      :color="activity.color"
-      :size="activity.size"
-      :hollow="activity.hollow"
-      :timestamp="activity.timestamp"
-    >
-      {{ activity.content }}
-    </el-timeline-item>
-  </el-timeline>
-    </div>
+  <div class="wrap" style="margin-top: 15px;">
+    <el-timeline style="max-width: 600px">
+      <el-timeline-item v-for="(activity, index) in tableData" :key="index" :timestamp="activity.createTime">
+        {{ activity.content }}
+      </el-timeline-item>
+    </el-timeline>
+  </div>
 </template>
 <script setup>
-import { onMounted, ref } from 'vue';
-import { MoreFilled } from '@element-plus/icons-vue'
-
-const activities = [
-  {
-    content: 'Custom icon',
-    timestamp: '2018-04-12 20:46',
-    size: 'large',
-    type: 'primary',
-    icon: MoreFilled,
-  },
-  {
-    content: 'Custom color',
-    timestamp: '2018-04-03 20:46',
-    color: '#0bbd87',
-  },
-  {
-    content: 'Custom size',
-    timestamp: '2018-04-03 20:46',
-    size: 'large',
-  },
-  {
-    content: 'Custom hollow',
-    timestamp: '2018-04-03 20:46',
-    type: 'primary',
-    hollow: true,
-  },
-  {
-    content: 'Default node',
-    timestamp: '2018-04-03 20:46',
-  },
-]
+  import { onMounted, ref } from 'vue';
+  import { MoreFilled } from '@element-plus/icons-vue'
+  import { getPageListData } from '@/api/main/system/system';
 
+  const props = defineProps({
+    planId: {
+      type: String,
+      default: ''
+    }
+  });
+  const tableData = ref([])
+  const planId = ref('')
+  const queryParams = ref({})
+  watch(props, (nweProps) => {
+    initMethod(nweProps);
+  });
+  onMounted(() => {
+    initMethod(props);
+  });
+  function initMethod(data) {
+    planId.value = data.planId
+    if (planId.value) {
+      getPlanpatient()
+    }
+  }
+  function getPlanpatient() {
+    queryParams.value.planId = planId.value
+    getPageListData('/SfPlanOperate/sfplanoperate', queryParams.value).then((res) => {
+      if (res.data.length > 0) {
+        tableData.value = res.data
+      }
+    })
+  }
 </script>
 <style scoped lang="scss"></style>

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

@@ -4,36 +4,38 @@
       <el-col :span="6">
         <el-card style="width: 100%;">
           <div class="card-title">
-            <el-input placeholder="请输入计划名称"></el-input>
+            <el-input v-model="form.name"  placeholder="请输入计划名称" @keyup.enter="handleKeyUpEnter"></el-input>
             <el-icon :size="20" class="iconEl" @click="iconHandle"><Filter /></el-icon>
-            
           </div>
           <div class="serach-bottom" v-if="!iconFlag" style="width: 100%; margin-top: 15px;">
             <el-row :gutter="20">
               <el-col :span="24">
-                <el-form-item label="计划">
-                  <el-select v-model="form.region" placeholder="请选择计划">
-                    <el-option label="Zone one" value="shanghai" />
-                    <el-option label="Zone two" value="beijing" />
+                <el-form-item label="随访类型">
+                  <el-select v-model="form.type" placeholder="请选择随访类型" style="width: 240px">
+                    <el-option v-for="item in followType" :key="item.value" :label="item.title" :value="item.value" />
                   </el-select>
                 </el-form-item>
-                
               </el-col>
               <el-col :span="24">
-                <el-form-item label="任务时间">
-                  <el-date-picker
-                    v-model="form.date1"
-                    type="daterange"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间"
-                  />
+                <el-form-item label="随访方式">
+                  <el-select v-model="form.way" placeholder="请选择随访类型" style="width: 240px">
+                    <el-option v-for="item in followWay" :key="item.value" :label="item.title" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="状态">
+                  <el-select v-model="form.state" placeholder="请选择状态">
+                    <el-option label="未开始" value="0" />
+                    <el-option label="进行中" value="1" />
+                    <el-option label="终止" value="2" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="要求时间">
+                <el-form-item label="开始时间">
                   <el-date-picker
-                    v-model="form.date2"
+                    v-model="form.date1"
                     type="daterange"
                     range-separator="至"
                     start-placeholder="开始时间"
@@ -41,42 +43,32 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="随访方式">
-                  <el-select v-model="form.delivery" placeholder="请选择随访方式">
-                    <el-option label="Zone one" value="shanghai" />
-                    <el-option label="Zone two" value="beijing" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="状态">
-                  <el-select v-model="form.resource" placeholder="请选择状态">
-                    <el-option label="Zone one" value="shanghai" />
-                    <el-option label="Zone two" value="beijing" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
             </el-row>
+            <div style="text-align: center;">
+              <el-button style="margin-right: 30px;" type="primary" @click="handleSearch">确 定</el-button>
+              <el-button style="margin-right: 30px;" type="primary" @click="handleResult">重 置</el-button>
+            </div>
           </div>
+
+
           <el-button class="card-add-btn" @click="onAddItem">新增计划 </el-button>
           <div class="card-content" ref="cardListRef" @scroll="doScroll">  
-            <el-card style="padding: 0;margin-bottom: 5px;" v-for="item in contentData">
+            <el-card style="padding: 0;margin-bottom: 5px;" v-for="item in planData" @click="handleItem(item)">
               <div class="content-title">
                 <el-icon class="icon-content" :size="20">
-                  <Phone v-if="item.type === '电话'" />
-                  <Message v-if="item.type === '短信'" />
+                  <Phone v-if="item.name === 1" />
+                  <Message v-if="item.name === 2" />
                 </el-icon>
-                <div class="titleText">{{item.title}}</div>
+                <div class="titleText">{{item.name}}</div>
               </div>
               <div class="content-center">
-                {{item.content}}
+                {{item.describes}}
               </div>
               <div class="content-progress">
                 <el-progress :percentage="item.percentage" />
               </div>
               <div class="content-bottom">
-                <div class="lf">{{item.planName}}</div>
+                <div class="lf">{{item.cycle===1?'周期':'每天'}}</div>
                 <div class="fr">
                   <el-button type="primary" link>{{item.state}}</el-button>
                 </div>
@@ -89,23 +81,23 @@
         
         <el-card style="width: 100%;">
           <div class="page-title">
-            <div class="lf">标题</div>
-            <el-button type="primary" link>进行中</el-button>
+            <div class="lf">{{planDetail.name}}</div>
+            <el-button type="primary" link>{{getPlanState(planDetail.state)}}</el-button>
             <div class="btn">
-              <el-button>编辑</el-button>
+              <el-button @click="handleEdit(planDetail)">编辑</el-button>
               <el-button>复制</el-button>
             </div>
           </div>
           <div class="page-content"> 
-            在中台产品那是一种内在的东西， 他们到达不了，也 他们到达不了，也 他们到达不了，也 他们到达不了，也
+            {{planDetail.describes}}
           </div>
           <div class="page-describe">
-            <span>患者数量：200</span>
-            <span>更新时间：2024-04-01 12:35:20</span>
-            <span>周期：2024-01-01 12:00:00 ~ 2024-12-01 12:00:00</span>
+            <span>患者数量：{{planDetail.patientsNum}}</span>
+            <span>更新时间：{{planDetail.updateTime}}</span>
+            <span>周期：{{planDetail.beginEffective}} ~ {{planDetail.endEffective}}</span>
           </div>
           <div class="page-describe">
-            <span>外呼坐席：张三、李四、王五</span>
+            <span>外呼坐席：{{seatData.join(',')}}</span>
           </div>
           <div class="page-mian">
             <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
@@ -116,17 +108,17 @@
               </el-tab-pane>
               <el-tab-pane label="患者列表" name="second">
                 <div class="tabList"> 
-                  <patient-list></patient-list>
+                  <patient-list :planId="planId"></patient-list>
                 </div>
               </el-tab-pane>
               <el-tab-pane label="计划详情" name="third">
                 <div class="tabList"> 
-                  <project-details planId="1"></project-details>
+                  <project-details :planId="planId" isdetil="1"></project-details>
                 </div>
               </el-tab-pane>
               <el-tab-pane label="操作日志" name="fourth">
                 <div class="tabList"> 
-                  <operation-log></operation-log>
+                  <operation-log :planId="planId"></operation-log>
                 </div>
               </el-tab-pane>
             </el-tabs>
@@ -141,84 +133,143 @@
 
 import { onMounted, ref } from 'vue';
 import dataBoard from './cpns/dataBoard';
-import patientList from './cpns/patientList/patientList';
+import patientList from '@/views/main/followUp/addFollowUpPlan/cpns/patientList/patientList';
 import projectDetails from '../addFollowUpPlan/addFollowUpPlan';
 import operationLog from './cpns/operationLog';
+import { getPageListData } from '@/api/main/system/system';
+import { useRouter } from 'vue-router';
+import { followType,followWay } from "@/utils/commonDic.js";
+import moment from 'moment';
 
 const activeName = ref('first')
-const handleClick = (tab, event) => {
-  console.log(tab, event)
-}
-
+const router = useRouter();
+const planParams = ref({
+  pageNum:1,
+  pageSize:10
+})
 const form = ref({
   name: '',
-  date1: '',
-  date2: '',
-  delivery: '',
-  resource: '',
+  type: '',
+  way: '',
+  state:'',
+  beginEffective: '',
+  endEffective:''
 })
 const iconFlag = ref(true)
+const contentData = ref([])
+const planData = ref([])
+const planDetail = ref({})
+const planId = ref('')
+const seatData = ref([])
+
+const handleClick = (tab, event) => {
+  console.log(tab, event)
+}
 function iconHandle() {
   console.log("点击")
   iconFlag.value = !iconFlag.value
 }
 const cardListRef = ref(null)
+
 onMounted(() => {
+  geFollowUpList()
 });
+function handleKeyUpEnter() {
+  console.log('回车');
+}
+function handleSearch() {
+  console.log('搜索');
+  planParams.value.name =  form.value.name
+  planParams.value.type =  form.value.type
+  planParams.value.way =  form.value.way
+  planParams.value.state =  form.value.state
+  planParams.value.beginEffective =  moment(form.value.date1[0]).format('YYYY-MM-DD HH:mm:ss')
+  planParams.value.endEffective =  moment(form.value.date1[1]).format('YYYY-MM-DD HH:mm:ss')
+  geFollowUpList()
+}
+function handleResult() {
+  console.log('重置');
+  form.value.name = ''
+  form.value.type = ''
+  form.value.way = ''
+  form.value.state = ''
+  form.value.date1 = ''
+}
+function geFollowUpList() {
+  
+  
+  getPageListData("/SfPlan/sfPlan",planParams.value).then((res)=>{
+    if (!planId.value) {
+      planId.value = res.data[0].plId
+      planDetail.value = res.data[0]
+      getPlanSeatList(planId.value)
+    }
+    contentData.value = res.data
+    planData.value = planData.value.concat(contentData.value);
+    
+  })
+}
+
+function getPlanSeatList(plId) {
+  const params = {plId}
+  getPageListData("/SfPlanSeats/sfplanseats",params).then((res)=>{
+    if (res.data.length>0) {
+      res.data.forEach(ele => {
+        seatData.value.push(ele.userName?ele.userName:ele.usercode)
+      });
+    }
+    
+  })
+}
+
+function handleEdit(item) {
+  router.push({
+    path: '/followUp/addFollowUpPlan',
+    query: {
+      planId: item.plId,
+    }
+  });
+}
+
+function handleItem(item) {
+  planDetail.value = item
+  getPlanSeatList(item.plId)
+}
+
+function getPlanState(value) {
+  let resultState = ''
+  switch (Number(value)) {
+    case 0:
+      resultState = '未开始'
+      break;
+    case 1:
+      resultState = '进行中'
+      break;
+    case 2:
+      resultState = '终止'
+      break;
+  }
+  return resultState
+}
+
 function doScroll() {
     const scrollwrapper = cardListRef.value
     const{ scrollTop,clientHeight,scrollHeight }= scrollwrapper // 获职滚动数据
     // 判断是否滚动到底部
     if(scrollTop +clientHeight >=scrollHeight -10){
-      console.log('滚动到底部')
+      console.log('滚动到底部',contentData.value.length)
+      if (contentData.value.length > 9) {
+        planParams.value.pageNum ++
+        geFollowUpList()
+      }
+      
     }
   }
+
 function onAddItem() {
   console.log('添加')
 }
 
-const contentData = ref([
-  {
-    title:'标题',
-    type:'电话',
-    percentage:50,
-    content:'在中台产品那是一种内在的东西， 他们到达不了，也 他们到达不了，也 他们到达不了，也 他们到达不了，也',
-    planName:'周期性计划',
-    state:'进行中'
-  },
-  {
-    title:'标题2',
-    type:'短信',
-    percentage:80,
-    content:'在中台产品那是一种内在的东西， 他们到达不了，也 他们到达不了，也 他们到达不了，也 他们到达不了，也',
-    planName:'周期性计划',
-    state:'进行中'
-  },
-  {
-    title:'标题2',
-    type:'短信',
-    percentage:80,
-    content:'在中台产品那是一种内在的东西， 他们到达不了，也 他们到达不了，也 他们到达不了，也 他们到达不了，也',
-    planName:'周期性计划',
-    state:'进行中'
-  },
-  {
-    title:'标题2',
-    type:'短信',
-    percentage:80,
-    content:'在中台产品那是一种内在的东西， 他们到达不了，也 他们到达不了，也 他们到达不了，也 他们到达不了，也',
-    planName:'周期性计划',
-    state:'进行中'
-  },
-  {
-    title:'标题2',
-    type:'短信',
-    percentage:80,
-    content:'在中台产品那是一种内在的东西， 他们到达不了，也 他们到达不了，也 他们到达不了，也 他们到达不了，也',
-    planName:'周期性计划',
-    state:'进行中'
-  }
-])
 </script>
 
 <style scoped lang="scss">
@@ -256,6 +307,7 @@ const contentData = ref([
     }
     .content-center{
       line-height: 20px;
+      height: 40px;
       text-overflow: ellipsis;
       display: -webkit-box;
       -webkit-line-clamp: 2;

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

@@ -55,7 +55,6 @@ import patientDetail from "@/views/main/patientFile/patientFileList/cpns/patient
 import knowledgeList from "@/views/main/knowledgeBase/knowledgeList/knowledgeList";
 import visitDetails from "./visitDetails";
 import { useRoute, useRouter } from 'vue-router';
-import {  } from 'vue-router';
 import { getTasks } from  '@/api/patient/task';
 
 const router = useRoute();

CMS1.0/src/views/main/patientFile/patientFileList/patientFileList.vue

@@ -79,7 +79,6 @@ export default defineComponent({
   },
   setup() {
     const router = useRouter();
-
     const [pageContentRef, handleResetClick, handleQueryClick] = usePageSearch()
     const activeNames = ref(['1'])
     const input2 = ref('')

CMS1.0/src/views/main/system/menu/index.vue

@@ -223,6 +223,7 @@
                             </template>
                             <el-radio-group v-model="form.status">
                                 <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                            </el-radio-group>
                         </el-form-item>
                     </el-col>
                 </el-row>