处理中处理

http/api.js

@@ -1,4 +1,4 @@
-import { get, post } from "@/http/http.js"
+import { get, post, path } from "@/http/http.js"
 
 /**
  * 微信登录
@@ -145,4 +145,11 @@ export function api_addSummaryDoc(data){
  */
 export function api_workHourManagement(data){
   return post("/bpm/data/fetchDataList/workHourManagement", data);
-}
+}
+
+/**
+ * 上传附件
+ */
+export function api_uploadAttachment(type, id){
+  return `${path}/common/common/uploadAttachment/${type}/${id}`
+}

http/http.js

@@ -1,7 +1,4 @@
-// #ifdef H5
-let path = `${location.origin}/service`
-// #endif
-
+export const path = `${location.origin}/service`
 // get方法
 export function get(url, data = {}) {
   url = path + url;

pages.json

@@ -82,6 +82,42 @@
         },
         "enablePullDownRefresh": true
       }
+    },
+    {
+      "path": "pages/categoryOne/categoryOne",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/categoryTwo/categoryTwo",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/categoryThree/categoryThree",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/synergeticAdd/synergeticAdd",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
     }
   ],
   "globalStyle": {

pages/categoryOne/categoryOne.vue

@@ -0,0 +1,161 @@
+<template>
+  <view class="categoryOne">
+    <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="toCategoryTwo(data)">
+        {{data.category}}
+      </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_incidentcategory } 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
+  })
+  
+  // 跳转二级故障现象列表
+  function toCategoryTwo(data){
+    uni.navigateTo({
+      url: `/pages/categoryTwo/categoryTwo?incidentId=${dataInfo.incidentId}&parentId=${data.id}&parentName=${data.category}`
+    })
+  }
+  
+  // 获取列表信息
+  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,
+      incidentcategory: {
+        selectType: 'one',
+      }
+    }
+    
+    // 当前所属院区或责任科室
+    if(loginUserStore.loginUser.user.duty){
+      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+    }else if(loginUserStore.loginUser.user.branch){
+      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+    }
+    
+    api_incidentcategory(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;
+    getList(0);
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.categoryOne{
+  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/categoryThree/categoryThree.vue

@@ -0,0 +1,202 @@
+<template>
+  <view class="categoryThree">
+    <view class="head">
+      <view class="one">{{dataInfo.grandParentName}}<uni-icons class="right" type="right" :size="16" :color="primaryColor"></uni-icons>{{dataInfo.parentName}}<uni-icons class="right" type="right" :size="16" :color="primaryColor"></uni-icons></view>
+      <text class="two ellipsis">{{dataInfo.categoryThreeObj.category}}</text>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <uni-data-checkbox v-model="dataInfo.categoryThree" :localdata="dataInfo.list" mode="list" wrap icon="right" :map="{text:'category',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_incidentcategory } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useHandlerStore } from '@/stores/handler'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const handlerStore = useHandlerStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentId: undefined,//事件ID
+    paramData: {},//传参
+    grandParentName: undefined,//二级故障现象名称
+    parentId: undefined,//三级故障现象id
+    parentName: '',//三级故障现象名称
+    categoryThree: undefined,//三级故障现象-回显
+    categoryThreeObj: {},//三级故障现象列表-已选择
+  })
+  
+  // 选择
+  function selectItem(e){
+    dataInfo.categoryThreeObj = e.detail.data;
+  }
+  
+  // 确认
+  function confirm(){
+    if(!dataInfo.categoryThree){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择三级故障现象'
+      });
+      return;
+    }
+    dataInfo.paramData.category = dataInfo.categoryThreeObj;
+    handlerStore.setHandlerData(dataInfo.paramData);
+    uni.redirectTo({
+      url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
+    })
+  }
+  
+  // 获取传递的数据
+  function getParamData(){
+    dataInfo.paramData = handlerStore.handler.data || {};
+    dataInfo.categoryThree = dataInfo.paramData.category ? dataInfo.paramData.category.id : undefined;
+    dataInfo.categoryThreeObj =  dataInfo.paramData.category || {};
+    getList(0);
+  }
+  
+  // 获取列表信息
+  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,
+      incidentcategory: {
+        parent: {
+          id: dataInfo.parentId,
+        },
+      }
+    }
+    
+    // 当前所属院区或责任科室
+    if(loginUserStore.loginUser.user.duty){
+      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+    }else if(loginUserStore.loginUser.user.branch){
+      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+    }
+    
+    api_incidentcategory(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.grandParentName = option.grandParentName;
+    dataInfo.parentId = option.parentId;
+    dataInfo.parentName = option.parentName;
+    getParamData();
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.categoryThree{
+  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>

pages/categoryTwo/categoryTwo.vue

@@ -0,0 +1,167 @@
+<template>
+  <view class="categoryTwo">
+    <view class="head">
+      {{dataInfo.parentName}}
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="toCategoryThree(data)">
+        {{data.category}}
+      </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_incidentcategory } 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
+    parentId: undefined,//父级故障现象ID
+    parentName: undefined,//父级故障现象名称
+  })
+  
+  // 跳转三级故障现象列表
+  function toCategoryThree(data){
+    uni.navigateTo({
+      url: `/pages/categoryThree/categoryThree?incidentId=${dataInfo.incidentId}&grandParentName=${dataInfo.parentName}&parentId=${data.id}&parentName=${data.category}`
+    })
+  }
+  
+  // 获取列表信息
+  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,
+      incidentcategory: {
+        parent: {
+          id: dataInfo.parentId,
+        },
+      }
+    }
+    
+    // 当前所属院区或责任科室
+    if(loginUserStore.loginUser.user.duty){
+      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+    }else if(loginUserStore.loginUser.user.branch){
+      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+    }
+    
+    api_incidentcategory(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.parentId = option.parentId;
+    dataInfo.parentName = option.parentName;
+    getList(0);
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.categoryTwo{
+  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/changeUser/changeUser.vue

@@ -10,7 +10,7 @@
       <template v-if="dataInfo.tabActiveValue === 'redeploy'">
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
-          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmmit && !dataInfo.groupId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
         </view>
         <view class="form_item">
           <view class="title radio"><text class="required newicon newicon-bitian"></text>是否转派到人：</view>
@@ -18,7 +18,7 @@
         </view>
         <view class="form_item" v-if="dataInfo.isAssignUser === 1">
           <view class="title select"><text class="required newicon newicon-bitian"></text>转派对象：</view>
-          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
         </view>
       </template>
       
@@ -26,15 +26,15 @@
       <template v-if="dataInfo.tabActiveValue === 'assign'">
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
-          <uni-data-select class="value" v-model="dataInfo.branchId" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" @change="changeBranch" :class="{formRed: isSubmmit && !dataInfo.branchId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.branchId" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" @change="changeBranch" :class="{formRed: isSubmit && !dataInfo.branchId}"></uni-data-select>
         </view>
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>责任科室：</view>
-          <uni-data-select class="value" v-model="dataInfo.dutyId" :localdata="dataInfo.dutyList" :clear="false" placeholder="请选择责任科室" @change="changeDuty" :class="{formRed: isSubmmit && !dataInfo.dutyId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.dutyId" :localdata="dataInfo.dutyList" :clear="false" placeholder="请选择责任科室" @change="changeDuty" :class="{formRed: isSubmit && !dataInfo.dutyId}"></uni-data-select>
         </view>
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
-          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmmit && !dataInfo.groupId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
         </view>
         <view class="form_item">
           <view class="title radio"><text class="required newicon newicon-bitian"></text>是否指派到人：</view>
@@ -42,7 +42,7 @@
         </view>
         <view class="form_item" v-if="dataInfo.isAssignUser === 1">
           <view class="title select"><text class="required newicon newicon-bitian"></text>指派对象：</view>
-          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择指派对象" :class="{formRed: isSubmmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择指派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
         </view>
       </template>
       
@@ -50,14 +50,14 @@
       <template v-if="dataInfo.tabActiveValue === 'reassign'">
         <view class="form_item column">
           <view class="title"><text class="required newicon newicon-bitian"></text>退回原因：</view>
-          <uni-easyinput class="value" type="textarea" v-model="dataInfo.reassignRemark" placeholder="请输入退回原因" :class="{formRed: isSubmmit && !dataInfo.reassignRemark.trim()}" />
+          <uni-easyinput class="value" type="textarea" v-model="dataInfo.reassignRemark" placeholder="请输入退回原因" :class="{formRed: isSubmit && !dataInfo.reassignRemark.trim()}" />
           <view class="tips">注：退回后，由调度台重新指派。</view>
         </view>
       </template>
     </scroll-view>
     <view class="foot_common_btns">
       <button @click="goBack" type="default" class="cancelButton btn">返回</button>
-      <button @click="submmit" type="default" class="primaryButton btn">提交</button>
+      <button @click="submit" type="default" class="primaryButton btn">提交</button>
     </view>
   </view>
 </template>
@@ -108,7 +108,7 @@
   })
   
   // 是否提交
-  const isSubmmit = ref(false)
+  const isSubmit = ref(false)
   
   // 重置
   function reset(){
@@ -144,7 +144,7 @@
       return;
     }
     dataInfo.tabActiveValue = tabValue;
-    isSubmmit.value = false;
+    isSubmit.value = false;
     reset();
     initForm()
   }
@@ -393,20 +393,20 @@
   }
   
   // 提交
-  function submmit(){
-    isSubmmit.value = true;
+  function submit(){
+    isSubmit.value = true;
     
     if(dataInfo.tabActiveValue === 'redeploy'){
-      submmitRedeploy();
+      submitRedeploy();
     }else if(dataInfo.tabActiveValue === 'assign'){
-      submmitAssign();
+      submitAssign();
     }else if(dataInfo.tabActiveValue === 'reassign'){
-      submmitReassign();
+      submitReassign();
     }
   }
   
   // 转派提交
-  function submmitRedeploy(){
+  function submitRedeploy(){
     if(!dataInfo.groupId){
       uni.showToast({
       	icon: 'none',
@@ -463,7 +463,7 @@
   }
   
   // 指派提交
-  function submmitAssign(){
+  function submitAssign(){
     if(!dataInfo.branchId){
       uni.showToast({
       	icon: 'none',
@@ -536,7 +536,7 @@
   }
   
   // 退回提交
-  function submmitReassign(){
+  function submitReassign(){
     if(!dataInfo.reassignRemark.trim()){
       uni.showToast({
       	icon: 'none',
@@ -620,7 +620,7 @@
       display: flex;
       align-items: center;
       padding-top: 24rpx;
-      height: 86rpx;
+      min-height: 86rpx;
       &.column{
         height: auto;
         flex-direction: column;

pages/consumableList/consumableList.vue

@@ -94,7 +94,7 @@
           mask: true,
         });
         setTimeout(() => {
-          uni.reLaunch({
+          uni.redirectTo({
             url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
           })
         }, 1500)

pages/handler/handler.vue

@@ -5,7 +5,7 @@
         {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
       </view>
     </view>
-    <scroll-view scroll-y class="body">
+    <scroll-view scroll-y class="body" :class="{ page_padding: !(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder), bg: (dataInfo.tabActiveValue === 'doing' && isInSummaryOrder) }">
       <!-- 汇总单 -->
       <template v-if="dataInfo.tabActiveValue === 'doing' && isInSummaryOrder">
         <!-- 耗材 -->
@@ -73,26 +73,44 @@
       </template>
       
       <!-- 故障处理 -->
-      <template v-if="dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder">故障处理
-        <view class="form_item">
-          <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
-          <uni-data-select class="value" v-model="dataInfo.branchId" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" @change="changeBranch" :class="{formRed: isSubmmit && !dataInfo.branchId}"></uni-data-select>
+      <template v-if="dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder">
+        <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
+          <view class="title"><text class="required newicon newicon-bitian"></text>解决方案：</view>
+          <uni-easyinput class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
-        <view class="form_item">
-          <view class="title select"><text class="required newicon newicon-bitian"></text>责任科室：</view>
-          <uni-data-select class="value" v-model="dataInfo.dutyId" :localdata="dataInfo.dutyList" :clear="false" placeholder="请选择责任科室" @change="changeDuty" :class="{formRed: isSubmmit && !dataInfo.dutyId}"></uni-data-select>
+        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+          <view class="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
+          <view class="value category" @click="selectCategory">
+            <text class="categoryName ellipsis-multiline">{{dataInfo.category.mutiCategory}}</text>
+            <text class="newicon newicon-weibiaoti2010104"></text>
+          </view>
         </view>
         <view class="form_item">
-          <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
-          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmmit && !dataInfo.groupId}"></uni-data-select>
+          <view class="title select"><text class="required newicon newicon-bitian"></text>处理方式：</view>
+          <uni-data-select class="value" v-model="dataInfo.handleCategory" :localdata="dataInfo.handleCategoryList" :clear="false" placeholder="请选择处理方式" :class="{formRed: isSubmit && !dataInfo.handleCategory}"></uni-data-select>
+        </view>
+        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>关闭代码：</view>
+          <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择关闭代码" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select>
         </view>
         <view class="form_item">
-          <view class="title radio"><text class="required newicon newicon-bitian"></text>是否指派到人：</view>
-          <uni-data-checkbox class="value" v-model="dataInfo.isAssignUser" :localdata="dataInfo.isAssignUserList" @change="changeIsAssignUser" />
+          <view class="title"><text class="required newicon newicon-bitian transparent"></text>协同人员：</view>
+          <text class="synergeticNames ellipsis">{{dataInfo.synergetic.map(v => v.name).join('，')}}</text>
+          <button type="primary" plain size="mini" class="primaryPlainButton synergeticAdd" @click="synergeticAdd">+立即添加</button>
         </view>
-        <view class="form_item" v-if="dataInfo.isAssignUser === 1">
-          <view class="title select"><text class="required newicon newicon-bitian"></text>指派对象：</view>
-          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择指派对象" :class="{formRed: isSubmmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
+        <view class="form_item_column">
+          <view class="form_item">
+            <view class="title"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
+            <view class="value">
+              <uni-file-picker ref="handlerImgRef" v-model="dataInfo.handlerImgList" limit="3" @success="handlerImgSuccess" @fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete"></uni-file-picker>
+            </view>
+          </view>
+          <view class="form_item">
+            <view class="title transparent"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
+            <view class="value">
+              <text class="imgTips ellipsis">(支持JPG/PNG格式图片，单张大小10M以内)</text>
+            </view>
+          </view>
         </view>
       </template>
       
@@ -100,21 +118,21 @@
       <template v-if="dataInfo.tabActiveValue === 'overtime'">
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>延期原因：</view>
-          <uni-data-select class="value" v-model="dataInfo.repairTypeId" :localdata="dataInfo.repairTypeList" :clear="false" placeholder="请选择延期原因" :class="{formRed: isSubmmit && !dataInfo.repairTypeId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.repairTypeId" :localdata="dataInfo.repairTypeList" :clear="false" placeholder="请选择延期原因" :class="{formRed: isSubmit && !dataInfo.repairTypeId}"></uni-data-select>
         </view>
         <view class="form_item column">
           <view class="title"><text class="required newicon newicon-bitian"></text>延期说明：</view>
-          <uni-easyinput class="value" type="textarea" v-model="dataInfo.deferralRemark" placeholder="请输入延期说明" :class="{formRed: isSubmmit && !dataInfo.deferralRemark.trim()}" />
+          <uni-easyinput class="value" type="textarea" v-model="dataInfo.deferralRemark" placeholder="请输入延期说明" :class="{formRed: isSubmit && !dataInfo.deferralRemark.trim()}" />
         </view>
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>延期天数：</view>
-          <uni-data-select class="value" v-model="dataInfo.deferralDayId" :localdata="dataInfo.deferralDayList" :clear="false" placeholder="请选择延期天数" :class="{formRed: isSubmmit && !dataInfo.deferralDayId}"></uni-data-select>
+          <uni-data-select class="value" v-model="dataInfo.deferralDayId" :localdata="dataInfo.deferralDayList" :clear="false" placeholder="请选择延期天数" :class="{formRed: isSubmit && !dataInfo.deferralDayId}"></uni-data-select>
         </view>
       </template>
     </scroll-view>
     <view class="foot_common_btns">
       <button @click="goBack" type="default" class="cancelButton btn">返回</button>
-      <button @click="submmit" type="default" class="primaryButton btn">{{dataInfo.tabActiveValue === 'doing' && isInSummaryOrder ? '下一步' : '提交'}}</button>
+      <button @click="submit" type="default" class="primaryButton btn">{{dataInfo.tabActiveValue === 'doing' && isInSummaryOrder ? '下一步' : '提交'}}</button>
     </view>
     <NumberModal v-if="dataInfo.isNumber" @cancelEmit="cancelNumber" @confirmEmit="conformNumber" @removeEmit="removeNumber" :selectData="dataInfo.selectData" :selectType="dataInfo.selectType" :evtNumber="dataInfo.evtNumber" showRemove></NumberModal>
   </view>
@@ -125,26 +143,25 @@
   import NumberModal from '@/components/NumberModal.vue';
   import { onLoad } from '@dcloudio/uni-app'
   import { generateNumberArray } from '@/utils/index.js'
-  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc, api_uploadAttachment } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useUploadFile } from '@/share/useUploadFile.js'
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
+  import { useHandlerStore } from '@/stores/handler'
   
   useSetTitle();
   const loginUserStore = useLoginUserStore();
+  const handlerStore = useHandlerStore();
   const { makePhoneCall }  = useMakePhoneCall();
+  const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
   
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
-  // 是否进入汇总单
-  const isInSummaryOrder = computed(() => () => {
-    return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlerUser.id == loginUserStore.loginUser.user.id);
-  })
-  
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -154,24 +171,10 @@
     tabActiveValue: 0,//当前选择的tab
     incidentId: undefined,//事件ID
     incidentData: {},//事件对象
-    groupList: [], //工作组列表
-    groupId: undefined, //工作组ID
-    userList: [], //用户列表
-    userId: undefined, //用户ID
-    branchList: [], //院区列表
-    branchId: undefined, //院区ID
-    dutyList: [], //责任科室列表
-    dutyId: undefined, //责任科室ID
-    repairTypeList: [], //维修原因列表
-    repairTypeId: undefined, //维修原因ID
+    repairTypeList: [], //延期原因列表
+    repairTypeId: undefined, //延期原因ID
     deferralDayList: [], //延期天数列表
     deferralDayId: undefined, //延期天数ID
-    isAssignUser: 1, //工作组是否转派到人
-    isAssignUserList: [
-      { text: '是', value: 1 },
-      { text: '否', value: 0 },
-    ], //工作组是否转派到人选项
-    reassignRemark: '',//退回原因
     deferralRemark: '',//延期说明
     summaryObj: {
       consumableList: [],//耗材列表
@@ -182,10 +185,98 @@
     evtNumber: 1,//弹窗返回的数量
     selectData: {},//选择的对象
     selectType: {},//选择的对象类型
+    handleDescription: '',//解决方案
+    handleCategory: undefined,//处理方式
+    handleCategoryList: [],//处理方式列表
+    closecode: undefined,//关闭代码
+    closecodeList: [],//关闭代码列表
+    handlerImgList: [],//处理图片列表
+    category: {},//故障现象
+    synergetic: [],//协同人员
   })
   
   // 是否提交
-  const isSubmmit = ref(false)
+  const isSubmit = ref(false)
+  
+  // 处理图片
+  const handlerImgRef = ref(null)
+  
+  // 是否进入汇总单
+  const isInSummaryOrder = computed(() => {
+    return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
+  })
+  
+  // 上传处理图片成功
+  function handlerImgSuccess(e){
+    dataInfo.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    console.log(dataInfo.handlerImgList);
+    let handlerOrder$ = handlerOrder();
+    let requestList = [handlerOrder$];
+    dataInfo.handlerImgList.forEach(v => {
+      let handlerOrderImg$ = handlerOrderImg(v);
+      requestList.push(handlerOrderImg$);
+    })
+    
+    Promise.all(requestList).then(resList => {
+      uni.hideLoading();
+      console.log(resList);
+      if(resList[0].state == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '处理成功',
+          mask: true,
+        });
+        setTimeout(() => {
+          uni.reLaunch({
+            url: '/pages/incidentList/incidentList',
+          })
+        }, 1500)
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: resList[0].msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 上传处理图片失败
+  function handlerImgFail(e){
+    dataInfo.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 选择上传图片
+  function handlerImgSelect(e){
+    dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 删除上传图片
+  function handlerImgDelete(e){
+    dataInfo.handlerImgList = dataInfo.handlerImgList.filter(v => e.tempFile.uuid != v.uuid);
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 添加协同人员
+  function synergeticAdd(){
+    handlerStore.setHandlerData(dataInfo);
+    uni.navigateTo({
+      url: `/pages/synergeticAdd/synergeticAdd?incidentId=${dataInfo.incidentId}`
+    })
+  }
+  
+  // 选择故障现象
+  function selectCategory(){
+    handlerStore.setHandlerData(dataInfo);
+    uni.navigateTo({
+      url: `/pages/categoryOne/categoryOne?incidentId=${dataInfo.incidentId}`
+    })
+  }
   
   // 点击修改数量
   function numberClick(data, type){
@@ -307,28 +398,37 @@
   
   // 重置
   function reset(){
-    dataInfo.branchId = undefined;
-    dataInfo.branchList = [];
-    
-    dataInfo.dutyId = undefined;
-    dataInfo.dutyList = [];
-    
-    dataInfo.groupId = undefined;
-    dataInfo.groupList = [];
-    
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    
-    dataInfo.isAssignUser = 1;
-    
-    dataInfo.reassignRemark = '';
-    dataInfo.deferralRemark = '';
+    dataInfo.repairTypeList = []; //延期原因列表
+    dataInfo.repairTypeId = undefined; //延期原因ID
+    dataInfo.deferralDayList = []; //延期天数列表
+    dataInfo.deferralDayId = undefined; //延期天数ID
+    dataInfo.deferralRemark = '';//延期说明
+    dataInfo.summaryObj = {
+      consumableList: [],//耗材列表
+      workHourManagementList: [],//工时列表
+    };//汇总单信息
+    dataInfo.summaryId = undefined;//汇总单Id
+    dataInfo.isNumber = false;//修改数量弹窗
+    dataInfo.evtNumber = 1;//弹窗返回的数量
+    dataInfo.selectData = {};//选择的对象
+    dataInfo.selectType = {};//选择的对象类型
+    dataInfo.handleDescription = '';//解决方案
+    dataInfo.handleCategory = undefined;//处理方式
+    dataInfo.handleCategoryList = [];//处理方式列表
+    dataInfo.closecode = undefined;//关闭代码
+    dataInfo.closecodeList = [];//关闭代码列表
+    dataInfo.handlerImgList = [];//处理图片列表
+    dataInfo.category = {};//故障现象
+    dataInfo.synergetic = [];//协同人员
   }
   
   // 初始化表单
   function initForm(){
-    if(dataInfo.tabActiveValue === 'doing'){
+    if(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder.value){
       getSummaryList();
+    }else if(dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder.value){
+      getHandleCategorys();
+      getClosecodes();
     }else if(dataInfo.tabActiveValue === 'overtime'){
       getRepairTypes();
       getDeferralDays();
@@ -341,13 +441,13 @@
       return;
     }
     dataInfo.tabActiveValue = tabValue;
-    isSubmmit.value = false;
+    isSubmit.value = false;
     reset();
-    initForm()
+    initForm();
   }
   
   // 获取事件详情
-  function getIncidentDetail(){
+  function getIncidentDetail(isSummaryNext = false){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -357,19 +457,37 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
-        let chuli = false;//故障处理权限
-        for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-            if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_chuli") {
-              chuli = true
-            }
-        }
         
-        // 故障处理
-        if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id && chuli){
-          dataInfo.tabs.splice(0, 0, {id: 5, name: '故障处理', value: 'doing', num: ''});
+        if(isSummaryNext){
+          // 汇总单-下一步
+          dataInfo.incidentData.duty.addSummary = 0;
         }
         
-        dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+        // 跳转页面选择了选项并且工单ID一致
+        if(handlerStore.handler.data && handlerStore.handler.data.incidentId == dataInfo.incidentId){
+          Object.assign(dataInfo, handlerStore.handler.data);
+          console.log(dataInfo)
+          handlerStore.clearHandlerData();
+        }else{
+          // 初始化回显
+          dataInfo.category = dataInfo.incidentData.category || {};
+          dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
+          
+          let chuli = false;//故障处理权限
+          for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
+              if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_chuli") {
+                chuli = true
+              }
+          }
+          
+          // 故障处理
+          if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id && chuli){
+            let flag = dataInfo.tabs.some(v => v.value === 'doing');
+            !flag && dataInfo.tabs.splice(0, 0, {id: 5, name: '故障处理', value: 'doing', num: ''});
+          }
+          
+          dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+        }
         
         initForm()
       }else{
@@ -401,6 +519,56 @@
     })
   }
   
+  // 获取处理方式列表
+  function getHandleCategorys(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "key": 'incident_handleCategory',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      uni.hideLoading();
+      res = res || [];
+      dataInfo.handleCategoryList = res.map(v => ({
+        text: v.name,
+        value: v.id,
+        key: v.value,
+      }));
+      if(!dataInfo.handleCategory){
+        let handleCategory = dataInfo.handleCategoryList.find(v => v.key == 'SUPPORT');
+        dataInfo.handleCategory = handleCategory ? handleCategory.value : undefined;
+      }
+    })
+  }
+  
+  // 获取关闭代码列表
+  function getClosecodes(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "key": 'incident_closecode',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      uni.hideLoading();
+      res = res || [];
+      dataInfo.closecodeList = res.map(v => ({
+        text: v.name,
+        value: v.id,
+        key: v.value,
+      }));
+      if(!dataInfo.closecode){
+        let closecode = dataInfo.closecodeList.find(v => v.key == '060');
+        dataInfo.closecode = closecode ? closecode.value : undefined;
+      }
+    })
+  }
+  
   // 获取延期天数列表
   function getDeferralDays(){
     dataInfo.deferralDayList = generateNumberArray(1, 15).map(v => ({
@@ -450,377 +618,112 @@
     })
   }
   
-  // 获取院区列表
-  function getBranchs(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    let postData = {
-      "idx": 0,
-      "sum": 9999,
-    };
-    api_branch(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.branchList = res.list.map(v => ({
-          text: v.hosName,
-          value: v.id,
-        }));
-        
-        if(loginUserStore.loginUser.user.duty){
-          // 当前的所属责任科室
-          dataInfo.branchId = loginUserStore.loginUser.user.duty.branch;
-          changeBranch();
-          
-          dataInfo.dutyId = loginUserStore.loginUser.user.duty.id;
-          changeDuty();
-        }else if(loginUserStore.loginUser.user.branch){
-          // 当前的所属院区
-          dataInfo.branchId = loginUserStore.loginUser.user.branch.id;
-        }
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
-  }
-  
-  // 获取责任科室列表
-  function getDutys(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    let postData = {
-      "idx": 0,
-      "sum": 9999,
-      "dutyDepartment": {
-        "branch": dataInfo.branchId,
-      }
-    };
-    api_dutyDepartment(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.dutyList = res.list.map(v => ({
-          text: v.dept,
-          value: v.id,
-        }));
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
-  }
-  
-  // 获取工作组列表
-  function getGroups(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    
-    let duty = undefined;
-    if(dataInfo.tabActiveValue === 'redeploy'){
-      duty = dataInfo.incidentData.duty;
-    }else if(dataInfo.tabActiveValue === 'assign'){
-      duty = { id: dataInfo.dutyId };
-    }
-    
-    let postData = {
-      "idx": 0,
-      "sum": 9999,
-      "group": {
-          "duty": duty,
-          "selectType": "nouser"
-      }
-    };
-    api_group(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.groupList = res.list.map(v => ({
-          text: v.groupName,
-          value: v.id,
-        }));
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
-  }
-  
-  // 获取用户列表
-  function getUsers(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    let postData = {
-      "idx": 0,
-      "sum": 9999,
-      "user": {
-          "groupdata":{
-            "id": dataInfo.groupId,
-          },
-          "roledata": {
-              "rolecode": "first-line support"
-          },
-          "roledata2": {
-              "rolecode": "second-line support"
-          },
-          "selectType": "1",
-          "selectDetails": 1,
-          "simple": true,
-          "engineer": 1
-      }
-    };
-    api_user(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.userList = res.list.map(v => ({
-          text: v.name,
-          value: v.id,
-        }));
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
-  }
-  
-  // 选择院区
-  function changeBranch(){
-    dataInfo.dutyId = undefined;
-    dataInfo.dutyList = [];
-    
-    dataInfo.groupId = undefined;
-    dataInfo.groupList = [];
-    
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    getDutys();
-  }
-  
-  // 选择责任科室
-  function changeDuty(){
-    dataInfo.groupId = undefined;
-    dataInfo.groupList = [];
-    
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    getGroups();
-  }
-  
-  // 选择工作组
-  function changeGroup(){
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    getUsers();
-  }
-  
-  // 选择是否转派到人
-  function changeIsAssignUser(){
-    dataInfo.userId = undefined;
-  }
-  
   // 提交
-  function submmit(){
-    isSubmmit.value = true;
-    if(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder){
-      
-    }else if(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder){
-      
+  function submit(){
+    isSubmit.value = true;
+    if(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder.value){
+      isSubmit.value = false;
+      getIncidentDetail(true);
+    }else if(dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder.value){
+      submitHandler();
     }else if(dataInfo.tabActiveValue === 'overtime'){
-      submmitOvertime();
+      submitOvertime();
     }
   }
   
-  // 转派提交
-  function submmitRedeploy(){
-    if(!dataInfo.groupId){
-      uni.showToast({
-      	icon: 'none',
-        title: '请选择工作组'
-      });
-      return;
-    }
-    
-    if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
-      uni.showToast({
-      	icon: 'none',
-        title: '请选择指派对象'
-      });
-      return;
-    }
-    
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    
+  // 处理提交事件
+  function handlerOrder(){
     let postData = {
       incident: dataInfo.incidentData,
     }
     
-    if(dataInfo.userId){
-      // 派人
-      postData.incident.assignee = dataInfo.userId;
-    } else {
-      // 派组
-      postData.incident.candidateGroups = dataInfo.groupId;
-    }
+    postData.incident.handleDescription = dataInfo.handleDescription;
+    postData.incident.handlCategory = {id: dataInfo.handlCategory};
+    postData.incident.closecode = {id: dataInfo.closecode};
+    postData.incident.category = dataInfo.category;
+    postData.incident.synergetic = dataInfo.synergetic;
     
-    api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
-      uni.hideLoading();
-      if(res.state == 200){
-        uni.showToast({
-        	icon: 'none',
-          title: '转派成功',
-          mask: true,
-        });
-        setTimeout(() => {
-          uni.reLaunch({
-            url: '/pages/incidentList/incidentList',
-          })
-        }, 1500)
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+    return api_incidentTask(dataInfo.tabActiveValue, postData);
   }
   
-  // 指派提交
-  function submmitAssign(){
-    if(!dataInfo.branchId){
+  // 处理图片
+  function handlerOrderImg(imgObj){
+    return uploadFile(imgObj, 'incident', dataInfo.incidentId)
+  }
+  
+  // 处理提交
+  function submitHandler(){
+    console.log(dataInfo);
+    if(!dataInfo.handleDescription.trim() && dataInfo.category.hasSimple != 1){
       uni.showToast({
       	icon: 'none',
-        title: '请选择院区'
+        title: '请填写解决方案'
       });
       return;
     }
     
-    if(!dataInfo.dutyId){
+    if(!dataInfo.category.id && dataInfo.category.hasSimple != 1){
       uni.showToast({
       	icon: 'none',
-        title: '请选择责任科室'
+        title: '请选择故障现象'
       });
       return;
     }
     
-    if(!dataInfo.groupId){
+    if(!dataInfo.handleCategory){
       uni.showToast({
       	icon: 'none',
-        title: '请选择工作组'
+        title: '请选择处理方式'
       });
       return;
     }
     
-    if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
+    if(!dataInfo.closecode && dataInfo.category.hasSimple != 1){
       uni.showToast({
       	icon: 'none',
-        title: '请选择指派对象'
+        title: '请选择关闭代码'
       });
       return;
     }
+    console.log(dataInfo.handlerImgList)
     
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
-    let postData = {
-      incident: dataInfo.incidentData,
-    }
-    
-    if(dataInfo.userId){
-      // 派人
-      postData.incident.assignee = dataInfo.userId;
-    } else {
-      // 派组
-      postData.incident.candidateGroups = dataInfo.groupId;
+    if(dataInfo.handlerImgList.length){
+      // 有图片
+      handlerImgRef.value.upload();
+    }else{
+      // 没有图片
+      let handlerOrder$ = handlerOrder();
+      let requestList = [handlerOrder$];
+      Promise.all(requestList).then(resList => {
+        uni.hideLoading();
+        console.log(resList);
+        if(resList[0].state == 200){
+          uni.showToast({
+          	icon: 'none',
+            title: '处理成功',
+            mask: true,
+          });
+          setTimeout(() => {
+            uni.reLaunch({
+              url: '/pages/incidentList/incidentList',
+            })
+          }, 1500)
+        }else{
+          uni.showToast({
+            icon: 'none',
+            title: resList[0].msg || '请求数据失败！'
+          });
+        }
+      })
     }
-    
-    api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
-      uni.hideLoading();
-      if(res.state == 200){
-        uni.showToast({
-        	icon: 'none',
-          title: '指派成功',
-          mask: true,
-        });
-        setTimeout(() => {
-          uni.reLaunch({
-            url: '/pages/incidentList/incidentList',
-          })
-        }, 1500)
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
   }
   
-  // 退回提交
-  function submmitReassign(){
-    if(!dataInfo.reassignRemark.trim()){
-      uni.showToast({
-      	icon: 'none',
-        title: '请填写退回原因'
-      });
-      return;
-    }
-    
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    
-    let postData = {
-      incident: dataInfo.incidentData,
-    }
-    
-    postData.incident.reassignRemark = dataInfo.reassignRemark;
-    
-    api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
-      uni.hideLoading();
-      if(res.state == 200){
-        uni.showToast({
-        	icon: 'none',
-          title: '退回成功',
-          mask: true,
-        });
-        setTimeout(() => {
-          uni.reLaunch({
-            url: '/pages/incidentList/incidentList',
-          })
-        }, 1500)
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
-  }
   // 延期处理提交
-  function submmitOvertime(){
+  function submitOvertime(){
     if(!dataInfo.repairTypeId){
       uni.showToast({
       	icon: 'none',
@@ -894,7 +797,6 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  background-color: #F7F7F7;
   .head{
     height: 88rpx;
     display: flex;
@@ -920,6 +822,9 @@
     box-sizing: border-box;
     flex: 1;
     min-height: 0;
+    &.bg{
+      background-color: #F7F7F7;
+    }
     .summaryItem{
       &:first-of-type{
         .summaryItem_head{
@@ -995,11 +900,19 @@
         }
       }
     }
+    .form_item_column{
+      padding-top: 24rpx;
+      min-height: 86rpx;
+      .form_item{
+        padding-top: 0;
+        min-height: auto;
+      }
+    }
     .form_item{
       display: flex;
       align-items: center;
       padding-top: 24rpx;
-      height: 86rpx;
+      min-height: 86rpx;
       &.column{
         height: auto;
         flex-direction: column;
@@ -1026,10 +939,40 @@
         display: flex;
         align-items: center;
         margin-right: 12rpx;
+        flex-shrink: 0;
         &.select{
           width: calc(5em + 20rpx);
         }
       }
+      .value{
+        width: 100%;
+        &.category{
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .categoryName{
+            font-size: 26rpx;
+            color: #555;
+            flex: 1;
+          }
+          .newicon-weibiaoti2010104{
+            color: $uni-primary;
+            margin-left: 24rpx;
+          }
+        }
+        .imgTips{
+          color: #909399;
+          font-size: 22rpx;
+        }
+      }
+      .synergeticNames{
+        font-size: 26rpx;
+        margin-right: 24rpx;
+      }
+      .synergeticAdd{
+        flex-shrink: 0;
+      }
     }
   }
 }

pages/incidentList/incidentList.vue

@@ -197,7 +197,6 @@
         uni.showToast({
         	icon: 'none',
           title: '接单成功',
-          mask: true,
         });
       }else{
         uni.showToast({

pages/initBind/initBind.vue

@@ -8,7 +8,7 @@
         <view class="info_form_item">
           <label for="account" class="label"><text class="required newicon newicon-bitian"></text>工号:</label>
           <uni-easyinput class="flex1" v-model="postData.account" placeholder="请输入工号" focus
-            :styles="{borderColor: !postData.account.trim() && isSubmmit ? '#f00' : ''}" :primaryColor="primaryColor" />
+            :styles="{borderColor: !postData.account.trim() && isSubmit ? '#f00' : ''}" :primaryColor="primaryColor" />
         </view>
       </view>
     </view>
@@ -43,13 +43,13 @@
   const primaryColor = ref(defaultColor)
 
   // 是否提交
-  const isSubmmit = ref(false)
+  const isSubmit = ref(false)
 
   /**
    * 绑定
    */
   function bind() {
-    isSubmmit.value = true;
+    isSubmit.value = true;
     if(!postData.account.trim()){
       uni.showToast({
       	icon: 'none',

pages/synergeticAdd/synergeticAdd.vue

@@ -0,0 +1,205 @@
+<template>
+  <view class="synergeticAdd">
+    <view class="body" v-if="dataInfo.list.length">
+      <uni-data-checkbox v-model="dataInfo.userList" multiple :localdata="dataInfo.list" mode="list" wrap icon="right" :map="{text:'name',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_incidentDetail } from '@/http/api.js'
+  import { api_user } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useHandlerStore } from '@/stores/handler'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const handlerStore = useHandlerStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentId: undefined,//事件ID
+    incidentData: {},//事件对象
+    paramData: {},//传参
+    userList: [],//协同人列表-回显
+    userSelectedList: [],//协同人列表-已选择
+  })
+  
+  // 选择
+  function selectItem(e){
+    dataInfo.userSelectedList = e.detail.data;
+  }
+  
+  // 确认
+  function confirm(){
+    if(dataInfo.userSelectedList.length === 0){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择协同人员'
+      });
+      return;
+    }
+    dataInfo.paramData.synergetic = dataInfo.userSelectedList;
+    handlerStore.setHandlerData(dataInfo.paramData);
+    uni.redirectTo({
+      url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
+    })
+  }
+  
+  // 获取列表信息
+  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,
+      user: {
+        currentDuty: dataInfo.incidentData.duty.id,
+        roleData: {
+          "rolecode": "first-line support"
+        }
+      }
+    }
+    
+    api_user(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 || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取传递的数据
+  function getParamData(){
+    dataInfo.paramData = handlerStore.handler.data || {};
+    dataInfo.userSelectedList = dataInfo.paramData.synergetic || [];
+    dataInfo.userList = dataInfo.userSelectedList.map(v => v.id);
+    getIncidentDetail();
+  }
+  
+  // 获取事件详情
+  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 || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    getParamData();
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.synergeticAdd{
+  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{
+    margin-bottom: 140rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    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

@@ -73,7 +73,6 @@
   // 选择
   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);
   }
   
@@ -104,7 +103,7 @@
           mask: true,
         });
         setTimeout(() => {
-          uni.reLaunch({
+          uni.redirectTo({
             url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
           })
         }, 1500)

share/useUploadFile.js

@@ -0,0 +1,45 @@
+import { api_uploadAttachment } from "@/http/api.js"
+export function useUploadFile() {
+  /**
+   * 压缩
+   */
+  const toBlob = (canvas, imgObj) => {
+    return new Promise((resolve,reject) => {
+      canvas.toBlob((fileSrc) => {
+        resolve(fileSrc)
+      }, `${imgObj.fileType}/${imgObj.extname}`, 0.3)
+    })
+  }
+  /**
+   * 上传图片
+   */
+  const uploadFile = async (imgObj, type, incidentId) => {
+    const res = await uni.getImageInfo({src: imgObj.url});
+    console.log('压缩前', res)
+    let canvasWidth = res.width //图片原始长宽
+    let canvasHeight = res.height
+    let img = new Image()
+    img.src = res.path
+    let canvas = document.createElement('canvas');
+    let ctx = canvas.getContext('2d')
+    canvas.width = canvasWidth
+    canvas.height = canvasHeight
+    ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight)
+    
+    const fileSrc = await toBlob(canvas, imgObj)
+    let tp = window.URL.createObjectURL(fileSrc)
+    console.log('压缩后', tp);
+    return uni.uploadFile({
+      url: api_uploadAttachment(type, incidentId),
+      filePath: tp,
+      name: 'file',
+      formData: {
+        'filename': imgObj.name
+      }
+    });
+  }
+
+  return {
+    uploadFile
+  };
+}

static/scss/common.scss

@@ -37,6 +37,13 @@ uni-toast,
   border-color: $uni-primary!important;
 }
 
+// 按钮样式-镂空-绿色
+.primaryPlainButton{
+  color: $uni-primary!important;
+  border-color: $uni-primary!important;
+  margin: 0!important;
+}
+
 // 按钮样式-灰色
 .cancelButton{
   color: #fff!important;
@@ -115,6 +122,7 @@ uni-toast,
   -webkit-line-clamp: 2; /* 定义显示的行数 */
   overflow: hidden;
   text-overflow: ellipsis;
+  word-break: break-all;
 }
 
 // 透明
@@ -155,3 +163,7 @@ uni-toast,
   margin-right: 24rpx!important;
   flex: 1!important;
 }
+.uni-data-checklist .checklist-group .checklist-box.is--list{
+  border-top: none!important;
+  border-bottom: 1rpx solid #DEDEDE!important;
+}

stores/handler.js

@@ -0,0 +1,30 @@
+import { defineStore } from "pinia"
+import { reactive } from 'vue'
+
+export const useHandlerStore = defineStore(
+  "handler",
+  () => {
+    const handler = reactive({
+      data: null,
+    });
+
+    // 保存事件信息
+    function setHandlerData(data) {
+      handler.data = data;
+    }
+    
+    // 清空事件信息
+    function clearHandlerData() {
+      handler.data = null;
+    }
+
+    return {
+      handler,
+      setHandlerData,
+      clearHandlerData,
+    };
+  },
+  {
+    unistorage: true, // 开启后对 state 的数据读写都将持久化
+  },
+);