1.10.0

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

@@ -537,7 +537,9 @@ function stateBack (Result) {
   } else if (scoketState.value === '振铃') {
     inRingHandle()
   } else if (scoketState.value === '话后处理中') {
-
+    getCallState.value = '2'
+    btnState.value = true
+    dropCallState.value = true
     initSearchCallLogs();
   } else {
     getCallState.value = '2'

src/components/page-order/src/form/complain.vue

@@ -286,10 +286,10 @@ const onSubmit = (formEl) => {
                     emit('updateSuccess');
                 });
             } else {
-                if (lineState.value === '通话中') {
-                    proxy.$modal.msgSuccess('正在通话中');
-                    return
-                }
+                // if (lineState.value === '通话中') {
+                //     proxy.$modal.msgSuccess('正在通话中');
+                //     return
+                // }
                 createPageData('/order/workorder', params).then((data) => {
                     proxy.$modal.msgSuccess('提交成功！');
                     resetForm()

src/components/page-order/src/form/consult.vue

@@ -239,10 +239,10 @@ const onSubmit = (formEl) => {
             emit('updateSuccess');
           });
       }else{
-        if (lineState.value === '通话中') {
-          proxy.$modal.msgSuccess('正在通话中');
-          return   
-        }
+        // if (lineState.value === '通话中') {
+        //   proxy.$modal.msgSuccess('正在通话中');
+        //   return   
+        // }
         createPageData('/order/workorder', params).then((data) => {
             proxy.$modal.msgSuccess('提交成功！');
             resetForm()

src/components/page-order/src/form/consultation.vue

@@ -424,10 +424,10 @@ const onSubmit = (formEl) => {
                     emit('updateSuccess');
                 });
             } else {
-                if (lineState.value === '通话中') {
-                    proxy.$modal.msgSuccess('正在通话中');
-                    return
-                }
+                // if (lineState.value === '通话中') {
+                //     proxy.$modal.msgSuccess('正在通话中');
+                //     return
+                // }
                 createPageData('/order/workorder', params).then((data) => {
                     proxy.$modal.msgSuccess('提交成功！');
                     resetForm()

src/components/page-order/src/form/repair.vue

@@ -256,10 +256,10 @@ const onSubmit = (formEl) => {
             emit('updateSuccess');
           });
       }else{
-        if (lineState.value === '通话中') {
-          proxy.$modal.msgSuccess('正在通话中');
-          return   
-        }
+        // if (lineState.value === '通话中') {
+        //   proxy.$modal.msgSuccess('正在通话中');
+        //   return   
+        // }
         createPageData('/order/workorder', params).then((data) => {
             proxy.$modal.msgSuccess('提交成功！');
             resetForm()

src/components/page-order/src/form/transport.vue

@@ -44,14 +44,26 @@
         <!--院前急救相关字段-end-->
 
         
+        
+        <el-form-item v-if="workOrderCode === 'yqjzy'" label="患者姓名">
+            <el-input v-model="form.patientName" />
+        </el-form-item>
         <el-form-item label="患者数量" prop="patientnum">
             <el-input-number v-model="form.patientnum" :min="1" :max="10" />
         </el-form-item>
+        <el-form-item v-if="workOrderCode === 'yqjzy'" label="检查项目">
+            <el-input v-model="form.checkItem" />
+        </el-form-item>
+        <el-form-item v-if="workOrderCode === 'yqjzy'" label="担架">
+            <el-input-number v-model="form.spencer" :min="0" :max="10" />
+        </el-form-item>
+
         <el-form-item label="站点" prop="site">
             <el-select v-model="form.site" filterable placeholder="请选择站点"  style="width: 214px;">
                 <el-option v-for="item in siteOptions" :key="item.value" :label="item.title" :value="item.value" />
             </el-select>
         </el-form-item>
+
         <el-form-item label="现场地址" prop="destination">
             <el-input v-model="form.destination" />
         </el-form-item>
@@ -125,6 +137,12 @@ const form: any = ref({
     callnum: '', // 患者电话 
     callcode: '', // 患者姓名
     patientnum: '', // 患者数量 
+
+    patientName:'',  // 患者姓名      
+    checkItem:'',  // 检查项目
+    spencer:0,  // 担架
+
+    workorderId: '', // 工单ID
     // caresnum: '', // 陪护数量
     // doctornum: '',   // 医护数量
     destination: '', // 目的地 
@@ -216,6 +234,10 @@ function getdetail(id) {
         form.value.callcode = carData.callcode
         form.value.patientnum = carData.patientnum
         form.value.contactPhone = carData.contactPhone
+
+        form.value.patientName = carData.patientName
+        form.value.checkItem = carData.checkItem
+        form.value.spencer = carData.spencer
         // form.value.caresnum = carData.caresnum
         // form.value.doctornum = carData.doctornum
         form.value.destination = carData.destination
@@ -400,10 +422,10 @@ const onSubmit = async (formEl) => {
             emit('updateSuccess');
           });
       }else{
-        if (lineState.value === '通话中') {
-          proxy.$modal.msgSuccess('正在通话中');
-          return   
-        }
+        // if (lineState.value === '通话中') {
+        //   proxy.$modal.msgSuccess('正在通话中');
+        //   return   
+        // }
         createPageData('/order/carworkorder', params).then((data) => {
             proxy.$modal.msgSuccess('提交成功！');
             resetForm()

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

@@ -74,7 +74,7 @@
                         </el-row>
                     </el-card>
                 </el-col>
-                <el-col :span="12">
+                <!-- <el-col :span="12">
                     <el-card class="page-card">
                         <template #header>
                             <div class="card-header">
@@ -92,9 +92,8 @@
                             </div>
                         </template>
                         <div id="mainEcharts3" style="width: 100%; height: 300px;"></div>
-                        
                     </el-card>
-                </el-col>
+                </el-col> -->
                 <el-col :span="24">
                     <el-card class="page-card">
                         <template #header>
@@ -146,16 +145,16 @@ function initMethod(data) {
   planId.value = data.planId
   if (planId.value) {
     chartDom1 = document.getElementById('mainEcharts1');
-    chartDom2 = document.getElementById('mainEcharts2');
-    chartDom3 = document.getElementById('mainEcharts3');
+    // chartDom2 = document.getElementById('mainEcharts2');
+    // chartDom3 = document.getElementById('mainEcharts3');
     // chartDom4 = document.getElementById('mainEcharts4');
     chartDom4 = echarts.init(mainEcharts4.value);
     chartDom4.resize();
     selectPlDataBoard()
     selectPlComplete()
     getSfComplete()
-    getCallDuration()
-    getDialogueRound()
+    // getCallDuration()
+    // getDialogueRound()
     getListeningStatus()
   }
 }

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

@@ -31,10 +31,11 @@
       <div class="search-header">
         <div class="search-title">任务列表</div>
         <div class="search-form">
-          <el-radio-group v-model="searchParams.state" @change="search">
+          <el-radio-group v-model="searchState" @change="search">
             <el-radio-button label="全部" value="0" />
             <el-radio-button label="待随访" value="1" />
             <el-radio-button label="已随访" value="3" />
+            <el-radio-button label="随访池" value="4" />
             <!-- <el-radio-button label="异常随访" value="4" /> -->
           </el-radio-group>
           <el-input v-model="searchParams.key" style="width: 240px; margin-top: 6px; margin-left: 15px;"
@@ -314,7 +315,7 @@ const currentPage = ref(1)
 const pageSize = ref(6)
 const pageTotal = ref(0)
 const taskList = ref([])
-
+const searchState = ref('1')
 const searchParams = ref({
   state: '1', // 状态
   tel: '',  // 姓名或手机号
@@ -328,7 +329,13 @@ const searchParams = ref({
 const search = () => {
 
   console.log(searchParams.value, 'radio1')
-
+  if(searchState.value == 4){
+    searchParams.value.allYsf = 1;
+    delete searchParams.value.state
+  }else{
+    searchParams.value.allYsf = 0 
+    searchParams.value.state = searchState.value
+  }
   getTaskList(1);
 }
 

src/views/main/workOrderManagement/workHandle.vue

@@ -299,19 +299,32 @@
               <el-tag type="success" v-else>不需要</el-tag>
             </div>
           </div>
-          <div>
+          
+          <div v-if="ordeDetailData.patientName">
+            <div>患者姓名</div>
+            <div>{{ ordeDetailData.patientName }} </div>
+          </div>
+          <div v-if="ordeDetailData.patientnum">
             <div>患者数量</div>
             <div>{{ ordeDetailData.patientnum }} 人</div>
           </div>
+          <div v-if="ordeDetailData.checkItem">
+            <div>检查项目</div>
+            <div>{{ ordeDetailData.checkItem }} </div>
+          </div>
+          <div v-if="ordeDetailData.spencer">
+            <div>担架</div>
+            <div>{{ ordeDetailData.spencer }} </div>
+          </div>
           <div v-if="ordeDetailData.siteName">
             <div>站点</div>
             <div>{{ ordeDetailData.siteName }}</div>
           </div>
-          <div>
+          <div v-if="ordeDetailData.destination">
             <div>地址</div>
             <div>{{ ordeDetailData.destination }}</div>
           </div>
-          <div>
+          <div v-if="ordeDetailData.needtime">
             <div>发车时间</div>
             <div>{{ ordeDetailData.needtime }}</div>
           </div>