派单和直接解决

http/api.js

@@ -162,7 +162,7 @@ export function api_listAttachment(type, id){
 }
 
 /**
- * 获取附件
+ * 获取事件流程
  */
 export function api_incidentLog(data){
   return post("/simple/data/fetchDataList/incidentLog", data);

pages.json

@@ -145,19 +145,25 @@
       }
     },
     {
-      "path" : "pages/searchArea/searchArea",
-      "style" : 
-      {
-        "navigationBarTitleText" : "",
-        "enablePullDownRefresh" : false
+      "path": "pages/searchArea/searchArea",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/searchPlace/searchPlace",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
       }
     },
     {
-      "path" : "pages/searchPlace/searchPlace",
-      "style" : 
-      {
-        "navigationBarTitleText" : "",
-        "enablePullDownRefresh" : false
+      "path": "pages/assign/assign",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
       }
     }
   ],

pages/assign/assign.vue

@@ -0,0 +1,978 @@
+<template>
+  <view class="handler">
+    <view class="head">
+      <view class="tab" :class="{active: tab.value === dataInfo.tabActiveValue}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.value)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+    </view>
+    <scroll-view scroll-y class="body page_padding">
+      <!-- 故障处理 -->
+      <template v-if="dataInfo.tabActiveValue === 'direct'">
+        <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" 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.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"><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_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>
+      
+      <!-- 派单 -->
+      <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.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>
+          <uni-data-checkbox class="value" v-model="dataInfo.isAssignUser" :localdata="dataInfo.isAssignUserList" @change="changeIsAssignUser" />
+        </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: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
+        </view>
+        <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>
+    </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 { ref, reactive, computed } from '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 { 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'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const handlerStore = useHandlerStore();
+  const incidentBuildStore = useIncidentBuildStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { uploadFile }  = useUploadFile();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    tabs: [
+      {id: 5, name: '直接处理', value: 'direct', num: ''},
+      {id: 6, name: '派单', value: 'assign', num: ''},
+    ],
+    tabActiveValue: 0,//当前选择的tab
+    incidentId: undefined,//事件ID
+    incidentData: {},//事件对象
+    groupList: [], //工作组列表
+    groupId: undefined, //工作组ID
+    userIdList: [], //延期天数列表
+    userIdId: undefined, //延期天数ID
+    deferralRemark: '',//延期说明
+    summaryObj: {
+      consumableList: [],//耗材列表
+      workHourManagementList: [],//工时列表
+    },//汇总单信息
+    summaryId: undefined,//汇总单Id
+    isNumber: false,//修改数量弹窗
+    evtNumber: 1,//弹窗返回的数量
+    selectData: {},//选择的对象
+    selectType: {},//选择的对象类型
+    handleDescription: '',//解决方案
+    handleCategory: undefined,//处理方式
+    handleCategoryList: [],//处理方式列表
+    closecode: undefined,//关闭代码
+    closecodeList: [],//关闭代码列表
+    handlerImgList: [],//处理图片列表
+    category: {},//故障现象
+    synergetic: [],//协同人员
+    isAssignUser: 1, //工作组是否转派到人
+    isAssignUserList: [
+      { text: '是', value: 1 },
+      { text: '否', value: 0 },
+    ], //工作组是否转派到人选项
+  })
+  
+  // 是否提交
+  const isSubmit = ref(false)
+  
+  // 处理图片
+  const handlerImgRef = ref(null)
+  
+  // 上传处理图片成功
+  function handlerImgSuccess(e){
+    dataInfo.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    console.log(dataInfo.handlerImgList);
+    let requestList = [];
+    
+    // 处理图片
+    dataInfo.handlerImgList.forEach(v => {
+      let handlerOrderImg$ = handlerOrderImg(v);
+      requestList.push(handlerOrderImg$);
+    })
+    
+    // 报修图片
+    dataInfo.incidentData.repairImgList.forEach(v => {
+      let repairOrderImg$ = repairOrderImg(v);
+      requestList.push(repairOrderImg$);
+    })
+    
+    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){
+    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, 'assign');
+    uni.navigateTo({
+      url: `/pages/synergeticAdd/synergeticAdd?incidentId=${dataInfo.incidentId}`
+    })
+  }
+  
+  // 选择故障现象
+  function selectCategory(){
+    handlerStore.setHandlerData(dataInfo, 'assign');
+    uni.navigateTo({
+      url: `/pages/categoryOne/categoryOne?incidentId=${dataInfo.incidentId}`
+    })
+  }
+  
+  // 点击修改数量
+  function numberClick(data, type){
+    if(type === 'editConsumable'){
+      dataInfo.evtNumber = data.consumablesNum;
+    }else if(type === 'editWorkHourManagement'){
+      dataInfo.evtNumber = data.workHourNum2;
+    }
+    
+    dataInfo.isNumber = true;
+    dataInfo.selectData = data;
+    dataInfo.selectType = type;
+  }
+  
+  // 确认修改数量
+  function conformNumber(evtNumber){
+    dataInfo.evtNumber = evtNumber;
+    dataInfo.isNumber = false;
+    addSummaryDoc();
+  }
+  
+  // 移除数量
+  function removeNumber(evtNumber){
+    dataInfo.evtNumber = evtNumber;
+    dataInfo.isNumber = false;
+    removeSummaryDoc();
+  }
+  
+  // 关闭修改数量
+  function cancelNumber(){
+    dataInfo.isNumber = false;
+  }
+  
+  // 修改耗材/工时
+  function addSummaryDoc(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "summaryId": dataInfo.summaryId,
+      "modifyNum": 'edit',
+    };
+    if(dataInfo.selectType === 'editConsumable'){
+      postData.consumableList = [
+        {
+          "consumablesId": dataInfo.selectData.consumableId,
+          "consumablesNum": dataInfo.evtNumber,
+        }
+      ];
+    }else if(dataInfo.selectType === 'editWorkHourManagement'){
+      postData.workHourManagementList = [
+        {
+          "workHourId": dataInfo.selectData.id,
+          "workHourNum": dataInfo.evtNumber,
+        }
+      ];
+    }
+    api_addSummaryDoc(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '修改数量成功',
+          mask: true,
+        });
+        getSummaryList();
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 移除耗材/工时
+  function removeSummaryDoc(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "summaryId": dataInfo.summaryId,
+      "remove": 'remove',
+    };
+    if(dataInfo.selectType === 'editConsumable'){
+      postData.consumableList = [
+        {
+          "consumablesId": dataInfo.selectData.consumableId,
+          "consumablesNum": dataInfo.evtNumber,
+        }
+      ];
+    }else if(dataInfo.selectType === 'editWorkHourManagement'){
+      postData.workHourManagementList = [
+        {
+          "workHourId": dataInfo.selectData.id,
+          "workHourNum": dataInfo.evtNumber,
+        }
+      ];
+    }
+    api_addSummaryDoc(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '移除成功',
+          mask: true,
+        });
+        getSummaryList();
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 重置
+  function reset(){
+    dataInfo.repairTypeList = []; //延期原因列表
+    dataInfo.groupId = undefined; //延期原因ID
+    dataInfo.userIdList = []; //延期天数列表
+    dataInfo.userIdId = 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 === 'direct'){
+      getHandleCategorys();
+      getClosecodes();
+    }else if(dataInfo.tabActiveValue === 'assign'){
+      getGroups();
+    }
+  }
+  
+  // 点击tab
+  function clickTab(tabValue){
+    if(dataInfo.tabActiveValue == tabValue){
+      return;
+    }
+    dataInfo.tabActiveValue = tabValue;
+    isSubmit.value = false;
+    reset();
+    dataInfo.category = dataInfo.incidentData.category || {};
+    dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
+    initForm();
+  }
+  
+  // 选择工作组
+  function changeGroup(){
+    dataInfo.userId = undefined;
+    dataInfo.userList = [];
+    getUsers();
+  }
+  
+  // 选择是否转派到人
+  function changeIsAssignUser(){
+    dataInfo.userId = undefined;
+  }
+  
+  // 获取工作组列表
+  function getGroups(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let postData = {
+      "idx": 0,
+      "sum": 9999,
+      "group": {
+          "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"
+          },
+          "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 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 addConsumable(){
+    uni.navigateTo({
+      url: `/pages/consumableList/consumableList?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}`
+    })
+  }
+  
+  // 添加工时
+  function addWorkHourManagement(){
+    uni.navigateTo({
+      url: `/pages/workHourManagementOne/workHourManagementOne?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}`
+    })
+  }
+  
+  // 提交
+  function submit(){
+    isSubmit.value = true;
+    if(dataInfo.tabActiveValue === 'direct'){
+      submitHandler();
+    }else if(dataInfo.tabActiveValue === 'assign'){
+      submitAssign();
+    }
+  }
+  
+  // 处理提交事件
+  function handlerOrder(){
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    postData.incident.handleDescription = dataInfo.handleDescription;
+    postData.incident.handleCategory = {id: dataInfo.handleCategory};
+    postData.incident.closecode = {id: dataInfo.closecode};
+    postData.incident.category = dataInfo.category;
+    postData.incident.synergetic = dataInfo.synergetic;
+    
+    return api_incidentTask('accept', postData);
+  }
+  
+  // 派单提交事件
+  function assignOrder(){
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    if(dataInfo.userId){
+      // 派人
+      postData.incident.assignee = dataInfo.userId;
+    } else {
+      // 派组
+      postData.incident.candidateGroups = dataInfo.groupId;
+    }
+    
+    return api_incidentTask('accept', postData);
+  }
+  
+  // 处理图片
+  function handlerOrderImg(imgObj){
+    return uploadFile(imgObj, 'incident', dataInfo.incidentId)
+  }
+  
+  // 报修图片
+  function repairOrderImg(imgObj){
+    return uploadFile(imgObj, 'wechatRequesterIncident', dataInfo.incidentId)
+  }
+  
+  // 处理提交
+  function submitHandler(){
+    console.log(dataInfo);
+    if(!dataInfo.handleDescription.trim() && dataInfo.category.hasSimple != 1){
+      uni.showToast({
+      	icon: 'none',
+        title: '请填写解决方案'
+      });
+      return;
+    }
+    
+    if(!dataInfo.category.id && dataInfo.category.hasSimple != 1){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择故障现象'
+      });
+      return;
+    }
+    
+    if(!dataInfo.handleCategory){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择处理方式'
+      });
+      return;
+    }
+    
+    if(!dataInfo.closecode && dataInfo.category.hasSimple != 1){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择关闭代码'
+      });
+      return;
+    }
+    
+    if(!dataInfo.incidentData.duty){
+      uni.showToast({
+      	icon: 'none',
+        title: '您选择的故障现象没有设置责任科室'
+      });
+      return;
+    }
+    console.log(dataInfo.handlerImgList)
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    if(dataInfo.handlerImgList.length){
+      // 有图片
+      let handlerOrder$ = handlerOrder();
+      let requestList = [handlerOrder$];
+      Promise.all(requestList).then(resList => {
+        uni.hideLoading();
+        console.log(resList);
+        if(resList[0].state == 200){
+          dataInfo.incidentId = resList[0].data.id;
+          handlerImgRef.value.upload();
+        }else{
+          uni.showToast({
+            icon: 'none',
+            title: resList[0].msg || '请求数据失败！'
+          });
+        }
+      })
+    }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 || '请求数据失败！'
+          });
+        }
+      })
+    }
+  }
+  
+  // 派单提交
+  function submitAssign(){
+    if(!dataInfo.groupId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择工作组'
+      });
+      return;
+    }
+    
+    if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择指派对象'
+      });
+      return;
+    }
+    
+    if(!dataInfo.incidentData.duty){
+      uni.showToast({
+      	icon: 'none',
+        title: '您选择的故障现象没有设置责任科室'
+      });
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    if(dataInfo.handlerImgList.length){
+      // 有图片
+      let assignOrder$ = assignOrder();
+      let requestList = [assignOrder$];
+      Promise.all(requestList).then(resList => {
+        uni.hideLoading();
+        console.log(resList);
+        if(resList[0].state == 200){
+          dataInfo.incidentId = resList[0].data.id;
+          handlerImgRef.value.upload();
+        }else{
+          uni.showToast({
+            icon: 'none',
+            title: resList[0].msg || '请求数据失败！'
+          });
+        }
+      })
+    }else{
+      // 没有图片
+      let assignOrder$ = assignOrder();
+      let requestList = [assignOrder$];
+      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 || '请求数据失败！'
+          });
+        }
+      })
+    }
+   
+  }
+  
+  onLoad((option) => {
+    // 跳转页面选择了选项
+    if(handlerStore.handler.data){
+      Object.assign(dataInfo, handlerStore.handler.data);
+      console.log(dataInfo)
+      handlerStore.clearHandlerData();
+    }else if(incidentBuildStore.incidentBuild.data){
+      // 初始化
+      dataInfo.incidentData = incidentBuildStore.incidentBuild.data || {};
+      if(dataInfo.incidentData.category){
+        dataInfo.category = dataInfo.incidentData.category;
+      }
+      if(dataInfo.incidentData.priority){
+        dataInfo.incidentData.priority = { id: dataInfo.incidentData.priority };
+      }
+      if(dataInfo.incidentData.source){
+        dataInfo.incidentData.source = { id: dataInfo.incidentData.source };
+      }
+      if(dataInfo.incidentData.requester){
+        dataInfo.incidentData.requester = { id: dataInfo.incidentData.requester }
+      }
+    }
+    
+    dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+    initForm()
+  })
+</script>
+
+<style lang="scss" scoped>
+.handler{
+  height: 100%;
+  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;
+      }
+    }
+  }
+  .body{
+    margin-top: 88rpx;
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    &.bg{
+      background-color: #F7F7F7;
+    }
+    .summaryItem{
+      &:first-of-type{
+        .summaryItem_head{
+          border-bottom: 1rpx solid #DDDDDD;
+        }
+      }
+      .summary_total{
+        padding: 20rpx 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .summaryItem_head{
+        padding: 24rpx;
+        font-size: 26rpx;
+        color: #3A3A3A;
+      }
+      .summaryItem_body{
+        font-size: 30rpx;
+        background-color: #fff;
+        .summaryItem_bodyItem{
+          padding: 24rpx;
+          border-bottom: 1rpx solid #DDDDDD;
+          .summaryItem_bodyItem_top{
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .value{
+              padding-left: 48rpx;
+              flex-shrink: 0;
+            }
+          }
+          .summaryItem_bodyItem_bottom{
+            margin-top: 24rpx;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .name{
+              text-align: right;
+              flex: 1;
+            }
+            .value{
+              width: 240rpx;
+              text-align: right;
+              padding-left: 48rpx;
+              flex-shrink: 0;
+            }
+          }
+        }
+      }
+      .summaryItem_foot{
+        font-size: 30rpx;
+        background-color: #fff;
+        &.total{
+          margin-top: 24rpx;
+        }
+        .summaryItem_foot_total{
+          padding: 24rpx 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        .summaryItem_foot_add{
+          border-top: 1rpx solid #DDDDDD;
+          padding: 24rpx 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .newicon-icon-test{
+            font-size: 30rpx;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+    .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;
+      min-height: 86rpx;
+      &.column{
+        height: auto;
+        flex-direction: column;
+        align-items: flex-start;
+        .title{
+          margin-right: 0;
+        }
+        .value{
+          margin-top: 10rpx;
+          padding-left: 20rpx;
+          box-sizing: border-box;
+        }
+        .tips{
+          padding: 24rpx;
+          text-align: center;
+          font-size: 22rpx;
+          color: #909399;
+          width: 100%;
+          box-sizing: border-box;
+        }
+      }
+      .title{
+        font-size: 26rpx;
+        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;
+      }
+    }
+  }
+}
+</style>

pages/buildIncident/buildIncident.vue

@@ -56,13 +56,13 @@
       </view>
       <view class="form_item_column">
         <view class="form_item">
-          <view class="title"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
+          <view class="title"><text class="required newicon newicon-bitian transparent"></text>报修图片：</view>
           <view class="value">
-            <uni-file-picker ref="handlerImgRef" v-model="incidentData.handlerImgList" limit="3" @success="handlerImgSuccess" @fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete"></uni-file-picker>
+            <uni-file-picker ref="handlerImgRef" v-model="incidentData.repairImgList" 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="title transparent"><text class="required newicon newicon-bitian transparent"></text>报修图片：</view>
           <view class="value">
             <text class="imgTips ellipsis">(支持JPG/PNG格式图片，单张大小10M以内)</text>
           </view>
@@ -116,10 +116,10 @@
     "repairType": undefined,
     "requester":undefined,
     "acceptUser": loginUserStore.loginUser.user,
-    handlerImgList: [],//处理图片列表
+    repairImgList: [],//报修图片列表
   })
   
-  // 处理图片
+  // 报修图片
   const handlerImgRef = ref(null)
   
   // 数据
@@ -133,60 +133,32 @@
   // 是否提交
   const isSubmit = ref(false)
   
-  // 上传处理图片成功
+  // 上传报修图片成功
   function handlerImgSuccess(e){
-    dataInfo.handlerImgList.forEach(v => {
+    incidentData.repairImgList.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 || '请求数据失败！'
-    //     });
-    //   }
-    // })
+    console.log(incidentData.repairImgList);
   }
   
-  // 上传处理图片失败
+  // 上传报修图片失败
   function handlerImgFail(e){
-    dataInfo.handlerImgList.forEach(v => {
+    incidentData.repairImgList.forEach(v => {
       v.url = v.path;
     })
-    console.log(dataInfo.handlerImgList);
+    console.log(incidentData.repairImgList);
   }
   
   // 选择上传图片
   function handlerImgSelect(e){
-    dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
-    console.log(dataInfo.handlerImgList);
+    incidentData.repairImgList = incidentData.repairImgList.concat(e.tempFiles);
+    console.log(incidentData.repairImgList);
   }
   
   // 删除上传图片
   function handlerImgDelete(e){
-    dataInfo.handlerImgList = dataInfo.handlerImgList.filter(v => e.tempFile.uuid != v.uuid);
-    console.log(dataInfo.handlerImgList);
+    incidentData.repairImgList = incidentData.repairImgList.filter(v => e.tempFile.uuid != v.uuid);
+    console.log(incidentData.repairImgList);
   }
   
   // 选择故障现象
@@ -338,7 +310,7 @@
     return api_incidentTask('accept', postData);
   }
   
-  // 处理图片
+  // 报修图片
   function handlerOrderImg(imgObj){
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
@@ -347,7 +319,7 @@
   function submit(){
     isSubmit.value = true;
     console.log(dataInfo);
-    if(!dataInfo.branch){
+    if(!incidentData.branch){
       uni.showToast({
       	icon: 'none',
         title: '请选择院区'
@@ -355,7 +327,7 @@
       return;
     }
     
-    if(!dataInfo.department){
+    if(!incidentData.department){
       uni.showToast({
       	icon: 'none',
         title: '请选择报修科室'
@@ -363,7 +335,7 @@
       return;
     }
     
-    if(!dataInfo.contactsInformation.trim()){
+    if(!incidentData.contactsInformation.trim()){
       uni.showToast({
       	icon: 'none',
         title: '请填写联系电话'
@@ -371,7 +343,7 @@
       return;
     }
     
-    if(!dataInfo.category){
+    if(!incidentData.category){
       uni.showToast({
       	icon: 'none',
         title: '请选择故障现象'
@@ -379,60 +351,57 @@
       return;
     }
     
-    if(!dataInfo.handleDescription.trim()){
+    if(!incidentData.description.trim()){
       uni.showToast({
       	icon: 'none',
         title: '请填写故障描述'
       });
       return;
     }
-    console.log(dataInfo.handlerImgList)
-    incidentBuildStore.setIncidentBuildData(dataInfo, 'buildIncident');
+    console.log(incidentData);
     
-    // uni.showLoading({
-    //   title: "加载中",
-    //   mask: true,
-    // });
-    // 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 || '请求数据失败！'
-    //       });
-    //     }
-    //   })
-    // }
+    // 处理责任科室
+    if(incidentData.category.branchType == 1){
+      // 分院区
+      if(incidentData.branch){
+        var dutyConfig = incidentData.category.branchUserGroups.find(v=>v.branchId == incidentData.branch);
+        if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
+          incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
+        }else{
+          incidentData.duty = undefined;
+        }
+      }else{
+        incidentData.duty = undefined;
+      }
+    }else{
+      // 不分院区
+      incidentData.duty = incidentData.category.dutyDepartment;
+    }
+    
+    incidentData.title = incidentData.category.category;
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    uni.navigateTo({
+      url: '/pages/assign/assign'
+    })
   }
   
   onLoad((option) => {
     if(incidentBuildStore.incidentBuild.data){
       Object.assign(incidentData, incidentBuildStore.incidentBuild.data);
-      incidentBuildStore.clearIncidentBuildData();
+      // incidentBuildStore.clearIncidentBuildData();
       
       // 修改报修科室,则回显楼栋,楼层,详细地址,联系电话
-      incidentData.place = incidentData.department.place || undefined;
-      incidentData.houseNumber = incidentData.department.address || '';
-      incidentData.contactsInformation = incidentData.department.phone || '';
+      if(!incidentData.place){
+        incidentData.place = incidentData.department.place || undefined;
+      }
+      
+      if(!incidentData.houseNumber){
+        incidentData.houseNumber = incidentData.department.address || '';
+      }
+      
+      if(!incidentData.contactsInformation){
+        incidentData.contactsInformation = incidentData.department.phone || '';
+      }
     }
     getBranchs();
     getRequesters();

pages/homePage/homePage.vue

@@ -61,6 +61,7 @@
   }
 
   onLoad((option) => {
+    uni.clearStorageSync();
     wechatLoginEncrypt();
   })
 </script>

pages/my/my.vue

@@ -2,7 +2,7 @@
   <view class="mine">
     <scroll-view scroll-y class="body">
       <view class="top">
-        <view class="top_name">Hi,廖小明</view>
+        <view class="top_name">Hi,{{loginUserStore.loginUser.user.name}}</view>
         <view class="top_count">
           <view class="top_count_item" @click="toIncident('todoingAll', 1543)">
             <view class="name">待接单</view>

pages/synergeticAdd/synergeticAdd.vue

@@ -81,7 +81,6 @@
       idx: dataInfo.idx,
       sum: 20,
       user: {
-        currentDuty: dataInfo.incidentData.duty.id,
         roleData: {
           "rolecode": "first-line support"
         },
@@ -89,6 +88,10 @@
       }
     }
     
+    if(dataInfo.incidentData.duty){
+      postData.user.currentDuty = dataInfo.incidentData.duty.id;
+    }
+    
     api_user(postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();
@@ -114,7 +117,12 @@
     dataInfo.paramData = handlerStore.handler.data || {};
     dataInfo.userSelectedList = dataInfo.paramData.synergetic || [];
     dataInfo.userList = dataInfo.userSelectedList.map(v => v.id);
-    getIncidentDetail();
+    if(dataInfo.incidentId !== 'undefined'){
+      getIncidentDetail();
+    }else{
+      dataInfo.incidentData = handlerStore.handler.data || {};
+      getList(0);
+    }
   }
   
   // 获取事件详情