增加校区

src/views/newIncident.vue

@@ -1154,10 +1154,12 @@ export default {
 
         if (inspecInfo.place) {
           if (inspecInfo.place.id) {
-            that.model.placeValue[0] = inspecInfo.place.area.id;
-            that.model.placeValue[1] = inspecInfo.place.id;
-            that.selectedPlaceTxt =
-              inspecInfo.place.area.area + " " + inspecInfo.place.place;
+            if (inspecInfo.branch) {
+              that.model.placeValue[0] = inspecInfo.branch.id;
+            }
+            that.model.placeValue[1] = inspecInfo.place.area.id;
+            that.model.placeValue[2] = inspecInfo.place.id;
+            that.selectedPlaceTxt = inspecInfo.branch.hosName + " " + inspecInfo.place.area.area + " " + inspecInfo.place.place;
           }
         }
       } else {
@@ -1167,10 +1169,13 @@ export default {
         that.model.houseNumber = that.loginUser.houseNumber;
         if (that.loginUser.place && that.loginUser.place.length) {
           if (that.loginUser.place.id) {
+            if (that.loginUser.branch) {
+              that.model.placeValue[0] = that.loginUser.branch.id;
+            }
             if (that.loginUser.place.area) {
-              that.model.placeValue[0] = that.loginUser.place.area.id;
+              that.model.placeValue[1] = that.loginUser.place.area.id;
             }
-            that.model.placeValue[1] = that.loginUser.place.id;
+            that.model.placeValue[2] = that.loginUser.place.id;
           }
         }
         // if (localStorage.getItem("model")) {

src/views/wxChartDetail.vue

@@ -8,20 +8,22 @@
           <div class="info">
             <p>
               <span>报修人：</span>
-              <span>{{ model.requester.name }}</span>
-              <!-- yizhuanhuan: model.incidentState.name == '已受理', -->
-              <span
-                :class="{
-                  btn: true,
-                  fr: true,
-                  weizhuanhuan: model.incidentState.value == 0,
-                  bushouli: model.incidentState.value == 1,
-                  chulizhong: model.incidentState.value == 2,
-                  daipingjia: model.incidentState.value == 3,
-                  yijiejue: model.incidentState.value == 4
-                }"
-                >{{ model.incidentState.name }}</span
-              >
+              <span style="display:flex;align-items:center;">
+                <span>{{ model.requester.name }}</span>
+                <!-- yizhuanhuan: model.incidentState.name == '已受理', -->
+                <span
+                  :class="{
+                    btn: true,
+                    fr: true,
+                    weizhuanhuan: model.incidentState.value == 0,
+                    bushouli: model.incidentState.value == 1,
+                    chulizhong: model.incidentState.value == 2,
+                    daipingjia: model.incidentState.value == 3,
+                    yijiejue: model.incidentState.value == 4
+                  }"
+                  >{{ model.incidentState.name }}</span
+                >
+              </span>
             </p>
             <p class="relative">
               <span>报修电话:</span>
@@ -38,11 +40,9 @@
             </p>
             <p>
               <span>报修地址:</span>
-              <span
-                >{{ model.area ? model.area.area : "" }}
-                {{ model.place ? model.place.place : "" }}
-                {{ model.houseNumber || "" }}</span
-              >
+              <span>
+                {{ model.branch ? model.branch.hosName : "" }} {{ model.place ? model.place.area.area : "" }} {{ model.place ? model.place.place : "" }} {{ model.houseNumber || "" }}
+              </span>
             </p>
             <p class="desc">
               <span>报修描述:</span>
@@ -350,6 +350,8 @@ i.iconfont.blue {
           padding: 0.1rem 0.24rem;
           overflow: hidden;
           border-bottom: 0.01rem solid #e6e6e6;
+          display: flex;
+          justify-content: space-between;
           &.lastP {
             border-bottom: none;
             display: inline-block;
@@ -359,7 +361,7 @@ i.iconfont.blue {
           }
           &.relative {
             position: relative;
-            padding-right: 1rem;
+            // padding-right: 1rem;
           }
           .overflowEllipsis2 {
             margin-left: 1.96rem;
@@ -368,6 +370,7 @@ i.iconfont.blue {
             display: inline-block;
             width: 1.7rem;
             color: #333;
+            flex-shrink: 0;
           }
 
           span:nth-child(2) {