电话号码增加拨打功能

src/views/againAssign.vue

@@ -59,7 +59,8 @@
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr">{{model.incident.contactsInformation}}</span>
+              <span class="fr" v-if="!model.incident.contactsInformation"></span>
+              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{model.incident.contactsInformation}}</a></span>
             </p>
             <p>
               <span class="fl">联系地址</span>

src/views/closed.vue

@@ -81,7 +81,8 @@
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr">{{ model.incident.contactsInformation }}</span>
+              <span class="fr" v-if="!model.incident.contactsInformation"></span>
+              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{ model.incident.contactsInformation }}</a></span>
             </p>
             <p>
               <span class="fl">联系地址</span>
@@ -245,7 +246,7 @@
                   <span class="text1">{{ item.startTime }}</span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
-                  <p class="text2" v-if="item.desc">{{ item.desc }}</p>
+                  <p class="text2" v-if="item.desc" v-html="item.desc"></p>
                 </div>
               </div>
             </div>

src/views/grabSheet.vue

@@ -55,7 +55,8 @@
             </p>
               <p>
                 <span class="fl">联系电话</span>
-                <span class="fr">{{model.incident.contactsInformation||''}}</span>
+                <span class="fr" v-if="!model.incident.contactsInformation"></span>
+                <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{ model.incident.contactsInformation }}</a></span>
               </p>
               <p>
                 <span class="fl">联系地址</span>

src/views/incidentList.vue

@@ -39,8 +39,9 @@
                     <span class="grayFont">{{item.contacts}}</span>
                   </p>
                 </div>
-                <div class="bottom">
-                  <span class="fl"><span>{{valConfig==1?'联系电话':'科室电话'}}</span>：{{item.contactsInformation}}</span>
+                <div class="bottom" @click.stop>
+                  <span class="fl" v-if="!item.contactsInformation"><span>{{valConfig==1?'联系电话':'科室电话'}}</span>：</span>
+                  <span class="fl" v-if="item.contactsInformation"><span>{{valConfig==1?'联系电话':'科室电话'}}</span>：<a :href="'tel:'+item.contactsInformation">{{item.contactsInformation}}</a></span>
                   <span class="fr">报修时间：{{item.acceptDate}}</span>
                 </div>
               </div>
@@ -589,4 +590,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/indes.vue

@@ -50,34 +50,70 @@
           <div class="conent">
             <div class="head">
               <p>
-                事件单号：{{item.incidentsign}}
+                事件单号：{{ item.incidentsign }}
                 <span
-                  :class="{'btn':true, 'daipingjia':item.state.name=='待评价', 'daijiedan':(item.state.name=='待接单'&&item.state.name=='待接单'&&item.handlerUser&&!item.candidateGroups), 'daiqiangdan':(item.state.name=='待接单'&&item.state.name=='待接单'&&!item.handlerUser&&item.candidateGroups), 'chulizhong':item.state.name=='处理中', 'yijiejue':item.state.name=='已解决', 'yiguanbi':item.state.name=='已关闭', 'chongxinzhipai':item.state.name=='重新指派'}"
-                >{{item.state.name=='待接单'?((item.handlerUser&&!item.candidateGroups)?'待接单':'待抢单'):item.state.name}}</span>
+                  :class="{
+                    btn: true,
+                    daipingjia: item.state.name == '待评价',
+                    daijiedan:
+                      item.state.name == '待接单' &&
+                      item.state.name == '待接单' &&
+                      item.handlerUser &&
+                      !item.candidateGroups,
+                    daiqiangdan:
+                      item.state.name == '待接单' &&
+                      item.state.name == '待接单' &&
+                      !item.handlerUser &&
+                      item.candidateGroups,
+                    chulizhong: item.state.name == '处理中',
+                    yijiejue: item.state.name == '已解决',
+                    yiguanbi: item.state.name == '已关闭',
+                    chongxinzhipai: item.state.name == '重新指派'
+                  }"
+                  >{{
+                    item.state.name == "待接单"
+                      ? item.handlerUser && !item.candidateGroups
+                        ? "待接单"
+                        : "待抢单"
+                      : item.state.name
+                  }}</span
+                >
               </p>
             </div>
             <div class="center">
               <p class="desc">
                 <span class="fl">事件描述：</span>
-                <span class="grayFont overflowEllipsis2" v-html="item.description"></span>
+                <span
+                  class="grayFont overflowEllipsis2"
+                  v-html="item.description"
+                ></span>
               </p>
-              <p v-if='valConfig==1'>
+              <p v-if="valConfig == 1">
                 报修人：
-                <span class="grayFont">{{item.requester.name}}</span>
+                <span class="grayFont">{{ item.requester.name }}</span>
               </p>
-              <p v-if='valConfig==2'>
+              <p v-if="valConfig == 2">
                 报修科室 ：
-                <span class="grayFont">{{item.department?item.department.dept:''}}</span>
+                <span class="grayFont">{{
+                  item.department ? item.department.dept : ""
+                }}</span>
               </p>
             </div>
-            <div class="bottom">
-              <span class="fl">联系电话：{{item.contactsInformation}}</span>
-              <span class="fr">报修时间：{{item.acceptDate}}</span>
+            <div class="bottom" @click.stop>
+              <span class="fl" v-if="!item.contactsInformation"
+                >联系电话：</span
+              >
+              <span class="fl" v-if="item.contactsInformation"
+                >联系电话：<a :href="'tel:' + item.contactsInformation">{{
+                  item.contactsInformation
+                }}</a></span
+              >
+              <span class="fr">报修时间：{{ item.acceptDate }}</span>
             </div>
           </div>
         </div>
         <!-- 无数据 -->
-        <div class="wushuju" v-if="!dataList.length&&!newRapirLoading">
+        <div class="wushuju" v-if="!dataList.length && !newRapirLoading">
           <img src="./../../static/images/wushuju.svg" alt />
           <p>暂无待办事项</p>
         </div>
@@ -98,10 +134,12 @@
             <i class="iconfont icon-moren"></i>
           </span>
         </div>
-        <div class="conentBox" v-if="!newNoticeNoData&&!newNoticeLoading">
+        <div class="conentBox" v-if="!newNoticeNoData && !newNoticeLoading">
           <div class="conent" v-for="v in noticeData" @click="toGuideDetail(v)">
-            <div class="head overflowEllipsis2">{{v.title}}</div>
-            <div class="cot">{{v.createTime.substring(0,v.createTime.length-5)}}</div>
+            <div class="head overflowEllipsis2">{{ v.title }}</div>
+            <div class="cot">
+              {{ v.createTime.substring(0, v.createTime.length - 5) }}
+            </div>
           </div>
         </div>
         <!-- 无数据 -->
@@ -131,13 +169,13 @@ export default {
       newRapirLoading: true, //最新报修loading
       newNoticeLoading: true, //最新公告loading
       candidateGroups: "",
-      valConfig: JSON.parse(localStorage.getItem("valConfig"))-0,//报修主体
+      valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0 //报修主体
     };
   },
   methods: {
     // 获取公告列表数据
     getNoticData() {
-      console.log(this.valConfig)
+      console.log(this.valConfig);
       // alert('公告列表')
       var that = this;
       this.$http
@@ -243,7 +281,7 @@ export default {
   },
   created() {
     var that = this;
-    that.valConfig=JSON.parse(localStorage.getItem("valConfig"))-0
+    that.valConfig = JSON.parse(localStorage.getItem("valConfig")) - 0;
     that.loginUser.group.forEach(element => {
       that.candidateGroups += element.id + ",";
     });
@@ -428,4 +466,4 @@ export default {
   justify-content: center;
   align-items: center;
 }
-</style>
+</style>

src/views/my.vue

@@ -2,26 +2,29 @@
   <div class="bgColor">
     <div class="head">
       <div class="img"></div>
-      <div class="name">{{loginUser.name}}</div>
+      <div class="name">{{ loginUser.name }}</div>
     </div>
     <div class="myMessage">
       <div class="label">个人信息</div>
       <ul>
         <li>
           <div>工号</div>
-          <div>{{loginUser.account}}</div>
+          <div>{{ loginUser.account }}</div>
         </li>
         <li>
           <div>手机号</div>
-          <div>{{loginUser.phone}}</div>
+          <div v-if="!loginUser.phone"></div>
+          <div v-if="loginUser.phone">
+            <a :href="'tel:' + loginUser.phone">{{ loginUser.phone }}</a>
+          </div>
         </li>
         <li>
           <div>部门</div>
-          <div>{{loginUser.dept?loginUser.dept.dept:''}}</div>
+          <div>{{ loginUser.dept ? loginUser.dept.dept : "" }}</div>
         </li>
         <li>
           <div>工作组</div>
-          <div>{{groups}}</div>
+          <div>{{ groups }}</div>
         </li>
       </ul>
     </div>
@@ -29,7 +32,9 @@
       <div class="label">我的事件工单</div>
       <div class="tit">
         <div>全部</div>
-        <div @click="toIncidentList('all')">{{incidentCount.incidentAll||0}}条&nbsp;&nbsp;&nbsp;></div>
+        <div @click="toIncidentList('all')">
+          {{ incidentCount.incidentAll || 0 }}条&nbsp;&nbsp;&nbsp;>
+        </div>
       </div>
       <div class="rapirMessage">
         <div class="status" @click="toIncidentList('todo')">
@@ -40,7 +45,7 @@
           </div>
           <div>
             <span>待处理</span>
-            <span>{{incidentCount.incidentTodo||0}}</span>
+            <span>{{ incidentCount.incidentTodo || 0 }}</span>
           </div>
         </div>
         <div class="status" @click="toIncidentList('done')">
@@ -51,7 +56,7 @@
           </div>
           <div>
             <span>处理过</span>
-            <span>{{incidentCount.incidentDone||0}}</span>
+            <span>{{ incidentCount.incidentDone || 0 }}</span>
           </div>
         </div>
         <div class="status" @click="toIncidentList('create')">
@@ -62,7 +67,7 @@
           </div>
           <div>
             <span>我创建</span>
-            <span>{{incidentCount.incidentCreate||0}}</span>
+            <span>{{ incidentCount.incidentCreate || 0 }}</span>
           </div>
         </div>
       </div>
@@ -71,7 +76,11 @@
       <div class="label">我的巡检</div>
       <div class="tit">
         <div>全部</div>
-        <div @click="toinspectionList()">{{(incidentCount.inspectionTodo+incidentCount.inspectionDone)||0}}条&nbsp;&nbsp;&nbsp;></div>
+        <div @click="toinspectionList()">
+          {{
+            incidentCount.inspectionTodo + incidentCount.inspectionDone || 0
+          }}条&nbsp;&nbsp;&nbsp;>
+        </div>
       </div>
       <div class="rapirMessage">
         <div class="status">
@@ -83,7 +92,7 @@
           </div>
           <div @click="toinspectionList('todo')">
             <span>待处理</span>
-            <span>{{incidentCount.inspectionTodo||0}}</span>
+            <span>{{ incidentCount.inspectionTodo || 0 }}</span>
           </div>
         </div>
         <div @click="toinspectionList('done')" class="status">
@@ -94,7 +103,7 @@
           </div>
           <div>
             <span>处理过</span>
-            <span>{{incidentCount.inspectionDone||0}}</span>
+            <span>{{ incidentCount.inspectionDone || 0 }}</span>
           </div>
         </div>
       </div>
@@ -112,7 +121,7 @@ export default {
       promptingConent: "",
       promptingStatus: "",
       groups: "", //工作组
-      candidateGroups:''
+      candidateGroups: ""
     };
   },
   methods: {
@@ -122,10 +131,13 @@ export default {
       if (that.loginUser.group) {
         that.loginUser.group.forEach(element => {
           that.groups += element.groupName + "/";
-          that.candidateGroups+=element.id+','
+          that.candidateGroups += element.id + ",";
         });
       }
-      that.candidateGroups=that.candidateGroups.slice(0,that.candidateGroups.length-1)
+      that.candidateGroups = that.candidateGroups.slice(
+        0,
+        that.candidateGroups.length - 1
+      );
     },
     // 跳转到事件列表
     toIncidentList(searchType) {
@@ -140,21 +152,23 @@ export default {
     toinspectionList(state) {
       this.$router.push({
         name: "Inspection",
-        params:{
-          state:state
+        params: {
+          state: state
         }
       });
     },
     // 事件数量
-    getIncidentData(){
-        var that=this;
-        this.$http.post('service/bpm/data/getIncidentCount',{
-            assignee:that.loginUser.id,
-            candidateGroups:that.candidateGroups
-        }).then(function(res){
-            that.incidentCount=res.data;
+    getIncidentData() {
+      var that = this;
+      this.$http
+        .post("service/bpm/data/getIncidentCount", {
+          assignee: that.loginUser.id,
+          candidateGroups: that.candidateGroups
         })
-    },
+        .then(function(res) {
+          that.incidentCount = res.data;
+        });
+    }
   },
   created() {
     this.getGroups();
@@ -319,4 +333,4 @@ export default {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-</style>
+</style>

src/views/order.vue

@@ -58,7 +58,8 @@
             </p>
               <p>
                 <span class="fl">联系电话</span>
-                <span class="fr">{{model.incident.contactsInformation}}</span>
+                <span class="fr" v-if="!model.incident.contactsInformation"></span>
+              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{model.incident.contactsInformation}}</a></span>
               </p>
               <p>
                 <span class="fl">联系地址</span>

src/views/processing.vue

@@ -60,7 +60,8 @@
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr">{{modelData.incident.contactsInformation}}</span>
+              <span class="fr" v-if="!modelData.incident.contactsInformation"></span>
+              <span class="fr" v-if="modelData.incident.contactsInformation"><a :href="'tel:' + modelData.incident.contactsInformation">{{modelData.incident.contactsInformation}}</a></span>
             </p>
             <p>
               <span class="fl">联系地址</span>

src/views/solved.vue

@@ -59,7 +59,8 @@
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr">{{model.incident.contactsInformation}}</span>
+              <span class="fr" v-if="!model.incident.contactsInformation"></span>
+              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{model.incident.contactsInformation}}</a></span>
             </p>
             <p>
               <span class="fl">联系地址</span>
@@ -118,7 +119,8 @@
           </p>
           <p>
             <span class="fl">联系电话</span>
-            <span class="fr">{{model.incident.contactsInformation}}</span>
+            <span class="fr" v-if="!model.incident.contactsInformation"></span>
+              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{model.incident.contactsInformation}}</a></span>
           </p>
           <p>
             <span class="fl">处理方式</span>

src/views/waitConfirm.vue

@@ -61,7 +61,8 @@
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr">{{model.incident.contactsInformation}}</span>
+              <span class="fr" v-if="!model.incident.contactsInformation"></span>
+              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{model.incident.contactsInformation}}</a></span>
             </p>
             <p>
               <span class="fl">联系地址</span>
@@ -112,7 +113,8 @@
           </p>
           <p>
             <span class="fl">联系电话</span>
-            <span class="fr">{{model.incident.contactsInformation}}</span>
+            <span class="fr" v-if="!model.incident.contactsInformation"></span>
+              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation">{{model.incident.contactsInformation}}</a></span>
           </p>
           <p>
             <span class="fl">处理方式</span>