Merge pull request 'master' (#180) from master into test

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/180

src/views/task-management/components/WorkDialog.vue

@@ -116,7 +116,7 @@ watch(() => props.rowData, (newRowData) => {
       // console.log(dataDetails);
       const theData = [{createTime: '', data: []}]
 
-            dataDetails.forEach(for1data => {
+      dataDetails?.forEach(for1data => {
         // console.log(for1data.createTime, '--------');
         for (let i = 0; i < theData.length; i++) {
           // console.log(theData[i]);
@@ -150,15 +150,13 @@ watch(() => props.rowData, (newRowData) => {
 
       //工单时间线
       orderContent.value = []
-            // console.log(orderData.value);
+      console.log(orderData.value);
       // orderData.value.orderState='2'
       if (orderData.value.orderState === '0') {
         inputOrderContent(contentState0)
-            }
+      } else if (orderData.value.orderState === '1') {
-            else if (orderData.value.orderState === '1') {
         inputOrderContent(contentState1)
-            }
+      } else if (orderData.value.orderState === '2') {
-            else if (orderData.value.orderState === '2') {
         inputOrderContent(contentState2)
       }
       // console.log(orderContent.value);
@@ -215,7 +213,6 @@ defineExpose({
 });
 
 
-
 </script>
 
 <template>
@@ -276,7 +273,8 @@ defineExpose({
                   <voice ref="voiceRef" title="录音详情" :rowUrl="rowUrl"/>
                   <a :href=rowData.recordUrl download>
                     <el-button type="primary" :icon="Download"
-                                            @click="downloadRecord">下载录音</el-button>
+                               @click="downloadRecord">下载录音
+                    </el-button>
                   </a>
                   <!-- <el-scrollbar> -->
                   <!-- <div class="text">{{ rowData.recordUrl }}</div> -->
@@ -296,9 +294,11 @@ defineExpose({
                                         icon="MoreFilled" type="primary" size="large">
                         <div class="custom-card">
                           <div style="font-weight: bold">{{ activity.createTime }}</div>
+                          <template v-if="activity.data&&activity.data.length>0">
                             <div v-for="(info, index) in activity.data" :key="index">
                               <div class="timeline-row">
-                                                            <span :style="{ color: '#a8abb2' }">{{ info.callIdNumber
+                                                            <span :style="{ color: '#a8abb2' }">{{
+                                                                info.callIdNumber
                                                               }}</span>
                                 <PointTag dictType="call_status" :value="info.callState"
                                           class="tag"/>
@@ -306,9 +306,15 @@ defineExpose({
                                     color: info.callState === '通话中' ? '#6cc23a' : '#409eff'
                                 }">{{ info.callState }}</span> -->
                                 <span class="span-3th" :style="{ color: '#a8abb2' }">{{
-                                                                info.answeredTime || '00:00:00' }}</span>
+                                    info.answeredTime || '00:00:00'
+                                  }}</span>
                               </div>
                             </div>
+                          </template>
+                          <template v-else>
+                            <p>暂无电话拨打记录</p>
+                          </template>
+
                         </div>
                       </el-timeline-item>
                     </el-timeline>