add:故障报修

CallCenterWeb.UI/RMYY/src/api/faultRepairManagement/faultRepair.js

@@ -5,8 +5,8 @@ import request from '@/utils/request'
 export function getAddRepairbase(params) {
   return request({
     url: 'FaultRepair/AddFaultRepairWorkOrder',
-    method: 'get',
-    params
+    method: 'post',
+    data: params
   })
 }
 // 报修列表
@@ -17,4 +17,49 @@ export function getMaintenancerList(params) {
     params
   })
 }
+// 查收工单
+export function postTaskOrders(params) {
+  return request({
+    url: 'FaultRepair/checkWorkOrder',
+    method: 'post',
+    data: params
+  })
+}
+
+// 退回工单
+export function postBackWorkOrder(params) {
+  return request({
+    url: 'FaultRepair/BackWorkOrder',
+    method: 'post',
+    data: params
+  })
+}
+
+// 协作工单
+export function postAssistWorkOrder(params) {
+  return request({
+    url: 'FaultRepair/AssistWorkOrder',
+    method: 'post',
+    data: params
+  })
+}
+
+// 转派工单
+export function postTransfer(params) {
+  return request({
+    url: 'FaultRepair/Transfer',
+    method: 'post',
+    data: params
+  })
+}
+
+// 完工工单
+export function postDealWorkOrder(params) {
+  return request({
+    url: 'FaultRepair/DealWorkOrder',
+    method: 'post',
+    data: params
+  })
+}
+
 

CallCenterWeb.UI/RMYY/src/permission.js

@@ -4,6 +4,7 @@ import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css'// progress bar style
 import { getToken } from '@/utils/auth' // getToken from localstorage
+import { sort } from 'semver'
 
 NProgress.configure({ showSpinner: false })// NProgress Configuration
 
@@ -20,8 +21,12 @@ router.beforeEach((to, from, next) => {
       next({ path: '/' })
       NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
     } else {
+      if (!store.getters.deptments || store.getters.deptments.length < 1) {
+        store.dispatch('getDeptTree')
+      }
       if (store.getters.menus.length === 0) { // 判断当前用户是否已拉取菜单信息
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
+          
           store.dispatch('GetMenus').then(res => { // 拉取菜单 按钮
             const menuDatas = res.data// 菜单数据
             const buttonDatas = res.authorizeButton// 按钮数据
@@ -30,6 +35,7 @@ router.beforeEach((to, from, next) => {
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
             })
           })
+          
         }).catch((err) => {
           store.dispatch('FedLogOut').then(() => {
             Message.error(err || '获取菜单权限失败，请重新登录！')

CallCenterWeb.UI/RMYY/src/store/getters.js

@@ -22,6 +22,16 @@ const getters = {
   teamId: state => state.user.teamId, // 小组id
   name: state => state.user.name, // 用户姓名
 
+  deptments: state => state.deptment.deptments, // 部门信息
+  deptmap: state => {
+    if (state.deptment.deptmap) {
+      return state.deptment.deptmap
+    } else {
+      return '123'
+    }
+    
+  }, //部门map信息
+
   telIsConnected: state => state.telWebsocket.telIsConnected, // 是否建立话务websocket链接
   telMessageData: state => state.telWebsocket.telMessageData, // 话务 websocket 接收的数据
   telIsLogin: state => state.telWebsocket.telIsLogin, // 是否签入

CallCenterWeb.UI/RMYY/src/store/index.js

@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 import app from './modules/app'
 import serverConfig from './modules/serverConfig'
 import user from './modules/user'
+import deptment from './modules/deptment'
 import telWebsocket from './modules/telWebsocket'
 import tagsView from './modules/tagsView'
 import permission from './modules/permission'
@@ -15,6 +16,7 @@ const store = new Vuex.Store({
     app,
     serverConfig,
     user,
+    deptment,
     telWebsocket,
     tagsView,
     permission

CallCenterWeb.UI/RMYY/src/store/modules/deptment.js

@@ -0,0 +1,64 @@
+import md5 from 'js-md5'
+import { getDeptTree } from '@/api/systemSetup/roleSetting/userManage'
+// import { getToken, setToken, removeToken } from '@/utils/auth'
+// import { Message } from 'element-ui'
+
+const user = {
+    state: {
+        deptments: [],
+        deptmap: {},
+    },
+
+    mutations: {
+        SET_DEPTMENTS: (state, deptments) => {
+            state.deptments = deptments
+        },
+        SET_DEPTMAP:  (state, deptmap) => {
+            state.deptmap = deptmap
+        },
+    },
+
+    actions: {
+        // 获取部门信息
+        getDeptTree({ commit }) {
+            return new Promise((resolve, reject) => {
+                getDeptTree().then(response => {
+                    console.log('获取部门成功')
+                    // window.localStorage.setItem('DEPTMENTS', JSON.stringify(response.data))
+                    var deptMap = getDeptmentMap(response.data, '', {})
+                    commit('SET_DEPTMAP', deptMap)
+                    commit('SET_DEPTMENTS', response.data)
+                    resolve()
+                }).catch(error => {
+                    reject(error)
+                })
+            })
+        },
+    }
+}
+
+
+
+function getDeptmentMap(depts, pName, deptMap) {
+    for (let index = 0; index < depts.length; index++) {
+        const element = depts[index]
+        if (element.TypeId === 1) {
+            if (element.children && element.children.length > 0) {
+                getDeptmentMap(element.children, element.text, deptMap)
+            }
+        } else {
+            const thisName = pName + '/' + element.text
+            if (!deptMap[element.id]) {
+                deptMap[element.id] = thisName
+            }
+
+            if (element.children && element.children.length > 0) {
+                getDeptmentMap(element.children, thisName, deptMap)
+            }
+        } 
+    }
+
+    return deptMap;
+}
+
+export default user

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -33,7 +33,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item style="margin-left:50px;">
-            <el-button type="primary" size="medium">查询</el-button>
+            <el-button type="primary" size="medium" @click="getListTask">查询</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -48,13 +48,36 @@
       <el-table-column prop="F_WorkOrderCode" label="编号" align="center" />
       <el-table-column prop="F_Content" label="报修内容" align="center" min-width />
       <el-table-column prop="F_Phone" label="电话号码" align="center" min-width />
-      <el-table-column prop="T_Wowocodetypename" label="申请科室" align="center" min-width />
+      <el-table-column :formatter="formtDept" prop="F_ApplicationDept" label="申请科室" align="center" min-width />
       <el-table-column prop="F_PlaceOfRepair" label="报修地点" align="center" min-width />
-      <el-table-column prop="T_Woscore" label="工单状态" align="center" min-width />
-      <el-table-column prop="T_Wowocodetypename" label="协作" align="center" min-width />
-      <el-table-column prop="tousercodeusername" label="维修人" align="center" min-width />
-      <el-table-column prop="T_Woscore" label="超时时限" align="center" min-width />
+      <el-table-column prop="StateName" label="工单状态" align="center" min-width />
+      <el-table-column label="协作" align="center" min-width > 
+        <template slot-scope="scope">
+          {{ scope.row.AssistanceState ? scope.row.AssistanceState: '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="维修人" align="center" min-width >
+        <template slot-scope="scope">
+          {{ scope.row.F_Maintenancer ? scope.row.F_Maintenancer: '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="GapTime" label="超时时限" align="center" min-width />
       <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width />
+      <el-table-column
+            label="操作"
+            width="160"
+            align="center"
+            class-name="oparate_btn"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" v-if="isShowButton(scope.row, '接单')" @click="takeOrders(scope.row.F_WorkOrderCode)">接单</el-button>
+              <el-button type="text" v-if="isShowButton(scope.row, '退回')" @click="backOrder(scope.row.F_WorkOrderCode)">退回</el-button>
+              <el-button type="text" v-if="isShowButton(scope.row, '协作')" @click="cooperation(scope.row.F_WorkOrderCode)">协作</el-button>
+              <el-button type="text" v-if="isShowButton(scope.row, '转派')" @click="redeploy(scope.row.F_WorkOrderCode)">转派</el-button>
+              <el-button type="text" v-if="isShowButton(scope.row, '完成')" @click="doneWorkOrder(scope.row.F_WorkOrderCode)">完成</el-button>
+            </template>
+          </el-table-column>
     </el-table>
     <pagination
       v-show="pageParams.total > 0"
@@ -64,20 +87,141 @@
       class="pagination"
       @pagination="getListTask"
     />
+    
+    <el-dialog title="退回" :visible.sync="dialogBackOrder">
+      <el-form :model="backOrderForm">
+        
+         <el-form-item label="退回原因">
+          <el-input type="textarea" v-model="backOrderForm.BackReason"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogBackOrder = false">取 消</el-button>
+        <el-button type="primary" @click="postBackOrder">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="协作" :visible.sync="dialogCooperation">
+      <el-form :model="cooperationForm" :rules="rules" label-width="100px">
+        <el-form-item label="协作方式" prop="type">
+          <el-radio-group v-model="cooperationForm.type">
+            <el-radio label="0">内部协作</el-radio>
+            <el-radio label="1">外部协作</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="工单类别" prop="workOrderCategory" v-model="cooperationForm.workOrderCategory">
+              <select-order-typeTwo :second-order-type="secondOrderType" @post-second-order-type="getSecondOOrderType"/>
+        </el-form-item>
+        <el-form-item label="说明信息">
+            <el-input v-model="cooperationForm.content" :autosize="{ minRows: 4, maxRows: 8}" show-word-limit maxlength="100" type="textarea" placeholder="请输入说明信息"/>
+        </el-form-item>
+        <el-form-item label="协作人" prop="maintenancer" v-show="cooperationForm.type == '0'">
+          <el-select v-model="cooperationForm.maintenancer" placeholder="请选择协作人">
+            <el-option v-for="item in deptUsers" :key="item.usercode"
+                  :label="item.username"
+                  :value="item.usercode"></el-option>
+            
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogCooperation = false">取 消</el-button>
+        <el-button type="primary" @click="postCooperationOrder">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="转派" :visible.sync="dialogredeploy">
+      <el-form :model="redeployForm" :rules="rules" label-width="100px">
+
+        <el-form-item label="维修员信息" prop="maintenancer">
+          <el-select v-model="redeployForm.toUserCode" placeholder="请选择维修员信息">
+            <el-option v-for="item in deptUsers" :key="item.usercode"
+                  :label="item.username"
+                  :value="item.usercode"></el-option>
+            
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogredeploy = false">取 消</el-button>
+        <el-button type="primary" @click="postRedeployOrder">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="完工" :visible.sync="dialogDone">
+      <el-form :model="doneForm" :rules="rules" label-width="100px">
+        <el-form-item label="完成情况" prop="type">
+          <el-radio-group v-model="doneForm.type">
+            <el-radio label="0">正常完成</el-radio>
+            <el-radio label="1">异常完成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="完成说明">
+            <el-input v-model="doneForm.result" :autosize="{ minRows: 4, maxRows: 8}" show-word-limit maxlength="100" type="textarea" placeholder="请输入完成说明"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogDone = false">取 消</el-button>
+        <el-button type="primary" @click="postDoneOrder">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
+
+  
 </template>
 
 <script>
 import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-import { getMaintenancerList } from '@/api/faultRepairManagement/faultRepair'
+import { GetPerson } from '@/api/commonAPI'
+import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
+import { getMaintenancerList, postTaskOrders, postBackWorkOrder, postAssistWorkOrder, postTransfer, postDealWorkOrder } from '@/api/faultRepairManagement/faultRepair'
 export default {
   name: 'RepairList',
   components: {
-    Pagination
+    Pagination,
+    selectOrderTypeTwo
   },
   data() {
     return {
+      secondOrderType: {
+        typeid: 2,
+        pid: 3000
+      },
       state: 0,
+      dialogDone: false,
+      doneForm: {
+         workordercode: '',
+         type: 0,
+         result: '',
+      },
+      dialogredeploy: false,
+      redeployForm: {
+        workordercode: '',
+        toUserCode: '',
+      },
+      rules: {
+          type: [
+            { required: true, message: '请选择活动资源', trigger: 'change' }
+          ],
+          workOrderCategory: [
+            { required: true, message: '请选择工单类别', trigger: 'change' }
+          ],
+          maintenancer: [
+            { required: true, message: '请选择协作人', trigger: 'change' }
+          ],
+      },
+      dialogCooperation: false,
+      cooperationForm: {
+        workordercode: '',
+        workOrderCategory: 0,
+        type: '0',
+        content: '',
+        maintenancer: ''
+      },
+      dialogBackOrder: false,
+      backOrderForm: {
+        workordercode: '',
+        BackReason: '',
+      },
       activeName: '0',
       repairman: '', // 姓名
       rpairmanphone: '', // 电话
@@ -88,20 +232,187 @@ export default {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
         total: 0 // 总共多少数据
-      }
+      },
+      deptUsers:[],
+      deptments: [],
     }
   },
   computed: {},
   created() {
     this.getListTask()
+    
   },
   mounted() {
   },
   methods: {
+    formtDept(row, column) {
+      return this.$store.getters.deptmap[row[column.property].trim()]
+    },
+    isShowButton(row, name) { // 显示按钮
+      var show = false
+      if (row.Buttons && row.Buttons.length >0 && row.Buttons.findIndex((o)=> {return o.text === name}) >=0) {
+        show = true
+      }
+
+      return show
+    },
+    doneWorkOrder(code) {
+      this.dialogDone = true
+      this.doneForm.workordercode = code
+    },
+    postDoneOrder() { // 完工
+      new Promise((resolve) => {
+        const params = this.doneForm
+        postDealWorkOrder(params).then((response) => {
+          if (response.state === 'success') {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.dialogDone = false;
+          } else {
+            this.$message({
+              type: 'info',
+              message: response.message
+            });  
+          }
+        })
+        resolve()
+      })     
+    },
+    redeploy(code) {
+      this.getRepairman()
+      this.dialogredeploy = true
+      this.redeployForm.workordercode = code
+
+    },
+    postRedeployOrder() { // 转派
+      new Promise((resolve) => {
+        const params = this.redeployForm
+        postTransfer(params).then((response) => {
+          if (response.state === 'success') {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.dialogredeploy = false;
+          } else {
+            this.$message({
+              type: 'info',
+              message: response.message
+            });  
+          }
+        })
+        resolve()
+      })     
+    },
+    postCooperationOrder() { // 协作
+      new Promise((resolve) => {
+        const params = this.cooperationForm
+        postAssistWorkOrder(params).then((response) => {
+          if (response.state === 'success') {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.dialogCooperation = false;
+          } else {
+            this.$message({
+              type: 'info',
+              message: response.message
+            });  
+          }
+        })
+        resolve()
+      })      
+    },
+    // 获取申请人数据
+    getRepairman() {
+      const deptid = this.$store.getters.teamId
+      return new Promise((resolve) => {
+        const params = {
+          deptid,
+        }
+        GetPerson(params).then((res) => {
+          if (res.state === 'success') {
+            this.deptUsers = res.rows
+          }
+        })
+        resolve()
+      })
+    },
+    getSecondOOrderType(data) {
+      this.cooperationForm.workOrderCategory = data.value
+    },
     handleClick(res) {
-      this.state = Number(res.index)
+      this.state = Number(res.name)
+      this.getListTask()
+    },
+    cooperation(code) {
+      this.dialogCooperation = true;
+      this.cooperationForm.workordercode = code
+      this.getRepairman()
+    },
+    postBackOrder() { // 退回
+      new Promise((resolve) => {
+        const params = this.backOrderForm
+        postBackWorkOrder(params).then((response) => {
+          if (response.state === 'success') {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.dialogBackOrder = false;
+          } else {
+            this.$message({
+              type: 'info',
+              message: response.message
+            });  
+          }
+        })
+        resolve()
+      })
+    },
+    backOrder(code) { // 退回弹框
+      this.dialogBackOrder = true
+      this.backOrderForm.workordercode = code
+    },
+    takeOrders(code) { // 接单
+      this.$confirm('确认接受该工单吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          
+          new Promise((resolve) => {
+            const params = { 
+              workordercode: code,
+            }
+            postTaskOrders(params).then((response) => {
+              if (response.state === 'success') {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                });
+              } else {
+                this.$message({
+                  type: 'info',
+                  message: response.message
+                });  
+              }
+
+            })
+            resolve()
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
     },
     getListTask() {
+      this.taskDataLists = []
       return new Promise((resolve) => {
         const params = {
           page: this.pageParams.pageindex, // 第几页
@@ -114,9 +425,11 @@ export default {
           workordercode: this.workOrderId
         }
         getMaintenancerList(params).then((response) => {
+          this.pageParams.total = response.total
           if (response.rows.length > 0) {
             this.taskDataLists = response.rows
           }
+          
         })
         resolve()
       })
@@ -125,8 +438,8 @@ export default {
 }
 </script>
 
-<style scoped>
-.el-tabs__item {
+<style rel="stylesheet/scss" lang="scss" scoped>
+/deep/.el-tabs__item {
   width: 185px !important;
   text-align: center;
   font-size: 16px !important;

CallCenterWeb.UI/RMYY/src/views/login/index.vue

@@ -171,9 +171,10 @@ export default {
           this.loading = true
           this.$store.dispatch('Login', this.loginForm)
             .then(() => {
-              debugger
+              
               this.$message.success('登录成功')
               this.loading = false
+             
               this.$router.push({
                 path: '/'
               })

CallCenterWeb.UI/RMYY/static/config/serverConfig.json

@@ -1,6 +1,6 @@
 {
   "NODE_ENV": "development",
-  "BASE_API": " http://192.168.1.37:8000/",
+  "BASE_API": " http://192.168.8.10:8033/",
  
   "SOCKET_IP": "192.168.8.7",
   "SOCKET_PORT": "8081",