1

CallCenterWeb.UI/RMYY/package.json

@@ -33,6 +33,7 @@
     "nprogress": "0.2.0",
     "qs": "^6.6.0",
     "signalr": "^2.4.0",
+    "sortablejs": "^1.15.0",
     "vue": "2.5.17",
     "vue-aplayer": "^1.6.1",
     "vue-clipboard2": "^0.3.1",

CallCenterWeb.UI/RMYY/src/utils/global.js

@@ -45,5 +45,25 @@ export const workOrderState = {
   {
     label: '已完成',
     value: '10'
+  }],
+  stateOptions_4000: [{
+    label: '待分配',
+    value: '0'
+  },
+  {
+    label: '已分配',
+    value: '1'
+  },
+  {
+    label: '已接单',
+    value: '2'
+  },
+  {
+    label: '处理中',
+    value: '4'
+  },
+  {
+    label: '已完成',
+    value: '10'
   }]
 }

CallCenterWeb.UI/RMYY/src/views/layout/components/Navbar/index.vue

@@ -44,11 +44,22 @@
         <el-tab-pane label="未读" name="0">
           <el-button type="text" @click="sendMsg()">发送消息</el-button>
           <p style="font-size: 14px;">您当前有未读消息<span style="color: #CC0000;">{{noread}}</span>条</p>
+          <div v-for="(item,index) in noreadlist" :key="index" style="position: relative;margin-bottom: 15px;">
+            <div style="width: 80px;text-align: center;">
+              <img class="pimg" :src="$store.getters.serverConfig.BASE_API+item.F_See" />
+              <p class="puser">{{item.F_UserName}}</p>
+            </div>
+            <div class="pcon">{{item.Content}}</div>
+            <div class="pdate">
+              {{item.CreateDate}}
+              <span class="phf" @click="tosend(item.F_RoleId,item.FromUserId)">回复</span>
+            </div>
+          </div>
         </el-tab-pane>
         <el-tab-pane label="已读" name="1">
           <p style="font-size: 14px;">注:显示最近50条已读</p>
           <div v-for="(item,index) in readlist" :key="index" style="position: relative;margin-bottom: 15px;">
-            <div>
+            <div style="width: 80px;text-align: center;">
               <img class="pimg" :src="$store.getters.serverConfig.BASE_API+item.F_See" />
               <p class="puser">{{item.F_UserName}}</p>
             </div>
@@ -269,9 +280,10 @@
       font-size: 10px;
       line-height: 20px;
       margin-top: -20px;
-      width: 50px;
+      width: 80px;
       text-align: center;
       overflow: hidden;
+      color: #333;
     }
 
     .pcon {
@@ -279,7 +291,7 @@
       line-height: 20px;
       position: absolute;
       top: 0;
-      left: 70px;
+      left: 100px;
     }
 
     .pdate {
@@ -287,7 +299,7 @@
       line-height: 20px;
       position: absolute;
       bottom: 0;
-      left: 70px;
+      left: 100px;
       color: #888;
     }
 

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

@@ -16,12 +16,20 @@
       <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">
+      <el-table-column label="状态" align="center">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="btn_withdraw(scope.row.F_ID)">撤回</el-button>
+         <div v-if="scope.row.F_State==0">待接单</div>
+         <div v-if="scope.row.F_State==2">已接单</div>
+         <div v-if="scope.row.F_State==3">已退回</div>
+         <div v-if="scope.row.F_State==4">处理中</div>
+         <div v-if="scope.row.F_State==10">已完成</div>
         </template>
       </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_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" />

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

@@ -58,7 +58,7 @@
       <el-col :md="24" class="order_detail_body">
         <el-card shadow="hover">
           <el-tabs v-model="activeName" ref="tabs">
-            <el-tab-pane label="处理结果" name="1">
+            <!-- <el-tab-pane label="处理结果" name="1">
               <el-col :md="24" class="order_detail_content">
                 <table class="tabdept" cellspacing="0" cellpadding="0">
                   <tr>
@@ -71,8 +71,8 @@
                   </tr>
                 </table>
               </el-col>
-            </el-tab-pane>
-            <el-tab-pane label="工单流程" name="2">
+            </el-tab-pane> -->
+            <el-tab-pane label="工单流程" name="1">
               <el-table :data="workOrderCirculationList" border style="width: 100%">
                 <el-table-column prop="F_CreateUser" label="操作人" align="center">
                 </el-table-column>
@@ -119,7 +119,7 @@
     },
     data() {
       return {
-        activeName: 'first',
+        activeName: '1',
         imgUrl: this.$store.getters.serverConfig.BASE_API,
         orderDetailData: {
           F_ID: '',

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

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading">
-    <el-table :data="selectarr" border stripe>
+    <!-- <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" />
@@ -8,6 +8,13 @@
       <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-table :data="selectarr" class="airlineDeviceTable" border row-key="F_ID">
+      <el-table-column type="index" width="100" label="序号" align="center">
+      </el-table-column>
+      <el-table-column align="center" v-for="(item, index) in col" :key="`col_${index}`" :prop="dropCol[index].prop"
+        :label="item.label">
+      </el-table-column>
     </el-table>
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
       <el-col :span="24">
@@ -53,6 +60,7 @@
   import {
     GetPerson
   } from '@/api/commonAPI'
+  import Sortable from 'sortablejs'
   export default {
     name: "Distribution",
     props: {
@@ -71,6 +79,48 @@
     },
     data() {
       return {
+        col: [{
+            label: '工单号',
+            prop: 'F_WorkOrderCode'
+          },
+          {
+            label: '工单内容',
+            prop: 'F_Content'
+          },
+          {
+            label: '出发地',
+            prop: 'F_DepartPlace'
+          },
+          {
+            label: '目的地',
+            prop: 'F_Destination'
+          },
+          {
+            label: '用车时间',
+            prop: 'F_UseTime'
+          }
+        ],
+        dropCol: [{
+            label: '工单号',
+            prop: 'F_WorkOrderCode'
+          },
+          {
+            label: '工单内容',
+            prop: 'F_Content'
+          },
+          {
+            label: '出发地',
+            prop: 'F_DepartPlace'
+          },
+          {
+            label: '目的地',
+            prop: 'F_Destination'
+          },
+          {
+            label: '用车时间',
+            prop: 'F_UseTime'
+          }
+        ],
         typeList: [],
         carArr: [],
         repairman: [], // 申请人数据
@@ -99,7 +149,42 @@
       this.getVehicleLists() //车辆arr
       this.getVehicleUserLists() //司机arr
     },
+    mounted() {
+      this.$nextTick(() => {
+        this.rowDrop()
+        // this.columnDrop()
+      })
+    },
     methods: {
+      //行拖拽
+      rowDrop() {
+        const tbody = document.querySelector('.airlineDeviceTable .el-table__body-wrapper tbody');
+        const that = this;
+        Sortable.create(tbody, {
+          draggable: ".el-table__row",
+          // 结束拖拽后的回调函数
+          onEnd({
+            newIndex,
+            oldIndex
+          }) {
+            const currentRow = that.selectarr.splice(oldIndex, 1)[0];
+            that.selectarr.splice(newIndex, 0, currentRow);
+          },
+        })
+      },
+      //列拖拽
+      columnDrop() {
+        const wrapperTr = document.querySelector('.airlineDeviceTable .el-table__header-wrapper tr')
+        this.sortable = Sortable.create(wrapperTr, {
+          animation: 180,
+          delay: 0,
+          onEnd: evt => {
+            const oldItem = this.dropCol[evt.oldIndex]
+            this.dropCol.splice(evt.oldIndex, 1)
+            this.dropCol.splice(evt.newIndex, 0, oldItem)
+          }
+        })
+      },
       getVehicleLists() {
         const params = {
           state: 0
@@ -117,8 +202,9 @@
         })
       },
       onsub() {
+        const arr= this.selectarr.map(item => item.F_WorkOrderCode)
         const params = {
-          orderid: this.selectids.toString(),
+          orderid: arr.toString(),
           driver: this.ruleForm.driver,
           carid: this.ruleForm.carid
         }

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

@@ -41,26 +41,22 @@
       <el-table-column :show-overflow-tooltip="true" prop="F_CreateTime" label="申请时间" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_UseTime" label="用车时间" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_CarTypeName" label="车辆类型" align="center" />
-      <el-table-column label="工单状态" align="center">
+      <el-table-column :show-overflow-tooltip="true" prop="StateName" label="工单状态" align="center" />
+      <!-- <el-table-column label="工单状态" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.F_State==0">待分配</div>
           <div v-if="scope.row.F_State==1">已分配</div>
           <div v-if="scope.row.F_State==2">已接单</div>
           <div v-if="scope.row.F_State==4">处理中</div>
           <div v-if="scope.row.F_State==10">已完成</div>
-        </template>
+        </template> -->
       </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_delete(scope.row.F_WorkOrderCode)">删除
-          </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)">派车
+          <el-button v-if="scope.row.F_State==0" size="mini" type="text" @click="btn_edit(scope.row.F_ID,scope.row.F_WorkOrderCode)">编辑</el-button>
+          <el-button v-if="scope.row.F_State==0" size="mini" type="text" @click="btn_delete(scope.row.F_WorkOrderCode)">删除
           </el-button>
-          <el-button v-permission="'btnSure'" size="mini" type="text" @click="btn_sure(scope.row.F_ID)">确定工单</el-button> -->
+          <el-button v-if="scope.row.F_State==0" size="mini" type="text" @click="btn_fenpei(scope.row.F_WorkOrderCode,scope.row)">分配</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -138,7 +134,7 @@
               selectarr:this.multipleSelection
             } // props
           },
-          area: ['60%', '60%'],
+          area: ['70%', '70%'],
           title: '分配'
         })
       },
@@ -156,7 +152,7 @@
               selectarr:this.multipleSelection
             } // props
           },
-          area: ['60%', '60%'],
+          area: ['70%', '70%'],
           title: '分配'
         })
       },