换人处理

http/api.js

@@ -75,4 +75,46 @@ export function api_wechatRequesterIncident(data){
  */
 export function api_callrecord(data){
   return post("/bpm/data/fetchDataList/callrecord", data);
+}
+
+/**
+ * 获取工作组列表
+ */
+export function api_group(data){
+  return post("/user/data/fetchDataList/group", data);
+}
+
+/**
+ * 获取人员列表
+ */
+export function api_user(data){
+  return post("/user/data/fetchDataList/user", data);
+}
+
+/**
+ * 获取院区列表
+ */
+export function api_branch(data){
+  return post("/user/data/fetchDataList/branch", data);
+}
+
+/**
+ * 获取责任科室列表
+ */
+export function api_dutyDepartment(data){
+  return post("/user/data/fetchDataList/dutyDepartment", data);
+}
+
+/**
+ * 获取事件详情
+ */
+export function api_incidentDetail(data){
+  return get("/simple/data/fetchData/incident/" + data);
+}
+
+/**
+ * 转派
+ */
+export function api_incidentTask(type, data){
+  return post("/flow/incident/task/" + type, data);
 }

interceptor/routeInterceptor.js

@@ -3,7 +3,8 @@ const loginUserStore = useLoginUserStore()
 
 let repaireRouterList = [
     "/pages/homePage/homePage", //登录页
-    "/pages/repairEntrance/repairEntrance", //绑定工号
+    "/pages/initBind/initBind", //绑定工号
+    "/pages/repairEntrance/repairEntrance", //报修入口页
   ]
   let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
   //用遍历的方式分别为uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器
@@ -12,7 +13,7 @@ let repaireRouterList = [
       invoke(e) {
         // 调用前拦截
         const url = e.url.split('?')[0];
-        // 报修人不可以访问除了登录页,绑定工号页的其他页面
+        // 报修人不可以访问除了登录页,绑定工号页,报修入口页的其他页面
         if (!repaireRouterList.includes(url) && loginUserStore.loginUser.user && loginUserStore.loginUser.user
           .engineer !== 1) {
           uni.reLaunch({

pages.json

@@ -33,15 +33,7 @@
       }
     },
     {
-      "path": "pages/index/index",
-      "style": {
-        "h5": {
-          "titleNView": false
-        }
-      }
-    },
-    {
-      "path": "pages/repairList/repairList",
+      "path": "pages/my/my",
       "style": {
         "h5": {
           "titleNView": false
@@ -49,7 +41,7 @@
       }
     },
     {
-      "path": "pages/my/my",
+      "path": "pages/changeUser/changeUser",
       "style": {
         "h5": {
           "titleNView": false

pages/changeUser/changeUser.vue

@@ -0,0 +1,661 @@
+<template>
+  <view class="changeUser">
+    <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">
+      <!-- 转派 -->
+      <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>
+        </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: isSubmmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
+        </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.branchId" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" @change="changeBranch" :class="{formRed: isSubmmit && !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>
+        </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>
+        <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: isSubmmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
+        </view>
+      </template>
+      
+      <!-- 退回 -->
+      <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()}" />
+          <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>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useGoBack } from '@/share/useGoBack.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    tabs: [
+      // {id: 1, name: '转派', value: 'redeploy', num: ''},
+      // {id: 2, name: '指派', value: 'assign', num: ''},
+      // {id: 3, name: '升级', value: 'upgrade', num: ''},
+      // {id: 4, name: '退回', value: 'reassign', num: ''},
+    ],
+    tabActiveValue: 0,//当前选择的tab
+    incidentId: undefined,//事件ID
+    incidentData: {},//事件对象
+    groupList: [], //工作组列表
+    groupId: undefined, //工作组ID
+    userList: [], //用户列表
+    userId: undefined, //用户ID
+    branchList: [], //院区列表
+    branchId: undefined, //院区ID
+    dutyList: [], //责任科室列表
+    dutyId: undefined, //责任科室ID
+    isAssignUser: 1, //工作组是否转派到人
+    isAssignUserList: [
+      { text: '是', value: 1 },
+      { text: '否', value: 0 },
+    ], //工作组是否转派到人选项
+    reassignRemark: '',//退回原因
+  })
+  
+  // 是否提交
+  const isSubmmit = ref(false)
+  
+  // 重置
+  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 = '';
+  }
+  
+  // 初始化表单
+  function initForm(){
+    if(dataInfo.tabActiveValue === 'redeploy'){
+      getGroups();
+    }else if(dataInfo.tabActiveValue === 'assign'){
+      getBranchs();
+    }
+  }
+  
+  // 点击tab
+  function clickTab(tabValue){
+    if(dataInfo.tabActiveValue == tabValue){
+      return;
+    }
+    dataInfo.tabActiveValue = tabValue;
+    isSubmmit.value = false;
+    reset();
+    initForm()
+  }
+  
+  // 获取事件详情
+  function getIncidentDetail(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+
+    api_incidentDetail(dataInfo.incidentId).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        dataInfo.incidentData = res.data || {};
+        let transferFlag = false;//转派权限
+        let assignFlag = false;//指派权限
+        for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
+            if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
+                assignFlag = true
+            }
+            if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_transfer") {
+                transferFlag = true
+            }
+        }
+        
+        // 转派
+        if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id && !assignFlag && transferFlag){
+          dataInfo.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
+        }
+        
+        // 指派
+        if((dataInfo.incidentData.state.value == 'pending' || dataInfo.incidentData.state.value == 'handler' || dataInfo.incidentData.state.value == 'reassign') && assignFlag){
+          let index = dataInfo.tabs.findIndex(v => v.value === 'reassign');
+          if(index < 0){
+            dataInfo.tabs = [{id: 1, name: '指派', value: 'assign', num: ''}];
+          }else{
+            dataInfo.tabs.splice(index, 0, {id: 1, name: '指派', value: 'assign', num: ''});
+          }
+        }
+        
+        // 退回
+        if(dataInfo.incidentData.state.value == 'pending' || dataInfo.incidentData.state.value == 'handler'){
+          if(dataInfo.tabs.length){
+            dataInfo.tabs.splice(dataInfo.tabs.length, 0, {id: 4, name: '退回', value: 'reassign', num: ''});
+          }else{
+            dataInfo.tabs = [{id: 4, name: '退回', value: 'reassign', num: ''}];
+          }
+        }
+        
+        dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+        
+        initForm()
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取院区列表
+  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 === 'redeploy'){
+      submmitRedeploy();
+    }else if(dataInfo.tabActiveValue === 'assign'){
+      submmitAssign();
+    }else if(dataInfo.tabActiveValue === 'reassign'){
+      submmitReassign();
+    }
+  }
+  
+  // 转派提交
+  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,
+    });
+    
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    if(dataInfo.userId){
+      // 派人
+      postData.incident.assignee = dataInfo.userId;
+    } else {
+      // 派组
+      postData.incident.candidateGroups = dataInfo.groupId;
+    }
+    
+    api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
+      uni.hideLoading();
+      if(res.state == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '转派成功',
+          mask: true,
+          complete: () => {
+            setTimeout(() => {
+              uni.reLaunch({
+                url: '/pages/incidentList/incidentList',
+              })
+            }, 1500)
+          }
+        });
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 指派提交
+  function submmitAssign(){
+    if(!dataInfo.branchId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择院区'
+      });
+      return;
+    }
+    
+    if(!dataInfo.dutyId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择责任科室'
+      });
+      return;
+    }
+    
+    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,
+    });
+    
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    if(dataInfo.userId){
+      // 派人
+      postData.incident.assignee = dataInfo.userId;
+    } else {
+      // 派组
+      postData.incident.candidateGroups = dataInfo.groupId;
+    }
+    
+    api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
+      uni.hideLoading();
+      if(res.state == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '指派成功',
+          mask: true,
+          complete: () => {
+            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,
+          complete: () => {
+            setTimeout(() => {
+              uni.reLaunch({
+                url: '/pages/incidentList/incidentList',
+              })
+            }, 1500)
+          }
+        });
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    getIncidentDetail();
+  })
+</script>
+
+<style lang="scss" scoped>
+.changeUser{
+  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;
+    .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;
+    padding: 0 24rpx;
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    .form_item{
+      display: flex;
+      align-items: center;
+      padding-top: 24rpx;
+      height: 86rpx;
+      &.column{
+        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;
+        &.select{
+          width: calc(5em + 20rpx);
+        }
+      }
+    }
+  }
+}
+</style>

pages/incidentList/incidentList.vue

@@ -40,10 +40,10 @@
             <view class="name" @click="makePhoneCall(data.contactsInformation)">联系电话：{{data.contactsInformation}}<uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></view>
             <text class="date">{{formatDate(data.startDate, 'MM-dd HH:mm')}}</text>
           </view>
-          <view class="btns" v-if="data.state.value === 'pending' || data.state.value === 'handler'">
-            <button @click="handler('changeUser')" type="default" class="primaryButton btn">换人处理</button>
-            <button @click="handler('handler')" type="default" class="primaryButton btn" v-if="data.state.value === 'handler'">处理</button>
-            <button @click="handler('receive')" type="default" class="primaryButton btn" v-if="data.state.value === 'pending'">接单</button>
+          <view class="btns">
+            <button @click="handler('changeUser', data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && assignFlag)">换人处理</button>
+            <button @click="handler('handler', data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'handler'">处理</button>
+            <button @click="handler('receive', data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'pending'">接单</button>
           </view>
         </view>
       </view>
@@ -82,6 +82,8 @@
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+  const assignFlag = ref(false);//指派权限
+  
   // 数据
   const dataInfo = reactive({
     tabs: [{id: 0, name: '全部', value: 'all', num: ''}],
@@ -156,9 +158,9 @@
   }
   
   // 处理按钮
-  function handler(type){
+  function handler(type, incidentId){
     uni.navigateTo({
-      url: `/pages/${type}/${type}`
+      url: `/pages/${type}/${type}?incidentId=${incidentId}`
     })
   }
   
@@ -202,7 +204,7 @@
       uni.stopPullDownRefresh();
       if(res.status == 200){
         let list = res.list || [];
-        list = list.map(v => ({...v, ...{reqAttachment: true, callID:123}}))//模拟
+        list = list.map(v => ({...v, ...{callID:123}}))//模拟
         if(list.length){
           dataInfo.hasMore = true;
           dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
@@ -283,6 +285,11 @@
   }
   
   onLoad((option) => {
+    for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
+        if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
+            assignFlag.value = true;
+        }
+    }
     getTabs();
   })
   

pages/index/index.vue

@@ -1,19 +0,0 @@
-<template>
-  <view>
-    首页
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        
-      };
-    }
-  }
-</script>
-
-<style lang="scss">
-
-</style>

pages/initBind/initBind.vue

@@ -1,6 +1,6 @@
 <template>
-  <view class="repairEntrance page_padding">
-    <view class="info">
+  <view class="repairEntrance">
+    <view class="info page_padding">
       <view class="info_text">
         <view class="text_left text_justify">您还没有绑定工号，请填写您的工号进行绑定。</view>
       </view>
@@ -8,11 +8,13 @@
         <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 && isSubmmit ? '#f00' : ''}" :primaryColor="primaryColor" />
+            :styles="{borderColor: !postData.account.trim() && isSubmmit ? '#f00' : ''}" :primaryColor="primaryColor" />
         </view>
       </view>
     </view>
-    <button @click="bind" type="default" class="primaryButton bind">绑定</button>
+    <view class="foot_common_btns">
+      <button @click="bind" type="default" class="primaryButton btn">绑定</button>
+    </view>
   </view>
 </template>
 
@@ -48,13 +50,10 @@
    */
   function bind() {
     isSubmmit.value = true;
-    if(!postData.account){
-      uni.showModal({
-        title: '提示',
-        content: `请填写工号`,
-        showCancel: false,
-        confirmColor: defaultColor,
-        confirmText: '取消',
+    if(!postData.account.trim()){
+      uni.showToast({
+      	icon: 'none',
+        title: '请填写工号'
       });
       return;
     }
@@ -153,10 +152,5 @@
         }
       }
     }
-
-    .bind {
-      width: 100%;
-      margin-bottom: 24rpx;
-    }
   }
 </style>

pages/repairEntrance/repairEntrance.vue

@@ -1,12 +1,14 @@
 <template>
-  <view class="repairEntrance page_padding">
-    <view class="info">
+  <view class="repairEntrance">
+    <view class="info page_padding">
       <view class="info_text">
         <view class="text_left text_justify">您没有报修处理权限，如需要请联系管理员。</view>
       </view>
       <view class="info_tips text_center">如您需要报修点击<text class="info_primary">"进入报修”</text></view>
     </view>
-    <button @click="goToRepair" type="default" class="primaryButton goToRepair">进入报修</button>
+    <view class="foot_common_btns">
+      <button @click="goToRepair" type="default" class="primaryButton btn">进入报修</button>
+    </view>
   </view>
 </template>
 
@@ -47,9 +49,5 @@
         }
       }
     }
-    .goToRepair{
-      width: 100%;
-      margin-bottom: 24rpx;
-    }
   }
 </style>

pages/repairList/repairList.vue

@@ -1,19 +0,0 @@
-<template>
-  <view>
-    我的报修
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        
-      };
-    }
-  }
-</script>
-
-<style lang="scss">
-
-</style>

share/useGoback.js

@@ -0,0 +1,12 @@
+export function useGoBack() {
+  /**
+   * 返回
+   */
+  const goBack = () => {
+    uni.navigateBack();
+  }
+  
+  return {
+    goBack
+  }
+}

static/scss/common.scss

@@ -2,7 +2,7 @@
 page{
   background-color: #fff;
   color: #000;
-  height: calc(100vh - 50px);
+  height: 100vh;
 }
 
 uni-toast,
@@ -30,13 +30,34 @@ uni-toast,
   text-align: justify;
 }
 
-// 按钮
+// 按钮样式-绿色
 .primaryButton{
   color: #fff!important;
   background-color: $uni-primary!important;
   border-color: $uni-primary!important;
 }
 
+// 按钮样式-灰色
+.cancelButton{
+  color: #fff!important;
+  background-color: $uni-info!important;
+  border-color: $uni-info!important;
+}
+
+// 底部按钮
+.foot_common_btns{
+  width: 100%;
+  box-sizing: border-box;
+  margin-bottom: 24rpx;
+  padding: 0 24rpx;
+  display: flex;
+  align-items: center;
+  gap: 24rpx;
+  .btn{
+    flex: 1;
+  }
+}
+
 // 必填标识
 .required{
   color: #f00;
@@ -96,3 +117,16 @@ uni-toast,
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+// 透明
+.transparent{
+  opacity: 0;
+}
+
+// 下拉框边框红色
+.formRed{
+  .uni-select,
+  .uni-easyinput__content{
+    border: 1px solid red!important;
+  }
+}