解决冲突

components/DsFilePicker.vue

@@ -0,0 +1,88 @@
+<template>
+  <uni-file-picker ref="handlerImgRef" v-model="baseFormData.handlerImgList" limit="3" @success="handlerImgSuccess" @fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete" title="(支持JPG/PNG格式图片，单张大小10M以内)"></uni-file-picker>
+</template>
+
+<script setup>
+  import { defineEmits, ref, reactive, defineProps } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useUploadFile } from '@/share/useUploadFile.js'
+
+  const emit = defineEmits(['cancelEmit', 'knowEmit']);
+  const { inspectionExecuteId } = defineProps({
+    inspectionExecuteId: {
+      type: Number,
+    }
+  });
+  const loginUserStore = useLoginUserStore();
+  const { uploadFile }  = useUploadFile();
+
+  // 表单数据
+  const baseFormData = reactive({
+    handlerImgList: [],
+  })
+  
+  // 处理图片
+  const handlerImgRef = ref(null)
+  // handlerImgRef.value.upload();
+  
+  // 处理图片
+  function handlerOrderImg(imgObj){
+    return uploadFile(imgObj, 'incident', inspectionExecuteId.value)
+  }
+  
+  // 上传报修图片成功
+  function handlerImgSuccess(e){
+    baseFormData.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    
+    let requestList = [];
+    
+    // 处理图片
+    baseFormData.handlerImgList.forEach(v => {
+      let handlerOrderImg$ = handlerOrderImg(v);
+      requestList.push(handlerOrderImg$);
+    })
+    
+    Promise.all(requestList).then(resList => {
+      uni.hideLoading();
+      console.log(resList);
+      uni.showToast({
+      	icon: 'none',
+        title: '建单成功',
+        mask: true,
+      });
+      setTimeout(() => {
+        uni.reLaunch({
+          url: '/pages/incidentList/incidentList',
+        })
+      }, 1500)
+    })
+  }
+  
+  // 上传报修图片失败
+  function handlerImgFail(e){
+    baseFormData.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+  }
+  
+  // 选择上传图片
+  function handlerImgSelect(e){
+    baseFormData.handlerImgList = baseFormData.handlerImgList.concat(e.tempFiles);
+  }
+  
+  // 删除上传图片
+  function handlerImgDelete(e){
+    baseFormData.handlerImgList = baseFormData.handlerImgList.filter(v => e.tempFile.uuid != v.uuid);
+  }
+  
+  onLoad((option) => {
+    console.log(inspectionExecuteId)
+  })
+</script>
+
+<style lang="scss" scoped>
+
+</style>

components/InspectionListFilter.vue

@@ -0,0 +1,400 @@
+<template>
+  <view class="container" @touchmove.stop.prevent v-if="pageData.pageRouter === 'default'">
+    <view class="container_form">
+      <view class="category" @click="clickPageRouter('inspectionForm')">
+        <text class="name">巡检单</text>
+        <text class="value ellipsis">{{searchData.inspectionForm ? searchData.inspectionForm.name : ''}}</text>
+      </view>
+      
+      <view class="area" @click="clickPageRouter('area')">
+        <text class="name">楼栋</text>
+        <text class="value ellipsis">{{searchData.area ? searchData.area.buildingName : ''}}</text>
+      </view>
+      
+      <view class="acceptDate" @click="changeIsShowDate()">
+        <text class="name">登记时间</text>
+        <text class="value ellipsis" v-if="searchData.acceptDate.length">{{searchData.acceptDate[0] || ''}}至{{searchData.acceptDate[1] || ''}}</text>
+        <text class="value ellipsis" v-else>全部</text>
+      </view>
+    </view>
+    <view class="container_foot">
+      <view class="clear" @click="clear">清除选项</view>
+      <view class="foot_btns">
+        <view class="cancel" @click="cancel">取消</view>
+        <view class="confirm" @click="confirm">确认</view>
+      </view>
+    </view>
+    <PyhRdtpicker
+        :show="isShowDate"
+        :start="start"
+        :end="end"
+        @showchange="showDatechange"
+        :value="searchData.acceptDate"
+        @change="bindDateChange"
+        :themeColor="primaryColor"
+    ></PyhRdtpicker>
+  </view>
+  <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'area'">
+    <view class="container_form">
+      <view class="hospital">
+        <text class="name">楼栋</text>
+      </view>
+      
+      <scroll-view scroll-y class="areas">
+        <view class="areas_item" v-for="area in pageData.areaList" :key="area.id" @click="clickArea(area)">{{area.buildingName}}</view>
+      </scroll-view>
+    </view>
+    <view class="container_foot">
+      <view class="foot_btns">
+        <view class="cancel" @click="clickPageRouter('default')">取消</view>
+      </view>
+    </view>
+  </view>
+  <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'inspectionForm'">
+    <view class="container_form">
+      <view class="hospital">
+        <text class="name">巡检单</text>
+      </view>
+      
+      <scroll-view scroll-y class="categorys">
+        <view class="categorys_item" v-for="item in pageData.inspectionFormList" :key="item.id" @click="clickInspectionForm(item)">{{item.name}}</view>
+      </scroll-view>
+    </view>
+    <view class="container_foot">
+      <view class="foot_btns">
+        <view class="cancel" @click="clickPageRouter('default')">取消</view>
+      </view>
+    </view>
+  </view>
+  <view class="mask" @touchmove.stop.prevent></view>
+  <view class="line" @touchmove.stop.prevent></view>
+  
+</template>
+
+<script setup>
+  import PyhRdtpicker from '@/components/PyhRdtpicker/PyhRdtpicker.vue';
+  import { defineEmits, ref, reactive, defineProps } from 'vue'
+  import { startOfYear, endOfYear, format, add } from 'date-fns'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { api_building, api_inspectionForm } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  
+  const emit = defineEmits(['cancelEmit', 'confirmEmit']);
+  const { evt } = defineProps({
+    evt: {
+      type: Object,
+      required: true,
+    },
+  });
+  const loginUserStore = useLoginUserStore();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 登记时间
+  const isShowDate = ref(false)
+  
+  const start = ref(format(startOfYear(add(new Date(), { years: -5})), 'yyyy-MM-dd'));
+  const end = ref(format(endOfYear(add(new Date(), { years: 0})), 'yyyy-MM-dd'));
+  
+  // 页面数据
+  const pageData = reactive({
+    pageRouter: 'default',
+    areaList: [],
+    inspectionFormList: [],
+  });
+  
+  const searchData = reactive({
+    area: {id: 0, buildingName: '全部'},
+    inspectionForm: {id: 0, name: '全部'},
+    acceptDate: [],
+  })
+  
+  // 显示登记时间
+  function showDatechange(){
+    isShowDate.value = !isShowDate.value;
+  }
+  
+  // 登记时间确定
+  function bindDateChange(e){
+    console.log(e);
+    searchData.acceptDate = e;
+  }
+  
+  // 点击区域
+  function clickArea(area){
+    pageData.pageRouter = 'default';
+    searchData.area = area;
+  }
+  
+  // 点击故障现象
+  function clickInspectionForm(inspectionForm){
+    pageData.pageRouter = 'default';
+    searchData.inspectionForm = inspectionForm;
+  }
+  
+  // 清空
+  function clear(){
+    searchData.area = {id: 0, buildingName: '全部'};
+    searchData.inspectionForm = {id: 0, name: '全部'};
+    searchData.acceptDate = [];
+    console.log(searchData.acceptDate)
+  }
+  
+  // 取消
+  function cancel(){
+    emit('cancelEmit')
+  }
+  
+  // 确认
+  function confirm(){
+    emit('confirmEmit', searchData);
+  }
+  
+  // 获取楼栋列表
+  function getAreaList(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      account: loginUserStore.loginUser.user.account,
+      building: {},
+    }
+    api_building(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        let list = res.list || [];
+        pageData.areaList = [{ id: 0, buildingName: '全部' }, ...list];
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取故障现象列表
+  function getInspectionFormList(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      account: loginUserStore.loginUser.user.account,
+      inspectionForm: {
+        status: {value: "1"},
+      },
+    }
+    
+    api_inspectionForm(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        let list = res.list || [];
+        pageData.inspectionFormList = [{ id:0, name: '全部' }, ...list];
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 页面路由跳转
+  function clickPageRouter(type){
+    pageData.pageRouter = type;
+    switch(type){
+      case 'area':
+        getAreaList();
+      break;
+      case 'inspectionForm':
+        getInspectionFormList();
+      break;
+    }
+  }
+  
+  // 显示登记时间
+  function changeIsShowDate(type){
+    isShowDate.value = true;
+  }
+  
+  onLoad((option) => {
+    searchData.area = evt.area;
+    searchData.inspectionForm = evt.inspectionForm;
+    searchData.acceptDate = evt.acceptDate;
+  })
+</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;
+}
+.line{
+  content: '';
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+  height: 8rpx;
+  width: 100%;
+  background-color: #EBEBEB;
+}
+.container{
+  position: fixed;
+  left: 125rpx;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  background-color: #F7F7F7;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  
+  .container_form{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-height: 0;
+  }
+  
+  .hospital{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 32rpx 24rpx 24rpx;
+    background-color: #fff;
+    .name{
+      font-size: 30rpx;
+      flex-shrink: 0;
+      margin-right: 24rpx;
+    }
+    .value{
+      font-size: 26rpx;
+      color: #5DAAB6;
+    }
+  }
+  
+  .areas{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .areas_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+  
+  .categorys{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .categorys_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+  
+  .tabs{
+    margin-top: 16rpx;
+    background-color: #FBFBFB;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    gap: 16rpx 0;
+    padding: 24rpx 16rpx;
+    .tab{
+      width: 180rpx;
+      height: 60rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background-color: #F7F7F7;
+      font-size: 28rpx;
+      position: relative;
+      .newicon-xuanzejiaobiao{
+        opacity: 0;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        font-size: 38rpx;
+        color: #53B9BB;
+      }
+      &.active{
+        background-color: rgba(149, 220, 231, 0.30);
+        .newicon-xuanzejiaobiao{
+          opacity: 1;
+        }
+      }
+    }
+  }
+  
+  .area,
+  .category,
+  .acceptDate{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 24rpx;
+    background-color: #fff;
+    margin-top: 24rpx;
+    .name{
+      font-size: 28rpx;
+      flex-shrink: 0;
+      margin-right: 24rpx;
+    }
+  }
+  
+  .container_foot{
+    .clear{
+      padding: 24rpx;
+      font-size: 28rpx;
+      background-color: #fff;
+      margin: 0 16rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .foot_btns{
+      margin-top: 24rpx;
+      display: flex;
+      border-top: 1rpx solid #BFBFBF;
+      .cancel{
+        flex: 1;
+        background-color: #fff;
+        font-size: 32rpx;
+        padding: 24rpx;
+        display: flex;
+        justify-content: center;
+      }
+      .confirm{
+        flex: 1;
+        font-size: 32rpx;
+        padding: 24rpx;
+        background-color: $uni-primary;
+        display: flex;
+        justify-content: center;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>

http/api.js

@@ -216,6 +216,54 @@ export function api_loginEncrypt(data){
 }
 
 /**
+ * 获取巡检执行列表
+ */
+export function api_inspectionTask(data){
+  return post("/hsms/fetchDataList/inspectionTask", data);
+}
+
+/**
+ * 获取巡检执行列表-数量
+ */
+export function api_listCount(data){
+  return post("/hsms/listCount", data);
+}
+
+/**
+ * 获取字典列表
+ */
+export function api_hsms_getDictionary(data){
+  return post("/hsms/common/getDictionary", data);
+}
+
+/**
+ * 获取巡检单列表
+ */
+export function api_inspectionForm(data){
+  return post("/hsms/fetchDataList/inspectionForm", data);
+}
+
+/**
+ * 获取楼栋列表
+ */
+export function api_building(data){
+  return post("/hsms/fetchDataList/building", data);
+}
+
+/**
+ * 巡检签到
+ */
+export function api_scanCode(data){
+  return post("/hsms/scanCode", data);
+}
+/**
+ * 巡检执行项保存
+ */
+export function api_addModel(data){
+  return post("/hsms/addModel", data);
+}
+
+/**
  * 报修端-公告
  */
 export function api_getNotice(data){
@@ -227,5 +275,4 @@ export function api_getNotice(data){
  */
 export function api_getCount(data){
   return post("/repair/incident/count", data);
-}
-
+}

http/http.js

@@ -67,7 +67,10 @@ export function post(url, data = {}) {
 }
 
 // 扫一扫
-export function SM() {
+export function SM(code = '') {
+  if(code){
+    return Promise.resolve(code);
+  }
   // #ifndef H5
   return new Promise((resolve, reject) => {
     uni.scanCode({

main.js

@@ -1,12 +1,13 @@
-import {
-  createSSRApp
-} from 'vue'
+import { createSSRApp } from 'vue'
 import App from './App.vue'
 import * as Pinia from "pinia"
-import {
-  createUnistorage
-} from "./uni_modules/pinia-plugin-unistorage"
-console.info('v3.5.0');
+import { createUnistorage } from "./uni_modules/pinia-plugin-unistorage"
+
+console.info(`%c%c v3.5.0 %c 武汉大势恒通科技有限责任公司 `,
+  'color: #3eaf7c; font-size: 16px;line-height:30px;',
+  'background: #35495e; padding: 4px; border-radius: 3px 0 0 3px; color: #fff',
+  'background: #41b883; padding: 4px; border-radius: 0 3px 3px 0; color: #fff',
+);
 
 export function createApp() {
   const app = createSSRApp(App)

pages.json

@@ -182,6 +182,7 @@
 	     }
 	   }
 	 },
+<<<<<<< HEAD
 	 {
 		 "path": "pages/repair/home",
 		 "style": {
@@ -214,6 +215,25 @@
 			 }
 		 }
 	 }
+=======
+   {
+     "path": "pages/inspection/inspectionExecute/inspectionExecute",
+     "style": {
+       "h5": {
+         "titleNView": false
+       },
+       "enablePullDownRefresh": true
+     }
+   },
+   {
+     "path": "pages/inspection/inspectionValue/inspectionValue",
+     "style": {
+       "h5": {
+         "titleNView": false
+       }
+     }
+   }
+>>>>>>> f04f9a92e4933a3c5cda21806e1a8f4c5698e134
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
@@ -243,8 +263,13 @@
 			"iconPath": "static/img/icon_repairList.png",
 			"selectedIconPath": "static/img/icon_repairList_active.png",
 			"text": "我的报修"
-			},
-			{
+			}, {
+      "pagePath": "pages/inspection/inspectionExecute/inspectionExecute",
+      "iconPath": "static/img/icon_inspectionExecute.png",
+      "visible": false,
+      "selectedIconPath": "static/img/icon_inspectionExecute_active.png",
+      "text": "巡检"
+    }, {
       "pagePath": "pages/my/my",
       "iconPath": "static/img/icon_my.png",
       "selectedIconPath": "static/img/icon_my_active.png",

pages/incidentDetail/incidentDetail.vue

@@ -371,7 +371,7 @@
         dataInfo.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
 
         // 维修汇总单
-        if(dataInfo.incidentData.state.value == 'close' && dataInfo.incidentData.duty.addSummary == 1 && dataInfo.incidentData.repairSummary == 1){
+        if(dataInfo.incidentData.state.value == 'close' && dataInfo.incidentData.duty.addSummary == 1 && dataInfo.incidentData.summaryId){
           let flag = dataInfo.tabs.some(v => v.value === '2');
           !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '维修汇总单', value: '2', num: ''});
         }

pages/incidentList/incidentList.vue

@@ -77,6 +77,7 @@
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentNumStore } from '@/stores/incidentNum'
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
@@ -90,6 +91,7 @@
   const { stateStyle }  = computedStateStyle();
   const { currentLogOverTime }  = computedCurrentLogOverTime();
   const { makePhoneCall }  = useMakePhoneCall();
+  const { setTabbar }  = useSetTabbar();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
@@ -375,6 +377,8 @@
   }
 
   onLoad((option) => {
+    // 巡检tabbar
+    setTabbar(1);
     onLoadFn();
   })
 

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -0,0 +1,410 @@
+<template>
+  <view class="incidentList">
+    <view class="head">
+      <view class="tab" :class="{active: tab.id === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.id)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+      <view class="filter" @click="filterClick">
+        <text class="newicon newicon-shaixuan"></text>
+      </view>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
+        <view class="body_item_head ellipsis-multiline">
+          {{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+        </view>
+
+        <view class="body_item_content">
+          <view class="body_item_content_p" v-if="data.inspectionDTO">
+            <text class="name ellipsis">计划标题：{{data.inspectionDTO.name}}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.signType">
+            <text class="name ellipsis">签到方式：{{data.signType.name}}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.userDTO || data.groupDTO">
+            <text class="name ellipsis">执行人或组：{{ data.userDTO?.name || data.groupDTO?.groupName }}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.status || data.addTime">
+            <text class="name ellipsis">状态：{{ data.status?.name}}</text>
+            <text class="date">{{formatDate(data.addTime, 'yyyy-MM-dd HH:mm')}}</text>
+          </view>
+        </view>
+
+        <view class="body_item_foot">
+          <view class="btns pt0">
+            <button v-if="data.status.value === '1'" @click.stop="toInspectionValue(data)" type="default" class="primaryButton btn">执行</button>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <InspectionListFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></InspectionListFilter>
+  </view>
+</template>
+
+<script setup>
+  import InspectionListFilter from '@/components/InspectionListFilter.vue';
+  import { startOfDay, endOfDay, format, add } from 'date-fns'
+  import { ref, reactive, computed } from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+  import { SM } from "@/http/http.js"
+  import { api_hsms_getDictionary, api_inspectionTask, api_listCount, api_scanCode } from "@/http/api.js"
+  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+  import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
+  import { computedStateStyle } from '@/filters/computedStateStyle.js'
+  import { computedCurrentLogOverTime } from '@/filters/computedCurrentLogOverTime.js'
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
+  import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
+  import { useInspectionValueStore } from '@/stores/inspectionValue'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
+
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const inspectionListSearchStore = useInspectionListSearchStore();
+  const inspectionValueStore = useInspectionValueStore();
+  const { formatDate }  = filterFormatDate();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { currentLogOverTime }  = computedCurrentLogOverTime();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { setTabbar }  = useSetTabbar();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+
+  const assignFlag = ref(false);//指派权限
+  const qiangdan = ref(false);//接单权限
+
+  // 转换协同人
+  const computedSynergetic = computed(() => (synergetic) => {
+    return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
+  })
+
+  // 数据
+  const dataInfo = reactive({
+    tabs: [{id: 0, name: '全部', value: 'all', num: ''}],
+    tabActiveId: 0,//当前选择的tab
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    isFilter: false,//筛选框开关
+    evtFilter: {
+      area: {id: 0, area: '全部'},
+      inspectionForm: {id: 0, name: '全部'},
+      acceptDate: [],
+    },//筛选框数据
+  })
+
+  // 巡检项
+  function toInspectionValue(data){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
+    // 'inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0'
+    SM().then((ress1) => {
+      let postData = {
+        code: ress1,
+        taskId: data.id,
+        account: loginUserStore.loginUser.user.account,
+      };
+      api_scanCode(postData).then((res) => {
+        uni.hideLoading();
+        if (res.status == 200) {
+          inspectionValueStore.setInspectionValueData(res.data);
+          uni.navigateTo({
+            url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+          })
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: res.msg || '请求数据失败！'
+          });
+        }
+      });
+    }).catch(err=>{
+      uni.hideLoading();
+    });
+  }
+
+  // 获取tab选项
+  function getTabs(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    api_hsms_getDictionary({
+      "type": "list",
+      "key": "inspection_task_status"
+    }).then(res => {
+      uni.hideLoading();
+      let list = res.data || [];
+      let todo = list.find(v => v.value === '1');
+      let close = list.find(v => v.value === '2');
+      dataInfo.tabs = [{id: 0, name: '全部', value: 'all', num: ''}];
+      todo && dataInfo.tabs.push({...todo, ...{num: '', value: 'todo'}});
+      close && dataInfo.tabs.push({...close, ...{num: '', value: 'close'}});
+      getList(0);
+    })
+  }
+
+  // 点击tab
+  function clickTab(tabId){
+    dataInfo.tabActiveId = tabId;
+    getList(0);
+  }
+
+  // 点击筛选
+  function filterClick(){
+    dataInfo.isFilter = true;
+  }
+
+  // 确认筛选
+  function conformFilter(evtFilter){
+    dataInfo.evtFilter = evtFilter;
+    dataInfo.isFilter = false;
+    getList(0);
+  }
+
+  // 关闭筛选
+  function cancelFilter(){
+    dataInfo.isFilter = false;
+  }
+
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+    let tabActiveObj = dataInfo.tabs.find(v => v.id == dataInfo.tabActiveId);
+    let postData = {
+        "idx": dataInfo.idx,
+        "sum": 10,
+        "account": loginUserStore.loginUser.user.account,
+        "inspectionTask": {
+          "queryTask": tabActiveObj ? tabActiveObj.value : undefined,
+          "assignAccount": loginUserStore.loginUser.user.account,
+        }
+    }
+
+    if(dataInfo.evtFilter && dataInfo.evtFilter.inspectionForm && dataInfo.evtFilter.inspectionForm.id){
+      postData.inspectionTask.formId = dataInfo.evtFilter.inspectionForm.id;
+    }
+
+    if(dataInfo.evtFilter && Array.isArray(dataInfo.evtFilter.acceptDate) && dataInfo.evtFilter.acceptDate.length){
+      postData.inspectionTask.addTimeStart = format(startOfDay(new Date(dataInfo.evtFilter.acceptDate[0])), 'yyyy-MM-dd HH:mm:ss');
+      postData.inspectionTask.addTimeEnd = format(endOfDay(dataInfo.evtFilter.acceptDate[1]), 'yyyy-MM-dd HH:mm:ss');
+    }
+
+    if(dataInfo.evtFilter && dataInfo.evtFilter.area && dataInfo.evtFilter.area.id){
+      postData.inspectionTask.buildId = dataInfo.evtFilter.area.id;
+    }
+
+    inspectionListSearchStore.setInspectionListSearchData(dataInfo);
+    api_inspectionTask(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 || '请求数据失败！'
+        });
+      }
+    })
+
+    getCount(postData.inspectionTask);
+  }
+
+  // 获取列表数量
+  function getCount(inspectionTask = {}){
+    let postData = {
+      account: loginUserStore.loginUser.user.account,
+      taskList: [],
+    }
+    dataInfo.tabs.forEach(v => {
+        postData.taskList.push({...inspectionTask, ...{ queryTask: v.value }});
+    })
+
+    api_listCount(postData).then(res => {
+      if(res.state == 200){
+        let myData = res.data || [];
+        dataInfo.tabs.forEach((v) => {
+            v.num = myData[v.value];
+        })
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+
+  // 初始化
+  function onLoadFn(){
+    // 我的-数量跳转
+    if(inspectionListSearchStore.inspectionListSearch.data){
+      // 缓存的搜索条件
+      Object.assign(dataInfo, inspectionListSearchStore.inspectionListSearch.data);
+    }
+    getTabs();
+  }
+
+  onLoad((option) => {
+    // 巡检tabbar
+    setTabbar(1);
+    onLoadFn();
+  })
+
+  onTabItemTap(e => {
+    onLoadFn();
+  })
+
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+page{
+  height: calc(100vh - var(--window-bottom));
+}
+.incidentList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+    .filter{
+      width: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .newicon-shaixuan{
+        font-size: 36rpx;
+        color: #2C2C2C;
+      }
+    }
+  }
+  .body{
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    .body_item{
+      border-bottom: 8rpx solid #EBEBEB;
+      .body_item_head{
+        word-break: break-all;
+        text-align: justify;
+        text-align: left;
+        margin: 24rpx;
+        font-size: 30rpx;
+      }
+      .body_item_content{
+        border-top: 1rpx solid #D8D8D8;
+        padding: 24rpx 24rpx 24rpx 48rpx;
+        .body_item_content_p{
+          color: #6A6A6A;
+          font-size: 26rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 24rpx;
+          &:last-of-type{
+            margin-bottom: 0;
+          }
+          .name{
+            flex: 1;
+          }
+          .status{
+            padding: 4rpx 10rpx;
+            border-radius: 20rpx;
+            background-color: #DBE8FE;
+            font-size: 22rpx;
+            color: #006CF9;
+          }
+          .icon_all{
+            .mic-filled,
+            .image-filled
+            {
+              margin-left: 16rpx;
+            }
+          }
+        }
+      }
+      .body_item_foot{
+        border-top: 1rpx solid #D8D8D8;
+        font-size: 26rpx;
+        padding: 24rpx;
+        .foot_info{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .phone-filled{
+            margin-left: 5rpx;
+          }
+        }
+      }
+    }
+  }
+  .zanwu{
+    box-sizing: border-box;
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    height: calc(100vh - var(--window-bottom) - 88rpx);
+    display: flex;
+    justify-content: center;
+    background-color: #F7F7F7;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+}
+</style>

pages/inspection/inspectionValue/inspectionValue.vue

@@ -0,0 +1,371 @@
+<template>
+  <view class="inspectionValue">
+    <scroll-view scroll-y class="body">
+      <uni-forms ref="baseForm" :model="formValues" :rules="rules" class="form" label-position="top">
+        <template v-for="(item, index) of baseFormData" :key="index">
+          <!-- 下拉 -->
+          <uni-forms-item v-if="item.type === '1'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
+            <uni-data-picker :placeholder="'请选择' + item.name" :popup-title="'请选择' + item.name" :localdata="item.list" v-model="formValues[item.key]" @change="changeForm()">
+            </uni-data-picker>
+          </uni-forms-item>
+          <!-- 单选 -->
+          <uni-forms-item v-if="item.type === '2'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
+            <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" :localdata="item.list" />
+          </uni-forms-item>
+          <!-- 多选 -->
+          <uni-forms-item v-if="item.type === '3'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
+            <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" multiple :localdata="item.list" />
+          </uni-forms-item>
+          <!-- 数字 -->
+          <uni-forms-item v-if="item.type === '4'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
+            <uni-number-box v-model="formValues[item.key]" @change="changeForm()" :min="-9999" :max="9999" :placeholder="'请输入' + item.name"></uni-number-box>
+          </uni-forms-item>
+          <!-- 单行 -->
+          <uni-forms-item v-if="item.type === '5' && item.isException" class="formItem" :label="item.name" :required="item.required" :name="item.key">
+            <uni-easyinput v-model="formValues[item.key]" :placeholder="'请输入' + item.name" />
+          </uni-forms-item>
+          <!-- 多行 -->
+          <uni-forms-item v-if="item.type === '6' && item.isException" class="formItem" :label="item.name" :required="item.required" :name="item.key">
+            <uni-easyinput type="textarea" v-model="formValues[item.key]" :placeholder="'请输入' + item.name" />
+          </uni-forms-item>
+          <!-- 图片上传 -->
+          <uni-forms-item v-if="item.type === '7' && item.isException" class="formItem" :label="item.name" :required="item.required" :name="item.key">
+            <DsFilePicker v-model="formValues[item.key]"></DsFilePicker>
+          </uni-forms-item>
+          <!-- 分割线 -->
+          <view class="detail_head" v-if="item.type === '8'">
+            <text class="title">{{ item.name }}</text>
+          </view>
+        </template>
+      </uni-forms>
+    </scroll-view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="cancelButton btn">返回</button>
+      <button @click="submit" type="default" class="primaryButton btn">保存</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import fromPairs from 'lodash-es/fromPairs'
+  import keyBy from 'lodash-es/keyBy'
+  import DsFilePicker from '@/components/DsFilePicker.vue';
+  import { ref, reactive } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { api_addModel } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useGoBack } from '@/share/useGoBack.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useInspectionValueStore } from '@/stores/inspectionValue'
+import { forIn } from 'lodash-es';
+
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { goBack }  = useGoBack();
+  const inspectionValueStore = useInspectionValueStore();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+
+  // 所有页码数据
+  const formPageList = reactive([]);
+
+  // 表单
+  const baseForm = ref()
+
+  const inspectionExecuteId = ref()
+
+  // 数据-原始
+  const dataInfo = reactive({})
+
+  // 数据-检验
+  const rules = reactive({})
+
+  // 数据-填写值
+  const formValues = reactive({})
+
+  // 表单数据-渲染
+  // 下拉框	1
+  // 单选	2
+  // 多选	3
+  // 数值	4
+  // 单行文本	5
+  // 多行文本	6
+  // 照片上传	7
+  // 分割线	8
+  const baseFormData = reactive([
+    // { type: 1, name: '', value: '', list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
+    // { type: 2, name: '', value: '', list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
+    // { type: 3, name: '', value: [], list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
+    // { type: 4, name: '', value: '', list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
+    // { type: 5, name: '', value: '', list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
+    // { type: 6, name: '', value: '', list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
+    // { type: 7, name: '', value: [], list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
+  ])
+
+  // 修改
+  function changeForm(){
+    handleData(true);
+  }
+
+  // 保存
+  function submit(){
+    baseForm.value.validate().then(res => {
+      console.log('success', res);
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      console.log(formValues);
+      let postData = {
+        account: loginUserStore.loginUser.user.account,
+        valuesList: [],
+      };
+      // baseFormData
+      for(let key in formValues){
+        let obj = baseFormData.find(v => v.key === key);
+        if(!((obj.type === '5' && !obj.isException) || (obj.type === '6' && !obj.isException) || (obj.type === '7' && !obj.isException))){
+          let name = obj.name;
+          let itemId = obj.id;
+          let _formPageList = dataInfo.inspectionFormDTO?.formPageList || [];
+          _formPageList = _formPageList.map(v => v.formItemList).flat();
+          let formItem = _formPageList.find(v => v.id === itemId);
+          postData.valuesList.push({
+            taskId: inspectionExecuteId.value,
+            nodeId: dataInfo.id,
+            formId: dataInfo.inspectionFormDTO.id,
+            itemId: formItem.id,
+            pageId: formItem.pageId,
+            orders: formItem.orders,
+            name,
+            valuex: (formItem.type.value === '1' || formItem.type.value === '2' || formItem.type.value === '3') ? '' : formValues[key].toString(),
+            configIds: (formItem.type.value === '1' || formItem.type.value === '2' || formItem.type.value === '3') ? formValues[key].toString() : undefined,
+            hosId: dataInfo.inspectionFormDTO.hosId,
+          })
+        }
+      }
+      console.log(postData);
+      api_addModel(postData).then((res) => {
+        uni.hideLoading();
+        if (res.status == 200) {
+          inspectionValueStore.clearInspectionValueData();
+          uni.reLaunch({
+            url: `/pages/inspection/inspectionExecute/inspectionExecute`
+          })
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: res.msg || '请求数据失败！'
+          });
+        }
+      });
+    }).catch(err => {
+      console.log('err', err);
+    })
+  }
+
+  // 处理数据
+  function handleData(isException = false){
+    // 目前只取第一页
+    let firstPage = formPageList[0]?.formItemList || [];
+
+    firstPage = firstPage.filter( v => v.display === 1);
+
+    firstPage = firstPage.map((v, i) => {
+      let value = '';
+      v.formItemConfigList = v.formItemConfigList || [];
+
+      // value
+      if(v.type.value === '3'){
+        // 多选
+        let arr = v.formItemConfigList.filter(v => v.checkDefault === 1);
+        value = arr.length ? arr.map(v => v.id) : [];
+        console.log('多选', value)
+      } else if(v.type.value === '7'){
+        // 图片
+        value = [];
+      } else if(v.type.value === '1' || v.type.value === '2') {
+        // 单选或下拉
+        let defaultValue = v.formItemConfigList.find(v => v.checkDefault === 1);
+        value = defaultValue ? defaultValue.id : '';
+        console.log('单选或下拉', value)
+      } else{
+        // 其他
+        value = v.defaultValue;
+      }
+
+      return {
+        id: v.id,
+        key: `field${i}`,
+        type: v.type.value,
+        name: v.name,
+        value: isException ? formValues[`field${i}`] : value,
+        list: v.formItemConfigList ? v.formItemConfigList.map(v => ({text: v.name, value: v.id, checkException: v.checkException, uncheckException: v.uncheckException})) : [],
+        required: v.required === 1,
+        checkType: v.checkType,
+        showError: v.showError,
+        orders: v.orders,
+        valueMin: v.checkType === 2 ? v.valueLow : ( v.checkType === 1 ? (v.valuex - v.valueGap) : undefined),
+        valueMax: v.checkType === 2 ? v.valueUp : ( v.checkType === 1 ? (v.valuex + v.valueGap) : undefined),
+      }
+    });
+
+    let firstPageBottom = firstPage.filter(v => v.type === '5' || v.type === '6');
+    firstPage = firstPage.filter(v => v.type !== '5' && v.type !== '6' && v.type !== '7');
+
+    // 其他项
+    if(isException){
+      firstPage.forEach(v => {
+        // 下拉,单选
+        if(v.type === '1' || v.type === '2'){
+          let obj = v.list.find(vv => formValues[v.key] === vv.value);
+          v.isException = obj ? obj.checkException === 1 : false;
+        } else if(v.type === '3'){
+          // 多选
+          v.isException = v.list.some(vv => {
+            if(formValues[v.key].includes(vv.value)){
+              return vv.checkException === 1;
+            }else{
+              return false;
+            }
+          })
+        } else if(v.type === '4'){
+          v.isException = (v.value < v.valueMin) || (v.value > v.valueMax);
+        }
+      })
+    }else{
+      firstPage.forEach(v => {
+        if(v.type === '1' || v.type === '2'){
+          // 下拉,单选
+          let obj = v.list.find(vv => v.value === vv.value);
+          v.isException = obj ? obj.checkException === 1 : false;
+        } else if(v.type === '3'){
+          // 多选
+          v.isException = v.list.some(vv => {
+            if(v.value.includes(vv.value)){
+              return vv.checkException === 1;
+            }else{
+              return false;
+            }
+          })
+        } else if(v.type === '4'){
+          // 数值
+          v.isException = (formValues[v.key] < v.valueMin) || (formValues[v.key] > v.valueMax);
+        }
+      })
+    }
+
+    // 单行|多行|图片上传
+    let someIsException = firstPage.filter(v => v.type !== '8').some(v => v.isException);
+    console.log('someIsException=>', someIsException)
+    firstPageBottom.forEach(v => {
+      console.log('v.showError=>', v.showError)
+      v.isException = (v.showError === 1 && someIsException) || v.showError === 0;
+    })
+
+    firstPage = firstPage.concat(firstPageBottom).sort((a, b) => a.orders - b.orders);
+    console.log('firstPage=>', firstPage);
+
+    Object.assign(baseFormData, firstPage);
+    console.log('baseFormData=>', baseFormData);
+
+    Object.assign(formValues, fromPairs(firstPage.filter(v => v.type !== '8').map(v => ([v.key, v.value]))));
+    console.log('formValues=>', formValues);
+
+    let rulesObj = keyBy(firstPage.filter(v => v.type !== '8'), 'key');
+    console.log(rulesObj)
+
+    for(let key in rulesObj){
+      rulesObj[key] = {
+        rules: [
+          { required: rulesObj[key].required, errorMessage: `${rulesObj[key].name}不能为空` }
+        ]
+      }
+    }
+    Object.assign(rules, rulesObj);
+    console.log('rules=>', rules);
+  }
+
+  onLoad((option) => {
+    inspectionExecuteId.value = +option.inspectionExecuteId;
+    // 巡检项
+    if(inspectionValueStore.inspectionValue.data){
+      Object.assign(dataInfo, inspectionValueStore.inspectionValue.data);
+      Object.assign(formPageList, dataInfo.inspectionFormDTO?.formPageList || []);
+      handleData()
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.inspectionValue{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .body{
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    padding-bottom: 24rpx;
+    .formItem{
+      padding: 24rpx 24rpx 0;
+      margin-bottom: 0;
+    }
+    ::v-deep .uni-forms-item__label{
+      width: auto!important;
+    }
+    .detail_head{
+      padding: 24rpx;
+      border-top: 1rpx solid #D2D2D2;
+      border-bottom: 1rpx solid #D2D2D2;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 24rpx;
+      &:first-of-type{
+        border-top: none;
+        margin-top: 0;
+      }
+      .title{
+        font-size: 26rpx;
+        color: $uni-primary;
+        padding-left: 18rpx;
+        position: relative;
+        &:before{
+          content: '';
+          width: 8rpx;
+          height: 25rpx;
+          background-color: $uni-primary;
+          position: absolute;
+          left: 0;
+          top: 50%;
+          transform: translateY(-50%);
+        }
+      }
+    }
+  }
+}
+</style>

pages/my/my.vue

@@ -62,12 +62,14 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentNumStore } from '@/stores/incidentNum'
   import { repositoryListSearchStore } from '@/stores/repositorySearch'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
 	
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const incidentNumStore = useIncidentNumStore();
   const { makePhoneCall }  = useMakePhoneCall();
   const repositorySearchStore = repositoryListSearchStore();
+  const { setTabbar }  = useSetTabbar();
 	
   // 主题颜色
   const primaryColor = ref(defaultColor)
@@ -156,6 +158,8 @@
   }
   
   onLoad((option) => {
+    // 巡检tabbar
+    setTabbar(1);
     onLoadFn();
   })
   

pages/repair/home.vue

@@ -121,11 +121,24 @@
 	// 扫资产报修
 	function scanCodes(){
 		SM().then((res) => {
-		  uni.showLoading({
-		    title: "加载中",
-		    mask: true,
-		  });
-			uni.hideLoading();
+		  let postData = {
+		    code: ress1,
+		    account: loginUserStore.loginUser.user.account,
+		  };
+		  // api_scanCode(postData).then((res) => {
+		  //   uni.hideLoading();
+		  //   if (res.status == 200) {
+		  //     inspectionValueStore.setInspectionValueData(res.data);
+		  //     uni.navigateTo({
+		  //       url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+		  //     })
+		  //   } else {
+		  //     uni.showToast({
+		  //       icon: 'none',
+		  //       title: res.msg || '请求数据失败！'
+		  //     });
+		  //   }
+		  // });
 		})
 	}
 	

pages/repair/rapidRep.vue

@@ -219,11 +219,24 @@
 	// 扫码资产码
 	function scanCodes(){
 		SM().then((res) => {
-		  uni.showLoading({
-		    title: "加载中",
-		    mask: true,
-		  });
-			uni.hideLoading();
+		  let postData = {
+		    code: ress1,
+		    account: loginUserStore.loginUser.user.account,
+		  };
+		  // api_scanCode(postData).then((res) => {
+		  //   uni.hideLoading();
+		  //   if (res.status == 200) {
+		  //     inspectionValueStore.setInspectionValueData(res.data);
+		  //     uni.navigateTo({
+		  //       url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+		  //     })
+		  //   } else {
+		  //     uni.showToast({
+		  //       icon: 'none',
+		  //       title: res.msg || '请求数据失败！'
+		  //     });
+		  //   }
+		  // });
 		})
 	}
 	

readme.md

@@ -9,6 +9,5 @@
 - filters      存放过滤器
 
 # uni-ui源码修改记录
-- uni-forms-item.vue增加exception参数 
 - uni_modules\uni-data-picker\components\uni-data-picker 添加 @touchmove.stop.prevent 
-- uni_modules\uni-data-picker\components\uni-data-pickerview 添加 @touchmove.stop.prevent 
+- uni_modules\uni-data-picker\components\uni-data-pickerview 添加 @touchmove.stop.prevent 

share/useSetTabbar.js

@@ -0,0 +1,30 @@
+import { useLoginUserStore } from '@/stores/loginUser'
+const loginUserStore = useLoginUserStore();
+export function useSetTabbar() {
+  /**
+   * 设置tabbar
+   */
+  const setTabbar = (index) => {
+    let flag = false;
+    
+    switch(index){
+      case 1:
+        // 巡检
+        if(loginUserStore.loginUser.menu.some(v => v.link === 'app.inspection.inspectList')){
+          flag = true;
+        }
+        break;
+    }
+    
+    if(flag){
+      uni.setTabBarItem({
+        index,
+        visible: true,
+      });
+    }
+  }
+
+  return {
+    setTabbar
+  };
+}

static/scss/common.scss

@@ -5,6 +5,30 @@ page{
   height: 100vh;
 }
 
+.red{
+  color:red!important;
+}
+
+.customLabelWrap{
+  display: flex;
+}
+
+.customLabel{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  text-align: left;
+  font-size: 14px;
+  color: #606266;
+  height: 36px;
+  padding: 0 12px 0 0;
+  vertical-align: middle;
+  flex-shrink: 0;
+  box-sizing: border-box;
+  padding: 0 0 8px;
+  line-height: 1.5715;
+}
+
 uni-toast,
 [longpressactions]{
   z-index: 99999!important;
@@ -209,6 +233,11 @@ uni-toast,
   margin-top: 0!important;
 }
 
+// 内边距-top
+.pt0{
+  padding-top: 0!important;
+}
+
 .no-scroll{
 	overflow-y: hidden;
 }

stores/inspectionListSearch.js

@@ -0,0 +1,31 @@
+import { defineStore } from "pinia"
+import { reactive } from 'vue'
+
+export const useInspectionListSearchStore = defineStore(
+  "inspectionListSearch",
+  () => {
+    const inspectionListSearch = reactive({
+      data: null,
+    });
+
+    // 保存
+    function setInspectionListSearchData(data) {
+      inspectionListSearch.data = data;
+    }
+    
+    // 清空
+    function clearInspectionListSearchData() {
+      console.log(inspectionListSearch.data)
+      inspectionListSearch.data = null;
+    }
+
+    return {
+      inspectionListSearch,
+      setInspectionListSearchData,
+      clearInspectionListSearchData,
+    };
+  },
+  {
+    unistorage: true, // 开启后对 state 的数据读写都将持久化
+  },
+);

stores/inspectionValue.js

@@ -0,0 +1,31 @@
+import { defineStore } from "pinia"
+import { reactive } from 'vue'
+
+export const useInspectionValueStore = defineStore(
+  "inspectionValue",
+  () => {
+    const inspectionValue = reactive({
+      data: null,
+    });
+
+    // 保存
+    function setInspectionValueData(data) {
+      inspectionValue.data = data;
+    }
+    
+    // 清空
+    function clearInspectionValueData() {
+      console.log(inspectionValue.data)
+      inspectionValue.data = null;
+    }
+
+    return {
+      inspectionValue,
+      setInspectionValueData,
+      clearInspectionValueData,
+    };
+  },
+  {
+    unistorage: true, // 开启后对 state 的数据读写都将持久化
+  },
+);