Merge branch 'debelop' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_UI into debelop

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

@@ -25,6 +25,14 @@ export function getMaintenancerList(params) {
     params
   })
 }
+export function getListExpt(params) {
+  return request({
+    url: 'FaultRepair/MaintenancerList',
+    method: 'get',
+    responseType: 'blob',
+    params
+  })
+}
 // 查收工单
 export function postTaskOrders(params) {
   return request({

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

@@ -113,3 +113,11 @@ export function getListExptIsdc(params) {
     params
   })
 }
+// 催单
+export function getReminderWorkOrder(params) {
+  return request({
+    url: 'T_Car_WorkOrder/Reminder',
+    method: 'post',
+    params
+  })
+}

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

@@ -401,7 +401,7 @@ export default {
   },
   {
     key: 'GapTime',
-    value: '超时时限'
+    value: '工单时效'
   },
   {
     key: 'F_CreateTime',
@@ -443,6 +443,10 @@ export default {
   {
     key: 'F_AssignTime',
     value: '申请时间'
+  },
+  {
+    key: 'GapTime',
+    value: '工单时效'
   }
   ],
   _reportForm_deptTransfer: [{

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

@@ -124,18 +124,29 @@
         align="center"
       />
       <el-table-column
+        v-if="fieldListFlag.F_AssignTime"
+        prop="F_AssignTime"
+        label="申请时间"
+        align="center"
+      />
+      <el-table-column
         v-if="fieldListFlag.F_ToPlace"
         prop="F_ToPlace"
         label="送达地点"
         align="center"
-      />
+      />    
       <el-table-column
-        v-if="fieldListFlag.F_AssignTime"
-        prop="F_AssignTime"
-        label="申请时间"
+        v-if="fieldListFlag.GapTime"
+        prop="GapTime"
+        label="工单时效"
         align="center"
-      />
-      <!-- <el-table-column v-if="fieldListFlag.StateName" prop="StateName" label="工单状态" align="center" min-width /> -->
+        min-width>
+        <template slot-scope="scope">
+          <span v-if="scope.row.GapTime.indexOf('超时')>=0" style="color:red">{{ scope.row.GapTime }}</span>
+          <span v-if="scope.row.GapTime.indexOf('剩余')>=0" style="color:green">{{ scope.row.GapTime }}</span>
+          <span v-if="scope.row.GapTime=='-'">{{ "-" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="fieldListFlag.StateName"
         prop="StateName"

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

@@ -32,10 +32,13 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
       />
-      <el-button type="primary" class="filter-btn" @click="getListTask">
-        查询
+      <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="getListTask">
+        搜索
       </el-button>
-      <el-button type="primary" class="filter-btn" @click="btn_add_list">
+      <el-button type="primary" class="filter-btn" @click="btn_import">
+        导出
+      </el-button>
+      <el-button type="primary" class="filter-btn" icon="el-icon-s-tools" @click="btn_add_list">
         设置列
       </el-button>
     </div>
@@ -159,10 +162,15 @@
       <el-table-column
         v-if="fieldListFlag.GapTime"
         prop="GapTime"
-        label="超时时限"
+        label="工单时效"
         align="center"
-        min-width
-      />
+        min-width>
+        <template slot-scope="scope">
+          <span v-if="scope.row.GapTime.indexOf('超时')>=0" style="color:red">{{ scope.row.GapTime }}</span>
+          <span v-if="scope.row.GapTime.indexOf('剩余')>=0" style="color:green">{{ scope.row.GapTime }}</span>
+          <span v-if="scope.row.GapTime=='-'">{{ "-" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="fieldListFlag.F_CreateTime"
         prop="F_CreateTime"
@@ -975,10 +983,14 @@ import {
   getDicValueList,
   getsbeilist,
   getDicReason,
+  getListExpt,
 } from "@/api/faultRepairManagement/faultRepair";
 import { GetEquipmentAlllist, GetDelEquips } from "@/api/equipment/equip";
 import detail from "../../orderManage/components/orderDetail.vue";
 import Finish from "./finish";
+import {
+    exportExcel
+  } from "@/utils";
 export default {
   name: "RepairList",
   components: {
@@ -1179,6 +1191,20 @@ export default {
   },
   mounted() {},
   methods: {
+    btn_import() {
+      const exportparams = {
+        page: this.pageParams.pageindex, // 第几页
+        pagesize: this.pageParams.pagesize, // 每页几条信息
+        name: this.repairman,
+        state: this.state,
+        tel: this.rpairmanphone,
+        starttime: this.searchTime && this.searchTime[0],
+        endtime: this.searchTime && this.searchTime[1],
+        workordercode: this.workOrderId,
+        isdc: 1,
+      };
+      exportExcel(exportparams, getListExpt);
+    },
     getDeptid(data) {
       console.log(data);
       this.deptidArr = data;

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

@@ -28,6 +28,7 @@
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="未接单" name="3" />
       <el-tab-pane label="待完成" name="0" />
       <el-tab-pane label="已完成" name="1" />
       <el-tab-pane label="全部" name="2" />
@@ -167,7 +168,7 @@
     },
     data() {
       return {
-        activeName: "0",
+        activeName: "3",
         isDisable: false, // 防止多次点击
         loading: false,
         isedit: "1",
@@ -175,7 +176,7 @@
         fieldListFlag: {},
         buttonName: "",
         searchData: {
-          tab: "0",
+          tab: "3",
           keyword: "", // 关键字
           searchTime: "", // 时间
           starttime: "", // 开始时间
@@ -265,7 +266,6 @@
         }
       },
       getList() {
-        this.loading = true;
         return new Promise((resolve) => {
           const params = {
             usercode: this.searchData.usercode,
@@ -281,7 +281,6 @@
             pagesize: this.pageParams.pagesize, // int 每页几条信息
           };
           comOrderList(params).then((response) => {
-            this.loading = false;
             if (response.state.toLowerCase() === "success") {
               this.pageParams.total = response.total;
               this.dataLists = response.rows;

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

@@ -8,6 +8,12 @@
         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
@@ -32,15 +38,14 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
       />
-      <el-button type="primary" class="filter-item" @click="btn_search"
+      <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" @click="btn_export">
+      <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 :show-overflow-tooltip="true" prop="F_WorkOrderCode" label="工单编号" align="center" /> -->
       <el-table-column
         prop="F_WorkOrderCode"
         label="调度编号"
@@ -131,6 +136,7 @@ export default {
   data() {
     return {
       loading: false,
+      state:"",
       keyword: "",
       ordercode: "",
       carname: "",
@@ -165,7 +171,7 @@ export default {
           WorkOrderCode: this.ordercode,
           carname: this.carname,
           driverName: this.drivername,
-          state: "",
+          state: this.state,
         };
         this.searchData = params;
         getDriverList(params).then((response) => {

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

@@ -35,10 +35,11 @@
         type="primary"
         class="filter-item"
         size="medium"
+        icon="el-icon-search"
         @click="btn_search"
         >搜索</el-button
       >
-      <el-button type="primary" class="filter-btn" @click="btn_export"
+      <el-button type="primary" size="medium" class="filter-btn" @click="btn_export"
         >导出</el-button
       >
       <el-button
@@ -50,6 +51,7 @@
       >
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="未接单" name="2" />
       <el-tab-pane label="待分配" name="0" />
       <el-tab-pane label="已分配" name="1" />
       <el-tab-pane label="已完成" name="10" />
@@ -82,7 +84,8 @@
       <el-table-column prop="F_Type" label="类别" align="center">
         <template slot-scope="scope">
           <div>
-            {{ $store.getters.workTypeMap[parseInt(scope.row.F_Type)].text }}
+            {{scope.row.F_TypeName}}
+            <!-- {{ $store.getters.workTypeMap[parseInt(scope.row.F_Type)].text }} -->
           </div>
         </template>
       </el-table-column>
@@ -170,6 +173,13 @@
             @click="btn_overorder(scope.row.F_WorkOrderCode)"
             >完结</el-button
           >
+          <el-button
+            v-if="scope.row.F_State == 1"
+            size="mini"
+            type="text"
+            @click="btn_reminderorder(scope.row.F_WorkOrderCode)"
+            >催单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -203,7 +213,8 @@ import {
   getModelDetail,
   getAssignWorkOrder,
   getSureWorkOrder,
-  getOver
+  getOver,
+  getReminderWorkOrder
 } from "@/api/vehicleDispatch/vehicleScheduling.js";
 import { getGetAllCar } from "@/api/Escortservice/Escortservice.js";
 import { getOrderTypeList } from "@/api/commonAPI.js";
@@ -222,10 +233,10 @@ export default {
   data() {
     return {
       dialogFormVisible:false,
-      activeName: "0",
+      activeName: "2",
       loading: false,
       ordercode: "",
-      state: "0",
+      state: "2",
       typeList: [],
       type: "",
       startTime: "",
@@ -412,6 +423,28 @@ export default {
         }
       });
     },
+    //催单
+    btn_reminderorder(code){
+      const params ={
+        WorkOrderCode:code
+      }
+      this.$confirm("您确定要催单吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          getReminderWorkOrder(params).then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.getList();
+              this.$message.success("催单成功!");
+            }
+          });
+        })
+        .catch(() => {
+          this.$message("已取消");
+        });
+    },
     // 确定工单
     btn_sure(rowid) {
       const params = {
@@ -463,7 +496,7 @@ export default {
   font-size: 16px !important;
   font-weight: 600;
 }
-/deep/.el-tabs__header{
-  float: right;
-}
+// /deep/.el-tabs__header{
+//   float: right;
+// }
 </style>