汇总单

src/App.vue

@@ -25,6 +25,9 @@ export default {
 .fr {
   float: right;
 }
+.fontBold{
+  font-weight: bold;
+}
 .overflowEllipsis2 {
   overflow: hidden;
   text-overflow: ellipsis;

src/components/ConsumableMaterial/index.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="eventInformation" @click="showModal(model)">
+    <div class="head">
+      <p>
+        <span>{{ model.consumableName }}</span>
+        <span class="textRight">单价：<strong class="fontBold">{{ model.consumableEndPrice }}元</strong></span>
+      </p>
+    </div>
+    <p>
+      <span class="fl"></span>
+      <span class="fr"><strong class="fontBold">×{{ model.consumablesNum }}</strong>&emsp;&emsp;<span class="totalPrice">总价：<strong class="fontBold">{{model.consumablesNum * model.consumableEndPrice}}元</strong></span></span>
+    </p>
+    <!-- 弹窗 -->
+    <showModel
+      v-if="models.disjunctor"
+      :title="models.title"
+      :icon="models.icon"
+      :disjunctor="models.disjunctor"
+      @ok="ok"
+      @cancel="cancel"
+      @remove="remove"
+      :operate="models.operate"
+      selectName="hc_edit"
+      :data="hcData"
+    ></showModel>
+  </div>
+</template>
+
+<script>
+import showModel from "../showModel/showModel.vue";
+export default {
+  name: "ConsumableMaterial",
+  data() {
+    return {
+      hcData: {},
+      loadShow: true,
+      // 弹窗model
+      models: {
+        disjunctor: false
+      },
+    };
+  },
+  props: ["model", "id", "summaryId", "incidentId"],
+  components: {
+    showModel,
+  },
+  methods: {
+    // 移除
+    remove(data) {
+      console.log(data);
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/data/addSummaryDoc", {
+            "consumableList": [
+                {
+                    "consumablesId": data.hc.id,
+                    "consumablesNum": data.consumablesNum
+                }
+            ],
+            "summaryId": this.summaryId,
+            "remove": 'remove',
+        })
+        .then(res => {
+          toast.hide();
+          this.models.disjunctor = false;
+          if (res.data.status == 200) {
+            this.$createDialog({
+              type: "alert",
+              title: "操作成功",
+              icon: "cubeic-right",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              }
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              }
+            }).show();
+          }
+        });
+    },
+    //确定
+    ok(data) {
+      console.log(data);
+      const reg = /(^[1-9][0-9]*$)/;
+      if(!reg.test(data.consumablesNum)){
+          this.$createDialog({
+            type: "alert",
+            title: "请输入大于0的正整数!",
+            icon: "cubeic-warn"
+          }).show();
+          return;
+      }
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/data/addSummaryDoc", {
+            "consumableList": [
+                {
+                    "consumablesId": data.hc.id,
+                    "consumablesNum": data.consumablesNum
+                }
+            ],
+            "summaryId": this.summaryId,
+            "modifyNum": 'edit',
+        })
+        .then(res => {
+          toast.hide();
+          this.models.disjunctor = false;
+          if (res.data.status == 200) {
+            this.$createDialog({
+              type: "alert",
+              title: "操作成功",
+              icon: "cubeic-right",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              }
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              }
+            }).show();
+          }
+        });
+    },
+    //取消
+    cancel() {
+      this.models.disjunctor = false;
+    },
+    // 弹窗
+    showModal(item) {
+      console.log(item)
+      this.modelsData = item;
+      this.hcData = {
+        hc: {
+          endPrice: item.consumableEndPrice,
+          brandModel: item.consumableBrandModel,
+          name: item.consumableName,
+          id: item.consumableId,
+        },
+        incidentId: this.incidentId,
+        summaryId: this.summaryId,
+        consumablesNum: item.consumablesNum,
+      }
+      this.models = {
+        disjunctor: true,
+        title: "提示",
+        icon: "warn",
+        operate: {
+          ok: "确定",
+          cancel: "取消",
+          remove: '移除'
+        }
+      };
+    },
+  },
+  created() {
+    console.log(this.model);
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.eventInformation {
+  .totalPrice{
+    display: inline-block;
+    width: 2rem;
+    text-align: right;
+  }
+  .boeder_B {
+    border-bottom: 0.01rem solid #ccc;
+  }
+  .shows {
+    display: none;
+  }
+  .head {
+    border-bottom: 0.01rem solid #e6e6e6;
+    p {
+      padding: 0.24rem 0.3rem;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      i {
+        color: #00559d;
+      }
+      span {
+        flex: 1;
+        flex-shrink: 0;
+        width: 50%;
+        &.textRight{
+          text-align: right;
+        }
+      }
+    }
+  }
+  p {
+    line-height: 0.4rem;
+    padding: 0.1rem 0.24rem;
+    overflow: hidden;
+    .overflowEllipsis2 {
+      margin-left: 1.96rem;
+    }
+  }
+  .info_hide {
+    padding: 0.2rem 0.24rem;
+    border-bottom: 0.01rem solid #e6e6e6;
+    .hide {
+      color: #00559d;
+    }
+  }
+  .imgs-container {
+    a {
+      color: #03c !important;
+      &:visited {
+        color: #551a8b !important;
+      }
+    }
+    img {
+      width: 1.5rem;
+      height: 1.5rem;
+      margin-right: 0.7rem;
+      &:nth-child(1) {
+        margin-left: 0.75rem;
+      }
+    }
+  }
+  .progress {
+    padding: 0.2rem 0.2rem;
+    overflow: hidden;
+    transition-duration: 0.2s;
+    transition-timing-function: linear;
+    &.progressHide {
+      height: 1.7rem;
+    }
+    .progress_info {
+      overflow: hidden;
+      margin-bottom: 0.1rem;
+      &:nth-last-child(1) {
+        .cont {
+          border: none !important;
+        }
+      }
+      .progress_info_L {
+        float: left;
+        color: #333;
+        max-width: 18%;
+      }
+      .progress_info_R {
+        float: right;
+        margin-left: 0.09rem;
+        width: 80%;
+        font-size: 0.25rem;
+        .time {
+          i {
+            margin-left: -0.15rem;
+            &.icon-icon_weizuo {
+              color: #005495;
+            }
+            &.icon-icon_zhengzaijinx {
+              color: #48a843;
+              font-size: 0.37rem;
+            }
+          }
+          span {
+            margin-left: 0.15rem;
+          }
+        }
+        .cont {
+          border-left: 1px solid #999;
+          padding-left: 0.4rem;
+          min-height: 0.4rem;
+          &.blue {
+            border-left: 1px solid #005395;
+          }
+        }
+
+        .text1 {
+          font-size: 0.15rem;
+        }
+        .text2 {
+          color: #666;
+          word-break: break-all;
+        }
+        p {
+          padding: 0;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/WorkHourManagement/index.vue

@@ -0,0 +1,226 @@
+<template>
+  <div class="eventInformation" @click="showModal(model)">
+    <div class="head">
+      <p>
+        <span>{{ model.workName }}</span>
+        <span class="textRight"></span>
+      </p>
+    </div>
+    <p>
+      <span class="fl"></span>
+      <span class="fr"><span class="totalPrice">单次：<strong class="fontBold">{{model.wage}}元</strong></span></span>
+    </p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "WorkHourManagement",
+  data() {
+    return {
+      loadShow: true,
+    };
+  },
+  props: ["model", "id", "summaryId", "incidentId", "summaryObj"],
+  methods: {
+    // 移除
+    remove(data) {
+      console.log(data);
+      console.log(String(this.summaryObj.workHourManagementList.map(v => v.id).filter(v => v != this.id)))
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/data/addSummaryDoc", {
+            "workHourIds": String(this.summaryObj.workHourManagementList.map(v => v.id).filter(v => v != this.id)),
+            "summaryId": this.summaryId,
+        })
+        .then(res => {
+          toast.hide();
+          if (res.data.status == 200) {
+            this.$createDialog({
+              type: "alert",
+              icon: "cubeic-right",
+              title: "操作成功",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              },
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              }
+            }).show();
+          }
+        });
+    },
+    // 弹窗
+    showModal(item){
+      this.$createDialog({
+        type: "confirm",
+        title: "提示",
+        content: `您确认要移除工时【${item.workName}】吗`,
+        icon: "cubeic-right",
+        confirmBtn: {
+          text: "确定",
+          active: true,
+          disabled: false,
+          href: "javascript:;"
+        },
+        cancelBtn: {
+          text: "取消",
+          active: false,
+          disabled: false,
+          href: "javascript:;"
+        },
+        onConfirm: (e, promptValue) => {
+          this.loadShow = true;
+          this.remove(item);
+        },
+        onCancel: () => {}
+      }).show();
+    }
+  },
+  created() {
+    console.log(this.model);
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.eventInformation {
+  .totalPrice{
+    display: inline-block;
+    width: 2rem;
+    text-align: right;
+  }
+  .boeder_B {
+    border-bottom: 0.01rem solid #ccc;
+  }
+  .shows {
+    display: none;
+  }
+  .head {
+    border-bottom: 0.01rem solid #e6e6e6;
+    p {
+      padding: 0.24rem 0.3rem;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      i {
+        color: #00559d;
+      }
+      span {
+        flex: 1;
+        flex-shrink: 0;
+        width: 50%;
+        &.textRight{
+          text-align: right;
+        }
+      }
+    }
+  }
+  p {
+    line-height: 0.4rem;
+    padding: 0.1rem 0.24rem;
+    overflow: hidden;
+    .overflowEllipsis2 {
+      margin-left: 1.96rem;
+    }
+  }
+  .info_hide {
+    padding: 0.2rem 0.24rem;
+    border-bottom: 0.01rem solid #e6e6e6;
+    .hide {
+      color: #00559d;
+    }
+  }
+  .imgs-container {
+    a {
+      color: #03c !important;
+      &:visited {
+        color: #551a8b !important;
+      }
+    }
+    img {
+      width: 1.5rem;
+      height: 1.5rem;
+      margin-right: 0.7rem;
+      &:nth-child(1) {
+        margin-left: 0.75rem;
+      }
+    }
+  }
+  .progress {
+    padding: 0.2rem 0.2rem;
+    overflow: hidden;
+    transition-duration: 0.2s;
+    transition-timing-function: linear;
+    &.progressHide {
+      height: 1.7rem;
+    }
+    .progress_info {
+      overflow: hidden;
+      margin-bottom: 0.1rem;
+      &:nth-last-child(1) {
+        .cont {
+          border: none !important;
+        }
+      }
+      .progress_info_L {
+        float: left;
+        color: #333;
+        max-width: 18%;
+      }
+      .progress_info_R {
+        float: right;
+        margin-left: 0.09rem;
+        width: 80%;
+        font-size: 0.25rem;
+        .time {
+          i {
+            margin-left: -0.15rem;
+            &.icon-icon_weizuo {
+              color: #005495;
+            }
+            &.icon-icon_zhengzaijinx {
+              color: #48a843;
+              font-size: 0.37rem;
+            }
+          }
+          span {
+            margin-left: 0.15rem;
+          }
+        }
+        .cont {
+          border-left: 1px solid #999;
+          padding-left: 0.4rem;
+          min-height: 0.4rem;
+          &.blue {
+            border-left: 1px solid #005395;
+          }
+        }
+
+        .text1 {
+          font-size: 0.15rem;
+        }
+        .text2 {
+          color: #666;
+          word-break: break-all;
+        }
+        p {
+          padding: 0;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/showModel/showModel.vue

@@ -60,15 +60,25 @@
             style="border:1px solid #ececec;height:2rem;resize:none;"
           ></cube-textarea>
         </div>
+        <!-- 耗材 -->
+        <div class="select-wrap hc" v-if="selectName === 'hc_add' || selectName === 'hc_edit'">
+          <div class="hc_item">名称：{{ data.hc.name }}</div>
+          <div class="hc_item">型号品牌：{{ data.hc.brandModel }}</div>
+          <div class="hc_item">单价：{{ data.hc.endPrice }}元</div>
+          <div class="hc_item">使用数量：<cube-input type="number" style="flex:1" v-model="consumablesNum"></cube-input></div>
+        </div>
       </div>
       <div class="showModel__footer">
         <div v-if="operate.ok" class="showModel__ok" @click="ok">
           {{ operate.ok || "" }}
         </div>
-        <div v-if="operate.cancel" class="showModel__cancel" @click="cancel">
+        <div v-if="operate.remove && selectName === 'hc_edit'" class="showModel__remove" @click.stop="remove">
+          {{ operate.remove || "" }}
+        </div>
+        <div v-if="operate.cancel" class="showModel__cancel" @click.stop="cancel">
           {{ operate.cancel || "" }}
         </div>
-        <div v-if="operate.know" class="showModel__know" @click="know">
+        <div v-if="operate.know" class="showModel__know" @click.stop="know">
           {{ operate.know || "" }}
         </div>
         <div
@@ -87,6 +97,7 @@
 export default {
   data() {
     return {
+      consumablesNum: this.data ? (this.data.consumablesNum ? this.data.consumablesNum : 1) : 1,
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       logs: [],
       time: 5, //5秒后自动关闭
@@ -121,6 +132,11 @@ export default {
     }
   },
   props: {
+    // 携带的数据
+    data: {
+      type: Object,
+      default: () => {}
+    },
     // 显示隐藏
     disjunctor: {
       type: Boolean,
@@ -311,12 +327,18 @@ export default {
     ok() {
       if (this.selectName === "user") {
         this.$emit("ok", this.selectUserId);
+      } else if (this.selectName === "hc_add" || this.selectName === "hc_edit") {
+        this.$emit("ok", {hc: this.data.hc, consumablesNum:this.consumablesNum});
       } else if (this.textName === "textarea") {
         this.$emit("ok", this.textareaData);
       } else {
         this.$emit("ok");
       }
     },
+    // 移除
+    remove(){
+      this.$emit("remove", {hc: this.data.hc, consumablesNum:this.consumablesNum});
+    },
     // 取消
     cancel() {
       this.$emit("cancel");
@@ -333,6 +355,7 @@ export default {
     }
   },
   created() {
+    console.log(this.data)
     if (this.selectName === "user") {
       this.getZpBranch();
       // this.getZpGroup();
@@ -427,6 +450,14 @@ export default {
       .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%;
@@ -460,6 +491,15 @@ export default {
           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 {
@@ -467,6 +507,11 @@ export default {
         color: #005395;
       }
 
+      .showModel__remove {
+        flex: 1;
+        color: #f30922;
+      }
+
       .showModel__cancel {
         flex: 1;
       }

src/router/index.js

@@ -10,6 +10,9 @@ import NewIncident from './../views/newIncident.vue'//新建事件
 import Inspection from './../views/inspection.vue'//巡检列表
 import InspectionDetail from './../views/inspectionDetail.vue'//巡检详情
 import InspectionDoneDetail from './../views/inspectionDoneDetail.vue'//已完成巡检详情
+import ConsumableList from '../views/ConsumableList.vue'//耗材列表
+import WorkHourManagementOne from '../views/WorkHourManagementOne.vue'//工时管理一级目录
+import WorkHourManagementTwo from '../views/WorkHourManagementTwo.vue'//工时管理二级目录
 import NoticeDetails from './../views/noticeDetails.vue'//公告详情
 import NoticeList from './../views/noticeList.vue'//公告列表
 import KnowList from './../views/knowList.vue'//知识库列表（点赞）
@@ -25,6 +28,7 @@ import Processing from './../views/processing.vue' //处理中页面
 import Solved from './../views/solved.vue' //已解决页面
 import Closed from './../views/closed.vue' //已关闭页面
 import WaitConfirm from './../views/waitConfirm.vue' //待审核页面
+import SummaryOrder from './../views/summaryOrder.vue' //汇总单处理页面
 import ScanResult from './../views/scanResult.vue' //扫一扫结果页面
 import SearchDept from './../views/searchDept.vue' //搜索页面
 Vue.use(Router)
@@ -95,6 +99,30 @@ export default new Router({
       },
     },
     {
+      path: '/main/consumableList/:incidentId/:summaryId',
+      name: 'ConsumableList',
+      component: ConsumableList,
+      meta: {
+        allowBack: false
+      },
+    },
+    {
+      path: '/main/workHourManagementOne/:incidentId/:summaryId',
+      name: 'WorkHourManagementOne',
+      component: WorkHourManagementOne,
+      meta: {
+        allowBack: false
+      },
+    },
+    {
+      path: '/main/workHourManagementTwo/:incidentId/:summaryId/:parentId/:parentName',
+      name: 'WorkHourManagementTwo',
+      component: WorkHourManagementTwo,
+      meta: {
+        allowBack: false
+      },
+    },
+    {
       path: '/main/my',
       component: My,
       meta: {
@@ -159,6 +187,14 @@ export default new Router({
     },
   },
   {
+    path: '/summaryOrder/:incidentId/:processInstanceId',
+    name: 'SummaryOrder',
+    component: SummaryOrder,
+    meta: {
+      allowBack: false
+    },
+  },
+  {
     path: '/newIncident',
     name: 'NewIncident',
     component: NewIncident,

src/views/ConsumableList.vue

@@ -0,0 +1,695 @@
+<template>
+  <div class="bgColor">
+    <div slot="content" class="scroll-wrapper">
+      <div class="demo">
+        <div class="header">耗材列表</div>
+        <div class="seatchHeader">
+          <div class="search fl">
+            <input
+              class="searchInp"
+              type="text"
+              v-model="title"
+              placeholder="可通过名称、型号品牌进行检索支持拼音"
+              @input="searchData()"
+            />
+          </div>
+          <!-- <button class="selectBtn fr" @click="showPicker">筛选</button> -->
+        </div>
+        <div class="scroll-list-wrap">
+          <cube-scroll
+            ref="scroll"
+            :data="items"
+            :options="options"
+            @pulling-down="onPullingDown"
+            @pulling-up="onPullingUp"
+          >
+            <div class="conentBox">
+              <div
+                class="conent"
+                v-for="(item, index) in items"
+                @click="showModal(item)"
+                :key="index"
+              >
+                <div class="head">
+                  <p>
+                    <span>{{ item.name }}</span>
+                    <span>{{ item.brandModel }}</span>
+                  </p>
+                </div>
+                <div class="center">
+                  <p>
+                    <span class="fl"></span>
+                    <span class="grayFont overflowEllipsis2">{{item.endPrice}}元</span>
+                  </p>
+                </div>
+              </div>
+              <div class="wushuju" v-show="wushuju">
+                <img src="./../../static/images/wushuju.svg" alt />
+                <p>暂无数据</p>
+              </div>
+            </div>
+            <template v-if="customPullDown" slot="pulldown" slot-scope="props">
+              <div
+                v-if="props.pullDownRefresh"
+                class="cube-pulldown-wrapper"
+                :style="props.pullDownStyle"
+              >
+                <div
+                  v-show="props.beforePullDown"
+                  class="before-trigger"
+                  :style="{ paddingTop: props.bubbleY + 'px' }"
+                >
+                  <span
+                    :class="{
+                      rotate: props.bubbleY > pullDownRefreshThreshold - 40
+                    }"
+                    >↓</span
+                  >
+                </div>
+                <div class="after-trigger" v-show="!props.beforePullDown">
+                  <div v-show="props.isPullingDown" class="loading">
+                    <cube-loading></cube-loading>
+                  </div>
+                  <div v-show="!props.isPullingDown" class="text">
+                    <span class="refresh-text">更新成功</span>
+                  </div>
+                </div>
+              </div>
+            </template>
+          </cube-scroll>
+        </div>
+      </div>
+    </div>
+    <load-ing v-if="!items.length && !wushuju"></load-ing>
+    <!-- 弹窗 -->
+    <showModel
+      v-if="models.disjunctor"
+      :title="models.title"
+      :icon="models.icon"
+      :disjunctor="models.disjunctor"
+      @ok="ok"
+      @cancel="cancel"
+      :operate="models.operate"
+      selectName="hc_add"
+      :data="hcData"
+    ></showModel>
+  </div>
+</template>
+<script>
+import Vue from "vue";
+import showModel from "../components/showModel/showModel.vue";
+import CubePage from "../components/cube-page.vue";
+import SwitchOption from "../components/switch-option";
+import InputOption from "../components/input-option";
+import SelectOption from "../components/select-option";
+import LoadIng from "./loading.vue";
+export default {
+  data() {
+    return {
+      hcData: {},
+      modelsData: {}, //点击弹窗的那一项数据
+      // 弹窗model
+      models: {
+        disjunctor: false
+      },
+      valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      items: [],
+      pullDownRefresh: true,
+      pullDownRefreshThreshold: 60,
+      pullDownRefreshStop: 40,
+      pullDownRefreshTxt: "Refresh success",
+      pullUpLoad: true,
+      pullUpLoadThreshold: 0,
+      pullUpLoadMoreTxt: "加载更多",
+      pullUpLoadNoMoreTxt: "没有更多数据",
+      customPullDown: true,
+      wushuju: false,
+      title: "", //搜索内容
+      // stateData: [
+      //   {
+      //     text: "全部",
+      //     value: "all"
+      //   },
+      //   {
+      //     text: "待处理",
+      //     value: "todo"
+      //   },
+      //   {
+      //     text: "处理过",
+      //     value: "done"
+      //   }
+      // ],
+      // stateValue: "todo",
+      sum: 20,
+      idx: 0,
+      stateClass: "",
+      loadShow: true,
+      searching: false
+    };
+  },
+  components: {
+    CubePage,
+    SwitchOption,
+    InputOption,
+    SelectOption,
+    LoadIng,
+    showModel,
+  },
+  computed: {
+    options() {
+      return {
+        pullDownRefresh: this.pullDownRefreshObj,
+        pullUpLoad: this.pullUpLoadObj,
+        scrollbar: true
+      };
+    },
+    pullDownRefreshObj: function() {
+      return this.pullDownRefresh
+        ? {
+            threshold: parseInt(this.pullDownRefreshThreshold),
+            txt: this.pullDownRefreshTxt
+          }
+        : false;
+    },
+    pullUpLoadObj: function() {
+      return this.pullUpLoad
+        ? {
+            threshold: parseInt(this.pullUpLoadThreshold),
+            txt: {
+              more: this.pullUpLoadMoreTxt,
+              noMore: this.pullUpLoadNoMoreTxt
+            }
+          }
+        : false;
+    }
+  },
+  methods: {
+    //确定
+    ok(data) {
+      console.log(data);
+      const reg = /(^[1-9][0-9]*$)/;
+      if(!reg.test(data.consumablesNum)){
+          this.$createDialog({
+            type: "alert",
+            title: "请输入大于0的正整数!",
+            icon: "cubeic-warn"
+          }).show();
+          return;
+      }
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/data/addSummaryDoc", {
+            "consumableList": [
+                {
+                    "consumablesId": data.hc.id,
+                    "consumablesNum": data.consumablesNum
+                }
+            ],
+            "summaryId": this.$route.params.summaryId
+        })
+        .then(res => {
+          toast.hide();
+          this.models.disjunctor = false;
+          if (res.data.status == 200) {
+            this.$createDialog({
+              type: "alert",
+              title: "操作成功",
+              icon: "cubeic-right",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.items = [];
+                this.idx = 0;
+                this.$router.push({
+                  path: `/summaryOrder/${this.$route.params.incidentId}`
+                })
+              }
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.items = [];
+                this.idx = 0;
+                this.$router.push({
+                  path: `/summaryOrder/${this.$route.params.incidentId}`
+                })
+              }
+            }).show();
+          }
+        });
+    },
+    //取消
+    cancel() {
+      this.models.disjunctor = false;
+    },
+    // 弹窗
+    showModal(item) {
+      this.modelsData = item;
+      this.hcData = {
+        hc: item,
+        incidentId: this.$route.params.incidentId,
+        summaryId: this.$route.params.summaryId,
+      }
+      this.models = {
+        disjunctor: true,
+        title: "提示",
+        icon: "warn",
+        operate: {
+          ok: "确定",
+          cancel: "取消"
+        }
+      };
+    },
+    getParamsState() {
+      console.log(this.$route.params.state)
+      if (this.$route.params.state) {
+        console.log(this.$route.params.state);
+        this.stateValue = this.$route.params.state;
+      }
+    },
+    showPicker() {
+      if (!this.picker) {
+        this.picker = this.$createPicker({
+          title: "",
+          data: [this.stateData],
+          selectedIndex: [1],
+          onSelect: this.selectHandle,
+          onCancel: this.cancelHandle
+        });
+      }
+      this.picker.show();
+    },
+    selectHandle(selectedVal, selectedIndex, selectedText) {
+      console.log(selectedVal, selectedIndex, selectedText);
+
+      this.stateValue = selectedVal[0];
+      this.items = [];
+      this.getData();
+    },
+    cancelHandle() {},
+    // 搜索
+    searchData() {
+      this.items = [];
+      this.searching = true;
+      this.getData();
+    },
+    // 获取列表
+    getData() {
+      console.log(this.stateValue);
+      if (this.searching) {
+        this.idx = 0;
+      }
+      let postData = {
+        idx: this.idx,
+        sum: this.sum,
+        consumable: {
+          keyWord: this.title || '',
+        }
+      };
+      this.$http
+        .post(
+          "service/bpm/data/fetchDataList/consumable",
+          postData
+        )
+        .then((res) => {
+          if(res.status == 200){
+            if (res.data.list.length > 0) {
+              this.wushuju = false;
+              if (this.searching) {
+                this.items = res.data.list;
+              } else {
+                this.items = this.items.concat(res.data.list);
+              }
+            } else {
+              this.wushuju = this.searching;
+            }
+          }else{
+            this.$createDialog({
+              type: "alert",
+              title: "操作失败",
+              content: "请求失败!",
+              icon: "cubeic-wrong"
+            }).show();
+          }
+          this.loadShow = false;
+        });
+    },
+    onPullingDown() {
+      // 模拟更新数据
+      var that = this;
+      that.items = [];
+      that.idx = 0;
+      that.searching = false;
+      setTimeout(() => {
+        that.getData();
+      }, 1000);
+    },
+    onPullingUp() {
+      var that = this;
+      that.idx = that.idx + 1;
+      that.searching = false;
+      that.getData();
+    },
+    updatePullDownRefresh(val) {
+      this.pullDownRefresh = val;
+    },
+    updatePullDownRefreshThreshold(val) {
+      this.pullDownRefreshThreshold = val;
+    },
+    updatePullDownRefreshTxt(val) {
+      this.pullDownRefreshTxt = val;
+    },
+    updatePullUpLoad(val) {
+      this.pullUpLoad = val;
+    },
+    updatePullUpLoadThreshold(val) {
+      this.pullUpLoadThreshold = val;
+    },
+    updatePullUpLoadMoreTxt(val) {
+      this.pullUpLoadMoreTxt = val;
+    },
+    updatePullUpLoadNoMoreTxt(val) {
+      this.pullUpLoadNoMoreTxt = val;
+    },
+    updateCustomPullDown(val) {
+      this.customPullDown = val;
+    },
+    rebuildScroll() {
+      Vue.nextTick(() => {
+        this.$refs.scroll.destroy();
+        this.$refs.scroll.initScroll();
+      });
+    }
+  },
+  created() {
+    // this.$route.params.data
+    // this.getParamsState();
+    this.getData(this.idx, this.sum);
+  }
+};
+</script>
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+.scroll-list-wrap {
+  /* height: 350px */
+  height: 90vh;
+  /* border: 1px solid rgba(0, 0, 0, 0.1) */
+  border-radius: 5px;
+  transform: rotate(0deg); // fix 子元素超出边框圆角部分不隐藏的问题
+  // overflow: hidden;
+  padding-top: 1.76rem;
+}
+
+.foods-wrapper {
+  .food-item {
+    display: flex;
+
+    /* padding: 18px */
+    /* border-bottom: 1px solid rgba(7, 17, 27, 0.1) */
+    /* border-top: 1px solid rgba(7, 17, 27, 0.1)!important */
+    &:last-child {
+      border-none();
+      margin-bottom: 0;
+    }
+
+    .icon {
+      flex: 0 0 57px;
+      margin-right: 10px;
+    }
+
+    .food-content {
+      flex: 1;
+
+      .name {
+        margin: 2px 0 8px 0;
+        height: 14px;
+        line-height: 14px;
+        font-size: 14px;
+        color: rgb(7, 17, 27);
+      }
+
+      .description, .extra {
+        line-height: 10px;
+        font-size: 10px;
+        color: rgb(147, 153, 159);
+      }
+
+      .description {
+        line-height: 12px;
+        margin-bottom: 8px;
+      }
+
+      .extra {
+        .count {
+          margin-right: 12px;
+        }
+      }
+
+      .price {
+        font-weight: 700;
+        line-height: 24px;
+
+        .now {
+          margin-right: 8px;
+          font-size: 14px;
+          color: rgb(240, 20, 20);
+        }
+
+        .old {
+          text-decoration: line-through;
+          font-size: 10px;
+          color: rgb(147, 153, 159);
+        }
+      }
+
+      .cartcontrol-wrapper {
+        position: absolute;
+        right: 0;
+        bottom: 12px;
+
+        .scroll-wrapper {
+          .cube-pulldown-wrapper {
+            .before-trigger {
+              font-size: 30px;
+              line-height: 30px;
+              align-self: flex-end;
+
+              span {
+                display: inline-block;
+                transition: all 0.3s;
+                color: #666;
+
+                &.rotate {
+                  transform: rotate(180deg);
+                }
+              }
+            }
+
+            .after-trigger {
+              .refresh-text {
+                color: grey;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+<style lang="less" scoped>
+.bgColor {
+  background-color: white;
+}
+.food-item {
+  border-top: 0.16rem rgb(238, 238, 238) solid;
+}
+.food-content {
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+.title {
+  display: flex;
+  justify-content: space-between;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  padding: 0 0.24rem;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+.title i {
+  font-size: 0.32rem;
+  color: #005395;
+}
+.title div:nth-child(1) {
+  font-size: 0.32rem;
+}
+.title div:nth-child(1) span {
+  display: inline-block;
+  margin-left: 0.08rem;
+}
+.title div:nth-child(2) {
+  padding: 0.05rem 0.3rem;
+  /* border: 0.01rem rgb(0,0,255) solid; */
+  border-radius: 16px;
+  /* color: rgb(0,0,255); */
+  height: 0.25rem;
+  line-height: 0.25rem;
+  margin-top: 0.15rem;
+  font-size: 0.24rem;
+}
+.weishouli {
+  color: #991f00;
+  border: 0.01rem #991f00 solid;
+  background-color: #f4e8e5;
+}
+.bushouli {
+  color: #666666;
+  background-color: #eeeeee;
+  border: 0.01rem #666666 solid;
+}
+.chulizhong {
+  color: #003057;
+  background-color: #e5eaee;
+  border: 0.01rem #003057 solid;
+}
+.daipingjia {
+  color: #825b00;
+  background-color: #f2eee5;
+  border: 0.01rem #825b00 solid;
+}
+.yijiejue {
+  color: #40a19c;
+  background-color: #ebf5f5;
+  border: 0.01rem #40a19c solid;
+}
+.yichehui {
+  color: #48a843;
+  background-color: #ecf6ec;
+  border: 0.01rem #48a843 solid;
+}
+.timeBox {
+  display: flex;
+  justify-content: space-between;
+  font-size: 0.24rem;
+  color: #999999;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  padding: 0 0.24rem 0 0.64rem;
+}
+.wushuju {
+  margin-top: 2.4rem;
+  text-align: center;
+  color: #999;
+}
+.wushuju img {
+  width: 5.12rem;
+  height: 2.84rem;
+}
+.demo {
+  .header {
+    width: 100%;
+    height: 0.88rem;
+    line-height: 0.88rem;
+    text-align: center;
+    color: #fff;
+    font-size: 0.37rem;
+    background: linear-gradient(#2e2f32, #414246);
+    position: fixed;
+    top: 0;
+    z-index: 6;
+  }
+  .seatchHeader {
+    width: 100%;
+    background-color: #eee;
+    padding: 0.16rem;
+    overflow: hidden;
+    position: fixed;
+    top: 0.88rem;
+    z-index: 6;
+    box-sizing: border-box;
+    .search {
+      width: 100%;
+      height: 0.56rem;
+      font-size: 0.26rem;
+      color: #b2b2b2;
+      box-sizing: border-box;
+      .searchInp {
+        text-align: center;
+        background-color: #fff;
+        width: 100%;
+        height: 100%;
+        border-radius: 0.09rem;
+        border: none;
+        &:focus {
+          outline: none;
+        }
+      }
+    }
+    .selectBtn {
+      width: 1.2rem;
+      height: 0.56rem;
+      font-size: 0.32rem;
+      color: #005395;
+      border-color: #005395;
+      background-color: #fff;
+      border-radius: 0.09rem;
+      &:focus {
+        outline: none;
+      }
+    }
+  }
+}
+.conentBox {
+  width: 100%;
+  .conent {
+    font-size: 0.32rem;
+    font-weight: 400;
+    line-height: 0.45rem;
+    border-bottom: 0.16rem solid #e5e5e5;
+    .head {
+      border-bottom: 0.01rem solid #e6e6e6;
+      p {
+        padding: 0.24rem 0.48rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        i {
+          color: #00559d;
+        }
+        .btn {
+          float: right;
+        }
+      }
+    }
+    .center {
+      color: #333333;
+      border-bottom: 0.01rem solid #e6e6e6;
+      padding: 0.24rem 0.48rem;
+      p {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .grayFont {
+          color: #666;
+        }
+      }
+    }
+    .bottom {
+      overflow: hidden;
+      line-height: 0.86rem;
+      border-bottom: 0.01rem solid #e6e6e6;
+      font-size: 0.24rem;
+      color: #999;
+      padding: 0 0.24rem 0 0.48rem;
+    }
+  }
+}
+</style>

src/views/WorkHourManagementOne.vue

@@ -0,0 +1,457 @@
+<template>
+  <div class="bgColor">
+    <div slot="content" class="scroll-wrapper">
+      <div class="demo">
+        <div class="header">工时（一级目录）</div>
+        <div class="scroll-list-wrap">
+          <cube-scroll
+            :data="items"
+          >
+            <div class="conentBox">
+              <div
+                class="conent"
+                v-for="(item, index) in items"
+                @click="toDetail(item)"
+                :key="index"
+              >
+                <div class="head">
+                  <p>
+                    <span>{{ item.workName }}</span>
+                  </p>
+                </div>
+              </div>
+              <div class="wushuju" v-show="wushuju">
+                <img src="./../../static/images/wushuju.svg" alt />
+                <p>暂无数据</p>
+              </div>
+            </div>
+            <template v-if="customPullDown" slot="pulldown" slot-scope="props">
+              <div
+                v-if="props.pullDownRefresh"
+                class="cube-pulldown-wrapper"
+                :style="props.pullDownStyle"
+              >
+                <div
+                  v-show="props.beforePullDown"
+                  class="before-trigger"
+                  :style="{ paddingTop: props.bubbleY + 'px' }"
+                >
+                  <span
+                    :class="{
+                      rotate: props.bubbleY > pullDownRefreshThreshold - 40
+                    }"
+                    >↓</span
+                  >
+                </div>
+                <div class="after-trigger" v-show="!props.beforePullDown">
+                  <div v-show="props.isPullingDown" class="loading">
+                    <cube-loading></cube-loading>
+                  </div>
+                  <div v-show="!props.isPullingDown" class="text">
+                    <span class="refresh-text">更新成功</span>
+                  </div>
+                </div>
+              </div>
+            </template>
+          </cube-scroll>
+        </div>
+      </div>
+    </div>
+    <load-ing v-if="!items.length && !wushuju"></load-ing>
+  </div>
+</template>
+<script>
+import Vue from "vue";
+import CubePage from "../components/cube-page.vue";
+import SwitchOption from "../components/switch-option";
+import InputOption from "../components/input-option";
+import SelectOption from "../components/select-option";
+import LoadIng from "./loading.vue";
+export default {
+  data() {
+    return {
+      hcData: {},
+      modelsData: {}, //点击弹窗的那一项数据
+      // 弹窗model
+      models: {
+        disjunctor: false
+      },
+      valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      items: [],
+      pullDownRefresh: true,
+      pullDownRefreshThreshold: 60,
+      pullDownRefreshStop: 40,
+      pullDownRefreshTxt: "Refresh success",
+      pullUpLoad: true,
+      pullUpLoadThreshold: 0,
+      pullUpLoadMoreTxt: "加载更多",
+      pullUpLoadNoMoreTxt: "没有更多数据",
+      customPullDown: true,
+      wushuju: false,
+      sum: 1000,
+      idx: 0,
+      stateClass: "",
+      loadShow: true,
+      searching: false
+    };
+  },
+  components: {
+    CubePage,
+    SwitchOption,
+    InputOption,
+    SelectOption,
+    LoadIng,
+  },
+  methods: {
+    // 弹窗
+    toDetail(item) {
+      this.$router.push({
+        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.$route.params.summaryId}/${item.id}/${item.workName}`
+      });
+    },
+    // 获取列表
+    getData() {
+      if (this.searching) {
+        this.idx = 0;
+      }
+      let postData = {
+        idx: this.idx,
+        sum: this.sum,
+        workHourManagement: {
+          treeLevel: 1
+        }
+      };
+      this.$http
+        .post(
+          "service/bpm/data/fetchDataList/workHourManagement",
+          postData
+        )
+        .then((res) => {
+          if(res.status == 200){
+            if (res.data.list.length > 0) {
+              this.wushuju = false;
+              if (this.searching) {
+                this.items = res.data.list;
+              } else {
+                this.items = this.items.concat(res.data.list);
+              }
+            } else {
+              this.wushuju = true;
+            }
+          }else{
+            this.$createDialog({
+              type: "alert",
+              title: "操作失败",
+              content: "请求失败!",
+              icon: "cubeic-wrong"
+            }).show();
+          }
+          this.loadShow = false;
+        });
+    },
+  },
+  created() {
+    // this.$route.params.data
+    // this.getParamsState();
+    this.getData(this.idx, this.sum);
+  }
+};
+</script>
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+.scroll-list-wrap {
+  /* height: 350px */
+  height: 90vh;
+  /* border: 1px solid rgba(0, 0, 0, 0.1) */
+  border-radius: 5px;
+  transform: rotate(0deg); // fix 子元素超出边框圆角部分不隐藏的问题
+  // overflow: hidden;
+  padding-top: 0.88rem;
+}
+
+.foods-wrapper {
+  .food-item {
+    display: flex;
+
+    /* padding: 18px */
+    /* border-bottom: 1px solid rgba(7, 17, 27, 0.1) */
+    /* border-top: 1px solid rgba(7, 17, 27, 0.1)!important */
+    &:last-child {
+      border-none();
+      margin-bottom: 0;
+    }
+
+    .icon {
+      flex: 0 0 57px;
+      margin-right: 10px;
+    }
+
+    .food-content {
+      flex: 1;
+
+      .name {
+        margin: 2px 0 8px 0;
+        height: 14px;
+        line-height: 14px;
+        font-size: 14px;
+        color: rgb(7, 17, 27);
+      }
+
+      .description, .extra {
+        line-height: 10px;
+        font-size: 10px;
+        color: rgb(147, 153, 159);
+      }
+
+      .description {
+        line-height: 12px;
+        margin-bottom: 8px;
+      }
+
+      .extra {
+        .count {
+          margin-right: 12px;
+        }
+      }
+
+      .price {
+        font-weight: 700;
+        line-height: 24px;
+
+        .now {
+          margin-right: 8px;
+          font-size: 14px;
+          color: rgb(240, 20, 20);
+        }
+
+        .old {
+          text-decoration: line-through;
+          font-size: 10px;
+          color: rgb(147, 153, 159);
+        }
+      }
+
+      .cartcontrol-wrapper {
+        position: absolute;
+        right: 0;
+        bottom: 12px;
+
+        .scroll-wrapper {
+          .cube-pulldown-wrapper {
+            .before-trigger {
+              font-size: 30px;
+              line-height: 30px;
+              align-self: flex-end;
+
+              span {
+                display: inline-block;
+                transition: all 0.3s;
+                color: #666;
+
+                &.rotate {
+                  transform: rotate(180deg);
+                }
+              }
+            }
+
+            .after-trigger {
+              .refresh-text {
+                color: grey;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+<style lang="less" scoped>
+.bgColor {
+  background-color: white;
+}
+.food-item {
+  border-top: 0.16rem rgb(238, 238, 238) solid;
+}
+.food-content {
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+.title {
+  display: flex;
+  justify-content: space-between;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  padding: 0 0.24rem;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+.title i {
+  font-size: 0.32rem;
+  color: #005395;
+}
+.title div:nth-child(1) {
+  font-size: 0.32rem;
+}
+.title div:nth-child(1) span {
+  display: inline-block;
+  margin-left: 0.08rem;
+}
+.title div:nth-child(2) {
+  padding: 0.05rem 0.3rem;
+  /* border: 0.01rem rgb(0,0,255) solid; */
+  border-radius: 16px;
+  /* color: rgb(0,0,255); */
+  height: 0.25rem;
+  line-height: 0.25rem;
+  margin-top: 0.15rem;
+  font-size: 0.24rem;
+}
+.weishouli {
+  color: #991f00;
+  border: 0.01rem #991f00 solid;
+  background-color: #f4e8e5;
+}
+.bushouli {
+  color: #666666;
+  background-color: #eeeeee;
+  border: 0.01rem #666666 solid;
+}
+.chulizhong {
+  color: #003057;
+  background-color: #e5eaee;
+  border: 0.01rem #003057 solid;
+}
+.daipingjia {
+  color: #825b00;
+  background-color: #f2eee5;
+  border: 0.01rem #825b00 solid;
+}
+.yijiejue {
+  color: #40a19c;
+  background-color: #ebf5f5;
+  border: 0.01rem #40a19c solid;
+}
+.yichehui {
+  color: #48a843;
+  background-color: #ecf6ec;
+  border: 0.01rem #48a843 solid;
+}
+.timeBox {
+  display: flex;
+  justify-content: space-between;
+  font-size: 0.24rem;
+  color: #999999;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  padding: 0 0.24rem 0 0.64rem;
+}
+.wushuju {
+  margin-top: 2.4rem;
+  text-align: center;
+  color: #999;
+}
+.wushuju img {
+  width: 5.12rem;
+  height: 2.84rem;
+}
+.demo {
+  .header {
+    width: 100%;
+    height: 0.88rem;
+    line-height: 0.88rem;
+    text-align: center;
+    color: #fff;
+    font-size: 0.37rem;
+    background: linear-gradient(#2e2f32, #414246);
+    position: fixed;
+    top: 0;
+    z-index: 6;
+  }
+  .seatchHeader {
+    width: 100%;
+    background-color: #eee;
+    padding: 0.16rem;
+    overflow: hidden;
+    position: fixed;
+    top: 0.88rem;
+    z-index: 6;
+    box-sizing: border-box;
+    .search {
+      width: 100%;
+      height: 0.56rem;
+      font-size: 0.26rem;
+      color: #b2b2b2;
+      box-sizing: border-box;
+      .searchInp {
+        text-align: center;
+        background-color: #fff;
+        width: 100%;
+        height: 100%;
+        border-radius: 0.09rem;
+        border: none;
+        &:focus {
+          outline: none;
+        }
+      }
+    }
+    .selectBtn {
+      width: 1.2rem;
+      height: 0.56rem;
+      font-size: 0.32rem;
+      color: #005395;
+      border-color: #005395;
+      background-color: #fff;
+      border-radius: 0.09rem;
+      &:focus {
+        outline: none;
+      }
+    }
+  }
+}
+.conentBox {
+  width: 100%;
+  .conent {
+    font-size: 0.32rem;
+    font-weight: 400;
+    line-height: 0.45rem;
+    border-bottom: 0.16rem solid #e5e5e5;
+    .head {
+      border-bottom: 0.01rem solid #e6e6e6;
+      p {
+        padding: 0.24rem 0.48rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        i {
+          color: #00559d;
+        }
+        .btn {
+          float: right;
+        }
+      }
+    }
+    .center {
+      color: #333333;
+      border-bottom: 0.01rem solid #e6e6e6;
+      padding: 0.24rem 0.48rem;
+      p {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .grayFont {
+          color: #666;
+        }
+      }
+    }
+    .bottom {
+      overflow: hidden;
+      line-height: 0.86rem;
+      border-bottom: 0.01rem solid #e6e6e6;
+      font-size: 0.24rem;
+      color: #999;
+      padding: 0 0.24rem 0 0.48rem;
+    }
+  }
+}
+</style>

src/views/WorkHourManagementTwo.vue

@@ -0,0 +1,514 @@
+<template>
+  <div class="bgColor">
+    <div slot="content" class="scroll-wrapper">
+      <div class="demo">
+        <div class="header">一级目录选择的是：{{ $route.params.parentName }}</div>
+        <div class="scroll-list-wrap">
+          <cube-scroll
+            :data="items"
+          >
+            <div class="conentBox">
+              <!-- <div
+                class="conent"
+                v-for="(item, index) in items"
+                @click="toDetail(item)"
+                :key="index"
+              >
+                <div class="head">
+                  <p>
+                    <span>{{ item.workName }}</span>
+                  </p>
+                </div>
+              </div> -->
+              <cube-checkbox-group v-model="checkList" :options="itemsCopy" style="font-size: 0.4rem;" />
+              <div class="wushuju" v-show="wushuju">
+                <img src="./../../static/images/wushuju.svg" alt />
+                <p>暂无数据</p>
+              </div>
+            </div>
+          </cube-scroll>
+          <div class="sub">
+            <cube-button type="submit" @click="subVali()" v-show="!wushuju">确定</cube-button>
+            <cube-button type="submit" @click="goBack()">返回</cube-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <load-ing v-if="!items.length && !wushuju"></load-ing>
+  </div>
+</template>
+<script>
+import Vue from "vue";
+import CubePage from "../components/cube-page.vue";
+import SwitchOption from "../components/switch-option";
+import InputOption from "../components/input-option";
+import SelectOption from "../components/select-option";
+import LoadIng from "./loading.vue";
+export default {
+  data() {
+    return {
+      itemsCopy:[],
+      checkList:[],
+      hcData: {},
+      valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
+      items: [],
+      pullDownRefresh: true,
+      pullDownRefreshThreshold: 60,
+      pullDownRefreshStop: 40,
+      pullDownRefreshTxt: "Refresh success",
+      pullUpLoad: true,
+      pullUpLoadThreshold: 0,
+      pullUpLoadMoreTxt: "加载更多",
+      pullUpLoadNoMoreTxt: "没有更多数据",
+      customPullDown: true,
+      wushuju: false,
+      sum: 1000,
+      idx: 0,
+      stateClass: "",
+      loadShow: true,
+      searching: false
+    };
+  },
+  components: {
+    CubePage,
+    SwitchOption,
+    InputOption,
+    SelectOption,
+    LoadIng,
+  },
+  methods: {
+    // 确定
+    subVali(){
+      console.log(this.checkList);
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/data/addSummaryDoc", {
+            "workHourIds": String(this.checkList),
+            "summaryId": this.$route.params.summaryId
+        })
+        .then(res => {
+          toast.hide();
+          if (res.data.status == 200) {
+            this.$createDialog({
+              type: "alert",
+              title: "操作成功",
+              icon: "cubeic-right",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.items = [];
+                this.idx = 0;
+                this.$router.push({
+                  path: `/summaryOrder/${this.$route.params.incidentId}`
+                })
+              }
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.items = [];
+                this.idx = 0;
+                this.$router.push({
+                  path: `/summaryOrder/${this.$route.params.incidentId}`
+                })
+              }
+            }).show();
+          }
+        });
+    },
+    // 返回
+    goBack(){
+      this.$router.go(-1);
+    },
+    // 弹窗
+    toDetail(item) {
+      this.$router.push({
+        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.summaryId}/${item.id}`
+      });
+    },
+    // 获取列表
+    getData() {
+      if (this.searching) {
+        this.idx = 0;
+      }
+      this.$http
+        .post(
+          "service/bpm/data/querySummaryDoc",
+          {incidentId: this.$route.params.incidentId}
+        )
+        .then((res) => {
+          if(res.data.status == 200){
+            let workHourManagementList = res.data.workHourManagementList || [];
+            this.checkList = workHourManagementList.map(v => v.id);
+            console.log(this.checkList)
+            // ###########################
+            let postData = {
+              idx: this.idx,
+              sum: this.sum,
+              workHourManagement: {
+                parent: {id: this.$route.params.parentId}
+              }
+            };
+            this.$http
+              .post(
+                "service/bpm/data/fetchDataList/workHourManagement",
+                postData
+              )
+              .then((res) => {
+                if(res.data.status == 200){
+                  if (res.data.list.length > 0) {
+                    this.wushuju = false;
+                    if (this.searching) {
+                      this.items = res.data.list;
+                      this.itemsCopy = res.data.list.map(v => ({label:v.workName, value: v.id}));
+                    } else {
+                      this.items = this.items.concat(res.data.list);
+                      this.itemsCopy = this.itemsCopy.concat(res.data.list.map(v => ({label:v.workName, value: v.id})));
+                    }
+                  } else {
+                    this.wushuju = true;
+                  }
+                }else{
+                  this.$createDialog({
+                    type: "alert",
+                    title: "操作失败",
+                    content: "请求失败!",
+                    icon: "cubeic-wrong"
+                  }).show();
+                }
+                this.loadShow = false;
+              });
+            // ###########################
+          }else{
+            this.$createDialog({
+              type: "alert",
+              title: "操作失败",
+              content: "请求失败!",
+              icon: "cubeic-wrong"
+            }).show();
+          }
+        });
+    },
+  },
+  created() {
+    // this.$route.params.data
+    // this.getParamsState();
+    this.getData(this.idx, this.sum);
+  }
+};
+</script>
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+.sub {
+  background: #ececec;
+  display: flex;
+  .cube-btn {
+    background-color: #005395 !important;
+    flex: 1;
+    margin: 0.2rem 1%;
+    border-radius: 8px;
+  }
+}
+.scroll-list-wrap {
+  /* height: 350px */
+  height: 76vh;
+  /* border: 1px solid rgba(0, 0, 0, 0.1) */
+  border-radius: 5px;
+  transform: rotate(0deg); // fix 子元素超出边框圆角部分不隐藏的问题
+  // overflow: hidden;
+  padding-top: 0.88rem;
+}
+
+.foods-wrapper {
+  .food-item {
+    display: flex;
+
+    /* padding: 18px */
+    /* border-bottom: 1px solid rgba(7, 17, 27, 0.1) */
+    /* border-top: 1px solid rgba(7, 17, 27, 0.1)!important */
+    &:last-child {
+      border-none();
+      margin-bottom: 0;
+    }
+
+    .icon {
+      flex: 0 0 57px;
+      margin-right: 10px;
+    }
+
+    .food-content {
+      flex: 1;
+
+      .name {
+        margin: 2px 0 8px 0;
+        height: 14px;
+        line-height: 14px;
+        font-size: 14px;
+        color: rgb(7, 17, 27);
+      }
+
+      .description, .extra {
+        line-height: 10px;
+        font-size: 10px;
+        color: rgb(147, 153, 159);
+      }
+
+      .description {
+        line-height: 12px;
+        margin-bottom: 8px;
+      }
+
+      .extra {
+        .count {
+          margin-right: 12px;
+        }
+      }
+
+      .price {
+        font-weight: 700;
+        line-height: 24px;
+
+        .now {
+          margin-right: 8px;
+          font-size: 14px;
+          color: rgb(240, 20, 20);
+        }
+
+        .old {
+          text-decoration: line-through;
+          font-size: 10px;
+          color: rgb(147, 153, 159);
+        }
+      }
+
+      .cartcontrol-wrapper {
+        position: absolute;
+        right: 0;
+        bottom: 12px;
+
+        .scroll-wrapper {
+          .cube-pulldown-wrapper {
+            .before-trigger {
+              font-size: 30px;
+              line-height: 30px;
+              align-self: flex-end;
+
+              span {
+                display: inline-block;
+                transition: all 0.3s;
+                color: #666;
+
+                &.rotate {
+                  transform: rotate(180deg);
+                }
+              }
+            }
+
+            .after-trigger {
+              .refresh-text {
+                color: grey;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+<style lang="less" scoped>
+.bgColor {
+  background-color: white;
+}
+.food-item {
+  border-top: 0.16rem rgb(238, 238, 238) solid;
+}
+.food-content {
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+.title {
+  display: flex;
+  justify-content: space-between;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  padding: 0 0.24rem;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+.title i {
+  font-size: 0.32rem;
+  color: #005395;
+}
+.title div:nth-child(1) {
+  font-size: 0.32rem;
+}
+.title div:nth-child(1) span {
+  display: inline-block;
+  margin-left: 0.08rem;
+}
+.title div:nth-child(2) {
+  padding: 0.05rem 0.3rem;
+  /* border: 0.01rem rgb(0,0,255) solid; */
+  border-radius: 16px;
+  /* color: rgb(0,0,255); */
+  height: 0.25rem;
+  line-height: 0.25rem;
+  margin-top: 0.15rem;
+  font-size: 0.24rem;
+}
+.weishouli {
+  color: #991f00;
+  border: 0.01rem #991f00 solid;
+  background-color: #f4e8e5;
+}
+.bushouli {
+  color: #666666;
+  background-color: #eeeeee;
+  border: 0.01rem #666666 solid;
+}
+.chulizhong {
+  color: #003057;
+  background-color: #e5eaee;
+  border: 0.01rem #003057 solid;
+}
+.daipingjia {
+  color: #825b00;
+  background-color: #f2eee5;
+  border: 0.01rem #825b00 solid;
+}
+.yijiejue {
+  color: #40a19c;
+  background-color: #ebf5f5;
+  border: 0.01rem #40a19c solid;
+}
+.yichehui {
+  color: #48a843;
+  background-color: #ecf6ec;
+  border: 0.01rem #48a843 solid;
+}
+.timeBox {
+  display: flex;
+  justify-content: space-between;
+  font-size: 0.24rem;
+  color: #999999;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  padding: 0 0.24rem 0 0.64rem;
+}
+.wushuju {
+  margin-top: 2.4rem;
+  text-align: center;
+  color: #999;
+}
+.wushuju img {
+  width: 5.12rem;
+  height: 2.84rem;
+}
+.demo {
+  .header {
+    width: 100%;
+    height: 0.88rem;
+    line-height: 0.88rem;
+    text-align: center;
+    color: #fff;
+    font-size: 0.37rem;
+    background: linear-gradient(#2e2f32, #414246);
+    position: fixed;
+    top: 0;
+    z-index: 6;
+  }
+  .seatchHeader {
+    width: 100%;
+    background-color: #eee;
+    padding: 0.16rem;
+    overflow: hidden;
+    position: fixed;
+    top: 0.88rem;
+    z-index: 6;
+    box-sizing: border-box;
+    .search {
+      width: 100%;
+      height: 0.56rem;
+      font-size: 0.26rem;
+      color: #b2b2b2;
+      box-sizing: border-box;
+      .searchInp {
+        text-align: center;
+        background-color: #fff;
+        width: 100%;
+        height: 100%;
+        border-radius: 0.09rem;
+        border: none;
+        &:focus {
+          outline: none;
+        }
+      }
+    }
+    .selectBtn {
+      width: 1.2rem;
+      height: 0.56rem;
+      font-size: 0.32rem;
+      color: #005395;
+      border-color: #005395;
+      background-color: #fff;
+      border-radius: 0.09rem;
+      &:focus {
+        outline: none;
+      }
+    }
+  }
+}
+.conentBox {
+  width: 100%;
+  .conent {
+    font-size: 0.32rem;
+    font-weight: 400;
+    line-height: 0.45rem;
+    border-bottom: 0.16rem solid #e5e5e5;
+    .head {
+      border-bottom: 0.01rem solid #e6e6e6;
+      p {
+        padding: 0.24rem 0.48rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        i {
+          color: #00559d;
+        }
+        .btn {
+          float: right;
+        }
+      }
+    }
+    .center {
+      color: #333333;
+      border-bottom: 0.01rem solid #e6e6e6;
+      padding: 0.24rem 0.48rem;
+      p {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .grayFont {
+          color: #666;
+        }
+      }
+    }
+    .bottom {
+      overflow: hidden;
+      line-height: 0.86rem;
+      border-bottom: 0.01rem solid #e6e6e6;
+      font-size: 0.24rem;
+      color: #999;
+      padding: 0 0.24rem 0 0.48rem;
+    }
+  }
+}
+</style>

src/views/incidentList.vue

@@ -152,7 +152,7 @@
     </div>
     <load-ing v-show="loadShow"></load-ing>
     <!-- 指派弹窗 -->
-    <showModel 
+    <showModel
       v-if="models.disjunctor"
       :title="models.title"
       :icon="models.icon"
@@ -454,12 +454,19 @@ export default {
       } else if (data.state.value == "close") {
         name = "Closed";
       }
-      this.$router.push({
-        name: name,
-        params: {
-          data: data
-        }
-      });
+      if(data.duty && data.duty.addSummary == 1 && name == "Processing"){
+        // 责任科室【是否需要填写汇总单】开启，并且工单状态是处理中
+        this.$router.push({
+          path: `/summaryOrder/${data.id}/${data.processInstanceId}`
+        });
+      }else{
+        this.$router.push({
+          name: name,
+          params: {
+            data: data
+          }
+        });
+      }
     },
 
     getData() {

src/views/indes.vue

@@ -43,14 +43,14 @@
       >
         <div class="buildOrder">
           <div
-            class="buildOrderItem" 
+            class="buildOrderItem"
             @click="goTo('/main/incidentList/all/0/today')"
           >
             <div class="s_num">{{ newStatistics.createOrders }}</div>
             <div>今日建单</div>
           </div>
           <div
-            class="buildOrderItem" 
+            class="buildOrderItem"
             @click="goTo('/main/incidentList/all/1544')"
           >
             <!-- <div class="s_num">{{ newStatistics.todoOrders }}</div> -->
@@ -387,12 +387,20 @@ export default {
       } else if (data.state.value == "close") {
         name = "Closed";
       }
-      this.$router.push({
-        name: name,
-        params: {
-          data: data
-        }
-      });
+      if(data.duty && data.duty.addSummary == 1 && name == "Processing"){
+        name = 'SummaryOrder';
+        // 责任科室【是否需要填写汇总单】开启，并且工单状态是处理中
+        this.$router.push({
+          path: `/summaryOrder/${data.id}`
+        });
+      }else{
+        this.$router.push({
+          name: name,
+          params: {
+            data: data
+          }
+        });
+      }
     }
   },
   created() {

src/views/summaryOrder.vue

@@ -0,0 +1,690 @@
+<template>
+  <div class="againAssign">
+    <div class="conentBox">
+      <div class="header">汇总单</div>
+      <div v-if="$route.params.incidentId" class="conent">
+        <div class="navBar">
+          <div class="fl p50">
+            <a
+              :class="{ active: actives == 'info' }"
+              href="javascript:;"
+              @click="toInfo('info')"
+              >耗材清单</a
+            >
+          </div>
+          <div class="fl">
+            <a
+              :class="{ active: actives == 'progress' }"
+              href="javascript:;"
+              @click="toInfo('progress')"
+              >工时清单</a
+            >
+          </div>
+        </div>
+        <div class="label headtop" id="info">耗材清单</div>
+
+        <div class="info">
+          <ConsumableMaterial v-for="item in summaryObj.consumableList" :key="item.id" class="bottomBorder" :model="item" :id="item.id" :summaryId="summaryId" :incidentId="$route.params.incidentId" @refresh="refresh"></ConsumableMaterial>
+          <p class="textCenter">
+            <span>耗材总价：<strong class="fontBold">{{ totalPriceConsumable }}元</strong></span>
+          </p>
+          <p
+            class="addConsumableMaterial textCenter"
+            @click="addConsumableMaterial()"
+          >
+            <span class="dash dash-jia"></span>
+          </p>
+          <div class="label" id="progress">工时清单</div>
+          <WorkHourManagement v-for="item in summaryObj.workHourManagementList" :key="item.id" class="bottomBorder" :model="item" :id="item.id" :summaryId="summaryId" :incidentId="$route.params.incidentId" @refresh="refresh" :summaryObj="summaryObj"></WorkHourManagement>
+          <p class="textCenter">
+            <span>工时总价：<strong class="fontBold">{{ totalPriceWorkHourManagement }}元</strong></span>
+          </p>
+          <p class="addConsumableMaterial textCenter" @click="addWorkHourManagementOne()">
+            <span class="dash dash-jia"></span>
+          </p>
+        </div>
+      </div>
+      <load-ing v-if="loadShow"></load-ing>
+      <promp-ting
+        :conents="promptingConent"
+        :status="promptingStatus"
+      ></promp-ting>
+    </div>
+    <seiminModel ref="seiminModel"></seiminModel>
+    <div class="sub">
+      <cube-button type="submit" @click="temporaryStorage()">暂存</cube-button>
+      <cube-button type="submit" @click="submitHandler()">提交汇总单</cube-button>
+    </div>
+  </div>
+</template>
+<script>
+import seiminModel from "./../custom/seiminModel";
+import LoadIng from "./../views/loading.vue";
+import PrompTing from "./../views/prompting.vue";
+import ConsumableMaterial from "./../components/ConsumableMaterial/index.vue";
+import WorkHourManagement from "./../components/WorkHourManagement/index.vue";
+
+export default {
+  data() {
+    return {
+      // 耗材总价格
+      totalPriceConsumable: 0,
+      totalPriceWorkHourManagement: 0,
+      summaryObj: {},
+      loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      id: "",
+      actives: "info",
+      model: {}, //提交数据
+      loadShow: false,
+      pro_hides: false, //展开/收起处理进度
+      name: "",
+      label: "incidentInfo", //顶部快速定位
+      modelData: {
+        incident: {}
+      }, //上传的model
+      model: {
+        handleCategory: "", //处理方式
+        closecode: "", //关闭代码
+        category: [], //确认事件分类
+        handleDescription: "", //处理方案
+        knowledge: false, //是否提交知识库
+        isHelper: false, //是否需要协同
+        solutionType: [], //知识库类型
+        handlerUser: "", //升级/转派对象
+        isupreason: "", //升级原因
+        transferReason: "", //转派原因
+        synergeticReason: "", //协同原因
+        selectArea: "",
+        selectPlace: "",
+        transferMode: "", //转派方式
+        branch: "", //院区
+        duty: "" //责任科室
+      },
+      promptingConent: "",
+      promptingStatus: ""
+    };
+  },
+  methods: {
+    // 暂存
+    temporaryStorage(){
+      console.log(this.summaryObj);
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/data/addSummaryDoc", {
+            "summaryId": this.summaryId,
+            "staging": '暂存',
+        })
+        .then(res => {
+          toast.hide();
+          if (res.data.status == 200) {
+            this.$createDialog({
+              type: "alert",
+              title: "操作成功",
+              icon: "cubeic-right",
+              onConfirm: (e, promptValue) => {
+                this.$router.push({
+                  path: `/main/incidentList/todo/0`
+                })
+              }
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.$router.push({
+                  path: `/main/incidentList/todo/0`
+                })
+              }
+            }).show();
+          }
+        });
+    },
+    // 刷新
+    refresh(){
+      this.getInfo();
+    },
+    // 新增耗材
+    addConsumableMaterial() {
+      this.$router.push({
+        path: `/main/ConsumableList/${this.$route.params.incidentId}/${this.summaryId}`
+      });
+    },
+    // 新增工时
+    addWorkHourManagementOne() {
+      this.$router.push({
+        path: `/main/WorkHourManagementOne/${this.$route.params.incidentId}/${this.summaryId}`
+      });
+    },
+    // 获取汇总单信息
+    getInfo() {
+      this.$http.post("/service/bpm/data/querySummaryDoc", {incidentId: this.$route.params.incidentId}).then(res => {
+        if(res.data.status == 200){
+          this.summaryObj = res.data;
+          if(this.summaryObj.consumableList){
+            this.totalPriceConsumable = this.summaryObj.consumableList.reduce((pre, current) => pre + current.consumableEndPrice * current.consumablesNum, 0)
+          }else{
+            this.totalPriceConsumable = 0;
+          }
+          if(this.summaryObj.workHourManagementList){
+            this.totalPriceWorkHourManagement = this.summaryObj.workHourManagementList.reduce((pre, current) => pre + current.wage, 0)
+          }else{
+            this.totalPriceWorkHourManagement = 0;
+          }
+          this.summaryId = res.data.summaryId;
+        }else if(res.data.status == 201){
+          // 事件第一次绑定汇总单
+          this.summaryId = res.data.summaryId;
+        }
+      });
+    },
+    // 快速定位
+    toInfo(id) {
+      this.actives = id;
+      $("body,html").animate(
+        {
+          scrollTop:
+            $("#" + id).offset().top -
+            $(".header")[0].offsetHeight -
+            $(".navBar")[0].offsetHeight
+        },
+        260
+      );
+    },
+    // 提交
+    submitHandler() {
+      this.loadShow = true;
+      // 获取事件数据
+      this.$http
+        .get(
+          "/service/form/renderForm/handlerform/" +
+            this.$route.params.processInstanceId +
+            "/" +
+            this.loginUser.id +
+            "/" +
+            this.$route.params.incidentId,
+          {}
+        )
+        .then(res => {
+          this.modelData = res.data.model;
+          console.log(this.modelData)
+          this.modelData.incident.handleCategory = {id: 1565};
+          this.modelData.loginUser= this.loginUser;
+          this.$http
+          .post(
+            "service/bpm/bpm/completeTask/" +
+              this.modelData.incident.taskId +
+              "/" +
+              this.loginUser.id,
+            this.modelData
+          )
+          .then((res) => {
+            if (res.data) {
+              this.dialog = this
+                .$createDialog({
+                  type: "alert",
+                  title: "提交成功",
+                  content: "点击返回事件列表",
+                  icon: "cubeic-right",
+                  onConfirm: (e, promptValue) => {
+                    this.$router.push({ path: `/main/incidentList/todo/0` });
+                  }
+                })
+                .show();
+            } else {
+              this.loadShow = false;
+              this.dialog = this
+                .$createDialog({
+                  type: "alert",
+                  title: "系统错误,请稍后再试!",
+                  content: "请求失败",
+                  icon: "cubeic-wrong",
+                })
+                .show();
+            }
+          });
+        });
+    }
+  },
+  mounted() {
+    console.log(this.$route);
+    console.log(this.modelData, this.model, 999);
+    this.getInfo();
+  },
+  components: {
+    seiminModel,
+    LoadIng,
+    PrompTing,
+    ConsumableMaterial,
+    WorkHourManagement,
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.bottomBorder {
+  border-bottom: 0.2rem solid #eee;
+}
+.textCenter {
+  text-align: center;
+}
+.addConsumableMaterial {
+  border-top: 0.01rem solid #e6e6e6;
+  border-bottom: 0.01rem solid #e6e6e6;
+}
+.hcList {
+  display: flex;
+  align-items: center;
+  margin-top: 0.1rem;
+}
+.hcItem {
+  flex: 4;
+  margin: 0 0.05rem;
+}
+.hcItemClose {
+  flex: 1;
+  font-size: 0.4rem;
+}
+.addHc {
+  width: 90%;
+  height: 1rem;
+  margin: 0 auto;
+  border: 0.02rem solid #ccc;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.addHc .cubeic-add {
+  font-size: 0.8rem;
+}
+.newIncident .cube-form-group {
+  border-bottom: 0.02rem solid rgb(245, 245, 245);
+}
+.newIncident .sub .cube-btn {
+  margin-top: 1.1rem;
+}
+.btn_plcaeholde .cube-btn {
+  padding-left: 0;
+  padding-right: 0;
+  text-align: left;
+  color: inherit;
+  background: none;
+  border: none;
+}
+.btn_plcaeholde .cube-btn:active {
+  background-color: #fff;
+}
+.btn_plcaeholde .cube-btn::after {
+  content: ">";
+  float: right;
+  margin-right: 0.15rem;
+}
+.cube-form_standard .cube-upload-def .cube-upload-btn,
+.cube-form_standard .cube-upload-def .cube-upload-file {
+  margin-left: 3% !important;
+}
+// .sub .cube-btn {
+//   background-color: #005395 !important;
+//   width: 90%;
+//   margin: 0 auto;
+//   border-radius: 8px;
+// }
+.sub {
+  background: #ececec;
+  display: flex;
+  .cube-btn {
+    background-color: #005395 !important;
+    width: 48%;
+    margin: 0.2rem auto;
+    border-radius: 8px;
+  }
+}
+.cube-picker-wheel-item {
+  text-overflow: ellipsis;
+}
+</style>
+<style lang="less" scoped>
+.header {
+  width: 100%;
+  height: 0.88rem;
+  line-height: 0.88rem;
+  text-align: center;
+  color: #fff;
+  font-size: 0.37rem;
+  background: linear-gradient(#2e2f32, #414246);
+  position: fixed;
+  top: 0;
+  z-index: 6;
+}
+.incidentTitle {
+  .titleRefer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .titleTxtArea {
+      font-size: 0.3rem;
+      color: #333;
+      height: 2rem;
+      width: 62%;
+      &:focus {
+        outline: none;
+      }
+    }
+    .abtn {
+      display: inline-block;
+      width: 37%;
+      text-align: center;
+      height: 0.48rem;
+      color: #005395;
+      font-size: 0.28rem;
+    }
+  }
+}
+.form-custom {
+  .cube-form-item {
+    .cube-btn {
+      padding-left: 0;
+      padding-right: 0;
+      text-align: left;
+      color: inherit;
+      background: none;
+      border: none;
+    }
+  }
+}
+
+.label {
+  background-color: rgb(238, 238, 238);
+  height: 0.6rem;
+  line-height: 0.6rem;
+  padding-left: 0.2rem;
+  font-size: 0.24rem;
+  color: #666666;
+  span {
+    font-size: 0.2rem;
+    display: inline-block;
+    margin-left: 0.08rem;
+    color: #999999;
+  }
+  &.formLabel {
+    background-color: #fff;
+  }
+}
+
+.zhidu {
+  display: flex;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  border-bottom: 0.02rem solid rgb(245, 245, 245);
+  div:nth-child(1) {
+    width: 27.5%;
+    padding-left: 6%;
+  }
+}
+
+.bgColor {
+  background-color: white;
+  &.newIncident {
+    padding-top: 1.84rem;
+  }
+}
+
+.uplod {
+  padding: 0 0.24rem;
+  border-bottom: 0.02rem solid rgb(245, 245, 245);
+}
+.handleRadio {
+  border-bottom: 0.02rem solid rgb(245, 245, 245);
+}
+.synerBox {
+  height: 3rem;
+  overflow: scroll;
+}
+
+i.iconfont.blue {
+  color: #005395;
+  // &::after {
+  //   content: "";
+  //   width: 0.01rem;
+  //   height: 0.4rem;
+  //   background: #005395;
+  //   position: relative;
+  //   display: block;
+  //   left: 0.14rem;
+  // }
+}
+.againAssign {
+  .header {
+    width: 100%;
+    height: 0.88rem;
+    line-height: 0.88rem;
+    text-align: center;
+    color: #fff;
+    font-size: 0.37rem;
+    background: linear-gradient(#2e2f32, #414246);
+    position: fixed;
+    top: 0;
+    z-index: 6;
+  }
+  .navBar {
+    width: 100%;
+    height: 0.96rem;
+    line-height: 0.96rem;
+    background-color: #fafafa;
+    font-size: 0.28rem;
+    position: fixed;
+    top: 0.88rem;
+    z-index: 9;
+    div {
+      width: 33.33%;
+      text-align: center;
+      &.p50 {
+        width: 49.99%;
+      }
+      a {
+        display: inline-block;
+        height: 0.9rem;
+        width: 1.7rem;
+        padding: 0 0.1rem;
+        &.active {
+          color: #005395;
+          border-bottom: 0.06rem solid #005395;
+        }
+      }
+    }
+  }
+
+  .headtop {
+    margin-top: 1.84rem;
+  }
+  .label {
+    background-color: #eeeeee;
+    height: 0.6rem;
+    line-height: 0.58rem;
+    padding-left: 0.2rem;
+    font-size: 0.24rem;
+    color: #666666;
+    span {
+      font-size: 0.2rem;
+      display: inline-block;
+      margin-left: 0.08rem;
+      color: #999999;
+    }
+    &.formLabel {
+      background-color: #fff;
+    }
+  }
+  .conentBox {
+    width: 100%;
+    .conent {
+      font-size: 0.32rem;
+      font-weight: 400;
+      line-height: 0.45rem;
+      // border-bottom: 0.16rem solid #e5e5e5;
+
+      .shows {
+        display: none;
+      }
+      .boeder_B {
+        border-bottom: 0.01rem solid #ccc;
+      }
+      p {
+        &.desc {
+          overflow: hidden;
+        }
+        .grayFont {
+          width: 75%;
+          text-align: right;
+          overflow-x: scroll;
+        }
+      }
+      .bottom {
+        overflow: hidden;
+        line-height: 0.86rem;
+        border-bottom: 0.01rem solid #e6e6e6;
+        font-size: 0.24rem;
+        color: #999;
+        padding: 0 0.24rem 0 0.48rem;
+      }
+      .info {
+        color: #999;
+        font-size: 0.28rem;
+        overflow: hidden;
+        .head {
+          border-bottom: 0.01rem solid #e6e6e6;
+          p {
+            padding: 0.24rem 0.3rem;
+            i {
+              color: #00559d;
+            }
+          }
+        }
+        p {
+          line-height: 0.4rem;
+          padding: 0.1rem 0.24rem;
+          overflow: hidden;
+          .overflowEllipsis2 {
+            margin-left: 1.96rem;
+          }
+        }
+        .info_hide {
+          padding: 0.2rem 0.24rem;
+          border-bottom: 0.01rem solid #e6e6e6;
+          .hide {
+            color: #00559d;
+          }
+        }
+        .imgs-container {
+          a {
+            color: #03c !important;
+            &:visited {
+              color: #551a8b !important;
+            }
+          }
+          img {
+            width: 1.5rem;
+            height: 1.5rem;
+            margin-right: 0.7rem;
+            &:nth-child(1) {
+              margin-left: 0.75rem;
+            }
+          }
+        }
+        .progress {
+          padding: 0.2rem 0.2rem;
+          overflow: hidden;
+          transition-duration: 0.2s;
+          transition-timing-function: linear;
+          &.progressHide {
+            height: 1.7rem;
+          }
+          .progress_info {
+            overflow: hidden;
+            margin-bottom: 0.1rem;
+            &:nth-last-child(1) {
+              .cont {
+                border: none !important;
+              }
+            }
+            .progress_info_L {
+              float: left;
+              color: #333;
+              max-width: 18%;
+            }
+            .progress_info_R {
+              float: right;
+              margin-left: 0.09rem;
+              width: 80%;
+              font-size: 0.25rem;
+              .time {
+                i {
+                  margin-left: -0.15rem;
+                  &.icon-icon_weizuo {
+                    color: #005495;
+                  }
+                  &.icon-icon_zhengzaijinx {
+                    color: #48a843;
+                    font-size: 0.37rem;
+                  }
+                }
+                span {
+                  margin-left: 0.15rem;
+                }
+              }
+              .cont {
+                border-left: 1px solid #999;
+                padding-left: 0.4rem;
+                min-height: 0.4rem;
+                &.blue {
+                  border-left: 1px solid #005395;
+                }
+              }
+
+              .text1 {
+                font-size: 0.15rem;
+              }
+              .text2 {
+                color: #666;
+                word-break: break-all;
+              }
+              p {
+                padding: 0;
+              }
+            }
+          }
+        }
+      }
+      .txtLabel {
+        width: 100%;
+        overflow: hidden;
+        padding: 0.32rem 0.24rem 0.32rem 0.32rem;
+        .txt {
+          width: 30%;
+          color: #666;
+        }
+        .cube-textarea-wrapper {
+          width: 62%;
+        }
+      }
+      .sub {
+        background: #ececec;
+        .cube-btn {
+          background-color: #005395 !important;
+          width: 90%;
+          margin: 0.2rem auto;
+          border-radius: 8px;
+        }
+      }
+    }
+  }
+  .showwrap {
+    width: 75%;
+    text-align: right;
+  }
+}
+</style>

static/css/fontnew/demo_index.html

@@ -3,8 +3,8 @@
 <head>
   <meta charset="utf-8"/>
   <title>iconfont Demo</title>
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
-  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
   <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
   <link rel="stylesheet" href="demo.css">
   <link rel="stylesheet" href="iconfont.css">
@@ -55,6 +55,24 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon dash">&#xe600;</span>
+                <div class="name">加</div>
+                <div class="code-name">&amp;#xe600;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon dash">&#xe612;</span>
+                <div class="name">lock</div>
+                <div class="code-name">&amp;#xe612;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon dash">&#xe69e;</span>
+                <div class="name">unlock</div>
+                <div class="code-name">&amp;#xe69e;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon dash">&#xe8b5;</span>
                 <div class="name">扫一扫</div>
                 <div class="code-name">&amp;#xe8b5;</div>
@@ -96,9 +114,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'dash';
-  src: url('iconfont.woff2?t=1641526164246') format('woff2'),
-       url('iconfont.woff?t=1641526164246') format('woff'),
-       url('iconfont.ttf?t=1641526164246') format('truetype');
+  src: url('iconfont.woff2?t=1672887795273') format('woff2'),
+       url('iconfont.woff?t=1672887795273') format('woff'),
+       url('iconfont.ttf?t=1672887795273') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -125,6 +143,33 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon dash dash-jia"></span>
+            <div class="name">
+              加
+            </div>
+            <div class="code-name">.dash-jia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon dash dash-lock"></span>
+            <div class="name">
+              lock
+            </div>
+            <div class="code-name">.dash-lock
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon dash dash-unlock"></span>
+            <div class="name">
+              unlock
+            </div>
+            <div class="code-name">.dash-unlock
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon dash dash-saoyisao"></span>
             <div class="name">
               扫一扫
@@ -189,6 +234,30 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#dash-jia"></use>
+                </svg>
+                <div class="name">加</div>
+                <div class="code-name">#dash-jia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#dash-lock"></use>
+                </svg>
+                <div class="name">lock</div>
+                <div class="code-name">#dash-lock</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#dash-unlock"></use>
+                </svg>
+                <div class="name">unlock</div>
+                <div class="code-name">#dash-unlock</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#dash-saoyisao"></use>
                 </svg>
                 <div class="name">扫一扫</div>

static/css/fontnew/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "dash"; /* Project id 2879659 */
-  src: url('iconfont.woff2?t=1641526164246') format('woff2'),
-       url('iconfont.woff?t=1641526164246') format('woff'),
-       url('iconfont.ttf?t=1641526164246') format('truetype');
+  src: url('iconfont.woff2?t=1672887795273') format('woff2'),
+       url('iconfont.woff?t=1672887795273') format('woff'),
+       url('iconfont.ttf?t=1672887795273') format('truetype');
 }
 
 .dash {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.dash-jia:before {
+  content: "\e600";
+}
+
+.dash-lock:before {
+  content: "\e612";
+}
+
+.dash-unlock:before {
+  content: "\e69e";
+}
+
 .dash-saoyisao:before {
   content: "\e8b5";
 }

static/css/fontnew/iconfont.json

@@ -6,6 +6,27 @@
   "description": "引入一个新的字体图标",
   "glyphs": [
     {
+      "icon_id": "1302",
+      "name": "加",
+      "font_class": "jia",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "1802972",
+      "name": "lock",
+      "font_class": "lock",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
+    {
+      "icon_id": "10972117",
+      "name": "unlock",
+      "font_class": "unlock",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
       "icon_id": "11372685",
       "name": "扫一扫",
       "font_class": "saoyisao",