优化

config/index.js

@@ -14,7 +14,7 @@ module.exports = {
     proxyTable: {
       '/service': {//自定义名字，代表的是以下target中的内容
         // target: host.host+'/service/',//微信
-        target: 'http://192.168.3.111',//微信
+        target: 'http://192.168.4.105',//微信
         changeOrigin: true,//是否允许跨域
         // pathRewrite: {
         //   '^/service': ''
@@ -22,7 +22,7 @@ module.exports = {
       },
       '/file': {//自定义名字，代表的是以下target中的内容
         // target: host.host+'/service/',//微信
-        target: 'http://192.168.3.111',//微信
+        target: 'http://192.168.4.105',//微信
         changeOrigin: true,//是否允许跨域
         // pathRewrite: {
         //   '^/service': ''

src/components/showModelPicture/showModelPicture.vue

@@ -0,0 +1,270 @@
+<template>
+  <div class="showModel" v-if="disjunctor">
+    <div class="showModel__wrap">
+      <div class="showModel__header" v-if="title">
+        {{ title }}
+      </div>
+      <div class="showModel__article">
+        <div v-if="content" class="showModel__content" v-html="content"></div>
+        <div class="imgs-container">
+          <img :src="img.previewUrl" v-for="(img, index) in repairImgs" :key="index" class="imgs" @click="showImgs(repairImgs)" />
+        </div>
+      </div>
+      <div class="showModel__footer">
+        <div v-if="operate.know" class="showModel__know" @click.stop="know">
+          {{ operate.know || "" }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      repairImgs: [], //报修图片
+    };
+  },
+  props: {
+    // 显示隐藏
+    disjunctor: {
+      type: Boolean,
+      default: false
+    },
+    // 标题
+    title: {
+      type: String,
+      default: "提示"
+    },
+    // 内容
+    content: {
+      type: String,
+      default: ""
+    },
+    // 报修单id
+    wxIncidentId: {
+      type: Number,
+    },
+    // 操作按钮文字
+    operate: {
+      type: Object,
+      default: () => {
+        return {
+          know: "知道了"
+        };
+      }
+    }
+  },
+  methods: {
+    // 知道了
+    know() {
+      this.$emit("know");
+    },
+    // 获取报修图片
+    getRepairImgs() {
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .get(
+          "service/common/common/listAttachment/wechatRequesterIncident/" +
+            this.wxIncidentId,
+          {}
+        )
+        .then((res) => {
+          toast.hide();
+          console.log(res.data);
+          res.data.data = res.data.data || [];
+          res.data.data.forEach(v => {
+            v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          })
+          this.repairImgs = res.data.data;
+        });
+    },
+    //展示图片
+    showImgs(imgs){
+      this.$createImagePreview({
+        imgs:imgs.map(v=>v.previewUrl)
+      }).show()
+    },
+  },
+  mounted() {
+    this.getRepairImgs();
+  }
+};
+</script>
+
+<style lang="less">
+.showModel {
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.2);
+  z-index: 99;
+  .red{
+    color: red;
+  }
+
+  .imgs-container {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    img {
+      width: 1.5rem;
+      height: 1.5rem;
+      margin: 0.2rem 0.1rem;
+    }
+  }
+
+  .tipsAll {
+    .tips {
+      word-break: break-all;
+      margin-bottom: 0.1rem;
+    }
+  }
+
+  .showModel__wrap {
+    width: 6rem;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    background-color: #fff;
+    border-radius: 0.12rem;
+
+    .showModel__header {
+      font-size: 0.28rem;
+      color: #000;
+      height: 0.84rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-weight: bold;
+    }
+
+    .showModel__article {
+      margin: 0 auto 0.2rem;
+      width: 5.28rem;
+      padding: 0.2rem 0 0;
+      background-color: rgb(249, 250, 251);
+      border: 0.02rem solid rgb(229, 233, 237);
+      border-radius: 0.12rem;
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      .showModel__icon {
+        font-size: 1.38rem;
+        margin-bottom: 0.32rem;
+
+        &.showModel__icon--success {
+          color: rgb(52, 179, 73);
+        }
+
+        &.showModel__icon--warn {
+          color: rgb(245, 165, 35);
+        }
+
+        &.showModel__icon--error {
+          color: rgb(255, 58, 82);
+        }
+      }
+
+      .showModel__content {
+        width: 100%;
+        font-size: 0.26rem;
+        padding: 0 0 0.2rem;
+        border-bottom: 0.02rem solid #B7B7B7;
+        text-align: center;
+      }
+
+      .showModel__info {
+        font-size: 0.32rem;
+        color: rgb(102, 102, 102);
+      }
+      .select-wrap {
+        width: 80%;
+        margin: 0 auto;
+        &.hc{
+          font-size: 0.32rem;
+          .hc_item{
+            margin-bottom: 0.1rem;
+            display: flex;
+            align-items: center;
+          }
+        }
+      }
+      .specialCloseFlag {
+        width: 90%;
+        height: 100%;
+        padding: 0.16rem;
+      }
+    }
+
+    .showModel__footer {
+      box-sizing: border-box;
+      height: 1rem;
+      border-top: 0.02rem solid rgb(229, 233, 237);
+      display: flex;
+      align-items: center;
+
+      div {
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 0.36rem;
+        color: rgb(102, 102, 102);
+        position: relative;
+
+        &:nth-of-type(2)::before {
+          content: "";
+          position: absolute;
+          left: 0;
+          bottom: 0;
+          width: 0.02rem;
+          height: 0.87rem;
+          background-color: rgb(229, 233, 237);
+        }
+        &:nth-of-type(3)::before {
+          content: "";
+          position: absolute;
+          left: 0;
+          bottom: 0;
+          width: 0.02rem;
+          height: 0.87rem;
+          background-color: rgb(229, 233, 237);
+        }
+      }
+
+      .showModel__ok {
+        flex: 1;
+        color: #005395;
+      }
+
+      .showModel__remove {
+        flex: 1;
+        color: #f30922;
+      }
+
+      .showModel__cancel {
+        flex: 1;
+      }
+
+      .showModel__know {
+        flex: 1;
+        color: #005395;
+        font-size: 0.28rem;
+      }
+    }
+  }
+}
+</style>

src/router/index.js

@@ -127,7 +127,7 @@ export default new Router({
       },
     },
     {
-      path: '/main/consumableList/:incidentId/:summaryId/:processInstanceId',
+      path: '/main/consumableList/:incidentId/:summaryId/:processInstanceId/:dutyId',
       name: 'ConsumableList',
       component: ConsumableList,
       meta: {
@@ -215,7 +215,7 @@ export default new Router({
     },
   },
   {
-    path: '/summaryOrder/:incidentId/:processInstanceId',
+    path: '/summaryOrder/:incidentId/:processInstanceId/:dutyId',
     name: 'SummaryOrder',
     component: SummaryOrder,
     meta: {
@@ -223,7 +223,7 @@ export default new Router({
     },
   },
   {
-    path: '/summaryOrderDetail/:incidentId',
+    path: '/summaryOrderDetail/:incidentId/:dutyId',
     name: 'SummaryOrderDetail',
     component: SummaryOrderDetail,
     meta: {

src/views/ConsumableList.vue

@@ -224,7 +224,7 @@ export default {
                 this.items = [];
                 this.idx = 0;
                 this.$router.push({
-                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}/${this.$route.params.dutyId}`
                 })
               }
             }).show();
@@ -238,7 +238,7 @@ export default {
                 this.items = [];
                 this.idx = 0;
                 this.$router.push({
-                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}/${this.$route.params.dutyId}`
                 })
               }
             }).show();
@@ -302,6 +302,7 @@ export default {
     },
     // 获取列表
     getData() {
+      console.log(this.$route, 777)
       console.log(this.stateValue);
       if (this.searching) {
         this.idx = 0;
@@ -312,6 +313,7 @@ export default {
         sum: this.sum,
         consumable: {
           keyWord: this.title || '',
+          dutyDTO: {id: this.$route.params.dutyId}
         }
       };
       this.$http
@@ -320,6 +322,7 @@ export default {
           postData
         )
         .then((res) => {
+          console.log(this.searching, 'res')
           if(res.status == 200){
             if(title == this.title){
               if (res.data.list.length > 0) {
@@ -330,7 +333,11 @@ export default {
                   this.items = this.items.concat(res.data.list);
                 }
               } else {
-                this.wushuju = this.searching;
+                if(this.items.length){
+                  this.wushuju = this.searching;
+                }else{
+                  this.wushuju = true;
+                }
               }
             }
           }else{

src/views/IncidentNewList.vue

@@ -78,11 +78,10 @@
                       ></span
                     >
                   </p>
-                  <p v-if="valConfig == 2">
+                  <p v-if="valConfig == 2" style="padding-right:1rem;position:relative;">
                     报修科室 ：
-                    <span class="grayFont">{{
-                      item.department ? item.department.dept : ""
-                    }}</span>
+                    <span class="grayFont">{{ item.department ? item.department.dept : "" }}</span>
+                    <span v-if="item.reqAttachment" class="newicon newicon-a-11111" style="position:absolute;right:0;top:50%;transform:translateY(-50%);" @click.stop="clickImgs(item)"></span>
                   </p>
                 </div>
                 <div class="bottom">
@@ -172,6 +171,16 @@
       </div>
     </div>
     <load-ing v-show="loadShow"></load-ing>
+    <!-- 图片弹窗 -->
+    <showModelPicture
+      v-if="models3.disjunctor"
+      :title="models3.title"
+      :content="models3.content"
+      :disjunctor="models3.disjunctor"
+      @know="know3"
+      :operate="models3.operate"
+      :wxIncidentId="wxIncidentId"
+    ></showModelPicture>
     <!-- 指派弹窗 -->
     <showModel
       v-if="models.disjunctor"
@@ -218,6 +227,7 @@
 import seiminDrawer from "../custom/seiminDrawer.vue";
 import showModel from "../components/showModel/showModel.vue";
 import showModel2 from "../components/showModel2/showModel2.vue";
+import showModelPicture from "../components/showModelPicture/showModelPicture.vue";
 import CubePage from "../components/cube-page.vue";
 import SwitchOption from "../components/switch-option";
 import InputOption from "../components/input-option";
@@ -227,6 +237,7 @@ import LoadIng from "./../views/loading.vue";
 export default {
   data() {
     return {
+      wxIncidentId: '',
       evt: null,
       isShowDrawer: false,
       tabTypeIdActive: 2,
@@ -256,6 +267,9 @@ export default {
       models2: {
         disjunctor: false
       },
+      models3: {
+        disjunctor: false
+      },
       isAssign: false, //是否有权限指派
       isTransfer: false, //是否有权限转派
       isAll: false, //是否显示全部事件
@@ -302,6 +316,7 @@ export default {
     LoadIng,
     showModel,
     showModel2,
+    showModelPicture,
     seiminDrawer,
   },
   computed: {
@@ -333,6 +348,26 @@ export default {
     }
   },
   methods: {
+    // 图片----------------------start
+    //取消
+    know3() {
+      this.models3.disjunctor = false;
+    },
+    // 点击图片图标
+    clickImgs(item) {
+      console.log(item)
+      this.modelsData = item;
+      this.wxIncidentId = item.wxIncidentId;
+      this.models3 = {
+        disjunctor: true,
+        title: "提示",
+        content: "您申请的报修图片如下，请查看。",
+        operate: {
+          know: "知道了",
+        }
+      };
+    },
+    // 图片----------------------end
     // 确认侧边筛选框
     confirmDrawer(evt){
       console.log(evt);
@@ -697,6 +732,7 @@ export default {
       };
     },
     // 转派----------------------end
+
     //确定
     ok1(obj) {
       console.log(obj);
@@ -839,7 +875,7 @@ export default {
       if(data.duty && data.duty.addSummary == 1 && name == "Processing" && (data.handlerUser.id == this.loginUser.id)){
         // 责任科室【是否需要填写汇总单】开启，并且工单状态是处理中
         this.$router.push({
-          path: `/summaryOrder/${data.id}/${data.processInstanceId}`
+          path: `/summaryOrder/${data.id}/${data.processInstanceId}/${data.duty.id}`
         });
       }else{
         this.$router.push({

src/views/WorkHourManagementTwo.vue

@@ -109,7 +109,7 @@ export default {
                 this.items = [];
                 this.idx = 0;
                 this.$router.push({
-                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}/${this.$route.params.dutyId}`
                 })
               }
             }).show();
@@ -123,7 +123,7 @@ export default {
                 this.items = [];
                 this.idx = 0;
                 this.$router.push({
-                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}`
+                  path: `/summaryOrder/${this.$route.params.incidentId}/${this.$route.params.processInstanceId}/${this.$route.params.dutyId}`
                 })
               }
             }).show();

src/views/closed.vue

@@ -208,12 +208,12 @@ export default {
       if(this.model.incident.duty && this.model.incident.duty.addSummary == 1 && this.model.incident.state.value == "resolved"){
         // 责任科室【是否需要填写汇总单】开启，并且工单状态是已解决
         this.$router.push({
-          path: `/summaryOrderDetail/${this.model.incident.id}`
+          path: `/summaryOrderDetail/${this.model.incident.id}/${this.model.incident.duty.id}`
         });
       }else if(this.model.incident.duty && this.model.incident.duty.addSummary == 1 && this.model.incident.state.value == "close"){
         // 责任科室【是否需要填写汇总单】开启，并且工单状态是已关闭
         this.$router.push({
-          path: `/summaryOrderDetail/${this.model.incident.id}`
+          path: `/summaryOrderDetail/${this.model.incident.id}/${this.model.incident.duty.id}`
         });
       }
     },

src/views/incidentList.vue

@@ -801,7 +801,7 @@ export default {
       if(data.duty && data.duty.addSummary == 1 && name == "Processing"){
         // 责任科室【是否需要填写汇总单】开启，并且工单状态是处理中
         this.$router.push({
-          path: `/summaryOrder/${data.id}/${data.processInstanceId}`
+          path: `/summaryOrder/${data.id}/${data.processInstanceId}/${data.duty.id}`
         });
       }else{
         this.$router.push({

src/views/indes.vue

@@ -422,7 +422,7 @@ export default {
         name = 'SummaryOrder';
         // 责任科室【是否需要填写汇总单】开启，并且工单状态是处理中
         this.$router.push({
-          path: `/summaryOrder/${data.id}/${data.processInstanceId}`
+          path: `/summaryOrder/${data.id}/${data.processInstanceId}/${data.duty.id}`
         });
       }else{
         this.$router.push({

src/views/processing.vue

@@ -863,11 +863,12 @@ export default {
     },
     // 获取耗材列表
     getHcs() {
+      console.log(this.modelData, 777)
       this.$http
         .post("service/bpm/data/fetchDataList/consumable", {
           idx: 0,
           sum: 1000,
-          consumable: { isInventory: 1 }
+          consumable: { isInventory: 1, dutyDTO: this.modelData.incident.duty }
         })
         .then(res => {
           if (res.data.status == 200) {
@@ -984,6 +985,7 @@ export default {
           this.getMessage();
           // 故障现象
           this.getIncidentcategory();
+          this.getHcs();
 
           // 回显故障描述
           this.model.description = this.modelData.incident.description;
@@ -2020,7 +2022,6 @@ export default {
 
     this.action.target += this.processInstanceId;
     this.getParamsData();
-    this.getHcs();
     // 处理方式
     this.getHandleCategory();
     // 关闭代码

src/views/solved.vue

@@ -240,12 +240,12 @@ export default {
       if(this.model.incident.duty && this.model.incident.duty.addSummary == 1 && this.model.incident.state.value == "resolved"){
         // 责任科室【是否需要填写汇总单】开启，并且工单状态是已解决
         this.$router.push({
-          path: `/summaryOrderDetail/${this.model.incident.id}`
+          path: `/summaryOrderDetail/${this.model.incident.id}/${this.model.incident.duty.id}`
         });
       }else if(this.model.incident.duty && this.model.incident.duty.addSummary == 1 && this.model.incident.state.value == "close"){
         // 责任科室【是否需要填写汇总单】开启，并且工单状态是已关闭
         this.$router.push({
-          path: `/summaryOrderDetail/${this.model.incident.id}`
+          path: `/summaryOrderDetail/${this.model.incident.id}/${this.model.incident.duty.id}`
         });
       }
     },

src/views/summaryOrder.vue

@@ -1037,8 +1037,9 @@ export default {
     },
     // 新增耗材
     addConsumableMaterial() {
+      console.log(this.$route.params);
       this.$router.push({
-        path: `/main/ConsumableList/${this.$route.params.incidentId}/${this.summaryId}/${this.$route.params.processInstanceId}`
+        path: `/main/ConsumableList/${this.$route.params.incidentId}/${this.summaryId}/${this.$route.params.processInstanceId}/${this.$route.params.dutyId}`
       });
     },
     // 新增工时

src/views/summaryOrderDetail.vue

@@ -93,8 +93,9 @@ export default {
     },
     // 新增耗材
     addConsumableMaterial() {
+      console.log(this.$route.params)
       this.$router.push({
-        path: `/main/ConsumableList/${this.$route.params.incidentId}/${this.summaryId}/${this.$route.params.processInstanceId}`
+        path: `/main/ConsumableList/${this.$route.params.incidentId}/${this.summaryId}/${this.$route.params.processInstanceId}/${this.$route.params.dutyId}`
       });
     },
     // 新增工时

static/css/newicon/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe606;</span>
+                <div class="name">图片</div>
+                <div class="code-name">&amp;#xe606;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe609;</span>
                 <div class="name">设备巡检</div>
                 <div class="code-name">&amp;#xe609;</div>
@@ -78,9 +84,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1705398572308') format('woff2'),
-       url('iconfont.woff?t=1705398572308') format('woff'),
-       url('iconfont.ttf?t=1705398572308') format('truetype');
+  src: url('iconfont.woff2?t=1706169341925') format('woff2'),
+       url('iconfont.woff?t=1706169341925') format('woff'),
+       url('iconfont.ttf?t=1706169341925') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -107,6 +113,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-a-11111"></span>
+            <div class="name">
+              图片
+            </div>
+            <div class="code-name">.newicon-a-11111
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-shebeixunjian"></span>
             <div class="name">
               设备巡检
@@ -144,6 +159,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-a-11111"></use>
+                </svg>
+                <div class="name">图片</div>
+                <div class="code-name">#newicon-a-11111</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-shebeixunjian"></use>
                 </svg>
                 <div class="name">设备巡检</div>

static/css/newicon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304860 */
-  src: url('iconfont.woff2?t=1705398572308') format('woff2'),
-       url('iconfont.woff?t=1705398572308') format('woff'),
-       url('iconfont.ttf?t=1705398572308') format('truetype');
+  src: url('iconfont.woff2?t=1706169341925') format('woff2'),
+       url('iconfont.woff?t=1706169341925') format('woff'),
+       url('iconfont.ttf?t=1706169341925') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-a-11111:before {
+  content: "\e606";
+}
+
 .newicon-shebeixunjian:before {
   content: "\e609";
 }

static/css/newicon/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "39056749",
+      "name": "图片",
+      "font_class": "a-11111",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
       "icon_id": "2492912",
       "name": "设备巡检",
       "font_class": "shebeixunjian",