绑定到事件的耗材展示

src/App.vue

@@ -149,4 +149,16 @@ i.iconfont {
     color: #056a00;
   }
 }
-</style>
+.hcTable {
+  padding: 0.1rem 0.24rem;
+  table {
+    border-collapse: collapse;
+    border: 0.01rem solid #ccc;
+    width: 100%;
+    td {
+      border: 0.01rem solid #ccc;
+      text-align: center;
+    }
+  }
+}
+</style>

src/views/App.vue

@@ -22,5 +22,5 @@ export default {
 .bgColor{
       background-color: white
   }
-  
+
 </style>

src/views/Login.vue

@@ -46,19 +46,33 @@ export default {
   methods: {
     // 获取版本配置（报修主题：报修人/报修科室）
     getConfig() {
-      var that = this;
       this.$http
         .post("/service/sysinfo/data/fetchDataList/systemConfiguration", {
           idx: 0,
           sum: 1000,
-          systemConfiguration: { keyconfig: "repairMain" }
         })
-        .then(function(res) {
-          console.log(res);
+        .then((res) => {
+          let list = res.data.list;
+          let repairMain = list.find((v) => v.keyconfig == "repairMain"); //报修主体
+          let incidentWithConsumable = list.find(
+            (v) => v.keyconfig == "incidentWithConsumable"
+          ); //是否绑定耗材
+          let wxIncidentWithCmdb = list.find(
+            (v) => v.keyconfig == "wxIncidentWithCmdb"
+          ); //是否绑定资产
           localStorage.setItem(
             "valConfig",
-            JSON.stringify(res.data.list[0].valueconfig)
+            JSON.stringify(repairMain.valueconfig)
+          );
+          localStorage.setItem(
+            "incidentWithConsumable",
+            incidentWithConsumable.valueconfig
           );
+          localStorage.setItem(
+            "wxIncidentWithCmdb",
+            wxIncidentWithCmdb.valueconfig
+          );
+          this.$router.push({ path: "/main" });
         });
     },
     // 获取报修人登录方式
@@ -98,13 +112,12 @@ export default {
       this.$http.post("/service/auth/loginEncrypt", postData).then(res => {
         that.loading = false;
         if (res.data && res.data.state == 200) {
-          this.getConfig();
           localStorage.setItem("loginUser", JSON.stringify(res.data.data.user));
           localStorage.setItem(
             "login_requester",
             JSON.stringify(res.data.data.requester)
           );
-          this.$router.push({ path: "/main" });
+          this.getConfig();
         } else {
           that
             .$createDialog({
@@ -126,7 +139,6 @@ export default {
           window.location.href = res.data.url;
         } else {
           if (res.data.user) {
-            that.getConfig();
             localStorage.setItem(
               "loginUser",
               JSON.stringify(res.data.user.user)
@@ -135,7 +147,7 @@ export default {
               "login_requester",
               JSON.stringify(res.data.user.requester)
             );
-            this.$router.push({ path: "/main" });
+            that.getConfig();
           }
         }
       });
@@ -153,7 +165,6 @@ export default {
         that.$http.post("service/auth/wechatLoginEncrypt", code).then((res) => {
           if (res.data.state == 200) {
             if (res.data.user) {
-              that.getConfig();
               localStorage.setItem(
                 "loginUser",
                 JSON.stringify(res.data.user.user)
@@ -162,7 +173,7 @@ export default {
                 "login_requester",
                 JSON.stringify(res.data.user.requester)
               );
-              this.$router.push({ path: "/main" });
+              that.getConfig();
             }
           } else if (res.data.state == 501) {
             that

src/views/againAssign.vue

@@ -139,12 +139,29 @@
                   model.incident.place ? model.incident.place.area.area : "--"
                 }}</span>
               </p>
-              <p>
+              <p class="boeder_B">
                 <span class="fl">地点</span>
                 <span class="fr">{{
                   model.incident.place ? model.incident.place.place : "--"
                 }}</span>
               </p>
+              <div v-if="hcsjList.length">
+                <p>耗材</p>
+                <div class="hcTable">
+                  <table>
+                    <tr>
+                      <td>耗材名称</td>
+                      <td>价格</td>
+                      <td>数量</td>
+                    </tr>
+                    <tr v-for="(item,i) in hcsjList" :key="i">
+                      <td>{{item.consumable.name}}</td>
+                      <td>{{item.extra1}}</td>
+                      <td>{{item.consumablesSum}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
           </div>
           <p class="info_hide">
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -273,6 +290,9 @@ export default {
       id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
+      hcsjList:[],//绑定的耗材列表，展示
       promptingConent: "",
       promptingStatus: "",
       item_hides: false,
@@ -294,6 +314,18 @@ export default {
     PrompTing
   },
   methods: {
+    // 获取事件上绑定的耗材
+    getHcBySj() {
+      this.$http
+        .post("service/cmdb/storeList", {
+          data: { type: 2, source: "1627", sourceId: this.id },
+        })
+        .then((result) => {
+          if(result.data.status == 200){
+            this.hcsjList = result.data.data;
+          }
+        });
+    },
     //   获取事件数据
     getParamsData() {
       var that = this;
@@ -496,6 +528,9 @@ export default {
     this.id = this.$route.params.data.id;
     this.getParamsData();
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
     this.getHandlerUser();
     this.getCandidateGroups();
   }

src/views/closed.vue

@@ -149,12 +149,29 @@
                 model.incident.place ? model.incident.place.area.area : "--"
               }}</span>
             </p>
-            <p>
+            <p class="boeder_B">
               <span class="fl">地点</span>
               <span class="fr">{{
                 model.incident.place ? model.incident.place.place : "--"
               }}</span>
             </p>
+            <div v-if="hcsjList.length">
+                <p>耗材</p>
+                <div class="hcTable">
+                  <table>
+                    <tr>
+                      <td>耗材名称</td>
+                      <td>价格</td>
+                      <td>数量</td>
+                    </tr>
+                    <tr v-for="(item,i) in hcsjList" :key="i">
+                      <td>{{item.consumable.name}}</td>
+                      <td>{{item.extra1}}</td>
+                      <td>{{item.consumablesSum}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
           </div>
           <p class="info_hide">
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -305,6 +322,9 @@ export default {
       id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
+      hcsjList:[],//绑定的耗材列表，展示
       selected: 1,
       options: [
         {
@@ -332,6 +352,18 @@ export default {
     // HandlerLog
   },
   methods: {
+    // 获取事件上绑定的耗材
+    getHcBySj() {
+      this.$http
+        .post("service/cmdb/storeList", {
+          data: { type: 2, source: "1627", sourceId: this.id },
+        })
+        .then((result) => {
+          if(result.data.status == 200){
+            this.hcsjList = result.data.data;
+          }
+        });
+    },
     //   获取事件数据
     getParamsData() {
       var that = this;
@@ -453,6 +485,9 @@ export default {
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
   }
 };
 </script>

src/views/grabSheet.vue

@@ -134,12 +134,29 @@
                   model.incident.place ? model.incident.place.area.area : "--"
                 }}</span>
               </p>
-              <p>
+              <p class="boeder_B">
                 <span class="fl">地点</span>
                 <span class="fr">{{
                   model.incident.place ? model.incident.place.place : "--"
                 }}</span>
               </p>
+              <div v-if="hcsjList.length">
+                <p>耗材</p>
+                <div class="hcTable">
+                  <table>
+                    <tr>
+                      <td>耗材名称</td>
+                      <td>价格</td>
+                      <td>数量</td>
+                    </tr>
+                    <tr v-for="(item,i) in hcsjList" :key="i">
+                      <td>{{item.consumable.name}}</td>
+                      <td>{{item.extra1}}</td>
+                      <td>{{item.consumablesSum}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
             </div>
             <p class="info_hide">
               <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -223,6 +240,9 @@ export default {
       id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
+      hcsjList:[],//绑定的耗材列表，展示
       selected: 1,
       options: [
         {
@@ -246,6 +266,18 @@ export default {
     };
   },
   methods: {
+    // 获取事件上绑定的耗材
+    getHcBySj() {
+      this.$http
+        .post("service/cmdb/storeList", {
+          data: { type: 2, source: "1627", sourceId: this.id },
+        })
+        .then((result) => {
+          if(result.data.status == 200){
+            this.hcsjList = result.data.data;
+          }
+        });
+    },
     //   获取事件数据
     getParamsData() {
       var that = this;
@@ -406,6 +438,9 @@ export default {
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
   }
 };
 </script>

src/views/order.vue

@@ -175,12 +175,29 @@
                   model.incident.place ? model.incident.place.area.area : "--"
                 }}</span>
               </p>
-              <p>
+              <p class="boeder_B">
                 <span class="fl">地点</span>
                 <span class="fr">{{
                   model.incident.place ? model.incident.place.place : "--"
                 }}</span>
               </p>
+              <div v-if="hcsjList.length">
+                <p>耗材</p>
+                <div class="hcTable">
+                  <table>
+                    <tr>
+                      <td>耗材名称</td>
+                      <td>价格</td>
+                      <td>数量</td>
+                    </tr>
+                    <tr v-for="(item,i) in hcsjList" :key="i">
+                      <td>{{item.consumable.name}}</td>
+                      <td>{{item.extra1}}</td>
+                      <td>{{item.consumablesSum}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
               <!-- <p v-if="model.incident.synergeticReason">
                 <span class="fl" >协同原因</span>
                 <span class="fr">{{model.incident.synergeticReason}}</span>
@@ -296,6 +313,9 @@ export default {
     return {
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
+      hcsjList:[],//绑定的耗材列表，展示
       selected: 1,
       id: "",
       options: [
@@ -326,6 +346,18 @@ export default {
     // HandlerLog
   },
   methods: {
+    // 获取事件上绑定的耗材
+    getHcBySj() {
+      this.$http
+        .post("service/cmdb/storeList", {
+          data: { type: 2, source: "1627", sourceId: this.id },
+        })
+        .then((result) => {
+          if(result.data.status == 200){
+            this.hcsjList = result.data.data;
+          }
+        });
+    },
     //   获取事件数据
     getParamsData() {
       var that = this;
@@ -500,6 +532,9 @@ export default {
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
   }
 };
 </script>

src/views/processing.vue

@@ -170,12 +170,29 @@
                   : "--"
               }}</span>
             </p>
-            <p>
+            <p class="boeder_B">
               <span class="fl">地点</span>
               <span class="fr">{{
                 modelData.incident.place ? modelData.incident.place.place : "--"
               }}</span>
             </p>
+            <div v-if="hcsjList.length">
+                <p>耗材</p>
+                <div class="hcTable">
+                  <table>
+                    <tr>
+                      <td>耗材名称</td>
+                      <td>价格</td>
+                      <td>数量</td>
+                    </tr>
+                    <tr v-for="(item,i) in hcsjList" :key="i">
+                      <td>{{item.consumable.name}}</td>
+                      <td>{{item.extra1}}</td>
+                      <td>{{item.consumablesSum}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
 
             <!-- <p v-if="modelData.incident.synergeticReason">
                 <span class="fl" >协同原因</span>
@@ -508,6 +525,9 @@ export default {
     return {
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
+      hcsjList:[],//绑定的耗材列表，展示
       id: "",
       resignComment: "", //重新指派原因
       item_hides: false,
@@ -828,6 +848,18 @@ export default {
     // HandlerLog
   },
   methods: {
+    // 获取事件上绑定的耗材
+    getHcBySj() {
+      this.$http
+        .post("service/cmdb/storeList", {
+          data: { type: 2, source: "1627", sourceId: this.id },
+        })
+        .then((result) => {
+          if(result.data.status == 200){
+            this.hcsjList = result.data.data;
+          }
+        });
+    },
     //获取区域
     getAreaList() {
       return new Promise((resolve, reject) => {
@@ -1657,6 +1689,9 @@ export default {
     this.action.target += this.processInstanceId;
     this.getParamsData();
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
     // 处理方式
     this.getHandleCategory();
     // 关闭代码

src/views/solved.vue

@@ -147,12 +147,29 @@
                 model.incident.place ? model.incident.place.area.area : "--"
               }}</span>
             </p>
-            <p>
+            <p class="boeder_B">
               <span class="fl">地点</span>
               <span class="fr">{{
                 model.incident.place ? model.incident.place.place : "--"
               }}</span>
             </p>
+            <div v-if="hcsjList.length">
+                <p>耗材</p>
+                <div class="hcTable">
+                  <table>
+                    <tr>
+                      <td>耗材名称</td>
+                      <td>价格</td>
+                      <td>数量</td>
+                    </tr>
+                    <tr v-for="(item,i) in hcsjList" :key="i">
+                      <td>{{item.consumable.name}}</td>
+                      <td>{{item.extra1}}</td>
+                      <td>{{item.consumablesSum}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
           </div>
           <p class="info_hide">
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -331,6 +348,9 @@ export default {
       id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
+      hcsjList:[],//绑定的耗材列表，展示
       selected: 1,
       isclose: "close", //是否已解决
       iscloseArr: [
@@ -363,6 +383,18 @@ export default {
     // HandlerLog
   },
   methods: {
+    // 获取事件上绑定的耗材
+    getHcBySj() {
+      this.$http
+        .post("service/cmdb/storeList", {
+          data: { type: 2, source: "1627", sourceId: this.id },
+        })
+        .then((result) => {
+          if(result.data.status == 200){
+            this.hcsjList = result.data.data;
+          }
+        });
+    },
     //   获取事件数据
     getParamsData() {
       var that = this;
@@ -577,6 +609,9 @@ export default {
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
     this.getHandlerRes();
     this.getDegree();
   }