seimin %!s(int64=3) %!d(string=hai) anos
pai
achega
534595c6c7
Modificáronse 3 ficheiros con 69 adicións e 8 borrados
  1. 42 2
      index.html
  2. 25 4
      js/index.js
  3. 2 2
      js/login.js

+ 42 - 2
index.html

@@ -141,11 +141,11 @@
141 141
             </div>
142 142
             <div class="formItem" id="if_bx_eventClass">
143 143
               <div class="label">
144
-                <span class="required repairFlag">*</span>故障类型
144
+                <span class="required repairFlag">*</span>报修类别
145 145
               </div>
146 146
               <div class="inpBox bx_eventClass">
147 147
                 <select
148
-                  placeholder="请选择故障类型"
148
+                  placeholder="请选择报修类别"
149 149
                   id="bx_eventClass"
150 150
                   autocomplete="off"
151 151
                 ></select>
@@ -585,6 +585,11 @@
585 585
           >
586 586
             <strong>状态:</strong><span>{{state.name}}</span>
587 587
           </li>
588
+          {{if incident.category}}
589
+          <li class="pop1-hd__itemList">
590
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
591
+          </li>
592
+          {{/if}}
588 593
           <li class="pop1-hd__itemList">
589 594
             <strong>报修内容:</strong><span>{{description}}</span>
590 595
           </li>
@@ -685,6 +690,11 @@
685 690
           >
686 691
             <strong>状态:</strong><span>{{state.name}}</span>
687 692
           </li>
693
+          {{if incident.category}}
694
+          <li class="pop1-hd__itemList">
695
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
696
+          </li>
697
+          {{/if}}
688 698
           <li class="pop1-hd__itemList">
689 699
             <strong>报修内容:</strong><span>{{description}}</span>
690 700
           </li>
@@ -791,6 +801,11 @@
791 801
           >
792 802
             <strong>状态:</strong><span>{{state.name}}</span>
793 803
           </li>
804
+          {{if incident.category}}
805
+          <li class="pop1-hd__itemList">
806
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
807
+          </li>
808
+          {{/if}}
794 809
           <li class="pop1-hd__itemList">
795 810
             <strong>报修内容:</strong><span>{{description}}</span>
796 811
           </li>
@@ -903,6 +918,11 @@
903 918
           >
904 919
             <strong>状态:</strong><span>{{state.name}}</span>
905 920
           </li>
921
+          {{if incident.category}}
922
+          <li class="pop1-hd__itemList">
923
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
924
+          </li>
925
+          {{/if}}
906 926
           <li class="pop1-hd__itemList">
907 927
             <strong>报修内容:</strong><span>{{description}}</span>
908 928
           </li>
@@ -1021,6 +1041,11 @@
1021 1041
           >
1022 1042
             <strong>状态:</strong><span>{{state.name}}</span>
1023 1043
           </li>
1044
+          {{if incident.category}}
1045
+          <li class="pop1-hd__itemList">
1046
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
1047
+          </li>
1048
+          {{/if}}
1024 1049
           <li class="pop1-hd__itemList">
1025 1050
             <strong>报修内容:</strong><span>{{description}}</span>
1026 1051
           </li>
@@ -1137,6 +1162,11 @@
1137 1162
           >
1138 1163
             <strong>状态:</strong><span>{{state.name}}</span>
1139 1164
           </li>
1165
+          {{if incident.category}}
1166
+          <li class="pop1-hd__itemList">
1167
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
1168
+          </li>
1169
+          {{/if}}
1140 1170
           <li class="pop1-hd__itemList">
1141 1171
             <strong>报修内容:</strong><span>{{description}}</span>
1142 1172
           </li>
@@ -1253,6 +1283,11 @@
1253 1283
           >
1254 1284
             <strong>状态:</strong><span>{{state.name}}</span>
1255 1285
           </li>
1286
+          {{if incident.category}}
1287
+          <li class="pop1-hd__itemList">
1288
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
1289
+          </li>
1290
+          {{/if}}
1256 1291
           <li class="pop1-hd__itemList">
1257 1292
             <strong>报修内容:</strong><span>{{description}}</span>
1258 1293
           </li>
@@ -1443,6 +1478,11 @@
1443 1478
           >
1444 1479
             <strong>状态:</strong><span>{{state.name}}</span>
1445 1480
           </li>
1481
+          {{if incident.category}}
1482
+          <li class="pop1-hd__itemList">
1483
+            <strong>报修类别:</strong><span>{{incident.category.category}}</span>
1484
+          </li>
1485
+          {{/if}}
1446 1486
           <li class="pop1-hd__itemList">
1447 1487
             <strong>报修内容:</strong><span>{{description}}</span>
1448 1488
           </li>

+ 25 - 4
js/index.js

@@ -1,6 +1,6 @@
1 1
 $(function () {
2 2
   var repairMain = JSON.parse(sessionStorage.getItem("repair_main")); //报修主体
3
-  var ifCreate = JSON.parse(sessionStorage.getItem("ifCreate")); //自动建单
3
+  var reqHasCategory = JSON.parse(sessionStorage.getItem("reqHasCategory")); //自动建单
4 4
   var loginUser = JSON.parse(window.sessionStorage.getItem("loginUser")); //用户信息
5 5
   // repairMain.valueconfig = '2';
6 6
   var placeList = []; //获取到的地点列表
@@ -24,7 +24,7 @@ $(function () {
24 24
   var ks_arr = { list: [] }; //科室所有数据
25 25
   // 兼容ie的placeholder
26 26
   $("input, textarea").placeholder();
27
-  //获取故障类型列表seimin
27
+  //获取报修类别列表seimin
28 28
   function getEventClass() {
29 29
     $.ajax({
30 30
       type: "POST",
@@ -55,7 +55,7 @@ $(function () {
55 55
     });
56 56
   }
57 57
   // 自动建单
58
-  if (ifCreate.valueconfig == 1) {
58
+  if (reqHasCategory.valueconfig == 1) {
59 59
     getEventClass();
60 60
   } else {
61 61
     $("#if_bx_eventClass").remove();
@@ -579,7 +579,7 @@ $(function () {
579 579
       sourceType: "webRequesterIncident",
580 580
     };
581 581
     // 自动建单
582
-    if (ifCreate.valueconfig == 1) {
582
+    if (reqHasCategory.valueconfig == 1) {
583 583
       data.incident.categoryId = $("#bx_eventClass").val();
584 584
     }
585 585
     data.loginUser = {
@@ -1159,6 +1159,9 @@ $(function () {
1159 1159
                 if (resFilter.state.id == 1592) {
1160 1160
                   //未受理
1161 1161
                   //添加详情页流程数据
1162
+                  processMessageData.forEach(function(v){
1163
+                    v.desc = v.desc.replace(/<.*?>(.*?)<\/.*?>/g, '$1');
1164
+                  })
1162 1165
                   resFilter.processList = processMessageData;
1163 1166
                   //填充弹窗数据
1164 1167
                   var html = template("bx1_detail_temp", resFilter);
@@ -1219,6 +1222,9 @@ $(function () {
1219 1222
                   });
1220 1223
                 } else if (resFilter.state.id == 0) {
1221 1224
                   //添加详情页流程数据
1225
+                  processMessageData.forEach(function(v){
1226
+                    v.desc = v.desc.replace(/<.*?>(.*?)<\/.*?>/g, '$1');
1227
+                  })
1222 1228
                   resFilter.processList = processMessageData;
1223 1229
                   //填充弹窗数据
1224 1230
                   var html = template("bx2_detail_temp", resFilter);
@@ -1278,6 +1284,9 @@ $(function () {
1278 1284
                   });
1279 1285
                 } else if (resFilter.state.id == 1594) {
1280 1286
                   //添加详情页流程数据
1287
+                  processMessageData.forEach(function(v){
1288
+                    v.desc = v.desc.replace(/<.*?>(.*?)<\/.*?>/g, '$1');
1289
+                  })
1281 1290
                   resFilter.processList = processMessageData;
1282 1291
                   //填充弹窗数据
1283 1292
                   var html = template("bx3_detail_temp", resFilter);
@@ -1294,6 +1303,9 @@ $(function () {
1294 1303
                   });
1295 1304
                 } else if (resFilter.state.id == 1595) {
1296 1305
                   //添加详情页流程数据
1306
+                  processMessageData.forEach(function(v){
1307
+                    v.desc = v.desc.replace(/<.*?>(.*?)<\/.*?>/g, '$1');
1308
+                  })
1297 1309
                   resFilter.processList = processMessageData;
1298 1310
                   //填充弹窗数据
1299 1311
                   var html = template("bx4_detail_temp", resFilter);
@@ -1390,6 +1402,9 @@ $(function () {
1390 1402
                   });
1391 1403
                 } else if (resFilter.state.id == 1593) {
1392 1404
                   //添加详情页流程数据
1405
+                  processMessageData.forEach(function(v){
1406
+                    v.desc = v.desc.replace(/<.*?>(.*?)<\/.*?>/g, '$1');
1407
+                  })
1393 1408
                   resFilter.processList = processMessageData;
1394 1409
                   //填充弹窗数据
1395 1410
                   var html = template("bx5_detail_temp", resFilter);
@@ -1406,6 +1421,9 @@ $(function () {
1406 1421
                   });
1407 1422
                 } else if (resFilter.state.id == 1597) {
1408 1423
                   //添加详情页流程数据
1424
+                  processMessageData.forEach(function(v){
1425
+                    v.desc = v.desc.replace(/<.*?>(.*?)<\/.*?>/g, '$1');
1426
+                  })
1409 1427
                   resFilter.processList = processMessageData;
1410 1428
                   //填充弹窗数据
1411 1429
                   var html = template("bx6_detail_temp", resFilter);
@@ -1422,6 +1440,9 @@ $(function () {
1422 1440
                   });
1423 1441
                 } else {
1424 1442
                   //添加详情页流程数据
1443
+                  processMessageData.forEach(function(v){
1444
+                    v.desc = v.desc.replace(/<.*?>(.*?)<\/.*?>/g, '$1');
1445
+                  })
1425 1446
                   resFilter.processList = processMessageData;
1426 1447
                   //填充弹窗数据
1427 1448
                   var html = template("bx7_detail_temp", resFilter);

+ 2 - 2
js/login.js

@@ -57,10 +57,10 @@ $(function () {
57 57
                   type: "POST",
58 58
                   contentType: "application/json;charset=UTF-8",
59 59
                   url: baseUrl + "sysinfo/data/fetchDataList/systemConfiguration",
60
-                  data: JSON.stringify({ "idx": 0, "sum": 1000, "systemConfiguration": { "keyconfig": "ifCreate" } }),
60
+                  data: JSON.stringify({ "idx": 0, "sum": 1000, "systemConfiguration": { "keyconfig": "reqHasCategory" } }),
61 61
                   success: function (result) {
62 62
                     if (result.status == 200) {
63
-                      sessionStorage.setItem("ifCreate", JSON.stringify(result.list[0]));
63
+                      sessionStorage.setItem("reqHasCategory", JSON.stringify(result.list[0]));
64 64
                       window.location.href = 'index.html';
65 65
                     }
66 66
                     hasClick = false;