seimin 2 роки тому
батько
коміт
4c05d04179

+ 1 - 1
src/views/incidentList.vue

@@ -65,7 +65,7 @@
65
                   </p>
65
                   </p>
66
                   <p>
66
                   <p>
67
                     报修<span>{{ valConfig == 1 ? "人" : "科室" }}</span> :
67
                     报修<span>{{ valConfig == 1 ? "人" : "科室" }}</span> :
68
-                    <span class="grayFont">{{ item.contacts }}</span>
68
+                    <span class="grayFont">{{ valConfig == 1 ? item.contacts : (item.department?item.department.dept:'')  }}</span>
69
                     <span @click.stop v-if="item.contactsInformation"
69
                     <span @click.stop v-if="item.contactsInformation"
70
                       ><a :href="'tel:' + item.contactsInformation"
70
                       ><a :href="'tel:' + item.contactsInformation"
71
                         >(<i class="iconfont dsit-shouji"></i
71
                         >(<i class="iconfont dsit-shouji"></i

+ 3 - 1
src/views/indes.vue

@@ -38,7 +38,8 @@
38
           <div class="conent">
38
           <div class="conent">
39
             <div class="center">
39
             <div class="center">
40
               <div>
40
               <div>
41
-                <span class="fl">{{ item.requester.name }}</span>
41
+                <span class="fl" v-if="valConfig == 1">{{ item.requester?item.requester.name:'' }}</span>
42
+                <span class="fl" v-if="valConfig == 2">{{ item.requester?(item.requester.dept?item.requester.dept.dept:''):'' }}</span>
42
                 <span class="fr">{{
43
                 <span class="fr">{{
43
                   item.createTime | timeFormat("MM-dd HH:mm")
44
                   item.createTime | timeFormat("MM-dd HH:mm")
44
                 }}</span>
45
                 }}</span>
@@ -105,6 +106,7 @@ export default {
105
   data() {
106
   data() {
106
     return {
107
     return {
107
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
108
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
109
+      valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
108
       noticeData: "", //公告列表
110
       noticeData: "", //公告列表
109
       dataList: "", //最新报修
111
       dataList: "", //最新报修
110
       state: "", //流程状态
112
       state: "", //流程状态

+ 9 - 2
src/views/wxChartDetail.vue

@@ -7,8 +7,14 @@
7
           <div class="label headtop" id="info">报修信息</div>
7
           <div class="label headtop" id="info">报修信息</div>
8
           <div class="info">
8
           <div class="info">
9
             <p>
9
             <p>
10
-              <span>报修人:</span>
11
-              <span>{{ model.requester.name }}</span>
10
+              <template v-if="valConfig == 1">
11
+                <span>报修人:</span>
12
+                <span>{{ model.requester?model.requester.name:'' }}</span>
13
+              </template>
14
+              <template v-if="valConfig == 2">
15
+                <span>报修科室:</span>
16
+                <span>{{ model.requester?(model.requester.dept?model.requester.dept.dept:''):'' }}</span>
17
+              </template>
12
               <!-- yizhuanhuan: model.incidentState.name == '已受理', -->
18
               <!-- yizhuanhuan: model.incidentState.name == '已受理', -->
13
               <span
19
               <span
14
                 :class="{
20
                 :class="{
@@ -130,6 +136,7 @@ export default {
130
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
136
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
131
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
137
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
132
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
138
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
139
+      valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
133
       promptingConent: "",
140
       promptingConent: "",
134
       promptingStatus: "",
141
       promptingStatus: "",
135
       baseURL: http.host,
142
       baseURL: http.host,

+ 3 - 1
src/views/wxChartList.vue

@@ -55,7 +55,8 @@
55
                   </p>
55
                   </p>
56
                 </div>
56
                 </div>
57
                 <div class="bottom noneBorder">
57
                 <div class="bottom noneBorder">
58
-                  <span class="fl">报修人:{{ item.requester.name }}</span>
58
+                  <span class="fl" v-if="valConfig == 1">报修人:{{ item.requester?item.requester.name:'' }}</span>
59
+                  <span class="fl" v-if="valConfig == 2">报修科室:{{ item.requester?(item.requester.dept?item.requester.dept.dept:''):'' }}</span>
59
                   <span class="fr">报修时间:{{
60
                   <span class="fr">报修时间:{{
60
                     item.createTime | timeFormat("MM-dd HH:mm")
61
                     item.createTime | timeFormat("MM-dd HH:mm")
61
                   }}</span>
62
                   }}</span>
@@ -120,6 +121,7 @@ export default {
120
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
121
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
121
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
122
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
122
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
123
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
124
+      valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
123
       items: [],
125
       items: [],
124
       pullDownRefresh: true,
126
       pullDownRefresh: true,
125
       pullDownRefreshThreshold: 60,
127
       pullDownRefreshThreshold: 60,