资产显示

assets/js/controllers/customform/customformCtrl.js

@@ -13050,6 +13050,20 @@ appFormly.config(function config(formlyConfigProvider) {
       },
     ],
   });
+  //资产
+  formlyConfigProvider.setType({
+    name: "ui-zc",
+    templateUrl: "assets/views/customform/tpl/ui-zc.html",
+    controller: [
+      "$scope",
+      "api_bpm_data",
+      "Restangular",
+      function ($scope, api_bpm_data, Restangular) {
+        console.log($scope,'ui-zc');
+        $scope.wxIncidentWithCmdb = JSON.parse(sessionStorage.getItem("wxIncidentWithCmdb"));//资产
+      },
+    ],
+  });
   //绑定的耗材
   formlyConfigProvider.setType({
     name: "ui-hc",
@@ -13060,6 +13074,7 @@ appFormly.config(function config(formlyConfigProvider) {
       "Restangular",
       function ($scope, api_cmdb2, Restangular) {
         console.log($scope,'ui-hc')
+        $scope.incidentWithConsumable = JSON.parse(sessionStorage.getItem("incidentWithConsumable"));//耗材
         $scope.list = [];
         var sjId = $scope.model.incident.id;
         api_cmdb2.getHc(sjId).then(function (response) {

assets/js/controllers/desk/chartCtrl.js

@@ -10,6 +10,8 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
     var loginUser = $rootScope.user;
     //保存报修主体
     $scope.repairMain = JSON.parse(sessionStorage.getItem("repair_main"));
+    $scope.wxIncidentWithCmdb = JSON.parse(sessionStorage.getItem("wxIncidentWithCmdb"));//资产
+    $scope.incidentWithConsumable = JSON.parse(sessionStorage.getItem("incidentWithConsumable"));//耗材
     // ----------------分割线 start-----------------
     // 报修科室下拉
     $scope.ks_pageNum = 0; //科室下拉列表分页
@@ -205,6 +207,15 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             enableFiltering: false
         }
         ];
+        // 是否展示资产
+        if($scope.wxIncidentWithCmdb == 1){
+            let index = $scope.gridOptions.columnDefs.findIndex(v=>v.name == 'address');
+            $scope.gridOptions.columnDefs.splice(index,0,{
+                name: 'assetId',
+                displayName: '资产',
+                width:150
+            })
+        }
     } else if ($scope.repairMain.valueconfig == 2) {//报修主体为科室
         $scope.gridOptions.columnDefs = [{
             name: 'item',

assets/js/controllers/loginCtrl.js

@@ -11,11 +11,30 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
         $scope.isSSo = location.search.length > 0;
         //初始化，获取版本类别，处理人/处理科室-seimin
         $scope.isCategoryHandle = function () {
-            api_is_category.isCategory({ "idx": 0, "sum": 1000, "systemConfiguration": { "keyconfig": "repairMain" } })
+            api_is_category.isCategory({ "idx": 0, "sum": 1000 })
                 .then(function (res) {
                     if (res.status == 200) {
                         //存储报修主体到缓存
-                        sessionStorage.setItem("repair_main", JSON.stringify(res.list[0]));
+                        var list = res.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"
+                        ); //是否绑定资产
+                        sessionStorage.setItem(
+                        "repair_main",
+                        JSON.stringify(repairMain)
+                        );
+                        sessionStorage.setItem(
+                        "incidentWithConsumable",
+                        incidentWithConsumable.valueconfig
+                        );
+                        sessionStorage.setItem(
+                        "wxIncidentWithCmdb",
+                        wxIncidentWithCmdb.valueconfig
+                        );
                     }
                 })
                 .catch(function (err) {

assets/js/controllers/system/sysconfigCtrl.js

@@ -30,11 +30,30 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
         g.addData("systemConfiguration", arr).then(function (t) {
             if (t.status == 200) {
                 //获取报修主体
-                api_is_category.isCategory({ "idx": 0, "sum": 1000, "systemConfiguration": { "keyconfig": "repairMain" } })
+                api_is_category.isCategory({ "idx": 0, "sum": 1000 })
                     .then(function (res) {
                         if (res.status == 200) {
                             //存储报修主体到缓存
-                            sessionStorage.setItem("repair_main", JSON.stringify(res.list[0]));
+                            var list = res.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"
+                            ); //是否绑定资产
+                            sessionStorage.setItem(
+                            "repair_main",
+                            JSON.stringify(repairMain)
+                            );
+                            sessionStorage.setItem(
+                            "incidentWithConsumable",
+                            incidentWithConsumable.valueconfig
+                            );
+                            sessionStorage.setItem(
+                            "wxIncidentWithCmdb",
+                            wxIncidentWithCmdb.valueconfig
+                            );
                             o.swal({
                                 title: "保存成功!",
                                 type: "success",

assets/views/customform/tpl/ui-hc.html

@@ -1,4 +1,4 @@
-<div class="row padding-sm no-padding-vr bordered no-border-hr ">
+<div class="row padding-sm no-padding-vr bordered no-border-hr" ng-show="incidentWithConsumable==1">
     <div class="col-md-12">
         <div style="color: #333;">耗材：</div>
         <div class="panel panel-white">

assets/views/customform/tpl/ui-zc.html

@@ -0,0 +1,26 @@
+<div class="row padding-sm no-padding-vr bordered no-border-hr" ng-show="wxIncidentWithCmdb==1">
+    <div class="col-md-12">
+        <div style="color: #333;">资产：</div>
+        <div class="panel panel-white">
+            <div class="panel-body">
+                <table class="table table-striped table-hover" style="table-layout:fixed">
+                    <thead>
+                        <tr>
+                            <th class="center" style="width:10px">#</th>
+                            <th class="center" style="width:100px">资产名称</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class="center">1</td>
+                            <td class="center">{{model.incident.assetId}}</td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<style>
+    .center{text-align: center!important;}
+</style>

assets/views/desk/jry_wxDetail.html

@@ -170,6 +170,7 @@
           <div class="message">详细地址：{{model.address}}</div>
           <div class="message" ng-if="model.category">报修类别：{{model.category.category}}</div>
           <div class="message" ng-if="model.incident">受理人：{{model.incident.acceptUser.name}}</div>
+          <div class="message" ng-if="wxIncidentWithCmdb==1">资产：{{model.assetId}}</div>
           <div class="messageCont">报修内容：{{model.incidentDescription}}</div>
         </div>
       </div>