2.10

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

@@ -24,3 +24,35 @@ export function getWithdrawWorkOrder(params) {
     params
   });
 }
+//接单
+export function getSureWorkOrder(params) {
+  return request({
+    url: "T_Car_WorkOrder/SureWorkOrder",
+    method: "get",
+    params
+  });
+}
+//退回
+export function getBackWorkOrder(params) {
+  return request({
+    url: "T_Car_WorkOrder/BackWorkOrder",
+    method: "get",
+    params
+  });
+}
+//发车
+export function getStartCar(params) {
+  return request({
+    url: "T_Car_WorkOrder/StartCar",
+    method: "get",
+    params
+  });
+}
+//抵达
+export function getEndCar(params) {
+  return request({
+    url: "T_Car_WorkOrder/EndCar",
+    method: "get",
+    params
+  });
+}

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

@@ -433,6 +433,10 @@ export default {
     value: '申请科室'
   },
   {
+    key: 'F_Location',
+    value: '科室位置'
+  },
+  {
     key: 'Applicant',
     value: '申请人'
   },

CallCenterWeb.UI/RMYY/src/views/comDispatch/scheduleList/index.vue

@@ -118,6 +118,12 @@
         align="center"
       />
       <el-table-column
+        v-if="fieldListFlag.F_Location"
+        prop="F_Location"
+        label="科室位置"
+        align="center"
+      />
+      <el-table-column
         v-if="fieldListFlag.Applicant"
         prop="Applicant"
         label="申请人"
@@ -250,7 +256,7 @@ export default {
   },
   data() {
     return {
-      activeName: "-1",
+      activeName: "0",
       isDisable: false, // 防止多次点击
       loading: false,
       deleteId: [],

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

@@ -59,6 +59,7 @@
       <el-tab-pane label="已完成" name="3" />
     </el-tabs>
     <el-table
+      v-loading="loading"
       ref="multipleTable"
       :data="taskDataLists"
       border
@@ -1016,6 +1017,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       dialogZuzhang: false,
       dialogZhiban: false,
       zuzhangForm: {
@@ -2017,6 +2019,7 @@ export default {
         });
     },
     getListTask() {
+      this.loading = true
       this.taskDataLists = [];
       return new Promise((resolve) => {
         const params = {
@@ -2030,6 +2033,7 @@ export default {
           workordercode: this.workOrderId,
         };
         getMaintenancerList(params).then((response) => {
+          this.loading = false
           this.pageParams.total = response.total;
           if (response.rows.length > 0) {
             this.taskDataLists = response.rows;

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

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="个人资料" name="first">
-        <el-form ref="ruleForm" :model="form" label-width="100px">
+        <el-form ref="ruleForm" :model="form" :rules="rules" label-width="100px">
           <el-col :span="20">
             <el-row>
               <el-col :span="14">
@@ -27,7 +27,7 @@
             </el-row> -->
             <el-row>
               <el-col :span="14">
-                <el-form-item label="原密码">
+                <el-form-item label="原密码" prop="oldpas">
                   <el-input
                     v-model="form.oldpas"
                     type="password"
@@ -38,7 +38,7 @@
             </el-row>
             <el-row>
               <el-col :span="14">
-                <el-form-item label="新密码">
+                <el-form-item label="新密码" prop="newpas">
                   <el-input
                     v-model="form.newpas"
                     type="password"
@@ -49,7 +49,7 @@
             </el-row>
             <el-row>
               <el-col :span="14">
-                <el-form-item label="确认密码">
+                <el-form-item label="确认密码" prop="confirmpas">
                   <el-input
                     v-model="form.confirmpas"
                     type="password"
@@ -105,6 +105,7 @@
 
 <script>
 import { getResetPwd, getUploadTX } from "@/api/layout/permsgEdit";
+import { validPassword } from "@/utils/validate";
 import md5 from "js-md5";
 export default {
   name: "Permsg",
@@ -115,7 +116,50 @@ export default {
     },
   },
   data() {
+	  const validatePass = (rule, value, callback) => {
+	    if (!validPassword(value)) {
+	      callback(
+	        new Error("请输入有效的密码（6-32个字符只能是字母、下划线、数字）！")
+	      );
+	    } else {
+	      if (this.form.confirmpas !== "") {
+	        this.$refs.ruleForm.validateField("confirmpas");
+	      }
+	      callback();
+	    }
+	  };
+    const validatePass2 = (rule, value, callback) => {
+      if (!validPassword(this.form.confirmpas)) {
+        callback(
+          new Error(
+            "请输入有效的密码（6-32个字符只能是字母、下划线、数字）！"
+          )
+        );
+      } else {
+        if (this.form.confirmpas !== this.form.newpas) {
+          callback(new Error("两次输入密码不一致!"));
+        }
+        callback();
+      }
+    };
     return {
+      rules:{
+        oldpas:[{
+           required: true,
+           trigger: "blur",
+           message: "请输入原密码",
+        }],
+        newpas:[{
+            required: true,
+            trigger: "blur",
+            validator: validatePass,
+        }],
+        confirmpas:[{
+            required: true,
+            trigger: "blur",
+            validator: validatePass2,
+        }],
+      },
       fileList: [],
       photoHide: true,
       formLabelWidth: "120px",
@@ -146,10 +190,6 @@ export default {
     };
   },
   created() {
-    console.log(
-      this.$store.getters.serverConfig.BASE_API +
-        localStorage.getItem("storageUsertx")
-    );
     if (localStorage.getItem("storageUsertx")) {
       this.fileList.push({
         name: "",
@@ -167,32 +207,33 @@ export default {
       console.log(tab, event);
     },
     onsub() {
-      return new Promise((resolve) => {
-        const params = {
-          oldpwd: md5(this.form.oldpas),
-          usercode: localStorage.getItem("storageUsercode"),
-          pwd: md5(this.form.confirmpas),
-          username: this.form.name,
-          phone: this.form.phone,
-        };
-        if (!this.form.oldpas) {
-          this.$message.error("请输入原密码");
-          return;
+      this.$refs.ruleForm.validate((valid) => {
+        if(valid){
+          const params = {
+            oldpwd: md5(this.form.oldpas),
+            usercode: localStorage.getItem("storageUsercode"),
+            pwd: md5(this.form.confirmpas),
+            username: this.form.name,
+            phone: this.form.phone,
+          };
+          // if (!this.form.oldpas) {
+          //   this.$message.error("请输入原密码");
+          //   return;
+          // }
+          // if (this.form.confirmpas != this.form.newpas) {
+          //   this.$message.error("两次密码输入不一致");
+          //   return;
+          // }
+          getResetPwd(params).then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.$parent.$layer.close(this.layerid);
+              this.$message.success("恭喜你，重置密码成功!");
+              window.localStorage.setItem("storageUserphone", this.form.phone);
+              window.localStorage.setItem("storageUsername", this.form.name);
+            }
+          });
         }
-        if (this.form.confirmpas != this.form.newpas) {
-          this.$message.error("两次密码输入不一致");
-          return;
-        }
-        getResetPwd(params).then((response) => {
-          if (response.state.toLowerCase() === "success") {
-            this.$parent.$layer.close(this.layerid);
-            this.$message.success("恭喜你，重置密码成功!");
-            window.localStorage.setItem("storageUserphone", this.form.phone);
-            window.localStorage.setItem("storageUsername", this.form.name);
-          }
-        });
-        resolve();
-      });
+      })
     },
     oncancel() {
       this.$parent.$layer.close(this.layerid);

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -45,7 +45,7 @@
       </el-table-column>
       <el-table-column v-if="fieldListFlag.F_ProposerDeptName" prop="F_ProposerDept" :formatter="formtDept" label="申请科室" align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_ProposerName" prop="F_ProposerName" label="申请人" align="center" min-width />
-      <el-table-column v-if="fieldListFlag.F_DeptLocation" prop="F_ProposerDept" :formatter="formtLocation" label="科室位置" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.F_DeptLocation" prop="F_LocationNew" label="科室位置" align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_Type" prop="F_Type" label="业务类别" align="center" min-width>
         <template slot-scope="scope">
           <span v-if="scope.row.F_Type==1000">业务咨询</span>
@@ -168,6 +168,7 @@
     },
     data() {
       return {
+        isloading:0,
         activeName: "0",
         isDisable: false, // 防止多次点击
         loading: false,
@@ -212,6 +213,7 @@
       this.getList();
       window.setInterval(() => {
         setTimeout(() => {
+          this.isloading = 1
           this.getList();
         }, 0)
       }, 30000)
@@ -232,12 +234,12 @@
             .text;
         }
       },
-      formtLocation(row, column) {
-        if (row.F_ProposerDept) {
-          return this.$store.getters.deptmap[parseInt(row.F_ProposerDept)]
-            .location;
-        }
-      },
+      // formtLocation(row, column) {
+      //   if (row.F_ProposerDept) {
+      //     return this.$store.getters.deptmap[parseInt(row.F_ProposerDept)]
+      //       .location;
+      //   }
+      // },
       refList() {
         this.getList();
       },
@@ -266,6 +268,11 @@
         }
       },
       getList() {
+        if(this.isloading==0){
+          this.loading = true
+        }else{
+          this.loading = false
+        }
         return new Promise((resolve) => {
           const params = {
             usercode: this.searchData.usercode,
@@ -282,6 +289,7 @@
           };
           comOrderList(params).then((response) => {
             if (response.state.toLowerCase() === "success") {
+              this.loading = false
               this.pageParams.total = response.total;
               this.dataLists = response.rows;
             }

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/driverOrder/driverOrderdetail - 副本.vue

@@ -0,0 +1,206 @@
+<template>
+  <div v-loading="loading">
+    <el-table :data="selectarr" class="airlineDeviceTable" border row-key="F_ID">
+      <el-table-column type="index" width="100" label="序号" align="center"/>
+      <el-table-column
+        v-for="(item, index) in col"
+        :key="`col_${index}`"
+        :prop="dropCol[index].prop"
+        :label="item.label"
+        align="center"/>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {
+  getCarList,
+  getCarUserList,
+  getAssignWorkOrder
+} from '@/api/vehicleDispatch/vehicleScheduling.js'
+import {
+  getModelDetail
+} from '@/api/vehicleDispatch/vehicleScheduling.js'
+import Sortable from 'sortablejs'
+export default {
+  name: 'DriverOrderdetail',
+  props: {
+    layerid: {
+      type: String,
+      default: ''
+    },
+    rowid: {
+      type: String,
+      default: ''
+    },
+    wocode: {
+      type: String,
+      default: ''
+    }
+    // selectids: {
+    //   type: Array,
+    //   default: []
+    // },
+    // selectarr: {
+    //   type: Array,
+    //   default: []
+    // }
+  },
+  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: [], // 申请人数据
+      hospitalsParam: {
+        id: 0,
+        name: ''
+      },
+      departmentsParam: {
+        id: 0,
+        name: ''
+      },
+      repairmanParam: {
+        id: 0,
+        name: ''
+      },
+      rules: {},
+      ruleForm: {
+        carid: '',
+        driver: ''
+      },
+      deptid: [],
+      selectarr: [],
+      loading: false
+    }
+  },
+  created() {
+    this.getDetail()
+  },
+  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)
+        }
+      })
+    },
+    getDetail() {
+      const params = {
+        orderid: this.rowid,
+        WorkOrderCode: this.wocode,
+        type: '3'
+      }
+      getModelDetail(params).then((response) => {
+        this.selectarr = response.Carlist
+      })
+    },
+    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 arr = this.selectarr.map(item => item.F_WorkOrderCode)
+    //   const params = {
+    //     orderid: arr.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/driverOrder/driverOrderdetail.vue

@@ -1,205 +1,355 @@
 <template>
   <div v-loading="loading">
-    <el-table :data="selectarr" class="airlineDeviceTable" border row-key="F_ID">
-      <el-table-column type="index" width="100" label="序号" align="center"/>
-      <el-table-column
-        v-for="(item, index) in col"
-        :key="`col_${index}`"
-        :prop="dropCol[index].prop"
-        :label="item.label"
-        align="center"/>
+    <!-- <el-steps :active="1">
+      <el-step title="步骤 1"></el-step>
+      <el-step title="步骤 2"></el-step>
+      <el-step title="步骤 3"></el-step>
+    </el-steps> -->
+    <el-table :data="selectarr">
+      <el-table-column type="index" width="100" label="序号" align="center" />
+      <el-table-column prop="F_WorkOrderCode" label="工单编号" align="center">
+        <template slot-scope="scope">
+          <span style="color: #409eff; cursor: pointer"
+            @click="hadndleOrderCode(scope.row.F_ID, scope.row.F_WorkOrderCode)">{{ scope.row.F_WorkOrderCode }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_Content" label="工单内容" align="center" />
+      <el-table-column prop="F_CarMessage" 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-column label="操作" align="center" class-name="oparate_btn">
+        <template slot-scope="scope">
+          <el-button v-show="scope.$index==0" v-for="item in scope.row.Buttons" :key="item.key" type="text"
+            @click="btnClickEvents(item, scope.row.F_WorkOrderCode, scope.row,scope.$index)">
+            {{ item.value }}
+          </el-button>
+          <el-button v-show="scope.$index!=0&&selectarr[scope.$index-1].F_State==10" v-for="item in scope.row.Buttons" :key="item.key" type="text"
+            @click="btnClickEvents(item, scope.row.F_WorkOrderCode, scope.row,scope.$index)">
+            {{ item.value }}
+          </el-button>
+        </template>
+      </el-table-column> -->
     </el-table>
+    <!-- 退回 -->
+    <el-dialog :visible.sync="dialog_tuihui" :append-to-body="true" title="退回">
+      <el-form ref="BackForm" :model="BackForm" :rules="rules" label-width="100px">
+        <el-form-item label="原因">
+          <el-select v-model="reasonStr" placeholder="请选择原因" @change="handleChangeReason">
+            <el-option v-for="item in reasonarr" :key="item.F_DictionaryValueId" :label="item.F_Name"
+              :value="`${item.F_DictionaryValueId},${item.F_Name}`" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialog_tuihui = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm('BackForm')">确 定</el-button>
+      </div>
+    </el-dialog>
+    <!-- 评价 -->
+    <el-dialog :visible.sync="dialog_pingjia" :append-to-body="true" title="评价">
+      <el-form ref="carEvaluteForm" :model="carEvaluteForm" :rules="rules" label-width="100px">
+        <el-form-item label="评价内容">
+          <el-input :autosize="{ minRows: 4, maxRows: 8 }" v-model="carEvaluteForm.Evaluation" show-word-limit
+            maxlength="100" type="textarea" />
+        </el-form-item>
+        <el-form-item label="分值">
+          <el-rate v-model="carEvaluteForm.score" :texts="evaluateText" show-text />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialog_pingjia = false">取 消</el-button>
+        <el-button type="primary" @click="submitEvaluateForm('carEvaluteForm')">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  getCarList,
-  getCarUserList,
-  getAssignWorkOrder
-} from '@/api/vehicleDispatch/vehicleScheduling.js'
-import {
-  getModelDetail
-} from '@/api/vehicleDispatch/vehicleScheduling.js'
-import Sortable from 'sortablejs'
-export default {
-  name: 'DriverOrderdetail',
-  props: {
-    layerid: {
-      type: String,
-      default: ''
+  import {
+    getCarList,
+    getCarUserList,
+    getAssignWorkOrder
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import {
+    getModelDetail
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import detail from "../vehicleScheduling/vehicleSchedulingList/components/detail";
+  import {
+    getSureWorkOrder,
+    getBackWorkOrder,
+    getStartCar,
+    getEndCar
+  } from "@/api/vehicleDispatch/driver";
+  import {
+    getCarEvaluateWorkorder
+  } from "@/api/orderManagement/vehicle";
+  import {
+    getDicReason
+  } from "@/api/faultRepairManagement/faultRepair";
+  export default {
+    name: 'DriverOrderdetail',
+    props: {
+      layerid: {
+        type: String,
+        default: ''
+      },
+      rowid: {
+        type: String,
+        default: ''
+      },
+      wocode: {
+        type: String,
+        default: ''
+      }
+      // selectids: {
+      //   type: Array,
+      //   default: []
+      // },
+      // selectarr: {
+      //   type: Array,
+      //   default: []
+      // }
     },
-    rowid: {
-      type: String,
-      default: ''
+    data() {
+      return {
+        carEvaluteForm:{
+          score:0,
+          Evaluation:''
+        },
+        evaluateText: ["不满意", "不满意", "基本满意", "满意", "满意"],
+        dialog_pingjia:false,
+        dialog_tuihui: false,
+        reasonStr: '',
+        BackForm: {
+          key: '',
+          value: '',
+          orderid: '',
+          reason: ''
+        },
+        reasonarr: [],
+        typeList: [],
+        carArr: [],
+        repairman: [], // 申请人数据
+        hospitalsParam: {
+          id: 0,
+          name: ''
+        },
+        departmentsParam: {
+          id: 0,
+          name: ''
+        },
+        repairmanParam: {
+          id: 0,
+          name: ''
+        },
+        rules: {},
+        ruleForm: {
+          carid: '',
+          driver: ''
+        },
+        ordercode:'',
+        deptid: [],
+        selectarr: [],
+        loading: false
+      }
     },
-    wocode: {
-      type: String,
-      default: ''
-    }
-    // selectids: {
-    //   type: Array,
-    //   default: []
-    // },
-    // selectarr: {
-    //   type: Array,
-    //   default: []
-    // }
-  },
-  data() {
-    return {
-      col: [{
-        label: '工单号',
-        prop: 'F_WorkOrderCode'
-      },
-      {
-        label: '工单内容',
-        prop: 'F_Content'
+    created() {
+      this.getDetail()
+    },
+    mounted() {
+
+    },
+    methods: {
+      getReason(flag) {
+        const params = {
+          Flag: flag,
+          Name: "",
+        };
+        getDicReason(params).then((res) => {
+          this.reasonarr = res.rows;
+        });
       },
-      {
-        label: '出发地',
-        prop: 'F_DepartPlace'
+      handleChangeReason(data) {
+        this.BackForm.key = data.split(",")[0];
+        this.BackForm.value = data.split(",")[1];
       },
-      {
-        label: '目的地',
-        prop: 'F_Destination'
+      submitForm(formName) {
+        const params = {
+          key: this.BackForm.key,
+          value: this.BackForm.value,
+          orderid: this.rowid,
+          reason: ''
+        }
+        getBackWorkOrder(params).then(res => {
+          if (res.state == "success") {
+            this.dialog_tuihui = false
+            this.reasonStr = ''
+            this.BackForm.key = ''
+            this.BackForm.value = ''
+            this.$message.success("退回成功!");
+            this.$parent.$layer.close(this.layerid)
+            this.$parent.getList();
+          }
+        })
       },
-      {
-        label: '用车时间',
-        prop: 'F_UseTime'
-      }
-      ],
-      dropCol: [{
-        label: '工单号',
-        prop: 'F_WorkOrderCode'
+      submitEvaluateForm(formName){
+        const params = {
+          WorkOrderCode: this.ordercode,
+          Evaluation: this.carEvaluteForm.Evaluation,
+          score: this.carEvaluteForm.score
+        }
+        getCarEvaluateWorkorder(params).then(res=>{
+          if (res.state == "success") {
+            this.dialog_pingjia = false
+            this.carEvaluteForm.Evaluation = ''
+            this.carEvaluteForm.score = 0
+            this.$message.success("评价成功!");
+            this.$parent.$layer.close(this.layerid)
+            this.$parent.getList();
+          }
+        })
       },
-      {
-        label: '工单内容',
-        prop: 'F_Content'
+      hadndleOrderCode(ordercode, wocode) {
+        this.$layer.iframe({
+          content: {
+            content: detail, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowid: Number(this.rowid),
+              wocode: wocode,
+            }, // props
+          },
+          area: ["80%", "90%"],
+          title: "工单详情",
+        });
       },
-      {
-        label: '出发地',
-        prop: 'F_DepartPlace'
+      btnClickEvents(button, wocode, row,index) {
+        console.log(index)
+        if (button.value == '接单') {
+          this.getJieDan()
+        }
+        if (button.value == '退回') {
+          this.getReason("TDYY")
+          this.dialog_tuihui = true
+        }
+        if (button.value == '发车') {
+          this.getFache(wocode)
+        }
+        if (button.value == '抵达') {
+          this.getDida(wocode)
+        }
+        if (button.value == '评价') {
+          this.dialog_pingjia = true
+          this.ordercode = wocode
+        }
       },
-      {
-        label: '目的地',
-        prop: 'F_Destination'
+      //接单
+      getJieDan() {
+        const params = {
+          orderid: this.rowid
+        }
+        this.$confirm("您确定要接单吗?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            getSureWorkOrder(params).then((response) => {
+              if (response.state == "success") {
+                this.$message.success("接单成功!");
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message("已取消");
+          });
       },
-      {
-        label: '用车时间',
-        prop: 'F_UseTime'
-      }
-      ],
-      typeList: [],
-      carArr: [],
-      repairman: [], // 申请人数据
-      hospitalsParam: {
-        id: 0,
-        name: ''
+      //发车
+      getFache(wocode) {
+        const params = {
+          orderid: this.rowid,
+          WorkOrderCode: wocode
+        }
+        this.$confirm("您是否抵达发车点?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            getStartCar(params).then((response) => {
+              if (response.state == "success") {
+                this.$message.success("发车成功!");
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message("已取消");
+          });
       },
-      departmentsParam: {
-        id: 0,
-        name: ''
+      //抵达
+      getDida(wocode) {
+        const params = {
+          orderid: this.rowid,
+          WorkOrderCode: wocode
+        }
+        this.$confirm("您是否抵达目的地?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            getEndCar(params).then((response) => {
+              if (response.state == "success") {
+                this.$message.success("抵达成功!");
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message("已取消");
+          });
       },
-      repairmanParam: {
-        id: 0,
-        name: ''
+      //评价
+      getPingJia(wocode){
+
       },
-      rules: {},
-      ruleForm: {
-        carid: '',
-        driver: ''
+      getDetail() {
+        const params = {
+          orderid: this.rowid,
+          WorkOrderCode: this.wocode,
+          type: '3'
+        }
+        getModelDetail(params).then((response) => {
+          this.selectarr = response.Carlist
+        })
       },
-      deptid: [],
-      selectarr: [],
-      loading: false
-    }
-  },
-  created() {
-    this.getDetail()
-  },
-  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)
+      getVehicleLists() {
+        const params = {
+          state: 0
         }
-      })
-    },
-    // 列拖拽
-    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)
+        getCarList(params).then(res => {
+          this.carArr = res.rows
+        })
+      },
+      getVehicleUserLists() {
+        const params = {
+          rolecode: 'SJ'
         }
-      })
-    },
-    getDetail() {
-      const params = {
-        orderid: this.rowid,
-        WorkOrderCode: this.wocode,
-        type: '3'
-      }
-      getModelDetail(params).then((response) => {
-        this.selectarr = response.Carlist
-      })
-    },
-    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
+        })
+      },
+      resetForm() {
+        this.$refs.ruleForm.resetFields()
       }
-      getCarUserList(params).then(res => {
-        this.repairman = res.rows
-      })
-    },
-    // onsub() {
-    //   const arr = this.selectarr.map(item => item.F_WorkOrderCode)
-    //   const params = {
-    //     orderid: arr.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>

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/driverOrder/index - 副本.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input
+        v-model="ordercode"
+        clearable
+        placeholder="请输入工单编号"
+        size="medium"
+        class="filter-item"
+      />
+      <el-select v-model="state" size="medium" clearable placeholder="请选择工单状态">
+        <el-option value="0" label="待接单"></el-option>
+        <el-option value="2" label="已接单"></el-option>
+        <el-option value="4" label="处理中"></el-option>
+        <el-option value="10" label="已完成"></el-option>
+      </el-select>
+      <el-input
+        v-model="carname"
+        clearable
+        placeholder="请输入车辆名称"
+        size="medium"
+        class="filter-item"
+      />
+      <el-input
+        v-model="drivername"
+        clearable
+        placeholder="请输入司机名称"
+        size="medium"
+        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" size="medium" icon="el-icon-search" @click="btn_search"
+        >搜索</el-button
+      >
+      <el-button type="primary" class="filter-btn" size="medium" @click="btn_export">
+        导出
+      </el-button>
+    </div>
+    <el-table v-loading="loading" :data="dataLists" border stripe>
+      <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)"
+          >
+            {{ scope.row.F_WorkOrderCode }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <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 label="状态" align="center">
+        <template slot-scope="scope">
+          <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>
+    <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,
+  getDriverListExport,
+  getWithdrawWorkOrder,
+} from "@/api/vehicleDispatch/driver";
+import Pagination from "@/components/context/Pagination";
+import detail from "./driverOrderdetail.vue";
+import { exportExcel } from "@/utils";
+
+export default {
+  name: "DriverOrer",
+  components: {
+    Pagination,
+  },
+  data() {
+    return {
+      loading: false,
+      state:"",
+      keyword: "",
+      ordercode: "",
+      carname: "",
+      drivername: "",
+      startTime: "",
+      pageParams: {
+        pageindex: 1, // Number(this.$store.getters.serverConfig.PAGESIZE)
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
+        total: 0,
+      },
+      searchData: {},
+      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, // 每页几条信息
+          starttime: this.startTime && this.startTime[0],
+          endtime: this.startTime && this.startTime[1],
+          WorkOrderCode: this.ordercode,
+          carname: this.carname,
+          driverName: this.drivername,
+          state: this.state,
+        };
+        this.searchData = params;
+        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();
+    },
+    hadndleOrderCode(ordercode, wocode) {
+      this.$layer.iframe({
+        content: {
+          content: detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowid: ordercode.toString(),
+            wocode: wocode,
+          }, // props
+        },
+        area: ["80%", "90%"],
+        title: "工单详情",
+      });
+    },
+    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("已取消撤回");
+        });
+    },
+    btn_export() {
+      this.searchData.isdc = 1;
+      exportExcel(this.searchData, getDriverListExport);
+    },
+  },
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

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

@@ -8,12 +8,12 @@
         size="medium"
         class="filter-item"
       />
-      <el-select v-model="state" size="medium" clearable placeholder="请选择工单状态">
+     <!-- <el-select v-model="state" size="medium" clearable placeholder="请选择工单状态">
         <el-option value="0" label="待接单"></el-option>
         <el-option value="2" label="已接单"></el-option>
         <el-option value="4" label="处理中"></el-option>
         <el-option value="10" label="已完成"></el-option>
-      </el-select>
+      </el-select> -->
       <el-input
         v-model="carname"
         clearable
@@ -31,9 +31,9 @@
       <el-date-picker
         v-model="startTime"
         size="medium"
-        type="daterange"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
+        type="datetimerange"
+        format="yyyy-MM-dd HH:mm:ss"
+        value-format="yyyy-MM-dd HH:mm:ss"
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
@@ -45,6 +45,11 @@
         导出
       </el-button>
     </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="待接单" name="0" />
+      <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
         prop="F_WorkOrderCode"
@@ -53,13 +58,12 @@
         min-width="110"
       >
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
+          <span
+            style="color: #409eff; cursor: pointer"
             @click="hadndleOrderCode(scope.row.F_ID, scope.row.F_WorkOrderCode)"
           >
             {{ scope.row.F_WorkOrderCode }}
-          </el-button>
+          </span>
         </template>
       </el-table-column>
       <el-table-column
@@ -135,8 +139,9 @@ export default {
   },
   data() {
     return {
+      activeName:"0",
       loading: false,
-      state:"",
+      state:"0",
       keyword: "",
       ordercode: "",
       carname: "",
@@ -160,6 +165,10 @@ export default {
     };
   },
   methods: {
+    handleClick(res) {
+      this.state = Number(res.name);
+      this.getList();
+    },
     getList() {
       // this.loading = true
       return new Promise((resolve) => {
@@ -231,4 +240,10 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/.el-tabs__item {
+    width: 185px !important;
+    text-align: center;
+    font-size: 16px !important;
+    font-weight: 600;
+  }
 </style>

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

@@ -24,9 +24,9 @@
       <el-date-picker
         v-model="startTime"
         size="medium"
-        type="daterange"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
+        type="datetimerange"
+        format="yyyy-MM-dd HH:mm:ss"
+        value-format="yyyy-MM-dd HH:mm:ss"
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期"

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

@@ -4,6 +4,8 @@
       <el-input v-model="keyword" clearable placeholder="请输入关键词" class="filter-item" size="medium" />
       <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-date-picker v-model="startTime2" size="medium" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至" start-placeholder="用车开始时间" end-placeholder="用车结束时间" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'btnExport'" type="primary" class="filter-item" @click="btn_export">
         <svg-icon icon-class="daochu" />导出
@@ -23,6 +25,7 @@
       <el-table-column :show-overflow-tooltip="true" prop="F_DriverName" label="司机" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_DriverPhon" 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_UseTime" label="用车时间" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_ControlManName" label="调度员" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_Remark" label="备注" align="center" />
     </el-table>
@@ -52,6 +55,7 @@
         loading: false,
         keyword: '',
         startTime: '',
+        startTime2:'',
         orderId: '',
         exporParams: {},
         pageParams: {
@@ -79,6 +83,8 @@
           const params = {
             starttime: this.startTime && this.startTime[0],
             endtime: this.startTime && this.startTime[1],
+            usestarttime:this.startTime2 && this.startTime2[0],
+            useendtime:this.startTime2 && this.startTime2[1],
             pageindex: this.pageParams.pageindex, // 第几页
             pagesize: this.pageParams.pagesize, // 每页几条信息
             keyword: this.keyword.replace(/\s+/g, '')

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -90,7 +90,8 @@
 						
 						const code = uni.getStorageSync("roleCode"); 
 						 // ||code == 'GLY' || code == 'DDZX'
-						if(code == 'WXY' || code == 'DDZX'|| code == 'GLY' || code == 'jcgn'  || code == 'GQY' || code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {
+						if(code == 'WXY' || code == 'DDZX'|| code == 'GLY' || code == 'jcgn'  || code == 'GQY' || 
+						code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {
 							uni.switchTab({
 								url: '/pages/myTask/myTask'
 							});

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/addVehicle/addVehicle.vue

@@ -47,7 +47,7 @@
 					<uni-data-select v-model="valiFormData.dispatch" field="T_Woname as value, T_Woname as text" :localdata="dispatchTypeData" />
 				</uni-forms-item>
 				<uni-forms-item label="发车时间">
-					<uni-datetime-picker v-model="valiFormData.usertime" />
+					<uni-datetime-picker v-model="valiFormData.usertime" @change="changeTime"/>
 				</uni-forms-item>
 				<uni-forms-item label="是否新生儿转运" required name="birth" v-if="typeName.indexOf('新生儿')>=0">
 					<uni-data-checkbox v-model="valiFormData.birth" :localdata="birthData" />
@@ -326,6 +326,11 @@
 					this.valiFormData.Phone = user.usertelphone
 				}
 			},
+			changeTime(data){
+				if(data.length==11){
+					this.valiFormData.usertime = data+"00:00:00"
+				}
+			},
 			// 工单提交
 			submit(ref) {
 				this.disabledButton = false

CallCenterWeb.UI/RMYYAPP/unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/wuyuan (2).mobileprovision
-ioscertFile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/证书.p12
+iosProfile=E:/WorkPlace/RMYY/CallCenterWeb.UI/证书/ios/正式/wuyuan (2).mobileprovision
+ioscertFile=E:/WorkPlace/RMYY/CallCenterWeb.UI/证书/ios/正式/证书.p12
 ioscertPassword=LN4Bq2cDrCPQMwql//0+Pw==