汇总单功能

components/IncidentAttachment.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container" @touchstart.stop>
+  <view class="container" @touchmove.stop.prevent>
     <view class="container_head">
       {{incidentData.reqAttachment ? '报修图片' : ''}}{{incidentData.reqAttachment && incidentData.callID ? '及' : ''}}{{incidentData.callID ? '录音' : ''}}
     </view>
@@ -18,7 +18,7 @@
       </view>
     </view>
   </view>
-  <view class="mask" @touchstart.stop></view>
+  <view class="mask" @touchmove.stop.prevent></view>
 </template>
 
 <script setup>

components/IncidentListFilter.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container" @touchstart.stop v-if="pageData.pageRouter === 'default'">
+  <view class="container" @touchmove.stop.prevent v-if="pageData.pageRouter === 'default'">
     <view class="container_form">
       <view class="hospital">
         <text class="name">院区</text>
@@ -28,7 +28,7 @@
       </view>
     </view>
   </view>
-  <view class="container" @touchstart.stop v-else-if="pageData.pageRouter === 'area'">
+  <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'area'">
     <view class="container_form">
       <view class="hospital">
         <text class="name">楼栋</text>
@@ -44,7 +44,7 @@
       </view>
     </view>
   </view>
-  <view class="container" @touchstart.stop v-else-if="pageData.pageRouter === 'category'">
+  <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'category'">
     <view class="container_form">
       <view class="hospital">
         <text class="name">故障现象</text>
@@ -60,8 +60,8 @@
       </view>
     </view>
   </view>
-  <view class="mask" @touchstart.stop></view>
-  <view class="line" @touchstart.stop></view>
+  <view class="mask" @touchmove.stop.prevent></view>
+  <view class="line" @touchmove.stop.prevent></view>
 </template>
 
 <script setup>

components/NumberModal.vue

@@ -0,0 +1,157 @@
+<template>
+  <view class="container" @touchmove.stop.prevent>
+    <view class="container_head">
+      数量
+    </view>
+    <view class="container_form">
+      <view class="content">
+        <template v-if="selectType === 'editConsumable' || selectType === 'addConsumable'">
+        {{ selectData.consumableName }}({{ selectData.consumableBrandModel }}) {{ selectData.consumableEndPrice }}元
+        </template>
+        <template v-else-if="selectType === 'editWorkHourManagement'">
+        {{ selectData.workName }}{{ selectData.wage }}元
+        </template>
+      </view>
+      
+      <view class="number">
+        <uni-number-box v-model="pageData.num" :background="primaryColor" color="#fff" :min="1" :max="10000" />
+      </view>
+    </view>
+    <view class="container_foot">
+      <view class="foot_btns">
+        <view class="cancel btn" @click="cancel">取消</view>
+        <view v-if="showRemove" class="remove btn" @click="remove">移除</view>
+        <view class="confirm btn" @click="confirm">确认</view>
+      </view>
+    </view>
+  </view>
+  <view class="mask" @touchmove.stop.prevent></view>
+</template>
+
+<script setup>
+  import { defineEmits, ref, reactive, defineProps } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { defaultColor } from '@/static/js/theme.js'
+  
+  const emit = defineEmits(['cancelEmit', 'confirmEmit', 'removeEmit']);
+  const { selectData, selectType, evtNumber, showRemove } = defineProps({
+    selectData: Object,
+    selectType: String,
+    evtNumber: {
+      type: Number,
+      default: 1,
+    },
+    showRemove: {
+      type: Boolean,
+      default: false,
+    }
+  });
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 页面数据
+  const pageData = reactive({
+    num: 1,
+  });
+  
+  // 取消
+  function cancel(){
+    emit('cancelEmit')
+  }
+  
+  // 确认
+  function confirm(){
+    emit('confirmEmit', pageData.num);
+  }
+  
+  // 移除
+  function remove(){
+    emit('removeEmit', pageData.num);
+  }
+  
+  onLoad((option) => {
+    pageData.num = evtNumber;
+  })
+</script>
+
+<style lang="scss" scoped>
+.mask{
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+}
+.container{
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 9999;
+  width: 690rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+  
+  .container_head{
+    padding: 55rpx;
+    font-size: 32rpx;
+    color: #333;
+    text-align: center;
+  }
+  
+  .container_form{
+    padding: 0 55rpx;
+    .content{
+      text-align: center;
+      font-size: 28rpx;
+    }
+    .number{
+      padding: 24rpx 0;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  
+  .container_foot{
+    .foot_btns{
+      display: flex;
+      border-top: 1rpx solid #DDDDDD;
+      .btn{
+        border-right: 1rpx solid #E3E3E3;
+        &:last-of-type{
+          border-right: none;
+        }
+      }
+      .confirm{
+        flex: 1;
+        font-size: 32rpx;
+        padding: 30rpx;
+        display: flex;
+        justify-content: center;
+        color: $uni-primary;
+      }
+      
+      .remove{
+        flex: 1;
+        font-size: 32rpx;
+        padding: 30rpx;
+        display: flex;
+        justify-content: center;
+        color: red;
+      }
+      
+      .cancel{
+        flex: 1;
+        background-color: #fff;
+        font-size: 32rpx;
+        padding: 30rpx;
+        display: flex;
+        justify-content: center;
+      }
+    }
+  }
+}
+</style>

filters/filterFormatDate.js

@@ -1,6 +1,6 @@
 import { computed } from "vue"
 import { isDate, format } from 'date-fns';
-import { isTimestamp } from '@/utils/isTimestamp.js'
+import { isTimestamp } from '@/utils/index.js'
 export function filterFormatDate() {
   /**
    * 日期格式化

http/api.js

@@ -36,14 +36,14 @@ export function api_getDictionary(data){
 }
 
 /**
- * 获取事件列表
+ * 获取工单列表
  */
 export function api_incident(data){
   return post("/user/data/fetchDataList/incident", data);
 }
 
 /**
- * 获取事件列表-数量
+ * 获取工单列表-数量
  */
 export function api_incident_count(data){
   return post("/flow/incident/list/count", data);
@@ -113,8 +113,36 @@ export function api_incidentDetail(data){
 }
 
 /**
- * 转派
+ * 转派/指派/退回/延期处理/新建事件
  */
 export function api_incidentTask(type, data){
   return post("/flow/incident/task/" + type, data);
+}
+
+/**
+ * 获取汇总单信息
+ */
+export function api_querySummaryDoc(data){
+  return post("/bpm/data/querySummaryDoc", data);
+}
+
+/**
+ * 获取耗材列表
+ */
+export function api_consumable(data){
+  return post("/bpm/data/fetchDataList/consumable", data);
+}
+
+/**
+ * 添加/修改/删除耗材
+ */
+export function api_addSummaryDoc(data){
+  return post("/bpm/data/addSummaryDoc", data);
+}
+
+/**
+ * 获取工时管理列表
+ */
+export function api_workHourManagement(data){
+  return post("/bpm/data/fetchDataList/workHourManagement", data);
 }

node_modules/.package-lock.json

@@ -12,6 +12,11 @@
         "url": "https://github.com/sponsors/kossnocorp"
       }
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
     "node_modules/weixin-jsapi": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/weixin-jsapi/-/weixin-jsapi-1.1.0.tgz",

package-lock.json

@@ -6,6 +6,7 @@
     "": {
       "dependencies": {
         "date-fns": "^3.6.0",
+        "lodash-es": "^4.17.21",
         "weixin-jsapi": "^1.1.0"
       }
     },
@@ -18,6 +19,11 @@
         "url": "https://github.com/sponsors/kossnocorp"
       }
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
     "node_modules/weixin-jsapi": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/weixin-jsapi/-/weixin-jsapi-1.1.0.tgz",

package.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "date-fns": "^3.6.0",
+    "lodash-es": "^4.17.21",
     "weixin-jsapi": "^1.1.0"
   }
 }

pages.json

@@ -47,6 +47,41 @@
           "titleNView": false
         }
       }
+    },
+    {
+      "path": "pages/handler/handler",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/consumableList/consumableList",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/workHourManagementOne/workHourManagementOne",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/workHourManagementTwo/workHourManagementTwo",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
     }
   ],
   "globalStyle": {

pages/changeUser/changeUser.vue

@@ -597,6 +597,7 @@
     z-index: 99;
     width: 100%;
     background-color: #fff;
+    font-size: 30rpx;
     .tab{
       flex: 1;
       display: flex;
@@ -621,6 +622,7 @@
       padding-top: 24rpx;
       height: 86rpx;
       &.column{
+        height: auto;
         flex-direction: column;
         align-items: flex-start;
         .title{

pages/consumableList/consumableList.vue

@@ -0,0 +1,243 @@
+<template>
+  <view class="consumableList">
+    <view class="head">
+      <uni-search-bar v-model="dataInfo.keyWord" placeholder="请搜索耗材" bgColor="#F8F8F8" @input="search" cancelButton="none" focus :radius="18" />
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="numberClick(data, 'addConsumable')">
+        {{data.name}}
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="primaryButton btn">返回</button>
+    </view>
+    <NumberModal v-if="dataInfo.isNumber" @cancelEmit="cancelNumber" @confirmEmit="conformNumber" :selectData="dataInfo.selectData" :selectType="dataInfo.selectType"></NumberModal>
+  </view>
+</template>
+
+<script setup>
+  import { debounce } from 'lodash-es'
+  import { ref, reactive} from 'vue'
+  import NumberModal from '@/components/NumberModal.vue';
+  import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+  import { api_consumable, api_incidentDetail, api_addSummaryDoc } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentId: undefined,//事件ID
+    summaryId: undefined,//汇总单ID
+    incidentData: {},//事件对象
+    keyWord: '',//搜索的关键词
+    isNumber: false,//修改数量弹窗
+    evtNumber: 1,//弹窗返回的数量
+    selectData: {},//选择的对象
+    selectType: {},//选择的对象类型
+  })
+  
+  // 点击修改数量
+  function numberClick(data, type){
+    dataInfo.isNumber = true;
+    dataInfo.selectData = data;
+    dataInfo.selectType = type;
+  }
+  
+  // 确认修改数量
+  function conformNumber(evtNumber){
+    dataInfo.evtNumber = evtNumber;
+    dataInfo.isNumber = false;
+    addSummaryDoc();
+  }
+  
+  // 关闭修改数量
+  function cancelNumber(){
+    dataInfo.isNumber = false;
+  }
+  
+  // 添加耗材
+  function addSummaryDoc(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "consumableList": [
+        {
+          "consumablesId": dataInfo.selectData.id,
+          "consumablesNum": dataInfo.evtNumber
+        }
+      ],
+      "summaryId": dataInfo.summaryId
+    };
+    api_addSummaryDoc(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '添加耗材成功',
+          mask: true,
+        });
+        setTimeout(() => {
+          uni.reLaunch({
+            url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
+          })
+        }, 1500)
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取事件详情
+  function getIncidentDetail(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    api_incidentDetail(dataInfo.incidentId).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        dataInfo.incidentData = res.data || {};
+        getList(0);
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 搜索
+  const search = debounce(getList.bind(null, 0), 500);
+  
+  // 获取列表信息
+  function getList(idx){
+    if(dataInfo.keyWord.trim() === ''){
+      dataInfo.list = [];
+      uni.stopPullDownRefresh();
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+
+    let postData = {
+      idx: dataInfo.idx,
+      sum: 20,
+      consumable: {
+        keyWord: dataInfo.keyWord,
+        dutyDTO: dataInfo.incidentData.duty,
+        showZero: true,
+      }
+    }
+    
+    api_consumable(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    dataInfo.summaryId = option.summaryId;
+    getIncidentDetail();
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.consumableList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: linear-gradient( 90deg, #58CF66 0%, #DDE9FC 100%);
+  }
+  .body{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

pages/incidentList/incidentList.vue

@@ -51,9 +51,9 @@
     <view class="zanwu" v-else>
       <text class="newicon newicon-zanwu"></text>
     </view>
+    <IncidentListFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></IncidentListFilter>
+    <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
   </view>
-  <incidentListFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></incidentListFilter>
-  <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
 </template>
 
 <script setup>
@@ -103,7 +103,7 @@
   const dataInfo = reactive({
     tabs: [{id: 0, name: '全部', value: 'all', num: ''}],
     tabActiveId: 0,//当前选择的tab
-    list: [],//事件列表
+    list: [],//工单列表
     idx: 0,//页码
     hasMore: true,//是否有更多数据
     isFilter: false,//筛选框开关
@@ -367,6 +367,9 @@
 </script>
 
 <style lang="scss" scoped>
+page{
+  height: calc(100vh - 50px);
+}
 .incidentList{
   display: flex;
   flex-direction: column;
@@ -378,6 +381,7 @@
     z-index: 99;
     width: 100%;
     background-color: #fff;
+    font-size: 30rpx;
     .tab{
       flex: 1;
       display: flex;
@@ -411,6 +415,7 @@
         text-align: justify;
         text-align: left;
         margin: 24rpx;
+        font-size: 30rpx;
       }
       .body_item_content{
         border-top: 1rpx solid #D8D8D8;

pages/workHourManagementOne/workHourManagementOne.vue

@@ -0,0 +1,156 @@
+<template>
+  <view class="workHourManagementOne">
+    <view class="head">
+      请选择工时分类
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="toWorkHourManagementTwo(data)">
+        {{data.workName}}
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="primaryButton btn">返回</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive} from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+  import { api_workHourManagement } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentId: undefined,//事件ID
+    summaryId: undefined,//汇总单ID
+  })
+  
+  // 跳转二级工时管理列表
+  function toWorkHourManagementTwo(data){
+    uni.navigateTo({
+      url: `/pages/workHourManagementTwo/workHourManagementTwo?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}&parentId=${data.id}&parentName=${data.workName}`
+    })
+  }
+  
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+
+    let postData = {
+      idx: dataInfo.idx,
+      sum: 20,
+      workHourManagement: {
+        treeLevel: 1,
+      }
+    }
+    
+    api_workHourManagement(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    dataInfo.summaryId = option.summaryId;
+    getList(0);
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.workHourManagementOne{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: #fff;
+    font-size: 26rpx;
+    color: $uni-primary;
+  }
+  .body{
+    border-top: 1rpx solid #DEDEDE;
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

pages/workHourManagementTwo/workHourManagementTwo.vue

@@ -0,0 +1,234 @@
+<template>
+  <view class="workHourManagementTwo">
+    <view class="head">
+      <text class="one">{{dataInfo.parentName}}<uni-icons class="right" type="right" :size="16" :color="primaryColor"></uni-icons></text>
+      <text class="two ellipsis">{{dataInfo.workHourManagementSelectedList.filter(v => v.parent.id == dataInfo.parentId).map(v => v.workName).join('；')}}</text>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <uni-data-checkbox v-model="dataInfo.workHourManagementList" multiple :localdata="dataInfo.list" mode="list" wrap icon="right" :map="{text:'workName',value:'id'}" @change="selectItem"></uni-data-checkbox>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="primaryButton btn">上一级</button>
+      <button @click="confirm" type="default" class="primaryButton btn">确认</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive} from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+  import { api_workHourManagement, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentId: undefined,//事件ID
+    summaryId: undefined,//汇总单ID
+    parentId: undefined,//一级工时管理id
+    parentName: '',//一级工时管理名称
+    workHourManagementList: [],//二级工时管理列表-回显
+    workHourManagementSelectedList: [],//二级工时管理列表-已选择
+  })
+  
+  // 获取汇总单信息
+  function getQuerySummaryDoc(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      incidentId: dataInfo.incidentId,
+    };
+    api_querySummaryDoc(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        dataInfo.workHourManagementSelectedList = res.workHourManagementList || [];
+        dataInfo.workHourManagementList = dataInfo.workHourManagementSelectedList.map(v => v.id);
+        getList(0);
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 选择
+  function selectItem(e){
+    let workHourManagementSelectedList = dataInfo.workHourManagementSelectedList.filter(v => v.parent.id != dataInfo.parentId);
+    let equelParentList = dataInfo.workHourManagementSelectedList.filter(v => v.parent.id == dataInfo.parentId);
+    dataInfo.workHourManagementSelectedList = workHourManagementSelectedList.concat(e.detail.data);
+  }
+  
+  // 确认
+  function confirm(){
+    if(dataInfo.workHourManagementSelectedList.length === 0){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择二级工时管理'
+      });
+      return;
+    }
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+
+    let postData = {
+      "workHourManagementList": dataInfo.workHourManagementSelectedList.map(v => ({workHourId: v.id, workHourNum: v.workHourNum2 || 1})),
+      "summaryId": dataInfo.summaryId
+    };
+    api_addSummaryDoc(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '添加工时成功',
+          mask: true,
+        });
+        setTimeout(() => {
+          uni.reLaunch({
+            url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
+          })
+        }, 1500)
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+
+    let postData = {
+      idx: dataInfo.idx,
+      sum: 20,
+      workHourManagement: {
+        parent: {
+          id: dataInfo.parentId,
+        }
+      }
+    }
+    
+    api_workHourManagement(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    dataInfo.summaryId = option.summaryId;
+    dataInfo.parentId = option.parentId;
+    dataInfo.parentName = option.parentName;
+    getQuerySummaryDoc();
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.workHourManagementTwo{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: #fff;
+    font-size: 26rpx;
+    color: $uni-primary;
+    .right{
+      margin-top: 2rpx;
+    }
+    .two{
+      flex: 1;
+    }
+  }
+  .body{
+    border-top: 1rpx solid #DEDEDE;
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

static/font/demo_index.html

@@ -55,6 +55,42 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe640;</span>
+                <div class="name">11</div>
+                <div class="code-name">&amp;#xe640;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe602;</span>
+                <div class="name">下箭头</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe601;</span>
+                <div class="name">3.1拍摄</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe6a0;</span>
+                <div class="name">录制管理</div>
+                <div class="code-name">&amp;#xe6a0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe621;</span>
+                <div class="name">知识库</div>
+                <div class="code-name">&amp;#xe621;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe689;</span>
+                <div class="name">快速报修</div>
+                <div class="code-name">&amp;#xe689;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe6cf;</span>
                 <div class="name">暂无</div>
                 <div class="code-name">&amp;#xe6cf;</div>
@@ -174,9 +210,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1713330377145') format('woff2'),
-       url('iconfont.woff?t=1713330377145') format('woff'),
-       url('iconfont.ttf?t=1713330377145') format('truetype');
+  src: url('iconfont.woff2?t=1713576883104') format('woff2'),
+       url('iconfont.woff?t=1713576883104') format('woff'),
+       url('iconfont.ttf?t=1713576883104') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -203,6 +239,60 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-icon-test"></span>
+            <div class="name">
+              11
+            </div>
+            <div class="code-name">.newicon-icon-test
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-xiajiantou"></span>
+            <div class="name">
+              下箭头
+            </div>
+            <div class="code-name">.newicon-xiajiantou
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-31paishe"></span>
+            <div class="name">
+              3.1拍摄
+            </div>
+            <div class="code-name">.newicon-31paishe
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-luzhiguanli"></span>
+            <div class="name">
+              录制管理
+            </div>
+            <div class="code-name">.newicon-luzhiguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-zhishiku"></span>
+            <div class="name">
+              知识库
+            </div>
+            <div class="code-name">.newicon-zhishiku
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-kuaisubaoxiu"></span>
+            <div class="name">
+              快速报修
+            </div>
+            <div class="code-name">.newicon-kuaisubaoxiu
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-zanwu"></span>
             <div class="name">
               暂无
@@ -384,6 +474,54 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-icon-test"></use>
+                </svg>
+                <div class="name">11</div>
+                <div class="code-name">#newicon-icon-test</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-xiajiantou"></use>
+                </svg>
+                <div class="name">下箭头</div>
+                <div class="code-name">#newicon-xiajiantou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-31paishe"></use>
+                </svg>
+                <div class="name">3.1拍摄</div>
+                <div class="code-name">#newicon-31paishe</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-luzhiguanli"></use>
+                </svg>
+                <div class="name">录制管理</div>
+                <div class="code-name">#newicon-luzhiguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-zhishiku"></use>
+                </svg>
+                <div class="name">知识库</div>
+                <div class="code-name">#newicon-zhishiku</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-kuaisubaoxiu"></use>
+                </svg>
+                <div class="name">快速报修</div>
+                <div class="code-name">#newicon-kuaisubaoxiu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-zanwu"></use>
                 </svg>
                 <div class="name">暂无</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304860 */
-  src: url('iconfont.woff2?t=1713330377145') format('woff2'),
-       url('iconfont.woff?t=1713330377145') format('woff'),
-       url('iconfont.ttf?t=1713330377145') format('truetype');
+  src: url('iconfont.woff2?t=1713576883104') format('woff2'),
+       url('iconfont.woff?t=1713576883104') format('woff'),
+       url('iconfont.ttf?t=1713576883104') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-icon-test:before {
+  content: "\e640";
+}
+
+.newicon-xiajiantou:before {
+  content: "\e602";
+}
+
+.newicon-31paishe:before {
+  content: "\e601";
+}
+
+.newicon-luzhiguanli:before {
+  content: "\e6a0";
+}
+
+.newicon-zhishiku:before {
+  content: "\e621";
+}
+
+.newicon-kuaisubaoxiu:before {
+  content: "\e689";
+}
+
 .newicon-zanwu:before {
   content: "\e6cf";
 }

static/font/iconfont.json

@@ -6,6 +6,48 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "5598925",
+      "name": "11",
+      "font_class": "icon-test",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "1718353",
+      "name": "下箭头",
+      "font_class": "xiajiantou",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "201565",
+      "name": "3.1拍摄",
+      "font_class": "31paishe",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "2732023",
+      "name": "录制管理",
+      "font_class": "luzhiguanli",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "11836501",
+      "name": "知识库",
+      "font_class": "zhishiku",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "18856229",
+      "name": "快速报修",
+      "font_class": "kuaisubaoxiu",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
       "icon_id": "20043806",
       "name": "暂无",
       "font_class": "zanwu",

static/scss/common.scss

@@ -48,8 +48,7 @@ uni-toast,
 .foot_common_btns{
   width: 100%;
   box-sizing: border-box;
-  margin-bottom: 24rpx;
-  padding: 0 24rpx;
+  padding: 24rpx;
   display: flex;
   align-items: center;
   gap: 24rpx;
@@ -130,3 +129,29 @@ uni-toast,
     border: 1px solid red!important;
   }
 }
+
+// 搜索框
+.uni-searchbar{
+  padding: 0!important;
+  width: 100%!important;
+}
+
+// 数字框
+.uni-numbox__value{
+  background-color: #fff!important;
+  color: #000!important;
+  border: 1px solid #E5E5E5!important;
+  margin-left: 20rpx!important;
+  margin-right: 20rpx!important;
+}
+
+// 多选框
+.uni-data-checklist .checklist-group .checklist-box.is--list{
+  padding: 24rpx!important;
+  font-size: 26rpx!important;
+}
+.uni-data-checklist .checklist-group .checklist-box .checklist-content .checklist-text{
+  margin-left: 0!important;
+  margin-right: 24rpx!important;
+  flex: 1!important;
+}

utils/isTimestamp.js

@@ -1,7 +1,9 @@
 import { isDate } from 'date-fns';
 
 /**
- * 判断是否是时间戳
+ * @description 判断是否是时间戳
+ * @param {number} 时间戳
+ * @return {boolean}
  */
 export const isTimestamp = (value) => {
   // 判断是否为数字
@@ -13,3 +15,13 @@ export const isTimestamp = (value) => {
   // 判断是否为日期对象
   return isDate(new Date(value));
 }
+
+/**
+ * @description 生成连续的数字
+ * @param {number} start 起点数字  
+ * @param {number} end 终点数字
+ * @return {array} 
+ */
+export const generateNumberArray = (start, end) => {
+  return Array.from(new Array(end + 1).keys()).slice(start);
+}