资产的展示

css/index.css

@@ -449,7 +449,7 @@ article > .content .left {
 }
 
 .right .r-list .r-item {
-  height: 165px;
+  /* height: 165px; */
   padding: 16px 8px 16px 16px;
   overflow: hidden;
   color: #333;
@@ -485,7 +485,7 @@ article > .content .left {
 
 .right .r-list .r-item .r-item-content {
   line-height: 20px;
-  height: 40px;
+  /* height: 40px; */
   margin-top: 4px;
 }
 

index.html

@@ -384,7 +384,10 @@
     {{else}} {{each data}}
     <li class="r-item">
       <div class="r-item-title">报修单号：<span>{{$value.bxcode}}</span></div>
-      <p class="r-item-content twoline">{{$value.description}}</p>
+      <p class="r-item-content twoline">报修内容：{{$value.description}}</p>
+      {{if $value.wxIncidentWithCmdb == 1}}
+      <p class="r-item-content twoline">资产：{{$value.assetId||'无'}}</p>
+      {{/if}}
       <div class="r-item-info clearfix">
         <strong class="fl">{{$value.createTime | dateFormat}}</strong>
         <a href="javascript:;" class="r-item-click fr" data-id="{{$value.id}}"
@@ -651,6 +654,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item">
@@ -753,6 +762,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item">
@@ -861,6 +876,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item">
@@ -975,6 +996,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item">
@@ -1095,6 +1122,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item">
@@ -1213,6 +1246,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item">
@@ -1331,6 +1370,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item">
@@ -1523,6 +1568,12 @@
             <strong>报修地址：</strong>
             <span>{{incident.place ? incident.place.area.area + incident.place.place : ''}}{{address}}</span>
           </li>
+          {{if wxIncidentWithCmdb == 1}}
+          <li class="pop1-hd__itemList">
+            <strong>资产：</strong>
+            <span>{{assetId||'无'}}</span>
+          </li>
+          {{/if}}
         </ul>
       </div>
       <div class="pop1-hd__item pop1-evaluate">

js/index.js

@@ -2,6 +2,8 @@ $(function () {
   var repairMain = JSON.parse(sessionStorage.getItem("repair_main")); //报修主体
   var reqHasCategory = JSON.parse(sessionStorage.getItem("reqHasCategory")); //自动建单
   var loginUser = JSON.parse(window.sessionStorage.getItem("loginUser")); //用户信息
+  var wxIncidentWithCmdb = JSON.parse(window.sessionStorage.getItem("wxIncidentWithCmdb")); //是否绑定资产
+  var incidentWithConsumable = JSON.parse(window.sessionStorage.getItem("incidentWithConsumable")); //是否绑定耗材
   // demo start
   $("#demo").html(template("demo_temp", { account: loginUser.account }));
   // demo end
@@ -1196,6 +1198,7 @@ $(function () {
               res.data[i].time = res.data[i].createTime;
               res.data[i].processInstanceId =
                 res.data[i].incident.processInstanceId;
+                res.data[i].wxIncidentWithCmdb = wxIncidentWithCmdb;//是否展示资产带入模板
             }
             //添加分页数据，汇总
             bx_arr.data = bx_arr.data.concat(res.data);

js/login.js

@@ -47,31 +47,34 @@ $(function () {
             type: "POST",
             contentType: "application/json;charset=UTF-8",
             url: baseUrl + "sysinfo/data/fetchDataList/systemConfiguration",
-            data: JSON.stringify({ "idx": 0, "sum": 1000, "systemConfiguration": { "keyconfig": "repairMain" } }),
+            data: JSON.stringify({ "idx": 0, "sum": 1000 }),
             success: function (result) {
               if (result.status == 200) {
-                sessionStorage.setItem("repair_main", JSON.stringify(result.list[0]));
-                // --------------
-                //判断是否自动建单
-                $.ajax({
-                  type: "POST",
-                  contentType: "application/json;charset=UTF-8",
-                  url: baseUrl + "sysinfo/data/fetchDataList/systemConfiguration",
-                  data: JSON.stringify({ "idx": 0, "sum": 1000, "systemConfiguration": { "keyconfig": "reqHasCategory" } }),
-                  success: function (result) {
-                    if (result.status == 200) {
-                      sessionStorage.setItem("reqHasCategory", JSON.stringify(result.list[0]));
-                      window.location.href = 'index.html';
-                    }
-                    hasClick = false;
-                  },
-                  //请求失败，包含具体的错误信息
-                  error: function (e) {
-                    console.log(e.status);
-                    console.log(e.responseText);
-                  }
-                });
-                // --------------
+                var list = result.list;
+                var repairMain = list.find((v) => v.keyconfig == "repairMain"); //报修主体
+                var incidentWithConsumable = list.find(
+                  (v) => v.keyconfig == "incidentWithConsumable"
+                ); //是否绑定耗材
+                var wxIncidentWithCmdb = list.find(
+                  (v) => v.keyconfig == "wxIncidentWithCmdb"
+                ); //是否绑定资产
+                var reqHasCategory = list.find(
+                  (v) => v.keyconfig == "reqHasCategory"
+                ); //获取是否自动建单
+                sessionStorage.setItem(
+                  "repair_main",
+                  JSON.stringify(repairMain)
+                );
+                sessionStorage.setItem(
+                  "incidentWithConsumable",
+                  incidentWithConsumable.valueconfig
+                );
+                sessionStorage.setItem(
+                  "wxIncidentWithCmdb",
+                  wxIncidentWithCmdb.valueconfig
+                );
+                sessionStorage.setItem("reqHasCategory", JSON.stringify(reqHasCategory));
+                window.location.href = 'index.html';
               }
               hasClick = false;
             },