fix

CMS1.0/.env.development

@@ -4,7 +4,7 @@ VITE_APP_TITLE = 在线客服管理系统
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
-# 若依管理系统/开发环境 http://192.168.150.249:8010   http://192.168.1.15:8010/
+# 若依管理系统/开发环境 http://192.168.150.249:8010   http://192.168.1.15:8010/  http://123.56.29.119:8080
 
 VITE_APP_BASE_API = 'http://192.168.1.15:8060/'
 

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="message" placeholder="请选择模版" style="width: 240px">
+              <el-select v-model="message" placeholder="请选择模版" style="width: 240px" @change="messageChange">
                 <el-option v-for="item in smsData" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -356,6 +356,8 @@ watch(getPlanId, (nweProps) => {
     }
   }
 });
+
+
 onMounted(() => {
   initMethod(props);
 });
@@ -376,6 +378,14 @@ const onAddItem = () => {
   centerDialogVisibleAddWorkorder.value = true;
 
 }
+function messageChange(e) {
+  console.log(e);
+  getPageDetail("/sms/template/"+e).then((res)=>{
+    console.log(res.data);
+  })
+  
+}
+
 function handleSeatTrue() {
   centerDialogVisibleAddWorkorder.value = false;
   const newAway = []
@@ -460,7 +470,7 @@ const handleConfirmClick = () => {
       formData.value = workBasicData.value
       formData.value.beginEffective = moment(workBasicData.value.indate[0]).format('YYYY-MM-DD HH:mm:ss')
       formData.value.endEffective = moment(workBasicData.value.indate[1]).format('YYYY-MM-DD HH:mm:ss')
-      delete formData.value.indate
+      
       formData.value.questionnaire = questionnaire.value
       formData.value.message = message.value
       formData.value.messageType = messageType.value
@@ -481,7 +491,10 @@ const handleConfirmClick = () => {
           // 关闭当前页面
           useTagsViewStore().delView(userRouter.currentRoute.value);
           // 返回上一页面
-          userRouter.go(-1);
+          userRouter.push({
+            path: '/followUp/followUpPlan',
+          })
+         
         })
       } else{
         createPageData('/SfPlan/sfPlan', formData.value).then((data) => {
@@ -489,7 +502,9 @@ const handleConfirmClick = () => {
             // 关闭当前页面
             useTagsViewStore().delView(userRouter.currentRoute.value);
             // 返回上一页面
-            userRouter.go(-1);
+            userRouter.push({
+              path: '/followUp/followUpPlan',
+            })
         })
       }
     }

CMS1.0/src/views/main/followUp/addFollowUpPlan/config/modal.config.js

@@ -8,7 +8,11 @@ export const modalConfig = {
       field: 'name',
       type: 'input',
       label: '计划名称',
-      placeholder: '请输入计划名称'
+      placeholder: '请输入计划名称',
+      otherOptions: {
+        maxlength:"50",
+        showWordLimit:'true'
+      }
     },
     {
       required : true ,
@@ -36,6 +40,7 @@ export const modalConfig = {
     },
     {
       field: 'indate', //string
+      required : true ,
       type: 'datepicker',
       label: '有效期', 
       otherOptions: {
@@ -49,7 +54,11 @@ export const modalConfig = {
       type: 'textarea',
       colLayout: { span: 16 },
       label: '描述',
-      placeholder: '请输入描述内容'
+      placeholder: '请输入描述内容',
+      otherOptions: {
+        maxlength:"100",
+        showWordLimit:'true'
+      }
     },
     // {
     //   required : true ,

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

@@ -137,6 +137,7 @@ function handleSearch() {
 const handleClick = () => {}
 watch(props, (nweProps) => {
   btnFlag.value = nweProps.btnFlag
+  console.log(btnFlag.value);
   initMethod(nweProps);
 });
 onMounted(() => {

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

@@ -115,7 +115,7 @@
               </el-tab-pane>
               <el-tab-pane label="患者列表" name="second">
                 <div class="tabList"> 
-                  <patient-list :planId="planId"></patient-list>
+                  <patient-list :planId="planId" :btnFlag="isdetilBtn"></patient-list>
                 </div>
               </el-tab-pane>
               <el-tab-pane label="计划详情" name="third">
@@ -144,13 +144,18 @@ import patientList from './cpns/patientFileList/patientFileList';
 import projectDetails from '../addFollowUpPlan/addFollowUpPlan';
 import operationLog from './cpns/operationLog';
 import { editPageData,getPageListData,getPageDetail } from '@/api/main/system/system';
-import { useRouter } from 'vue-router';
+import { useRouter} from 'vue-router';
 import { followType,followWay } from "@/utils/commonDic.js";
 import moment from 'moment';
 const { proxy } = getCurrentInstance();
 
+
 const activeName = ref('first')
 const router = useRouter();
+router.afterEach((to,from)=>{
+	// 记录用户的浏览记录
+  	console.log(to,from);
+})
 const planParams = ref({
   pageNum:1,
   pageSize:10
@@ -164,13 +169,14 @@ const form = ref({
   endEffective:''
 })
 const borderIndex = ref(0)
+const isdetilBtn = ref(false)
 const iconFlag = ref(true)
 const contentData = ref([])
 const planData = ref([])
 const planDetail = ref({})
 const planId = ref()
 const seatData = ref([])
-
+const activatedFlag = ref(false)
 const handleClick = (tab, event) => {
   console.log(tab, event)
 }
@@ -179,7 +185,10 @@ function iconHandle() {
   iconFlag.value = !iconFlag.value
 }
 const cardListRef = ref(null)
-
+onActivated(() => {
+  activatedFlag.value = true
+  geFollowUpList();
+})
 onMounted(() => {
   geFollowUpList()
 });
@@ -189,6 +198,12 @@ function handleKeyUpEnter() {
   planData.value = []
   geFollowUpList()
 }
+// beforeRouteEnter((to, from, next)=> {
+//   beforeRouteUpdate((to, from, next) => {
+//     console.log(to, from, next);
+//   })
+// })
+
 function handleSearch() {
   iconFlag.value = !iconFlag.value
   console.log('搜索');
@@ -216,8 +231,21 @@ function geFollowUpList() {
       planDetail.value = res.data[0]
       getPlanSeatList(planId.value)
     }
+   if (activatedFlag.value) {
+    planData.value = []
+    console.log(planDetail.value);
+    console.log(res.data[0]);
+    setTimeout(()=>{
+      handleItem(planDetail.value,0)
+    },50)
+   }
     contentData.value = res.data
     planData.value = planData.value.concat(contentData.value);
+    if (planData.value.state === 2) {
+        isdetilBtn.value = false
+      } else{
+        isdetilBtn.value = true
+      }
   })
 }
 
@@ -279,8 +307,8 @@ function handleClose(planId) {
 
 function getPlanDetail(planId) {
   getPageDetail("/SfPlan/sfPlan/"+planId).then((res)=>{
-    console.log(res.data)
     planDetail.value = res.data
+    
   })
 }
 
@@ -290,6 +318,11 @@ function handleItem(item,index) {
   planDetail.value = item
   planId.value = item.plId
   getPlanSeatList(item.plId)
+  if (planDetail.value.state === 2) {
+    isdetilBtn.value = false
+  } else{
+    isdetilBtn.value = true
+  }
 }
 
 function getPlanState(value) {

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

@@ -37,7 +37,7 @@
                             {{followSituationData.SfTask}}
                         </div>
                         <div >
-                            <el-image style="width: 100%; height: 20px" :src="echarts1Url" :fit="fit" />
+                            <el-image style="width: 100%;" :src="echarts1Url" :fit="fit" />
                         </div>
                         <template #footer>
                             今日任务量<span style="margin-left: 15px;">
@@ -51,7 +51,7 @@
                         <div class="header-text1">已完成量</div>
                         <div class="header-text2">{{followSituationData.SfTaskComplete}}</div>
                         <div>
-                            <el-image style="width: 100%; height: 20px" :src="echarts2Url" :fit="fit" />
+                            <el-image style="width: 100%;" :src="echarts2Url" :fit="fit" />
                         </div>
                         <template #footer>
                             今日完成量<span style="margin-left: 15px;">{{followSituationData.SfTaskDayComplete}}</span>
@@ -282,6 +282,9 @@ function getIcon(value) {
 
 function optionData1(xData,yData) {
     let resultData = {
+        tooltip: {
+            trigger: 'axis'
+        },
         xAxis: {
             type: 'category',
             data: xData
@@ -301,29 +304,19 @@ function optionData1(xData,yData) {
 }
 function optionData2() {
     let resultData = {
-
         tooltip: {
             trigger: 'axis'
         },
         legend: {
             data: ['接通率']
         },
-        
-        toolbox: {
-            feature: {
-            saveAsImage: {}
-            }
-        },
         xAxis: {
             type: 'category',
-            boundaryGap: false,
             data: optionxData2.value
         },
         yAxis: {
             type: 'value',
-            axisLabel: {
-                formatter: '{value} %'
-            }
+
         },
         series: [
             {
@@ -334,6 +327,7 @@ function optionData2() {
             },
             
         ]
+
     }
     return resultData
 }
@@ -354,7 +348,7 @@ function optionData2() {
         }
 
         .header-text3 {
-            margin-top: 5px;
+            margin-top: 23px;
 
             span {
                 margin-right: 30px;