fix

src/utils/commonDic.js

@@ -335,4 +335,13 @@ export const taskResults = [{
         end: true,
         // error: true,
     },
-];
+];
+// 0 未开始 1 进行中 2 终止 3 已完成 4 异常随访  5 待填报*/
+export const taskMsgResults = {
+    0: { title: '未开始', color: '#909399',  value: '' },
+    1: { title: '进行中', color: '#eebe77',  value: '正常接听', end: true, },
+    2: { title: '终止',  color: '#F56C6C',   value: '正常接听', end: true, },
+    3: { title: '已完成', color: '#67C23A',  value: '正常接听',  end: true, },
+    4: { title: '异常随访', color: '#F56C6C', value: '正常接听',  end: true, },
+    5: { title: '待填报',  color: '#E6A23C',  value: '正常接听',  end: true, }
+  };

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

@@ -22,11 +22,11 @@
                         周期：{{ getTimeFrame(planDetail.beginEffective, planDetail.endEffective) }}
                     </div>
                 </div>
-                <div class="content-form">
+                <div class="content-form"  v-show="planDetail.way && planDetail.way === 1">
                     <el-form-item label="结果">
                         <el-radio-group v-model="form.state">
                             <el-radio :value="item.value" size="large"
-                                v-for="item in taskResults.filter((o) => { return !!o.value })" :key="item.value">
+                                v-for="item in (taskResults && taskResults.filter((o) => { return !!o.value }))" :key="item.value">
                                 {{ item.title  }}
                             </el-radio>
                         </el-radio-group>
@@ -34,7 +34,7 @@
                     <el-form-item label="标签">
                         <el-radio-group v-model="form.resultLabel">
                             <el-radio :value="item.value" size="large"
-                                v-for="item in resultLabels.filter((o) => { return !!o.value })" :key="item.value">
+                                v-for="item in resultLabels && resultLabels.filter((o) => { return !!o.value })" :key="item.value">
                                 {{ item.title  }}
                             </el-radio>
                         </el-radio-group>
@@ -52,7 +52,7 @@
                         <div>
                             <span v-for="(node, index) in msgContent" :key="index">
                               <el-tag v-if="node.isTag" @click="node.click">{{ node.content }}</el-tag>
-                              <el-link type="primary" v-if="node.isLink" @click="node.click" style="line-height: 24px;">{{ node.content }}</el-link>
+                              <el-link type="primary" v-if="node.isLink" @click="handleQuestion" style="line-height: 24px;">{{ node.content }}</el-link>
                               <span v-if="!node.isTag && !node.isLink" v-html="node.content"></span>
                             </span>
                            
@@ -60,13 +60,14 @@
                     </div>
 
                     <!-- 问卷组件 -->
-                    <question v-if="planDetail.way === 1 && isParentMounted && (planDetail.way === 1 || (planDetail.messageType === 1 && planDetail.messageParameter))" ref="questionRef"
+                    <question v-if="isParentMounted && (planDetail.way === 1 || (planDetail.messageType === 1 && planDetail.messageParameter))" ref="questionRef"
                         :surveyId="planDetail.questionnaire || planDetail.messageParameter" :userId="taskDetail.patientFiles" :taskId="taskDetail.patientTaskId"></question>
                 </div>
                 <div class="content-submit" v-if="taskDetail.state === 1 && planDetail.way === 1 && planDetail.executionMethod === 1">
                     <el-button @click="handleCreat">创建工单</el-button>
                     <el-button type="primary" @click="submit">提交</el-button>
                 </div>
+                <!-- && planDetail.way !== 2 -->
                 <div class="content-submit" v-if="taskDetail.state === 3">
                     <el-button type="primary" @click="submit">保存</el-button>
                 </div>
@@ -102,6 +103,8 @@ import useUserStore from '@/store/modules/user'
 import { matchTags } from '@/utils/sms'
 import useSelectStore from '@/store/commonSelect/common';
 
+import { createPageData, } from '@/api/main/system/system';
+
 import { getPlanInfo } from '@/api/patient/plan';
 import { getTaskInfo, submitTaskResult } from '@/api/patient/task';
 import { smsDetail } from '@/api/system/sms'
@@ -258,6 +261,10 @@ const submit = () => {
     // if (planDetail.value.way === 1) {
         params = questionRef.value.getParams();
     }
+    if (planDetail.value.way === 2) {
+    // if (planDetail.value.way === 1) {
+        params = questionRef.value.getParams();
+    }
     console.log(params, 'params');
     
     if (!params &&  form.value.state === '正常接听') return;
@@ -296,7 +303,7 @@ const submit = () => {
 
     console.log(resultParams)
     console.log(params)
-    // return
+    
     //TODO: 增加判断，电话类型的如果接通，必须挂点电话之后才可以提交
     submitTaskResult({  
         ...resultParams,
@@ -324,7 +331,14 @@ const submit = () => {
 // 发送短信
 const sendMessage = () => {
     //TODO: 组装短信，并发送短信
-   
+   console.log(taskDetail.value.patientTaskId)
+   const  params = {
+        taskId: taskDetail.value.patientTaskId,
+   }
+   createPageData('/SfPlanPatient/sfplanpatient/submitsms?taskId='+taskDetail.value.patientTaskId).then((data) => {
+        proxy.$modal.msgSuccess('发送成功！');
+
+    })
     // 点击发送成功之后，需要更改状态
 }
 const scoketDatas = ref({});

src/views/main/followUp/followUpTask/cpns/visitDetails2.vue

@@ -0,0 +1,451 @@
+<template>
+    <div class="wrap">
+        <div class="descripEle">
+            <div class="title">
+                <span class="title-text">{{ planDetail.name }}</span>
+                <div class="title-btn">
+                    <el-button :type="taskStatusMap[taskDetail.state].color" size="small"
+                        v-if="taskStatusMap[taskDetail.state]">{{ taskStatusMap[taskDetail.state].title }}</el-button>
+                </div>
+                <div class="btn-call">
+                    <el-button @click="callPhone" v-if="planDetail.way === 1 && planDetail.executionMethod === 1" :icon="Phone">呼叫</el-button>
+                    <el-button @click="sendMessage" v-if="planDetail.way === 2 && planDetail.executionMethod === 1" :icon="Message">发送</el-button>
+                </div>
+            </div>
+            <div class="content">
+                <div class="content-info" v-if="planDetail.describes">{{ planDetail.describes }}</div>
+                <div class="content-item">
+                    <div class="item1">
+                        更新时间：{{ planDetail.updateTime || planDetail.createTime }}
+                    </div>
+                    <div class="item2">
+                        周期：{{ getTimeFrame(planDetail.beginEffective, planDetail.endEffective) }}
+                    </div>
+                </div>
+                <div class="content-form">
+                    <el-form-item label="结果">
+                        <el-radio-group v-model="form.state">
+                            <el-radio :value="item.value" size="large"
+                                v-for="item in taskResults.filter((o) => { return !!o.value })" :key="item.value">
+                                {{ item.title  }}
+                            </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="标签">
+                        <el-radio-group v-model="form.resultLabel">
+                            <el-radio :value="item.value" size="large"
+                                v-for="item in resultLabels.filter((o) => { return !!o.value })" :key="item.value">
+                                {{ item.title  }}
+                            </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                        <el-input v-model="form.desc" type="textarea" />
+                    </el-form-item>
+                </div>
+                <div class="content-questionnaire">
+                    
+                    <!-- 短信内容 -->
+                    <!--TODO: 等添加的组件写完直接照抄-->
+                    <div v-if="planDetail.way === 2">
+                        <div style="margin-bottom: 10px;"><el-text tag="b">短信内容</el-text></div>
+                        <div>
+                            <span v-for="(node, index) in msgContent" :key="index">
+                              <el-tag v-if="node.isTag" @click="node.click">{{ node.content }}</el-tag>
+                              <el-link type="primary" v-if="node.isLink" @click="node.click" style="line-height: 24px;">{{ node.content }}</el-link>
+                              <span v-if="!node.isTag && !node.isLink" v-html="node.content"></span>
+                            </span>
+                           
+                        </div>
+                    </div>
+
+                    <!-- 问卷组件 -->
+                    <question v-if="planDetail.way === 1 && isParentMounted && (planDetail.way === 1 || (planDetail.messageType === 1 && planDetail.messageParameter))" ref="questionRef"
+                        :surveyId="planDetail.questionnaire || planDetail.messageParameter" :userId="taskDetail.patientFiles" :taskId="taskDetail.patientTaskId"></question>
+                </div>
+                <div class="content-submit" v-if="taskDetail.state === 1 && planDetail.way === 1 && planDetail.executionMethod === 1">
+                    <el-button @click="handleCreat">创建工单</el-button>
+                    <el-button type="primary" @click="submit">提交</el-button>
+                </div>
+                <div class="content-submit" v-if="taskDetail.state === 3">
+                    <el-button type="primary" @click="submit">保存</el-button>
+                </div>
+            </div>
+        </div>
+        <el-dialog
+            v-model="dialogAddWorkorder"
+            :title="modalTitle"
+            center
+            width="70%"
+            :modal="true"
+            :show-close="true"
+        >
+            <page-order :taskId="taskId" :getDefaultInfo="defaultOrderInfo" @refreshOrder="submitRefresh()"></page-order>
+        </el-dialog>
+    </div>
+</template>
+<script setup>
+import { ref,onMounted,watch, h } from "vue";
+import { useRouter } from 'vue-router';
+import { ElMessage } from 'element-plus'
+import { userDecrypt } from '@/utils/aes'
+import { Message, Phone } from '@element-plus/icons-vue'
+
+import PageOrder from '@/components/page-order';
+import question from '@/views/main/questionnaireManagement/fillOut.vue'
+
+import { getTimeFrame, ArrayToMap } from '@/utils/tools'
+import { taskResults, taskStatus } from "@/utils/commonDic.js"
+import useSocketStore from '@/store/modules/socket';
+import { Send } from '@/utils/telWebsocket';
+import useUserStore from '@/store/modules/user'
+import { matchTags } from '@/utils/sms'
+import useSelectStore from '@/store/commonSelect/common';
+
+import { getPlanInfo } from '@/api/patient/plan';
+import { getTaskInfo, submitTaskResult } from '@/api/patient/task';
+import { smsDetail } from '@/api/system/sms'
+import { getPhoneFix } from '@/api/main/main';
+
+const router = useRouter();
+let planDetail = ref({});
+let taskDetail = ref({});
+const isParentMounted = ref(false);
+const questionRef = ref();
+const { proxy } = getCurrentInstance();
+const callId = ref('');
+const lineState = ref('');
+const resultLabels = ref([]);
+const defaultOrderInfo = ref({
+    caller: '',
+    callnum: '',
+
+});
+
+const msgContent = ref();
+
+const form = ref({
+    state: '',
+    desc: '',
+    resultLabel: '',
+})
+
+const props = defineProps({
+    planId: {
+        type: Number,
+        default: 0
+    },
+    taskId: {
+        type: Number,
+        default: 0
+    },
+});
+watch(props, (nweProps) => {
+    console.log('watch props', nweProps);
+    initMethod(props)
+});
+
+const emit = defineEmits([
+    'submit'
+])
+const dialogAddWorkorder = ref(false)
+const modalTitle = ref('添加工单')
+function submitRefresh() {
+    ElMessage({
+        message: '创建成功',
+        type: 'success',
+    })
+    dialogAddWorkorder.value = false
+}
+function handleCreat() {
+    defaultOrderInfo.value.caller = taskDetail.value.name;
+    defaultOrderInfo.value.callnum = userDecrypt(taskDetail.value.mobile);
+    console.log(defaultOrderInfo.value, 'defaultOrderInfo.value')
+    dialogAddWorkorder.value = true
+}
+
+const smsTempDetail = ref({})
+
+onMounted(() => {
+    resultLabels.value = useSelectStore().resultLabels;
+    initMethod(props)
+});
+
+const clickTag = () => {
+    console.log('处理厂k');
+}
+
+
+async function initMethod(props) {
+    callId.value = '';
+
+    const promiseAll = []
+    const types = [];
+    if (props.planId) {
+        types.push('plan');
+        promiseAll.push(getPlanInfo(props.planId));
+    }
+    if (props.taskId) {
+        types.push('task');
+        promiseAll.push(getTaskInfo(props.taskId));
+    }
+
+    const result = await Promise.all(promiseAll);
+
+    for (let index = 0; index < types.length; index++) {
+        const type = types[index];
+        const res = result[index];
+        if (res && res.state === 'success') {
+            if (type === 'plan') {
+                planDetail.value = res.data || {}
+            }
+            if (type === 'task') {
+                taskDetail.value = res.data || {}
+
+                if (taskDetail.value.callState && taskDetail.value.state > 1) {
+                    form.value.state = taskDetail.value.callState;
+                    form.value.desc = taskDetail.value.sfResult;
+                    form.value.resultLabel = taskDetail.value.labelValue;
+                } else {
+                    form.value.desc = '';
+                    const initStatus = taskResults.find((o) => { return !!o.checked });
+                    if (initStatus) form.value.state = initStatus.value
+                }
+                taskDetail.value.seatName = res.data.seatName ? res.data.seatName : useUserStore().name
+                isParentMounted.value = true;
+            }
+        }
+    }
+
+    if (planDetail.value.message && planDetail.value.way === 2) {
+        smsDetail(planDetail.value.message).then((smsRes) => {
+            if (smsRes && smsRes.state === 'success') {
+                smsTempDetail.value = smsRes.data
+
+                let urlLabel = '';
+                if (planDetail.value.messageType === 2) urlLabel = planDetail.value.messageParameter;
+                if (planDetail.value.messageType === 1) {
+                    urlLabel = '问卷'
+                }
+                msgContent.value = matchTags(smsRes.data.content, {
+                    userName: {
+                        label: taskDetail.value.name,
+                    },
+                    seatUser: {
+                        label: taskDetail.value.seatName,
+                        // click: () => {
+                        //     console.log(111);
+                        // }
+                    },
+                    url: {
+                        label: urlLabel,
+                    },
+                });
+
+            }
+        })
+    }
+}
+
+const taskStatusMap = ArrayToMap(taskStatus, 'value');
+
+// 提交结果
+const submit = () => {
+    console.log(lineState.value)
+    if (!(lineState.value === '' || lineState.value === '在线')) return proxy.$modal.msgError('请等待用户挂断');
+    let params = {}
+    if (planDetail.value.way === 1 &&  form.value.state === '正常接听') {
+    // if (planDetail.value.way === 1) {
+        params = questionRef.value.getParams();
+    }
+    console.log(params, 'params');
+    
+    if (!params &&  form.value.state === '正常接听') return;
+    // if (!params) return;
+    params.entername = taskDetail.value.name;
+    params.answeruser = taskDetail.value.patientFiles;
+    params.enterphone = taskDetail.value.mobile;
+
+    
+
+    // 更新state
+    const stateInfo = taskResults.find((o) => {
+        return o.value === form.value.state
+    });
+
+    let resultParams = {
+        patientTaskId: taskDetail.value.patientTaskId,
+        callState: form.value.state,
+        sfResult: form.value.desc,
+        labelValue: form.value.resultLabel || '',
+    };
+    if (callId.value) resultParams.callRecords = callId.value;
+    if (stateInfo) {
+        if (stateInfo.error) {
+            resultParams.state = 4;
+        } else if (stateInfo.end) {
+            resultParams.state = 3;
+        }
+    }
+    
+    // if (stateInfo && stateInfo.end) resultParams.state = 3;
+    // if (form.value.state === '无人接听') {
+    //     resultParams.state = 1
+    // }
+
+
+    console.log(resultParams)
+    console.log(params)
+    // return
+    //TODO: 增加判断，电话类型的如果接通，必须挂点电话之后才可以提交
+    submitTaskResult({  
+        ...resultParams,
+        answer: params,
+        planId: planDetail.value.plId,
+    }).then((res) => {
+        if (res.state === 'success') {
+            ElMessage({
+                message: '操作成功',
+                type: 'success',
+            })
+
+            // 告诉父级组件完成了
+            emit('submit')
+        } else {
+            // 失败
+            ElMessage({
+                message: '操作失败',
+                type: 'error',
+            })
+        }
+    })
+}
+
+// 发送短信
+const sendMessage = () => {
+    //TODO: 组装短信，并发送短信
+   
+    // 点击发送成功之后，需要更改状态
+}
+const scoketDatas = ref({});
+const stateObj = {
+  0:'离线',
+  1:'登录中',
+  2:'在线',
+  3:'通话中',
+  4:'话后处理中',
+  5:'离线',
+  6:'振铃',
+  7:'注销',
+}
+// 外呼
+const callPhone = () => {
+    lineState.value = '发起外呼';
+    // 获取解密后的手机号
+    
+    const phone = userDecrypt(taskDetail.value.mobile);
+    // const phone = '15838094023'
+    //TODO: 增加外呼逻辑
+    if (!useSocketStore().accountNumber) {
+        proxy.$modal.msgSuccess('还没有签入');
+        lineState.value = '';
+        return
+    }
+    getPhoneFix(phone).then((data) => {
+        if (data.state === 'success') {
+            scoketDatas.value = {
+                AgentID: useSocketStore().accountNumber,
+                AgentExten: useSocketStore().extensionNumber,
+                Type: 'MakeCall',
+                DestinationNumber: data.data[0],
+            };
+            console.log(scoketDatas.value);
+            Send(scoketDatas.value, (data) => {
+                console.log(data, 'data'); //{CallID: 'c6207188-1361-11ef-8802-2b593e364a61', RecPath: '/home/wav/luyin/20240516/1009/165344_c6207188136111ef88022b593e364a61.wav', Result: true, Type: 'RecordPath'}
+                if (data.Type === 'MakeCall') {
+                    console.log('外呼');
+                   
+                    if (data.Result == true) {
+                        proxy.$modal.msgSuccess('外呼成功');
+                    } else {
+                        proxy.$modal.msgError('外呼失败');
+                    }
+                }
+
+                if (data.Type === 'CallID') {
+                    callId.value = data.CallID;
+                }
+
+                if (data.Type === 'State') {
+                    lineState.value = stateObj[data.State];
+                }
+                console.log(lineState.value)
+            });
+        } else {
+            lineState.value = '';
+        }
+    }).catch(() => {
+        proxy.$modal.msgError('外呼失败');
+        lineState.value = '';
+    });
+
+    
+}
+
+</script>
+<style scoped lang="scss">
+.wrap {
+    .descripEle {
+        .title {
+            position: relative;
+            display: flex;
+
+            .title-text {
+                font-size: 18px;
+                font-weight: bold;
+                line-height: 36px;
+                margin-right: 30px;
+            }
+
+            .title-btn {
+                margin-top: 7px;
+                display: inline-block;
+            }
+
+            .btn-call {
+                position: absolute;
+                right: 15px;
+                top: 3px;
+            }
+        }
+
+        .content {
+            font-size: 14px;
+            color: #606266;
+
+            .content-info {
+                line-height: 28px;
+            }
+
+            .content-item {
+                display: flex;
+                margin-bottom: 15px;
+
+                .item1 {
+                    margin-right: 30px;
+                }
+            }
+
+            .content-submit {
+                margin: 0 auto;
+                text-align: center;
+                position: absolute;
+                bottom: 12px;
+                width: 45%;
+            }
+
+        }
+
+    }
+}
+</style>

src/views/main/followUp/followUpTask/followUpTask.vue

@@ -174,10 +174,20 @@
             <div>随访人员</div>
             <div>{{ item.seatName ? item.seatName : '-' }}</div>
           </td>
-          <td class="list-item">
+          <!-- <td class="list-item">
+            <div class="item-dot" :style="[{ 'background': taskResultsMap[item.callState || ''].color }]"></div>
+            <div class="item-state">{{ taskResultsMap[item.callState || ''].title }}</div>
+          </td> -->
+
+          <td class="list-item" v-if="item.way === 1">
             <div class="item-dot" :style="[{ 'background': taskResultsMap[item.callState || ''].color }]"></div>
             <div class="item-state">{{ taskResultsMap[item.callState || ''].title }}</div>
           </td>
+
+          <td class="list-item" v-if="item.way === 2 && item.state">
+            <div class="item-dot" :style="[{ 'background': taskMsgResults[item.state].color }]"></div>
+            <div class="item-state">{{ taskMsgResults[item.state].title }}</div>
+          </td>
           <td class="list-item">
             
             <el-button type="primary" link @click="handleDetail(item)" v-if="item.state === 1">随访</el-button>
@@ -225,7 +235,8 @@ import { Search } from '@element-plus/icons-vue'
 import { useRouter } from 'vue-router';
 import { getTasks, getSelfTaskReport } from  '@/api/patient/task'
 import { getPlans } from  '@/api/patient/plan'
-import { taskResults } from "@/utils/commonDic.js"
+import { taskResults,taskMsgResults } from "@/utils/commonDic.js";
+
 import { ArrayToMap } from '@/utils/tools'
 import { getZhuanguiStatus } from '@/utils/index'
 import { getPageListData, editPageData } from '@/api/main/system/system';

src/views/main/questionnaireManagement/fillOut.vue

@@ -33,7 +33,6 @@
 								<el-radio v-for="(val, ind) in v.optionViewList" :key="ind"
 									:label="val.optionname +':'+val.optiondetail"  :value="val.optionname"/>
 							</el-radio-group>
-							<el-input v-model="v['reason']" v-if="v.optionViewList.find((o) => { return o.remark === 'true' && o.optionname === v['_content'] })" type="textarea" placeholder="请输入"></el-input>
 						</div>
 					</div>
 
@@ -151,8 +150,14 @@
 		</el-dialog>
 	</div>
 </template>
+<script>
 
-<script setup>
+export default {
+	name: 'fillOut'
+}
+</script>
+
+<script setup name="fillOut">
 import { ref, reactive, getCurrentInstance, } from 'vue'
 
 import { getPageListData, createPageData } from '@/api/main/system/system'
@@ -169,22 +174,23 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
 	surveyId: {
 		type: Number,
-		default: 0
+		default:0
 	},
 	userId: {
 		type: String,
-		default:''
+		default: '-1'
 	},
-	answersheetId: {
+	sheetId: {
 		type: Number,
-		default: 0
+		default:0
 	},
 	taskId: {
 		type: Number,
 		default: 0
-	},
+	}
 });
 watch(props, (nweProps) => {
+	console.log('fillOut', props, nweProps);
 	getData()
 });
 /** -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
@@ -241,20 +247,22 @@ const buttDis = ref(true);
 
 // 获取初始化数据
 const getData = () => {
-	console.log(query.user, props.userId, 'query.user');
-	if ((query.user && query.user !== '-1') || props.userId || (props.answersheetId || query.answersheetid) || (props.taskId || query.taskId)) {
-		let url = `/survey/survey/getdetail?id=${props.surveyId || query.id}`;
-		if (props.userId || query.user) {
-			url += `&user=${props.userId || query.user}`;
-		}
-		if (props.answersheetId || query.answersheetid) {
-			url += `&answersheetid=${props.answersheetId || query.answersheetid}`;
-		}
-		if (props.taskId || query.taskId) {
-		    url += `&taskid=${props.taskId || query.taskId}`;
+	console.log(props.userId, props.surveyId, 'getData---');
+	if ((query.user && query.user !== '-1') || props.userId || (props.sheetId || query.sheetId) || (props.taskId || query.taskId)) {
+		console.log(props.surveyId, 'asdfasdf')
+		const params ={
+			id: props.surveyId || query.id,
+			user: props.userId || query.user,
+			sheetid: props.sheetId || query.sheetId,
+			taskid: props.taskId || query.taskId,
 		}
+
+		if (params.sheetid) delete params.user;
+
+		console.log(params, 'params--params');
+		if (!params.id) return;
 		
-		getPageListData(url).then(({ data }) => {
+		getPageListData(`/survey/survey/getdetail`,params).then(({ data }) => {
 
 			for (const val of data.questionlist) {
 				if (val.type === '单选' || val.type === '问答') {
@@ -273,12 +281,12 @@ const getData = () => {
 			rqDis.value = true;
 		})
 	} else {
-
+		console.log('getData');
 		setTimeout(() => {
 			Fingerprint2.get(async (components) => {
 				const values = components.map(component => component.value);
 				const murmur = Fingerprint2.x64hash128(values.join(''), 31);
-				
+
 				// 获取微信头像与昵称 
 				if (query.code) {
 					await getPageListData('/wechat/getopenid', {
@@ -291,7 +299,6 @@ const getData = () => {
 
 				// 唯一ID
 				let storId = localStorage.getItem('storId');
-				console.log(storId, 'storId');
 				if (storId) {
 					pageId.value = storId;
 				} else {
@@ -307,6 +314,10 @@ const getData = () => {
 					pageId.value = localStorage.getItem('storId')
 				}
 
+				// const params ={
+				// 	id:props.surveyId || query.id,
+				// 	user:props.userId || query.user,
+				// }
 				getPageListData(`/survey/survey/getdetail?id=${query.id}&user=${pageId.value}`).then(({ data }) => {
 					if (data.existanswer === 1) {
 						for (const val of data.questionlist) {
@@ -323,14 +334,12 @@ const getData = () => {
 					}
 
 					formData.value = data;
-					console.log(isEnd(formData.value), 'isEnd(formData.value)');
+
 					// 不是进行中的问卷 全部隐藏
 					if (isEnd(formData.value) !== '进行中' && query.user !== '-1') {
 						return;
 					}
 
-					
-					
 					// 判断 只能微信填写 没有进行微信授权 该用户没有填写
 					if (formData.value.setting === 1 && query.code === undefined && formData.value.existanswer !== 1) {
 						const appid = 'wxe8b06998505853d2';
@@ -396,11 +405,12 @@ const getParams = () => {
 			// 		"surveyid": 0
 			// 	}
 		],
-		answeruser: pageId.value, // 唯一标识  
+		answeruser: pageId.value || query.patientId, // 唯一标识  
 		surveyid: formData.value['surveyId'], // 问卷id 
-
+		taskId:(props.taskId || query.taskId), // 任务id
 		imgurl: wxData.value['imgUrl'],
 		nickname: wxData.value['nickName'],
+		isSms: query.isSms || '', // 是否短信
 	}
 
 	// 校验
@@ -430,12 +440,11 @@ const getParams = () => {
 		// 获取数据
 		if (v.type === '问答') {
 			params.answerlist.push({
-				answeruser: props.userId || pageId.value,
+				answeruser: query.patientId || props.userId || pageId.value,
 				answer: v._content,
 				optionid: 0,
 				questionid: v.questionId,
-				surveyid: v.surveyid,
-				
+				surveyid: v.surveyid
 			})
 		} else if (v.type === '排序') {
 			if (!Array.isArray(v._content)) {
@@ -444,7 +453,7 @@ const getParams = () => {
 
 			if (v._content) {
 				params.answerlist.push({
-					answeruser: props.userId || pageId.value,
+					answeruser: query.patientId || props.userId || pageId.value,
 					answer: v._content?.join(),
 					optionid: 0,
 					questionid: v.questionId,
@@ -463,19 +472,18 @@ const getParams = () => {
 				}
 			})) {
 				params.answerlist.push({
-					answeruser: props.userId || pageId.value,
+					answeruser: query.patientId || props.userId || pageId.value,
 					answer: optionname,
 					optionid: optionId,
 					questionid: v.questionId,
-					surveyid: v.surveyid,
-					reason: v.reason || '',
+					surveyid: v.surveyid
 				})
 			}
 
 
 		}
 	}
-
+	console.log(params, 'params');
 	return params;
 }
 
@@ -492,7 +500,8 @@ function sub(type) {
 		return;
 	}
 
-
+	console.log(params, 'params');
+	
 	if ((formData.value.entername || formData.value.enterphone) && type) {
 		formRef.value.validate().then(() => {
 			createPageData('/survey/answersheet', params).then(data => {
@@ -522,28 +531,21 @@ function clear() {
 // 判断状态
 function isEnd(data) {
 	let oldTime = new Date(data.starttime).getTime();
-		let newTime = new Date(data.endtime).getTime();
-		let time = new Date().getTime();
-		
+	let newTime = new Date(data.endtime).getTime();
+	let time = new Date().getTime();
 
 
-		if (data.active === 0) {
-			return '停用';
-		} 
-		if (!data.active) {
-			return '未发布';
-		}
-		if (data.active === 2) {
-			return '进行中';
-		}
+	if (!data.endtime || !data.starttime) {
+		return '未发布';
+	}
 
-		if (time < oldTime) {
-			return '未开始';
-		} else if (time > newTime) {
-			return '已结束';
-		} else if (time > oldTime && time < newTime) {
-			return '进行中';
-		}
+	if (time < oldTime) {
+		return '未开始';
+	} else if (time > newTime) {
+		return '已结束';
+	} else if (time > oldTime && time < newTime) {
+		return '进行中';
+	}
 }
 
 // 获取域名
@@ -552,6 +554,7 @@ function getoRigin() {
 }
 
 onMounted(() => {
+	console.log('fill-onMounted');
 	getData()
 });
 
@@ -582,7 +585,19 @@ defineExpose({
 	overflow: auto;
 }
 
-@media screen and (min-width : 800px) {
+/* 单选按钮标签换行 */
+:deep(.el-radio__label) {
+  white-space: normal !important;
+  word-break: break-word !important;
+}
+
+/* 多选框标签换行 */
+:deep(.el-checkbox__label) {
+  white-space: normal !important;
+  word-break: break-word !important;
+}
+
+@media screen and (min-width : 500px) {
 	.rqCss {
 		height: 100%;
 		background: rgb(245, 246, 250)
@@ -628,14 +643,12 @@ defineExpose({
 				text-align: left;
 				font-size: 15px;
 				color: rgb(102, 102, 102);
-    			// font-family: fangsong;
 			}
 		}
 
 		.footer {
 			font-size: 15px;
 			color: rgb(102, 102, 102);
-    		// font-family: fangsong;
 		}
 
 		.content {