fix

CMS1.0/src/components/page-add/src/page-add.vue

@@ -40,10 +40,8 @@
       watch(
         () => props.defaultInfo,
         (newValue) => {
-          console.log(newValue);
           for (const item of props.modalConfig.formItems) {
             formData.value[`${item.field}`] = newValue[`${item.field}`];
-            console.log(item.field, newValue[`${item.field}`]);
           }
           emit('dataChange', formData.value);
         },

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

@@ -8,7 +8,7 @@
             <span class="card-title">基础信息</span>
           </div>
         </template>
-        <page-add @dataChange="getWorkBasicData" ref="pageModalRef" :defaultInfo="defaultInfo"
+        <page-add @dataChange="getWorkBasicData"  :key="componentKey" ref="pageModalRef" :defaultInfo="defaultInfo"
           :modalConfig="modalConfigRef"></page-add>
       </el-card>
       <!-- 问卷配置 -->
@@ -41,6 +41,12 @@
                 祝您生活愉快！<el-tag type="danger" @click="questionHandle">问卷</el-tag>
               </div>
             </div>
+            <div class="templateBox" v-if="workBasicData.way === '1'">
+              <div class="template-title">问卷信息</div>
+              <div v-if="questionnaire" class="questionnaire">
+                <fill-out :surveyId="questionnaire" :userId="'1'"></fill-out>
+              </div>
+            </div>
           </el-col>
         </el-row>
       </el-card>
@@ -110,11 +116,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="匹配方式" label-width="200px">
-              <el-select v-model="matchingMethod" placeholder="请选择匹配方式" @change="changeSelect3" style="width: 240px">
+              <el-select v-model="matchingMethod" placeholder="请选择匹配方式" style="width: 240px">
                 <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'">
+            <el-form-item label="周期" label-width="200px">
               <el-select v-model="cycle" placeholder="请选择周期" style="width: 240px">
                 <el-option v-for="item in periodData" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
@@ -212,7 +218,7 @@
           filterable
           remote
           reserve-keyword
-          placeholder="Please enter a keyword"
+          placeholder="请选择坐席"
           :remote-method="remoteMethod"
           :loading="loading"
           style="width: 240px"
@@ -240,6 +246,8 @@
 import moment from 'moment';
 
 import PageAdd from '@/components/page-add';
+import fillOut from '@/views/main/questionnaireManagement/fillOut';
+
 import seatList from './cpns/seatList/seatList';
 import patientList from './cpns/patientList/patientList';
 import { modalConfig } from './config/modal.config';
@@ -260,8 +268,8 @@ const props = defineProps({
     default: () => ({}),
   },
   planId: {
-    type: String,
-    default: ''
+    type: Number,
+    default: 0
   },
   isdetil:{
     type: String,
@@ -278,6 +286,7 @@ const { proxy } = getCurrentInstance();
 const downLoadUrl = new URL('@/assets/downLoad/template.xlsx', import.meta.url).href
 const router = useRoute();
 const isdetil = ref('')
+const componentKey = ref(0)
 const loading = ref(false)
 const seatSelectvalue = ref()
 const rangeSeatData = ref([])
@@ -306,7 +315,7 @@ const filterObjData = ref({
 const filterLongData = ref([])
 const filterData = ref([])
 const screenData = ref([])
-
+const state =  ref(Number(router.query.planState || 0));
 
 const formData = ref({});
 const workBasicData = ref({});
@@ -332,9 +341,6 @@ const centerDialogVisibleQues = ref(false)
 const planId = ref(Number(router.query.planId || 0));
 const planDetailObj = ref({})
 
-function changeSelect3(data) {
-  console.log(data)
-}
 onMounted(() => {
   initMethod(props);
 });
@@ -377,8 +383,6 @@ function handleSeatTrue() {
     }
   });
   if (planId.value) {
-    console.log(seatSelectvalue.value)
-    console.log(newAway);
     newAway.forEach(element => {
       const params = {
         plId:planId.value,
@@ -412,6 +416,7 @@ function questionHandle() {
   centerDialogVisibleQues.value = true
 }
 const modalConfigRef = computed(() => {
+  
   //  随访类型
   const processorTypeItem = modalConfig.formItems.find((item) => item.field === 'type');
   processorTypeItem.options = followType;
@@ -428,7 +433,6 @@ const modalConfigRef = computed(() => {
 // 工单基础信息
 const getWorkBasicData = (item) => {
   workBasicData.value = item;
-  console.log(workBasicData.value)
 };
 defineExpose({
   getWorkBasicData,
@@ -454,8 +458,7 @@ const handleConfirmClick = () => {
       formData.value.patientsNumRule =patientsNumRule.value
       formData.value.patientsNum = patientsNum.value
       formData.value.screen = JSON.stringify(filterResultData.value)
-      console.log(formData.value)
-      if (planId.value) {
+      if (planId.value && !state.value) {
         formData.value.plId = planId.value
         editPageData('/SfPlan/sfPlan', formData.value).then((data) => {
           proxy.$modal.msgSuccess('编辑成功！');
@@ -463,9 +466,9 @@ const handleConfirmClick = () => {
       } else{
         createPageData('/SfPlan/sfPlan', formData.value).then((data) => {
             proxy.$modal.msgSuccess('新增成功！');
+            cleanForm()
         })
       }
-      
       // editPageData('/order/workorder', formData.value).then((data) => {})
     }
   });
@@ -473,10 +476,11 @@ const handleConfirmClick = () => {
 
 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
+      if (!state.value) {
+        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
@@ -498,13 +502,11 @@ function getPlanDetail(planId) {
       cycle.value = planDetailObj.value.cycle.toString()
       
       executionTime.value = converTime(planDetailObj.value.executionTime)
-      patientsNumRule.value = planDetailObj.value.patientsNumRule.toString()
+      patientsNumRule.value = planDetailObj.value.patientsNumRule && 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:{
@@ -524,7 +526,6 @@ function getPlanDetail(planId) {
           }
           filterData.value.push(obj)
         });
-        console.log(filterData.value);
       }
       // defaultInfo.value = planDetailObj.value.name
       // defaultInfo.value = planDetailObj.value.name
@@ -534,7 +535,28 @@ function getPlanDetail(planId) {
     
   })
 }
-
+function cleanForm() {
+  componentKey.value += 1
+  // defaultInfo.value.name =''
+  // defaultInfo.value.type =''
+  // defaultInfo.value.way =''
+  // defaultInfo.value.executionMethod =''
+  // defaultInfo.value.indate =[]
+  // defaultInfo.value.describes =''
+  questionnaire.value = ''
+  message.value = ''
+  questionnaireMsg.value = ''
+  quesIput.value = ''
+  allocation.value = ''
+  seatListData.value = []
+  cycle.value = ''
+  executionTime.value = ''
+  patientsNumRule.value = ''
+  patientsNum.value = ''
+  screenData.value = ''
+  deduplication.value = ''
+  matchingMethod.value = ''
+}
 const converTime = (arr) => {
   const _arr = arr.split(":");
   let result = new Date(2010, 10, 10, Number(_arr[0]), Number(_arr[1]), Number(_arr[2]))
@@ -560,8 +582,6 @@ function getPlanSeatList(plId) {
         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)
     //   });
@@ -716,8 +736,18 @@ const [pageModalRef, defaultInfo] = usePageModal(newCallback, editCallback);
 .templateBox {
   font-size: 14px;
   line-height: 32px;
+  .template-title {
+    margin-bottom: 15px;
+  }
 
-  .template-title {}
+  .questionnaire{
+    height: 600px;
+    scrollbar-width: none; /* firefox */
+    -ms-overflow-style: none; /* IE 10+ */
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+  
 }
 
 .questionBox {

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

@@ -12,7 +12,7 @@
           :total="total"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
-          @pagination="getList"
+          @pagination="getPlanpatient"
         />
         <el-upload
             style="text-align: center; margin-top: 15px;"
@@ -59,11 +59,11 @@ import { getPageListData } from '@/api/main/system/system';
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   planId: {
-    type: String,
-    default: ''
+    type: Number,
+    default: 0
   }
 });
-const planId = ref('')
+const planId = ref()
 const total = ref(0)
 const formData = ref({});
 const workBasicData = ref({});
@@ -86,12 +86,9 @@ const handleExcelSuccess = (response, uploadFile, uploadFiles) => {
   console.log(response, uploadFile, uploadFiles);
 };
 const onAddItem = () => {
-  console.log('新增')
   centerDialogVisibleAddWorkorder.value = true;
 }
-const handleClick = () => {
-  console.log('click')
-}
+const handleClick = () => {}
 watch(props, (nweProps) => {
   initMethod(nweProps);
 });
@@ -100,12 +97,10 @@ 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
@@ -120,8 +115,6 @@ const modalConfigRef = computed(() => {
   //  来源
   const processorSourceItem = modalConfig.formItems.find((item) => item.field === 'source');
   processorSourceItem.options = useSelectStore().dictSourceList;
-
-
   return modalConfig;
 });
 

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

@@ -115,8 +115,22 @@ const sfCompleteData = ref([])
 const callDurationData = ref({})
 const dialogueRoundData = ref({})
 const listeningStatusData = ref([])
-
+const planId = ref()
+const props = defineProps({
+  planId: {
+    type: Number,
+    default: 0
+  }
+});
+watch(props, (nweProps) => {
+  initMethod(nweProps);
+});
 onMounted(() => {
+    initMethod(props)
+})
+function initMethod(data) {
+  planId.value = data.planId
+  if (planId.value) {
     chartDom1 = document.getElementById('mainEcharts1');
     chartDom2 = document.getElementById('mainEcharts2');
     chartDom3 = document.getElementById('mainEcharts3');
@@ -127,12 +141,12 @@ onMounted(() => {
     getCallDuration()
     getDialogueRound()
     getListeningStatus()
-})
-
+  }
+}
 // 接听状态
 function getListeningStatus() {
     const params = {
-        plId:2
+        plId:planId.value
     }
     getPageListData("/SfPlanReport/selectListeningStatus",params).then((res)=>{
         if (res.data) {
@@ -171,7 +185,7 @@ function getListeningStatus() {
 function getDialogueRound() {
     const numbers = "10,15,30,45,60"
     const params = {
-        plId:2
+        plId:planId.value
     }
     getPageListData("/SfPlanReport/selectDialogueRound/"+numbers,params).then((res)=>{
         if (res.data) {
@@ -189,7 +203,7 @@ function getDialogueRound() {
 function getCallDuration() {
     const numbers = "10,15,30,45,60"
     const params = {
-        plId:2
+        plId:planId.value
     }
     getPageListData("/SfPlanReport/selectCallDuration/"+numbers,params).then((res)=>{
         if (res.data) {
@@ -206,7 +220,7 @@ function getCallDuration() {
 // 坐席完成量
 function getSfComplete() {
     const params = {
-        plId:2
+        plId:planId.value
     }
     getPageListData("/SfPlanReport/selectSfComplete",params).then((res)=>{
         if (res.data) {
@@ -218,7 +232,7 @@ function getSfComplete() {
 // 完成量统计
 function selectPlComplete() {
     const params = {
-        plId:2
+        plId:planId.value
     }
     getPageListData("/SfPlanReport/selectPlComplete",params).then((res)=>{
         if (res.data) {
@@ -237,7 +251,7 @@ function selectPlComplete() {
 // 数据看板
 function selectPlDataBoard() {
     const params = {
-        plId:2
+        plId:planId.value
     }
     getPageListData("/SfPlanReport/selectPlDataBoard",params).then((res)=>{
         if (res.data) {

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

@@ -14,12 +14,12 @@
 
   const props = defineProps({
     planId: {
-      type: String,
-      default: ''
+      type: Number,
+      default: 0
     }
   });
   const tableData = ref([])
-  const planId = ref('')
+  const planId = ref()
   const queryParams = ref({})
   watch(props, (nweProps) => {
     initMethod(nweProps);
@@ -36,6 +36,7 @@
   function getPlanpatient() {
     queryParams.value.planId = planId.value
     getPageListData('/SfPlanOperate/sfplanoperate', queryParams.value).then((res) => {
+      tableData.value = []
       if (res.data.length > 0) {
         tableData.value = res.data
       }

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

@@ -84,8 +84,10 @@
             <div class="lf">{{planDetail.name}}</div>
             <el-button type="primary" link>{{getPlanState(planDetail.state)}}</el-button>
             <div class="btn">
-              <el-button @click="handleEdit(planDetail)">编辑</el-button>
-              <el-button>复制</el-button>
+              <el-button @click="handleEdit(planDetail)" v-if="planDetail.state === 1">编辑</el-button>
+              <el-button @click="handleClose(planDetail.plId)" v-if="planDetail.state === 1">关闭</el-button>
+              <el-button @click="handleOpen(planDetail.plId)" v-if="planDetail.state === 2">开启</el-button>
+              <el-button @click="handleCopy(planDetail)">复制</el-button>
             </div>
           </div>
           <div class="page-content"> 
@@ -103,7 +105,7 @@
             <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
               <el-tab-pane label="数据看板" name="first" >
                 <div class="tabList"> 
-                  <data-board></data-board>
+                  <data-board :planId="planId"></data-board>
                 </div>
               </el-tab-pane>
               <el-tab-pane label="患者列表" name="second">
@@ -129,17 +131,18 @@
   </div>
 </template>
 
-<script setup>
+<script setup name="FollowUpPlan">
 
 import { onMounted, ref } from 'vue';
 import dataBoard from './cpns/dataBoard';
 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 { editPageData,getPageListData,getPageDetail } from '@/api/main/system/system';
 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();
@@ -159,7 +162,7 @@ const iconFlag = ref(true)
 const contentData = ref([])
 const planData = ref([])
 const planDetail = ref({})
-const planId = ref('')
+const planId = ref()
 const seatData = ref([])
 
 const handleClick = (tab, event) => {
@@ -176,6 +179,9 @@ onMounted(() => {
 });
 function handleKeyUpEnter() {
   console.log('回车');
+  planParams.value.name =  form.value.name
+  planData.value = []
+  geFollowUpList()
 }
 function handleSearch() {
   console.log('搜索');
@@ -183,8 +189,9 @@ function handleSearch() {
   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')
+  planParams.value.beginEffective =  form.value.date1 && moment(form.value.date1[0]).format('YYYY-MM-DD HH:mm:ss')
+  planParams.value.endEffective =  form.value.date1 && moment(form.value.date1[1]).format('YYYY-MM-DD HH:mm:ss')
+  planData.value = []
   geFollowUpList()
 }
 function handleResult() {
@@ -196,8 +203,6 @@ function handleResult() {
   form.value.date1 = ''
 }
 function geFollowUpList() {
-  
-  
   getPageListData("/SfPlan/sfPlan",planParams.value).then((res)=>{
     if (!planId.value) {
       planId.value = res.data[0].plId
@@ -206,7 +211,6 @@ function geFollowUpList() {
     }
     contentData.value = res.data
     planData.value = planData.value.concat(contentData.value);
-    
   })
 }
 
@@ -214,6 +218,7 @@ function getPlanSeatList(plId) {
   const params = {plId}
   getPageListData("/SfPlanSeats/sfplanseats",params).then((res)=>{
     if (res.data.length>0) {
+      seatData.value = []
       res.data.forEach(ele => {
         seatData.value.push(ele.userName?ele.userName:ele.usercode)
       });
@@ -221,7 +226,6 @@ function getPlanSeatList(plId) {
     
   })
 }
-
 function handleEdit(item) {
   router.push({
     path: '/followUp/addFollowUpPlan',
@@ -230,9 +234,47 @@ function handleEdit(item) {
     }
   });
 }
+function handleCopy(item) {
+  router.push({
+    path: '/followUp/addFollowUpPlan',
+    query: {
+      planId: item.plId,
+      planState:1
+    }
+  });
+}
+function handleOpen(planId) {
+  const params = {
+    id:planId,
+    state:1
+  }
+  editPageData('/SfPlan/sfPlan/modifyState/'+planId +'?state=1').then((data) => {
+    proxy.$modal.msgSuccess('开启成功');
+    getPlanDetail(planId)
+  })
+}
+function handleClose(planId) {
+  const params = {
+    id:planId,
+    state:2
+  }
+  editPageData('/SfPlan/sfPlan/modifyState/'+planId +'?state=2').then((data) => {
+    proxy.$modal.msgSuccess('关闭成功');
+    getPlanDetail(planId)
+  })
+}
+
+function getPlanDetail(planId) {
+  getPageDetail("/SfPlan/sfPlan/"+planId).then((res)=>{
+    console.log(res.data)
+    planDetail.value = res.data
+  })
+}
+
 
 function handleItem(item) {
   planDetail.value = item
+  planId.value = item.plId
   getPlanSeatList(item.plId)
 }
 
@@ -268,6 +310,9 @@ function doScroll() {
 
 function onAddItem() {
   console.log('添加')
+  router.push({
+    path: '/followUp/addFollowUpPlan',
+  });
 }
 
 </script>

CMS1.0/src/views/main/questionnaireManagement/fillOut.vue

@@ -55,9 +55,13 @@
 						</div>
 						<div>{{ v.remark }}</div>
 						<div>
+							<el-checkbox label="Option A" value="Value A" />
 							<el-checkbox-group v-model="v['_content']">
-								<el-checkbox v-for="(val, ind) in v.optionViewList" :key="ind"
-									:label="val.optionname">{{ val.optionname }}：{{ val.optiondetail }}</el-checkbox>
+								<el-checkbox 
+								v-for="(val, ind) in v.optionViewList" 
+								:key="ind" 
+								:label="val.optionname+'：'+val.optiondetail" 
+								value="val.optionname"/>
 							</el-checkbox-group>
 						</div>
 					</div>
@@ -105,8 +109,11 @@
 						<div>{{ v.remark }}</div>
 						<div>
 							<el-checkbox-group v-model="v['_content']">
-								<el-checkbox v-for="(val, ind) in v.optionViewList" :key="ind"
-									:label="val.optionname">{{ val.optionname }}：{{ val.optiondetail }}</el-checkbox>
+								<el-checkbox 
+								v-for="(val, ind) in v.optionViewList" 
+								:key="ind"
+								:label="val.optionname+'：'+val.optiondetail" 
+								value="val.optionnam"/>
 							</el-checkbox-group>
 							<div class="pxCss">您选择的顺序为：{{ v['_content']?.join('、') }}</div>
 						</div>