1

CallCenterWeb.UI/RMYY/src/api/vehicleDispatch/driver.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+// 获取
+export function getDriverList(params) {
+  return request({
+    url: 'T_Car_WorkOrder/GetCarList',
+    method: 'get',
+    params
+  })
+}
+// 撤回
+export function getWithdrawWorkOrder(params) {
+  return request({
+    url: 'T_Car_WorkOrder/WithdrawWorkOrder',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/RMYY/src/api/vehicleDispatch/vehicleScheduling.js

@@ -1,5 +1,20 @@
 import request from '@/utils/request'
-
+// 获取车辆
+export function getCarList(params) {
+  return request({
+    url: 'T_Car_Message/GetAllCar',
+    method: 'get',
+    params
+  })
+}
+// 获取司机
+export function getCarUserList(params) {
+  return request({
+    url: 'T_Car_WorkOrder/GetUserList',
+    method: 'get',
+    params
+  })
+}
 // 获取列表数据
 export function getList(params) {
   return request({

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/driverOrder/index.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input clearable v-model="ordercode" placeholder="请输入工单编号" class="filter-item" />
+      <el-input clearable v-model="carname" placeholder="请输入车辆名称" class="filter-item" />
+      <el-input clearable v-model="drivername" placeholder="请输入司机名称" class="filter-item" />
+      <el-date-picker v-model="startTime" size="medium" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      <el-button type="primary" class="filter-item" @click="btn_search">搜索</el-button>
+    </div>
+    <el-table v-loading="loading" :data="dataLists" border stripe>
+      <el-table-column :show-overflow-tooltip="true" prop="F_WorkOrderCode" label="工单编号" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_CarName" label="车辆信息" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_DriverName" label="司机" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_DepartPlace" label="出发地" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_Destination" label="目的地" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_CreateTime" label="创建时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_CloseTime" label="完工时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_State" label="状态" align="center" />
+      <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="btn_withdraw(scope.row.F_ID)">撤回</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
+  </div>
+</template>
+<script>
+  import {
+    getDriverList,
+    getWithdrawWorkOrder
+  } from '@/api/vehicleDispatch/driver'
+  import Pagination from '@/components/context/Pagination'
+
+  export default {
+    name: 'DriverOrer',
+    components: {
+      Pagination
+    },
+    data() {
+      return {
+        loading: false,
+        keyword: '',
+        ordercode: '',
+        carname: '',
+        drivername: '',
+        startTime: '',
+        pageParams: {
+          pageindex: 1, //Number(this.$store.getters.serverConfig.PAGESIZE)
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
+          total: 0
+        },
+        dataLists: []
+      }
+    },
+    created() {
+      this.getList()
+      document.onkeyup = (e) => {
+        if (e.keyCode === 13) {
+          this.getList()
+        }
+      }
+    },
+    methods: {
+      getList() {
+        // this.loading = true
+        return new Promise((resolve) => {
+          const params = {
+            pageindex: this.pageParams.pageindex, // 第几页
+            pagesize: this.pageParams.pagesize, // 每页几条信息
+            stime: this.searchDate && this.searchDate[0],
+            etime: this.searchDate && this.searchDate[1],
+            WorkOrderCode: this.ordercode,
+            carname: this.carname,
+            driverName: this.drivername,
+            state: ''
+          }
+          getDriverList(params).then((response) => {
+            this.loading = false
+            if (response.rows.length >= 0) {
+              this.pageParams.total = response.tatal
+              this.dataLists = response.rows
+            }
+          })
+          resolve()
+        })
+      },
+      btn_search() {
+        this.pageParams.pageindex = 1
+        this.getList()
+      },
+      btn_withdraw(id) {
+        const params = {
+          orderid: id
+        }
+        this.$confirm('您确定要撤回吗?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            getWithdrawWorkOrder(params).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getList()
+                this.$message.success('撤回成功!')
+              }
+            })
+          })
+          .catch(() => {
+            this.$message('已取消撤回')
+          })
+      },
+    }
+  }
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/distribution.vue

@@ -0,0 +1,141 @@
+<template>
+  <div v-loading="loading">
+    <el-table :data="selectarr" border stripe>
+      <el-table-column type="index" width="100" label="序号" align="center">
+      </el-table-column>
+      <el-table-column prop="F_WorkOrderCode" label="工单号" align="center" />
+      <el-table-column prop="F_Content" label="工单内容" align="center" />
+      <el-table-column prop="F_DepartPlace" label="出发地" align="center" />
+      <el-table-column prop="F_Destination" label="目的地" align="center" />
+      <el-table-column prop="F_UseTime" label="用车时间" align="center" />
+    </el-table>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
+      <el-col :span="24">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="车辆" prop="carid">
+              <el-select v-model="ruleForm.carid" style="width: 100%;">
+                <el-option v-for="(item,index) in carArr" :key="index" :label="item.carname" :value="item.carid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="司机" prop="driver">
+              <el-select v-model="ruleForm.driver" style="width:100%;">
+                <el-option v-for="item in repairman" :key="item.usercode" :label="item.username"
+                  :value="item.usercode" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item>
+          <el-button type="primary" @click='onsub'>保存</el-button>
+        </el-form-item>
+      </el-col>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import {
+    getCarList,
+    getCarUserList,
+    getAssignWorkOrder
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import {
+    getOrderTypeList
+  } from "@/api/commonAPI.js"
+  import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
+  import {
+    getCartype
+  } from "@/api/vehicleDispatch/vehicleManagement";
+  import {
+    GetPerson
+  } from '@/api/commonAPI'
+  export default {
+    name: "Distribution",
+    props: {
+      layerid: {
+        type: String,
+        default: "",
+      },
+      selectids: {
+        type: Array,
+        default: []
+      },
+      selectarr: {
+        type: Array,
+        default: []
+      }
+    },
+    data() {
+      return {
+        typeList: [],
+        carArr: [],
+        repairman: [], // 申请人数据
+        hospitalsParam: {
+          id: 0,
+          name: ''
+        },
+        departmentsParam: {
+          id: 0,
+          name: ''
+        },
+        repairmanParam: {
+          id: 0,
+          name: ''
+        },
+        rules: {},
+        ruleForm: {
+          carid: '',
+          driver: ''
+        },
+        deptid: [],
+        loading: false,
+      };
+    },
+    created() {
+      this.getVehicleLists() //车辆arr
+      this.getVehicleUserLists() //司机arr
+    },
+    methods: {
+      getVehicleLists() {
+        const params = {
+          state: 0
+        }
+        getCarList(params).then(res => {
+          this.carArr = res.rows
+        })
+      },
+      getVehicleUserLists() {
+        const params = {
+          rolecode: 'SJ'
+        }
+        getCarUserList(params).then(res => {
+          this.repairman = res.rows
+        })
+      },
+      onsub() {
+        const params = {
+          orderid: this.selectids.toString(),
+          driver: this.ruleForm.driver,
+          carid: this.ruleForm.carid
+        }
+        getAssignWorkOrder(params).then(res => {
+          if (res.state == 'success') {
+            this.$parent.$layer.close(this.layerid);
+            this.$message.success('分配成功')
+            this.$parent.getList()
+          }
+        })
+      },
+      resetForm() {
+        this.$refs.ruleForm.resetFields();
+      },
+    },
+  };
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <!-- <el-input v-model="keyword" placeholder="请输入关键词" class="filter-item" /> -->
+      <el-input clearable v-model="ordercode" placeholder="请输入工单编号" class="filter-item" />
       <el-select clearable v-model="type" placeholder="请选择工单类型" size="medium">
         <el-option v-for="item in typeList" :key="item.fid" :label="item.fname" :value="item.fid">
         </el-option>
@@ -9,6 +9,7 @@
       <el-date-picker v-model="startTime" size="medium" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
         range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-button type="primary" class="filter-item" size="medium" @click="btn_search">搜索</el-button>
+      <el-button type="primary" class="filter-item" size="medium" @click='btn_distribute'>批量分配</el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="全部" name="-1" />
@@ -16,8 +17,9 @@
       <el-tab-pane label="已分配" name="1" />
       <el-tab-pane label="已完成" name="10" />
     </el-tabs>
-    <el-table v-loading="loading" :data="dataLists" border stripe>
-      <el-table-column type="index" label="编号" align="center" fixed width="80" />
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55">
+      </el-table-column>
       <el-table-column prop="F_WorkOrderCode" label="工单编号" align="center" min-width="110">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_ID,scope.row.F_WorkOrderCode)">
@@ -50,11 +52,10 @@
       </el-table-column>
       <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button size="mini" type="text"
-            @click="btn_edit(scope.row.F_ID,scope.row.F_WorkOrderCode)">编辑</el-button>
+          <el-button size="mini" type="text" @click="btn_edit(scope.row.F_ID,scope.row.F_WorkOrderCode)">编辑</el-button>
           <el-button size="mini" type="text" @click="btn_delete(scope.row.F_WorkOrderCode)">删除
           </el-button>
-          <el-button size="mini" type="text">分配</el-button>
+          <el-button size="mini" type="text" @click="btn_fenpei(scope.row.F_WorkOrderCode,scope.row)">分配</el-button>
           <el-button size="mini" type="text">撤回</el-button>
           <!-- <el-button v-permission="'btnAssign'" v-if="scope.row.F_State==0" size="mini" type="text"
             @click="btn_assign(scope.row.F_ID)">派车
@@ -86,7 +87,7 @@
   import addOrEdit from './components/addOrEdit'
   import detail from './components/detail'
   import assign from './components/assign.vue'
-
+  import distribution from './components/distribution.vue'
   import Pagination from '@/components/context/Pagination'
 
   export default {
@@ -98,7 +99,7 @@
       return {
         activeName: '-1',
         loading: false,
-        keyword: '',
+        ordercode: '',
         state: '-1',
         typeList: [],
         type: '',
@@ -108,7 +109,9 @@
           pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
           total: 0
         },
-        dataLists: []
+        dataLists: [],
+        multipleSelection: [],
+        selectIds:[]
       }
     },
     created() {
@@ -121,6 +124,46 @@
       }
     },
     methods: {
+      btn_distribute(){
+        if(this.multipleSelection.length<1){
+          this.$message.error('没有要分配的选项')
+          return;
+        }
+        this.$layer.iframe({
+          content: {
+            content: distribution, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              selectids:this.selectIds,
+              selectarr:this.multipleSelection
+            } // props
+          },
+          area: ['60%', '60%'],
+          title: '分配'
+        })
+      },
+      btn_fenpei(id,row){
+        this.selectIds=[]
+        this.multipleSelection=[]
+        this.selectIds.push(id)
+        this.multipleSelection.push(row)
+        this.$layer.iframe({
+          content: {
+            content: distribution, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              selectids:this.selectIds,
+              selectarr:this.multipleSelection
+            } // props
+          },
+          area: ['60%', '60%'],
+          title: '分配'
+        })
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+        this.selectIds = val.map(item => item.F_WorkOrderCode)
+      },
       handleClick(res) {
         this.state = res.name
         this.getList()
@@ -142,6 +185,7 @@
             pageindex: this.pageParams.pageindex, // 第几页
             pagesize: this.pageParams.pagesize, // 每页几条信息
             state: this.state,
+            WorkOrderCode: this.ordercode,
             starttime: this.startTime && this.startTime[0],
             endtime: this.startTime && this.startTime[1]
           }