耗材详情展示

src/App.vue

@@ -125,4 +125,16 @@ i.iconfont {
     color: #056a00;
   }
 }
+.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/againAssign.vue

@@ -137,10 +137,27 @@
                 <span class="fl">区域</span>
                 <span class="fr">{{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"
@@ -269,6 +286,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,
@@ -290,6 +310,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;
@@ -492,6 +524,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

@@ -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"
@@ -302,6 +319,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: [
         {
@@ -328,6 +348,18 @@ export default {
     LoadIng
   },
   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;
@@ -449,6 +481,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

@@ -103,10 +103,27 @@
                 <span class="fl">区域</span>
                 <span class="fr">{{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">展开详情 >></span>
@@ -167,6 +184,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: [
         {
@@ -190,6 +210,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;
@@ -344,6 +376,9 @@ export default {
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
   }
 };
 </script>

src/views/indes.vue

@@ -246,6 +246,7 @@ export default {
   },
   methods: {
     scan(){
+      // this.$router.push({name:'ScanResult',params:{data:'[{"name":"资产名称","value":"哈哈哈"},{"name":"数量","value":"12"}]'}});
       SM(this).then((ress1) => {
         this.$router.push({name:'ScanResult',params:{data:ress1}});
       })

src/views/order.vue

@@ -113,10 +113,27 @@
                 <span class="fl">区域</span>
                 <span class="fr">{{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>
@@ -203,6 +220,8 @@ export default {
     return {
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
       selected: 1,
       id:'',
       options: [
@@ -225,6 +244,7 @@ export default {
       imgs: [], //图片
       model: {}, //提交数据
       pro_hides:false,//展开/收起处理进度
+      hcsjList:[],//绑定的耗材列表，展示
     };
   },
   components: {
@@ -232,6 +252,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;
@@ -398,8 +430,10 @@ export default {
           .processInstanceId;
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
   }
 };
 </script>

src/views/processing.vue

@@ -174,12 +174,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>
@@ -285,7 +302,11 @@
                 @click="removeHc(item.id)"
               ></span>
             </div>
-            <div class="addHc" @click="addHc()" v-if="incidentWithConsumable == 1">
+            <div
+              class="addHc"
+              @click="addHc()"
+              v-if="incidentWithConsumable == 1"
+            >
               <i class="cubeic-add"></i>增加耗材
             </div>
             <!-- 添加耗材 end -->
@@ -559,8 +580,8 @@ export default {
   data() {
     return {
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
-      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"),//是否绑定耗材
-      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"),//是否绑定资产
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       id: "",
       resignComment: "", //重新指派原因
@@ -883,6 +904,7 @@ export default {
       hcList: [], //绑定的耗材列表
       idMock: 0, //自增id,mock
       hcs: [], //耗材列表
+      hcsjList:[],//绑定的耗材列表，展示
     };
   },
   watch: {
@@ -1803,6 +1825,18 @@ export default {
     fileSubmitted(files) {
       this.action.data = { fileName: files.name };
     },
+    // 获取事件上绑定的耗材
+    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;
+          }
+        });
+    },
   },
   created() {
     this.processInstanceId = this.$route.params.data
@@ -1816,6 +1850,9 @@ export default {
     this.action.target += this.processInstanceId;
     this.getParamsData();
     this.getHcs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
     this.getImgs();
     // 处理方式
     this.getHandleCategory();

src/views/scanResult.vue

@@ -4,32 +4,12 @@
       <div class="conent">
         <div class="header">资产信息</div>
         <div>
-          <div class="label headtop" id="info">{{result[0]}}</div>
+          <div class="headtop" id="info"></div>
 
           <div class="info">
-            <p>
-              <span class="fl">编码：</span>
-              <span class="fr">{{result[1]}}</span>
-            </p>
-            <p>
-              <span class="fl">型号：</span>
-              <span class="fr">{{result[2]}}</span>
-            </p>
-            <p>
-              <span class="fl">序列号：</span>
-              <span class="fr">{{result[3]}}</span>
-            </p>
-            <p>
-              <span class="fl">用途：</span>
-              <span class="fr">{{result[4]}}</span>
-            </p>
-            <p>
-              <span class="fl">IP：</span>
-              <span class="fr">{{result[5]}}</span>
-            </p>
-            <p>
-              <span class="fl">位置：</span>
-              <span class="fr">{{result[6]}}</span>
+            <p v-for="(item,i) in result" :key="i">
+              <span class="fl">{{item.name}}：</span>
+              <span class="fr">{{item.value}}</span>
             </p>
           </div>
         </div>
@@ -168,6 +148,7 @@ i.iconfont.blue {
           line-height: 0.4rem;
           padding: 0.1rem 0.24rem;
           overflow: hidden;
+          border-bottom:0.01rem solid #e6e6e6;
           .overflowEllipsis2 {
             margin-left: 1.96rem;
           }

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"
@@ -330,6 +347,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: [
@@ -362,6 +382,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;
@@ -579,6 +611,9 @@ export default {
     this.getParamsData();
 
     this.getImgs();
+    if(this.incidentWithConsumable == 1){
+      this.getHcBySj();
+    }
     this.getHandlerRes();
     this.getDegree();
   }