seimin 1 rok temu
rodzic
commit
67ec158fe6

+ 3 - 14
src/components/EventInformation/index.vue

@@ -61,10 +61,6 @@
61 61
         >
62 62
       </p>
63 63
       <p>
64
-        <span class="fl">联系地址</span>
65
-        <span class="fr">{{ model.incident.houseNumber || "" }}</span>
66
-      </p>
67
-      <p>
68 64
         <span class="fl">预约时间</span>
69 65
         <span class="fr">{{ model.incident.yyTime || "" }}</span>
70 66
       </p>
@@ -108,17 +104,10 @@
108 104
         <span class="fl">逾期解决时间</span>
109 105
         <span class="fr">{{ model.incident.overdueTime }}</span>
110 106
       </p>
111
-      <p>
112
-        <span class="fl">区域</span>
113
-        <span class="fr">{{
114
-          model.incident.place ? model.incident.place.area.area : "--"
115
-        }}</span>
116
-      </p>
117 107
       <p class="boeder_B">
118
-        <span class="fl">地点</span>
119
-        <span class="fr">{{
120
-          model.incident.place ? model.incident.place.place : "--"
121
-        }}</span>
108
+        <span class="fl">详细地址</span>
109
+        <span class="fr" v-if="model.incident.place">{{ model.incident.branchName }} {{ model.incident.place.area.area }} {{ model.incident.place.place }} {{ model.incident.houseNumber }}</span>
110
+        <span class="fr" v-else>{{ model.incident.branchName }}</span>
122 111
       </p>
123 112
       <div v-if="hcsjList.length">
124 113
         <p>耗材</p>

+ 4 - 7
src/views/IncidentNewList.vue

@@ -93,13 +93,10 @@
93 93
                   </p>
94 94
                 </div>
95 95
                 <div class="bottom">
96
-                  <span v-if="!item.place"></span>
97
-                  <span
98
-                    v-if="item.place"
99
-                    style="width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"
100
-                    >{{ item.place.area.area }} {{ item.place.place }}
101
-                    {{ item.houseNumber }}</span
102
-                  >
96
+                  <span v-if="item.place" style="width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
97
+                    {{ item.branchName }} {{ item.place.area.area }} {{ item.place.place }} {{ item.houseNumber }}
98
+                  </span>
99
+                  <span v-else>{{ item.branchName}} </span>
103 100
                   <span>
104 101
                     <i v-if="item.callID" @click.stop="showAudio(item.callID)" class="dash dash-dianbohuifang"></i>
105 102
                     {{ item.acceptDate | timeFormat("MM-dd HH:mm") }}

+ 4 - 7
src/views/indes.vue

@@ -181,13 +181,10 @@
181 181
               </p>
182 182
             </div>
183 183
             <div class="bottom">
184
-              <span v-if="!item.place"></span>
185
-              <span
186
-                v-if="item.place"
187
-                style="width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"
188
-                >{{ item.place.area.area }} {{ item.place.place }}
189
-                {{ item.houseNumber }}</span
190
-              >
184
+              <span v-if="item.place" style="width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
185
+                {{ item.branchName }} {{ item.place.area.area }} {{ item.place.place }} {{ item.houseNumber }}
186
+              </span>
187
+              <span v-else>{{ item.branchName }}</span>
191 188
               <span>
192 189
                 <i v-if="item.callID" @click.stop="showAudio(item.callID)" class="dash dash-dianbohuifang"></i>
193 190
                 {{ item.acceptDate | timeFormat("MM-dd HH:mm") }}