车辆

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

@@ -9,7 +9,7 @@ export function getList(params) {
   })
 }
 // 添加
-export function getAddWorkOrde(params) {
+export function getAddWorkOrder(params) {
   return request({
     url: 'T_Car_WorkOrder/AddWorkOrder',
     method: 'post',
@@ -60,7 +60,7 @@ export function getSureWorkOrder(params) {
 export function getListExpt(params) {
   return request({
     url: 'T_Car_WorkOrder/GetListExpt',
-    method: 'get',
+    method: 'post',
     params
   })
 }
@@ -68,7 +68,7 @@ export function getListExpt(params) {
 export function getListExptIsdc(params) {
   return request({
     url: 'T_Car_WorkOrder/GetListExpt',
-    method: 'get',
+    method: 'post',
     responseType: 'blob',
     params
   })

CallCenterWeb.UI/RMYY/src/components/context/README.md

@@ -1,4 +1,4 @@
-# 1 物资部门数量组件
+# 1 物资部门数量组件（AddItems文件）
 
 ```html
     <add-items ref="childComponent" :item-info="itemInfo"/>
@@ -31,46 +31,85 @@ this.ruleForm.itemessage = this.$refs.childComponent.getItemessage();
 ```
 
 
-# 2 
+# 2 audio组件（audioPlayer文件）
 ```html
 
 ```
 
 ```js
+//文件引入
+import audioPlayer from '@/components/context/audioPlayer'
+//注册
 
 ```
 
 
-# 3  
+# 3  拨号盘(Dialplate文件)
 ```html
-
+        <Dialplate />
 ```
 
 ```js
-
+//引入
+import Dialplate from '@/components/context/Dialplate'
+//注册
+ components: { Dialplate }
 ```
 
 
-# 4 
+# 4 分页组件（Pagination）
 
 ```html
-    
+<pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
+      //getList是获取列表函数
+      
 ```
 
 ```js
-
+//引入注册
+import Pagination from '@/components/context/Pagination'
+components: { Pagination}
+
+//data定义
+ pageParams: {
+          pageindex: 1, //Number(this.$store.getters.serverConfig.PAGESIZE)
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
+          total: 0
+        }
 ```
 
-# 5 
+# 5 ScrollPane
 
 ```html
-    
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
 ```
 
 ```js
+//引入并注册
+import ScrollPane from '@/components/context/ScrollPane'
+components: { ScrollPane }
 
+//调用组件moveToTarget(currentTag)方法
+ this.$refs.scrollPane.moveToTarget(tag)
 ```
 
+# 6 TabOrderState
+```html
+    <tab-order-state :order-id="orderId"  @post-order-id="getOrderId"/>
+```
+```js
+//引入并注册
+import TabOrderState from '@/components/context/TabOrderState'
+components: { TabOrderState }
 
+//data中传参orderId
+orderId:2008
 
+//methods方法中
+ getOrderId(data){
+        this.state = data
+        this.getListTask() //获取列表数据函数
+      }
 
+```

CallCenterWeb.UI/RMYY/src/components/context/TabOrderState/index.vue

@@ -1,8 +1,8 @@
 <template>
   <el-tabs v-model="activeName" @tab-click="handleClick" >
-      <el-tab-pane v-for="(item, index) in typeStateList" 
-      :label="item.StateRemark" 
-      :name="item.StateId" 
+      <el-tab-pane v-for="(item, index) in typeStateList"
+      :label="item.StateRemark"
+      :name="item.StateId"
       :key="index"/>
     </el-tabs>
 </template>

CallCenterWeb.UI/RMYY/src/components/context/commonSelect/selectDepartments.vue

@@ -41,13 +41,13 @@ export default {
     }
   },
   watch: {
-    'departmentsParam.id': function() {
-      this.departmentsData.name = ''
-      this.departmentsData.value = 0
-      this.$emit('post-positon-list', this.departmentsData)
-      this.hospitalsId = this.departmentsParam.id
-      this.getDepartment()
-    },
+    // 'departmentsParam.id': function() {
+    //   this.departmentsData.name = ''
+    //   this.departmentsData.value = 0
+    //   this.$emit('post-positon-list', this.departmentsData)
+    //   this.hospitalsId = this.departmentsParam.id
+    //   this.getDepartment()
+    // },
     'departmentsParam.name': function() {
       this.showDetail()
     },

CallCenterWeb.UI/RMYY/src/components/context/commonSelect/selectOrderType.vue

@@ -18,9 +18,8 @@ export default {
   filters: {
     orderFilter(status) {
       const statusMap = {
-        4000: true,
         2003: true,
-        2008: true,
+        // 2008: true,
         2009: true
       }
       return statusMap[status]

CallCenterWeb.UI/RMYY/src/views/comDispatch/EquipmentLeasing/EquipmentLeasingList/index.vue

@@ -17,21 +17,7 @@
             <el-button v-permission="'equi_add'" type="primary" size="medium" @click="btn_add">添加工单</el-button>
           </el-form-item>
         </el-form>
-        <!-- <el-tabs v-if="isRoot==0" v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="全部" />
-          <el-tab-pane label="待出库" name="1" />
-          <el-tab-pane label="已出库" name="2" />
-          <el-tab-pane label="已返还" name="6" />
-        </el-tabs>
-        <el-tabs v-if="isRoot!=0" v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="全部" />
-          <el-tab-pane label="待确认" name="3" />
-          <el-tab-pane label="代派工" name="5" />
-          <el-tab-pane label="转运中" name="4" />
-          <el-tab-pane label="已完成" name="10" />
-          <el-tab-pane label="异常错误" name="9" />
-        </el-tabs> -->
-        <tab-order-state :order-id="orderId"  @post-order-id="getOrderId"/>
+        <tab-order-state :order-id="orderId" @post-order-id="getOrderId" />
         <el-table :data="taskDataLists" border stripe>
           <el-table-column prop="F_WorkOrderCode" label="工单编号" align="center" min-width="110">
             <template slot-scope="scope">
@@ -81,86 +67,6 @@
           :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getListTask" />
       </el-col>
     </el-row>
-    <!-- 出入库 -->
-    <el-dialog :title='title' :visible.sync="dialogFormVisible" width="70%">
-      <el-form :model="form">
-        <el-col :span="24">
-          <el-row>
-            <el-form-item v-if="title=='出库'" label="出库状态:" :label-width="formLabelWidth">
-              <el-select v-model="form.devstate" placeholder="请选择">
-                <el-option v-for="item in outTypes" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
-          <el-row v-for="(item,index) in devList" :key="index">
-            <el-col :span="6">
-              <el-form-item label="设备名称:" :label-width="formLabelWidth">
-                <el-input v-model="item.devmessage" autocomplete="off"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="数量:" :label-width="formLabelWidth">
-                <el-input-number v-model="item.num" :min="1"></el-input-number>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="设备编号:" :label-width="formLabelWidth">
-                <el-input placeholder="10001" v-model="item.codes" autocomplete="off"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-button type="primary" icon="el-icon-plus" circle @click="addItem()" />
-              <el-button  v-if="devList.length>1" type="primary" icon="el-icon-close" circle @click="removeItem" />
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="备注" :label-width="formLabelWidth">
-                <el-input v-model="form.remark" autocomplete="off"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item>
-            <el-button @click="dialogFormVisible = false">取 消</el-button>
-            <el-button type="primary" @click="outSure()">确 定</el-button>
-          </el-form-item>
-        </el-col>
-      </el-form>
-      <!-- <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="outSure()">确 定</el-button>
-      </div> -->
-    </el-dialog>
-    <el-dialog title="无库存" :visible.sync="dialogNoCount" width="30%">
-      <span>设备库存不足，本次工单异常结束，设备不足信息将反馈给坐席。</span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogNoCount = false">取 消</el-button>
-        <el-button type="primary" @click="dialogNoCount = false">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- 转返派 -->
-    <el-dialog :title="titleBack" :visible.sync="dialogDistribution">
-      <el-form :model="formzp">
-        <el-form-item label="配送人" prop="username" :label-width="formLabelWidth">
-          <select-repairman :repairman-param="repairmanParam" @post-repairman="getRepairman" />
-        </el-form-item>
-        <el-form-item label="电话" :label-width="formLabelWidth">
-          <el-input v-model="formzp.phon" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="对讲机" :label-width="formLabelWidth">
-          <el-input v-model="formzp.talkie" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="备注" :label-width="formLabelWidth">
-          <el-input v-model="formzp.remark" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogDistribution = false">取 消</el-button>
-        <el-button type="primary" @click="zpSure()">确 定</el-button>
-      </div>
-    </el-dialog>
-
   </div>
 </template>
 
@@ -185,6 +91,7 @@
   } from '@/api/systemSetup/roleSetting/orderTypeManage'
   import equiAddOrEdit from '../components/equiAddOrEdit.vue'
   import Outku from '../components/Outku.vue'
+  import assign from '../components/assign.vue'
   import equiDetail from '../components/equiDetail.vue'
   import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
   import TabOrderState from '@/components/context/TabOrderState'
@@ -197,17 +104,14 @@
     },
     data() {
       return {
-        orderId:2004,
-        dialogFormVisible: false,
-        dialogNoCount: false,
-        dialogDistribution: false,
+        orderId: 2001,
         formLabelWidth: '120px',
-        title: '',
-        titleBack: '',
+        // title: '',
+        // titleBack: '',
         form: {
           num: 1
         },
-        formzp: {},
+        // formzp: {},
         isRoot: '',
         devList: [{
           devmessage: '',
@@ -244,17 +148,13 @@
           pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
           total: 0 // 总共多少数据
         },
-        repairmanParam: {
-          id: 0,
-          name: ''
-        },
+        // repairmanParam: {
+        //   id: 0,
+        //   name: ''
+        // },
         taskDataLists: [], // 工单列表信息
         F_Id: '', //工单id
         state: -1, // 状态
-        detail: true, // 详情
-        word: true, // 评价
-        yc: true,
-        repair: true
       }
     },
     computed: {},
@@ -276,7 +176,7 @@
       setInterval(this.getListTask, 1000 * 60)
     },
     methods: {
-      getOrderId(data){
+      getOrderId(data) {
         this.state = data
         this.getListTask()
       },
@@ -299,6 +199,7 @@
         this.formzp.usercode = data.value
         this.formzp.username = data.name
       },
+      //出库
       handleOut(row) {
         this.$layer.iframe({
           content: {
@@ -306,17 +207,14 @@
             parent: this, // 当前的vue对象
             data: {
               woid: row.F_Id,
-              isOut:1
+              isOut: 1
             } // props
           },
           area: ['70%', '72%'],
           title: '出库信息'
         })
-        // this.title = '出库'
-        // this.dialogFormVisible = true
-        // this.F_Id = row.F_Id
-        // this.devstate = row.F_DevState
       },
+      //入库
       handleIn(row) {
         this.$layer.iframe({
           content: {
@@ -324,89 +222,40 @@
             parent: this, // 当前的vue对象
             data: {
               woid: row.F_Id,
-              isOut:0
+              isOut: 0
             } // props
           },
           area: ['70%', '72%'],
           title: '入库信息'
         })
-        // this.title = '入库'
-        // this.dialogFormVisible = true
-        // this.F_Id = row.F_Id
-        // this.devstate = row.F_DevState
       },
       handlezp(row) {
-        this.titleBack = '转派'
-        this.dialogDistribution = true
-        this.F_Id = row.F_Id
+        this.$layer.iframe({
+          content: {
+            content: assign, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              woid: row.F_Id,
+              isGo: 0
+            } // props
+          },
+          area: ['70%', '72%'],
+          title: '转派'
+        })
       },
       handlezpfh(row) {
-        this.titleBack = '转派(返还)'
-        this.dialogDistribution = true
-        this.F_Id = row.F_Id
-      },
-      //出库
-      outSure() {
-        this.dialogFormVisible = false
-        const params = {
-          woid: this.F_Id,
-          devstate: this.form.devstate,
-          devmessage: this.form.devmessage + '|' + this.form.num + '|' + this.form.codes,
-          remark: this.form.remark
-        }
-        if (this.title == '出库') {
-          getDevCheckout(params).then(res => {
-            if (res.state == 'success') {
-              this.$message.success("出库成功")
-              this.form = {}
-              this.getListTask()
-            }
-          })
-        }
-        if (this.title == '入库') {
-          const paramsr = {
-            woid: this.F_Id,
-            devmessage: this.form.devmessage + '|' + this.form.num + '|' + this.form.codes,
-            remark: this.form.remark
-          }
-          getDevStorage(paramsr).then(res => {
-            if (res.state == 'success') {
-              this.$message.success("入库成功")
-              this.form = {}
-              this.getListTask()
-            }
-          })
-        }
-      },
-      //转派
-      zpSure() {
-        this.dialogDistribution = false
-        const params = {
-          woid: this.F_Id,
-          usercode: this.formzp.usercode,
-          username: this.formzp.username,
-          phon: this.formzp.phon,
-          talkie: this.formzp.talkie,
-          remark: this.formzp.remark
-        }
-        if (this.titleBack == '转派') {
-          getAssignTransGo(params).then(res => {
-            if (res.state == 'success') {
-              this.$message.success("转派成功")
-              this.formzp = {}
-              this.getListTask()
-            }
-          })
-        } else {
-          getAssignTransOut(params).then(res => {
-            if (res.state == 'success') {
-              this.$message.success("转派(返还)成功")
-              this.formzp = {}
-              this.getListTask()
-            }
-          })
-        }
-
+        this.$layer.iframe({
+          content: {
+            content: assign, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              woid: row.F_Id,
+              isGo: 1
+            } // props
+          },
+          area: ['70%', '72%'],
+          title: '转派(返还)'
+        })
       },
       //转运
       zyWorkOrder(row) {
@@ -490,12 +339,22 @@
           })
       },
       noCount() {
-        this.dialogNoCount = true
-      },
-      handleClick(tab, event) {
-        this.state = Number(tab.name)
-        this.getListTask()
+        // this.dialogNoCount = true
+        this.$confirm("设备库存不足，本次工单异常结束，设备不足信息将反馈给坐席。", "提示", {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+
+          })
+          .catch(() => {
+            // this.$message('已取消')
+          })
       },
+      // handleClick(tab, event) {
+      //   this.state = Number(tab.name)
+      //   this.getListTask()
+      // },
       getWorkOrder() {
         return new Promise((resolve) => {
           getOrderTypeLists().then((res) => {
@@ -601,76 +460,11 @@
           .catch(() => {
             this.$message('已取消删除')
           })
-      },
-      getTime(date) {
-        var day = Math.floor(new Date().getTime() / 1000) - new Date(date).getTime() / 1000
-        var day2 = Math.floor(day / (24 * 3600))
-        var day3 = day2 * 24 * 3600
-        var day4 = day - day3
-        var day5 = Math.floor(day4 / 3600)
-        return day5
       }
     }
   }
 </script>
 
 <style rel="stylesheet/scss" scoped>
-  /deep/.el-tabs__item {
-    width: 185px !important;
-    text-align: center;
-    font-size: 16px !important;
-    font-weight: 600;
-  }
 
-  .el-popper[x-placement^='bottom'] {
-    z-index: 10px !important;
-  }
-
-  .operation div {
-    font-size: 14px;
-    color: #222;
-    padding: 5px 0;
-    cursor: pointer;
-  }
-
-  .el-icon-s-tools {
-    font-size: 18px !important;
-    vertical-align: middle;
-  }
-
-  .el-popover {
-    min-width: 75px;
-    text-align: center;
-  }
-
-  .el-table .cell {
-    position: relative;
-  }
-
-  .el {
-    cursor: pointer;
-  }
-
-  .filter-container {
-    padding-top: 15px;
-  }
-
-  .el-table--mini,
-  .el-table--small,
-  .el-table__expand-icon {
-    font-size: 14px;
-  }
-
-  .el-table--small td,
-  .el-table--small th {
-    padding: 2px 0 !important;
-  }
-
-  .filter-date {
-    width: 388px !important;
-  }
-
-  .el-table {
-    color: #000;
-  }
 </style>

CallCenterWeb.UI/RMYY/src/views/comDispatch/EquipmentLeasing/components/assign.vue

@@ -0,0 +1,107 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :model="formzp" label-width="100px">
+      <el-col :span="24">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="配送人" prop="username">
+              <select-repairman :repairman-param="repairmanParam" @post-repairman="getRepairman" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话">
+              <el-input v-model="formzp.phon" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="对讲机">
+              <el-input v-model="formzp.talkie" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="备注">
+            <el-input v-model="formzp.remark" autocomplete="off"></el-input>
+          </el-form-item>
+        </el-row>
+        <el-form-item>
+          <el-button @click="resetForm">取 消</el-button>
+          <el-button type="primary" @click="zpSure()">确 定</el-button>
+        </el-form-item>
+      </el-col>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import {
+    getAssignTransGo,
+    getAssignTransOut
+  } from '@/api/EquipmentLeasing/EquipmentLeasing.js'
+  export default {
+    name: 'Assign',
+    props: {
+      woid: {
+        type: Number,
+        default: ''
+      },
+      isGo: {
+        type: Number,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        formzp: {},
+        repairmanParam: {
+          id: 0,
+          name: ''
+        },
+      }
+    },
+    methods: {
+      //配送人
+      getRepairman(data) {
+        this.formzp.usercode = data.value
+        this.formzp.username = data.name
+      },
+      resetForm() {
+        this.$refs.ruleForm.resetFields()
+      },
+      zpSure() {
+        const params = {
+          woid: this.woid,
+          usercode: this.formzp.usercode,
+          username: this.formzp.username,
+          phon: this.formzp.phon,
+          talkie: this.formzp.talkie,
+          remark: this.formzp.remark
+        }
+        if (this.isGo == 0) {
+          getAssignTransGo(params).then(res => {
+            if (res.state == 'success') {
+              this.$message.success("转派成功")
+              this.formzp = {}
+              this.$parent.$layer.close(this.layerid)
+              this.$parent.getListTask() // 重新加载父级数据
+            }
+          })
+        } else {
+          getAssignTransOut(params).then(res => {
+            if (res.state == 'success') {
+              this.$message.success("转派(返还)成功")
+              this.formzp = {}
+              this.$parent.$layer.close(this.layerid)
+              this.$parent.getListTask() // 重新加载父级数据
+            }
+          })
+        }
+
+      },
+
+    }
+  }
+</script>
+
+<style>
+</style>

CallCenterWeb.UI/RMYY/src/views/comDispatch/EquipmentLeasing/components/equiAddOrEdit.vue

@@ -32,11 +32,6 @@
               <el-input v-model="ruleForm.phon" placeholder="请输入联系电话" />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="16">
-            <el-form-item label="设备信息" prop="devmessages">
-              <el-input v-model="ruleForm.devmessages" placeholder="请输入设备信息" />
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <el-row v-for="(item,index) in devList" :key="index">
           <el-col :span="8">
@@ -350,28 +345,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .btnPlus {
-    margin: 5px 0px 5px 20px;
-  }
-
-  .inputNumber {
-    height: 45px;
-  }
-
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 148px;
-    height: 148px;
-    line-height: 178px;
-    text-align: center;
-  }
-
-  /deep/.el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
 </style>

CallCenterWeb.UI/RMYY/src/views/comDispatch/EquipmentLeasing/components/equiDetail.vue

@@ -128,15 +128,7 @@
           this.orderDetailData.F_Remark = res.F_Remark // 备注
           this.workOrderCirculationList = response.itemlist // 配送信息
         })
-      },
-      // 老字符串
-      stringAddArray(addStr, oldStr) {
-        for (let index = 0; index < oldStr.length; index++) {
-          const element = oldStr[index]
-          this.orderDetailData.RedPic.push(addStr + element)
-        }
       }
-
     }
   }
 </script>

CallCenterWeb.UI/RMYY/src/views/comDispatch/Escortservice/EscortserviceList/index.vue

@@ -14,19 +14,12 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
-            <el-button type="primary" size="medium" @click="btn_add">添加工单</el-button>
-            <el-button v-if="selectArr.length>0" type="primary" size="medium" @click="handleDelCode()">删除工单</el-button>
+            <el-button v-permission="'btn_add'" type="primary" size="medium" @click="btn_add">添加工单</el-button>
+            <el-button v-permission="'btn_delete'" v-if="selectArr.length>0" type="primary" size="medium"
+              @click="handleDelCode()">删除工单</el-button>
           </el-form-item>
         </el-form>
-        <!-- <el-tabs v-if="isRoot==0" v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="全部" name="-1" />
-          <el-tab-pane label="待派工" name="0" />
-          <el-tab-pane label="待查收" name="1" />
-          <el-tab-pane label="待到达" name="2" />
-          <el-tab-pane label="陪检中" name="4" />
-          <el-tab-pane label="已完成" name="10" />
-        </el-tabs> -->
-        <tab-order-state :order-id="orderId"  @post-order-id="getOrderId"/>
+        <tab-order-state :order-id="orderId" @post-order-id="getOrderId" />
         <el-table ref="multipleTable" :data="taskDataLists" border stripe @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55">
           </el-table-column>
@@ -47,14 +40,21 @@
           <el-table-column :show-overflow-tooltip="true" prop="F_Remark" 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" @click="btn_edit(scope.row.F_Id)">修改</el-button>
-              <el-button v-if="scope.row.F_State==0" type="text" @click="handleOut(scope.row.F_Id)">转派</el-button>
-              <el-button v-if="scope.row.F_State==1" type="text" @click="btn_Surewo(scope.row)">查收</el-button>
-              <el-button v-if="scope.row.F_State==2" type="text" @click="btn_Arrivewo(scope.row)">已到达</el-button>
-              <el-button v-if="scope.row.F_State==3" type="text" @click="btn_Companywo(scope.row)">陪检</el-button>
-              <el-button v-if="scope.row.F_State==4" type="text" @click="btn_DealBooldWo(scope.row)">待处理</el-button>
-              <el-button v-if="scope.row.F_State==6" type="text" @click="btn_CompleteWo(scope.row)">已完成</el-button>
-              <el-button v-if="scope.row.F_State==10" type="text" @click="btn_Overwo(scope.row)">完结</el-button>
+              <el-button v-permission="'btn_edit'" type="text" @click="btn_edit(scope.row.F_Id)">修改</el-button>
+              <el-button v-permission="'btn_zp'" v-if="scope.row.F_State==0" type="text"
+                @click="handleOut(scope.row.F_Id)">转派</el-button>
+              <el-button v-permission="'btn_cs'" v-if="scope.row.F_State==1" type="text" @click="btn_Surewo(scope.row)">
+                查收</el-button>
+              <el-button v-permission="'btn_arrive'" v-if="scope.row.F_State==2" type="text"
+                @click="btn_Arrivewo(scope.row)">已到达</el-button>
+              <el-button v-permission="'btn_company'" v-if="scope.row.F_State==3" type="text"
+                @click="btn_Companywo(scope.row)">陪检</el-button>
+              <el-button v-permission="'btn_deal'" v-if="scope.row.F_State==4" type="text"
+                @click="btn_DealBooldWo(scope.row)">待处理</el-button>
+              <el-button v-permission="'btn_complete'" v-if="scope.row.F_State==6" type="text"
+                @click="btn_CompleteWo(scope.row)">已完成</el-button>
+              <el-button v-permission="'btn_over'" v-if="scope.row.F_State==10" type="text"
+                @click="btn_Overwo(scope.row)">完结</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -111,7 +111,7 @@
     },
     data() {
       return {
-        orderId:2008,
+        orderId: 2008,
         dialogOverorder: false,
         dialogOutorder: false,
         formLabelWidth: '120px',
@@ -165,8 +165,7 @@
         F_Id: '', //工单id
         state: -1, // 状态
         selectArr: [],
-        ids: [],
-        idstr:''
+        ids: []
       }
     },
     computed: {},
@@ -188,7 +187,7 @@
       setInterval(this.getListTask, 1000 * 60)
     },
     methods: {
-      getOrderId(data){
+      getOrderId(data) {
         this.state = data
         this.getListTask()
       },
@@ -207,8 +206,7 @@
       },
       handleSelectionChange(val) {
         this.selectArr = val;
-        this.ids=[]
-        // this.idstr=''
+        this.ids = []
         for (var i = 0; i < this.selectArr.length; i++) {
           this.ids.push(this.selectArr[i].F_Id)
         }
@@ -298,10 +296,10 @@
           }
         })
       },
-      handleClick(tab, event) {
-        this.state = Number(tab.name)
-        this.getListTask()
-      },
+      // handleClick(tab, event) {
+      //   this.state = Number(tab.name)
+      //   this.getListTask()
+      // },
       getWorkOrder() {
         return new Promise((resolve) => {
           getOrderTypeLists().then((res) => {
@@ -409,8 +407,7 @@
             type: 'warning'
           }).then(() => {
             const params = {
-              ids:this.ids
-              // ids: this.idstr.slice(0,this.idstr.length-1)
+              ids: this.ids
             }
             getDelWorkOrder(params).then(res => {
               if (res.state == 'success') {
@@ -423,76 +420,11 @@
           .catch(() => {
             this.$message('已取消删除')
           })
-      },
-      getTime(date) {
-        var day = Math.floor(new Date().getTime() / 1000) - new Date(date).getTime() / 1000
-        var day2 = Math.floor(day / (24 * 3600))
-        var day3 = day2 * 24 * 3600
-        var day4 = day - day3
-        var day5 = Math.floor(day4 / 3600)
-        return day5
       }
     }
   }
 </script>
 
 <style rel="stylesheet/scss" scoped>
-  /deep/.el-tabs__item {
-    width: 185px !important;
-    text-align: center;
-    font-size: 16px !important;
-    font-weight: 600;
-  }
 
-  .el-popper[x-placement^='bottom'] {
-    z-index: 10px !important;
-  }
-
-  .operation div {
-    font-size: 14px;
-    color: #222;
-    padding: 5px 0;
-    cursor: pointer;
-  }
-
-  .el-icon-s-tools {
-    font-size: 18px !important;
-    vertical-align: middle;
-  }
-
-  .el-popover {
-    min-width: 75px;
-    text-align: center;
-  }
-
-  .el-table .cell {
-    position: relative;
-  }
-
-  .el {
-    cursor: pointer;
-  }
-
-  .filter-container {
-    padding-top: 15px;
-  }
-
-  .el-table--mini,
-  .el-table--small,
-  .el-table__expand-icon {
-    font-size: 14px;
-  }
-
-  .el-table--small td,
-  .el-table--small th {
-    padding: 2px 0 !important;
-  }
-
-  .filter-date {
-    width: 388px !important;
-  }
-
-  .el-table {
-    color: #000;
-  }
 </style>

CallCenterWeb.UI/RMYY/src/views/comDispatch/Escortservice/EscortserviceReport/index.vue

@@ -12,7 +12,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="btn_search_task()">查询</el-button>
-        <el-button type="primary" @click="btn_export">
+        <el-button v-permission="'btn_export'" type="primary" @click="btn_export">
           <svg-icon icon-class="daochu" />导出
         </el-button>
       </el-form-item>

CallCenterWeb.UI/RMYY/src/views/comDispatch/Escortservice/components/escortAddOrEdit.vue

@@ -432,28 +432,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .btnPlus {
-    margin: 5px 0px 5px 20px;
-  }
-
-  .inputNumber {
-    height: 45px;
-  }
-
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 148px;
-    height: 148px;
-    line-height: 178px;
-    text-align: center;
-  }
-
-  /deep/.el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
 </style>

CallCenterWeb.UI/RMYY/src/views/comDispatch/Escortservice/components/escortDetail.vue

@@ -129,13 +129,6 @@
           this.orderDetailData.F_PatientName = res.F_PatientName // 备注
           this.workOrderCirculationList = response.itemlist // 配送信息
         })
-      },
-      // 老字符串
-      stringAddArray(addStr, oldStr) {
-        for (let index = 0; index < oldStr.length; index++) {
-          const element = oldStr[index]
-          this.orderDetailData.RedPic.push(addStr + element)
-        }
       }
 
     }

CallCenterWeb.UI/RMYY/src/views/comDispatch/Escortservice/components/escortOut.vue

@@ -2,22 +2,11 @@
   <div>
     <el-form ref="ruleForm" :model="ruleForm" label-width="100px">
       <el-col :span="24">
-        <!-- <el-row>
-          <el-form-item label="出库状态:" :label-width="formLabelWidth">
-            <el-select v-model="form.devstate" placeholder="请选择">
-              <el-option v-for="item in outTypes" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-row> -->
         <el-row v-for="(item,index) in devList" :key="index">
           <el-col :span="6">
-            <!-- <el-form-item label="申请人" prop="usercode" :label-width="formLabelWidth">
-              <el-input v-model="item.usercode" autocomplete="off"></el-input>
-            </el-form-item> -->
             <el-form-item label="转运人" prop="usercode" :label-width="formLabelWidth">
               <el-select v-model="devList[index].usercode">
-                <el-option v-for="item in nameList" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in nameList" :key="item.usercode" :label="item.username" :value="item.usercode">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -71,6 +60,7 @@
     getAssignWo,
     getGetAllCar
   } from '@/api/Escortservice/Escortservice.js'
+  import { GetPerson } from '@/api/commonAPI'
   export default {
     name: 'escortOut',
     props: {
@@ -120,11 +110,11 @@
         resstr: '',
         carList: []
         // isOut:0
-
       }
     },
     created() {
       this.getCar()
+      this.getRepairman()
     },
     methods: {
       addItem() {
@@ -148,6 +138,17 @@
           }
         }
       },
+      getRepairman() {
+        const params = {
+          deptid: 1 // 字典管理的工单标识
+        }
+        return new Promise((resolve) => {
+          GetPerson(params).then((res) => {
+            this.nameList = res.rows
+          })
+          resolve()
+        })
+      },
       //转派
       outSure() {
         this.getStr()
@@ -179,17 +180,16 @@
               label: res[i]
             })
           }
-          console.log(this.carList)
         })
       },
-      getRepairman(data) {
-        console.log(data)
-        this.form.usercode = data.value
-      },
+      // getRepairman(data) {
+      //   console.log(data)
+      //   this.form.usercode = data.value
+      // },
       resetForm() {
         this.form = {}
         this.$refs.ruleForm.resetFields()
-        this.devList=[{
+        this.devList = [{
           talkie: '',
           phone: '',
           usercode: ''

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/addOrEditDistribute.vue

@@ -5,31 +5,31 @@
         <el-row v-if="typeid === 2005">
           <el-col :span="8">
             <el-form-item label="工单类别" prop="hosname">
-              <select-order-type :third-order-type="thirdOrderTypeParam" @post-third-order-type="getThirdOrderType"/>
+              <select-order-type :third-order-type="thirdOrderTypeParam" @post-third-order-type="getThirdOrderType" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row >
+        <el-row>
           <el-col :span="8">
             <el-form-item label="院区" prop="hosname">
-              <select-hosname :hospitals-param="hospitalsParam" @post-hospitals="getHospitals"/>
+              <select-hosname :hospitals-param="hospitalsParam" @post-hospitals="getHospitals" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="科室" prop="deptname">
-              <select-departments :departments-param="departmentsParam" @post-departments="getDepartments"/>
+              <select-departments :departments-param="departmentsParam" @post-departments="getDepartments" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="申请人" prop="username">
-              <select-repairman :repairman-param="repairmanParam" @post-repairman="getRepairman"/>
+              <select-repairman :repairman-param="repairmanParam" @post-repairman="getRepairman" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row >
+        <el-row>
           <el-col :span="8">
             <el-form-item label="联系电话" prop="phon">
-              <el-input v-model="ruleForm.phon" placeholder="请输入联系电话"/>
+              <el-input v-model="ruleForm.phon" placeholder="请输入联系电话" />
             </el-form-item>
           </el-col>
           <el-col v-if="JSON.stringify(orderTypeData)==='{}'" :span="7">
@@ -43,8 +43,9 @@
           </el-col>
         </el-row>
 
-        <el-row v-if="(orderTypeData.F_Type2&&orderTypeData.F_Type2!=2004)||(typeid&&typeid !=2004)">
-          <add-items ref="childComponent" :item-info="itemInfo"/>
+        <el-row
+          v-if="((orderTypeData.F_Type2&&orderTypeData.F_Type2!=2004)||(typeid&&typeid !=2004))&&((orderTypeData.F_Type2&&orderTypeData.F_Type2!=2001)||(typeid&&typeid !=2001))&&((orderTypeData.F_Type2&&orderTypeData.F_Type2!=2008)||(typeid&&typeid !=2008))">
+          <add-items ref="childComponent" :item-info="itemInfo" />
         </el-row>
 
         <el-row v-if="(orderTypeData.F_Type2===2005)||(typeid ===2005)">
@@ -58,11 +59,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="搬运时间" prop="carrytime">
-              <el-date-picker
-                v-model="ruleForm.carrytime"
-                type="date"
-                placeholder="搬运时间"
-                value-format="yyyy-MM-dd"/>
+              <el-date-picker v-model="ruleForm.carrytime" type="date" placeholder="搬运时间" value-format="yyyy-MM-dd" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -71,35 +68,113 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="红处方数量" prop="number">
-                <el-input-number v-model="ruleForm.number" :min="1" size="medium" class="inputNumber"/>
+                <el-input-number v-model="ruleForm.number" :min="1" size="medium" class="inputNumber" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col>
               <el-form-item label="上传图片" prop="T_Woimageid">
-                <el-upload
-                  ref="upload"
-                  :headers="headers"
-                  :auto-upload="false"
-                  :on-success="handle_success"
-                  :file-list="fileList"
-                  :on-change="handleFileUploaderChange"
-                  action="#"
-                  class="avatar-uploader"
-                  list-type="picture"
-                >
+                <el-upload ref="upload" :headers="headers" :auto-upload="false" :on-success="handle_success"
+                  :file-list="fileList" :on-change="handleFileUploaderChange" action="#" class="avatar-uploader"
+                  list-type="picture">
                   <i class="el-icon-plus avatar-uploader-icon" />
                 </el-upload>
               </el-form-item>
             </el-col>
           </el-row>
         </el-row>
-        
+        <el-row v-if="(orderTypeData.F_Type2===2001)||(typeid ===2001)">
+          <el-row v-for="(item,index) in devList" :key="index">
+            <el-col :span="8">
+              <el-form-item label="设备名称" prop="devname">
+                <el-input v-model="item.devname" placeholder="设备名称" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="数量" prop="num">
+                <el-input-number v-model="item.num" :min="1"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-button type="primary" icon="el-icon-plus" circle @click="addDevItem()" />
+              <el-button type="primary" v-if="devList.length>1" icon="el-icon-close" circle
+                @click="removeDevItem(index)" />
+            </el-col>
+          </el-row>
+        </el-row>
+        <el-row v-if="(orderTypeData.F_Type2===2008)||(typeid ===2008)">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="患者姓名" prop="patient">
+                <el-input v-model="ruleForm.patient" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="床号" prop="bednum">
+                <el-input v-model="ruleForm.bednum" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="住院号" prop="inpatientnum">
+                <el-input v-model="ruleForm.inpatientnum" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检查项目" prop="checkitem">
+                <el-input v-model="ruleForm.checkitem" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="预约检查时间" prop="yuyuetime">
+                <el-date-picker v-model="ruleForm.yuyuetime" type="datetime" placeholder="选择日期时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="注意事项" prop="attention">
+                <el-select v-model="ruleForm.attention">
+                  <el-option v-for="item in attentionList" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="出行方式" prop="travel">
+                <el-select v-model="ruleForm.travel">
+                  <el-option v-for="item in travelList" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="护理级别" prop="nursinglevel">
+                <el-select v-model="ruleForm.nursinglevel">
+                  <el-option v-for="item in nursinglevelList" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="是否带管" prop="withpipe">
+                <el-select v-model="ruleForm.withpipe">
+                  <el-option v-for="item in withpipeList" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-row>
         <el-row>
           <el-col :span="16">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入备注"/>
+              <el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -114,284 +189,377 @@
 </template>
 
 <script>
+  import {
+    getWorkOrderGetDept,
+    UploadImage64
+  } from '@/api/commonAPI'
+  import {
+    getDeatil,
+    addData,
+    editData
+  } from '@/api/comDispatch/muterDistribute'
 
-import { getWorkOrderGetDept, UploadImage64 } from '@/api/commonAPI'
-import { getDeatil, addData, editData } from '@/api/comDispatch/muterDistribute'
-
-import AddItems from '@/components/context/AddItems'
+  import AddItems from '@/components/context/AddItems'
 
-export default {
-  name: 'AddOrEditDistribute',
-  components: {
-    AddItems
-  },
-  props: {
-    rowid: {
-      type: String,
-      default: ''
+  export default {
+    name: 'AddOrEditDistribute',
+    components: {
+      AddItems
     },
-    typeid: {
-      type: Number,
-      default: 0
-    },
-    layerid: {
-      type: String,
-      default: ''
-    },
-    orderTypeData: {
-      type: Object,
-      default() {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      hospitalsId: 0,
-      thirdOrderTypeParam: {
-        typeid: 3,
-        pid: 2005
-      },
-      hospitalsParam: {
-        id: 0,
-        name: ''
-      },
-      itemInfo:{
-        address:'送达地点',
-        addressPlaceholder:'请选择送达地点',
-        name:'物品名称',
-        namePlaceholder:'请输入物品名称',
-        clearFlag:false
-      },
-      departmentsParam: {
-        id: 0,
-        name: ''
+    props: {
+      rowid: {
+        type: String,
+        default: ''
       },
-      positonParam: {
-        id: 1
+      typeid: {
+        type: Number,
+        default: 0
       },
-      repairmanParam: {
-        id: 0,
-        name: ''
+      layerid: {
+        type: String,
+        default: ''
       },
-      ruleForm: {
-        callid: '',
-        type: '', // 工单类别
-        hosid: '',	// 院区id
-        hosname: '',	// 院区id
-        source: '电话',
-        deptid: '', // 申请科室id
-        deptname: '', // 申请科室名称
-        usercode: '', // 申请人编码
-        orthertype: '',
-        orthertypeName: '',
-        isthird: 1,
-        username: '', //	申请人
-        phon: '', //	联系电话
-        itemessage: '', //	标本名称
-        islarge: '1',
-        carrytime: '',
-        number: 0,
-        imgId: '',
-        remark: '' //	备注
-      },
-      fileList: [],
-      imgBase64Array: '',
-      headers: {
-        Authorization: localStorage.getItem('Admin-Token')
-      },
-      loading: false
-    }
-  },
-  watch: {
-    'orderTypeData.F_Type2': function() {
-      // console.log(this.orderTypeData.F_Type2)
-    }
-  },
-  created() {
-    if (this.rowid) {
-      this.ruleForm.id = this.rowid
-      this.getDetail(this.rowid)
-    }
-    if (JSON.stringify(this.orderTypeData) === '{}') {
-      this.ruleForm.source = ''
-    }
-  },
-  methods: {
+      orderTypeData: {
+        type: Object,
+        default () {
+          return {}
+        }
+      }
+    },
+    data() {
+      return {
+        hospitalsId: 0,
+        thirdOrderTypeParam: {
+          typeid: 3,
+          pid: 2005
+        },
+        hospitalsParam: {
+          id: 0,
+          name: ''
+        },
+        itemInfo: {
+          address: '送达地点',
+          addressPlaceholder: '请选择送达地点',
+          name: '物品名称',
+          namePlaceholder: '请输入物品名称',
+          clearFlag: false
+        },
+        departmentsParam: {
+          id: 0,
+          name: ''
+        },
+        positonParam: {
+          id: 1
+        },
+        repairmanParam: {
+          id: 0,
+          name: ''
+        },
+        ruleForm: {
+          callid: '',
+          type: '', // 工单类别
+          hosid: '', // 院区id
+          hosname: '', // 院区id
+          source: '电话',
+          deptid: '', // 申请科室id
+          deptname: '', // 申请科室名称
+          usercode: '', // 申请人编码
+          orthertype: '',
+          orthertypeName: '',
+          isthird: 1,
+          username: '', //	申请人
+          phon: '', //	联系电话
+          itemessage: '', //	标本名称
+          islarge: '1',
+          carrytime: '',
+          number: 0,
+          imgId: '',
+          remark: '', //	备注
+          bednum: '',
+          patient: '',
+          inpatientnum: '',
+          checkitem: '',
+          yuyuetime: '',
+          attention: '',
+          travel: '',
+          nursinglevel: '',
+          withpipe: ''
+        },
+        fileList: [],
+        devList: [{
+          devname: '',
+          num: 1
+        }],
+        resstr: '',
+        attentionList: [{
+          value: 1,
+          label: "空腹"
+        }, {
+          value: 2,
+          label: "憋尿"
+        }, {
+          value: 3,
+          label: "其他"
+        }],
+        travelList: [{
+          value: 1,
+          label: "步行"
+        }, {
+          value: 2,
+          label: "开车"
+        }, {
+          value: 3,
+          label: "走路"
+        }],
+        nursinglevelList: [{
+          value: 1,
+          label: "一级"
+        }, {
+          value: 2,
+          label: "二级"
+        }, {
+          value: 3,
+          label: "特级"
+        }],
+        withpipeList: [{
+          value: 1,
+          label: "引流管"
+        }, {
+          value: 2,
+          label: "尿管"
+        }, {
+          value: 3,
+          label: "胃管"
+        }],
+        imgBase64Array: '',
+        headers: {
+          Authorization: localStorage.getItem('Admin-Token')
+        },
+        loading: false
+      }
+    },
+    watch: {
+      'orderTypeData.F_Type2': function() {
+        // console.log(this.orderTypeData.F_Type2)
+      }
+    },
+    created() {
+      if (this.rowid) {
+        this.ruleForm.id = this.rowid
+        this.getDetail(this.rowid)
+      }
+      if (JSON.stringify(this.orderTypeData) === '{}') {
+        this.ruleForm.source = ''
+      }
+    },
+    methods: {
 
-    submitForm() {
+      submitForm() {
 
-      this.ruleForm.itemessage = this.$refs.childComponent.getItemessage();
+        this.ruleForm.itemessage = this.$refs.childComponent.getItemessage();
 
-      if (JSON.stringify(this.orderTypeData) !== '{}') {
-        this.ruleForm.type = this.orderTypeData.F_Type2
-        this.ruleForm.orthertype = this.orderTypeData.F_Type3
-      } else {
-        this.ruleForm.type = this.typeid
-      }
-      this.ruleForm.imgId = this.ruleForm.imgId.slice(0, this.ruleForm.imgId.length - 1)
-      this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-          this.loading = true
-          const datas = {
-            callid: this.ruleForm.id,
-            type: this.ruleForm.type, //	工单类别
-            source: this.ruleForm.source, //	工单来源
-            orthertype: this.ruleForm.orthertype,
-            hosid: this.ruleForm.hosid, //	院区id
-            deptid: this.ruleForm.deptid, //	申请科室id
-            deptname: this.ruleForm.deptname, // 申请科室名称
-            usercode: this.ruleForm.usercode, //	申请人编码
-            username: this.ruleForm.username, //	申请人
-            phon: this.ruleForm.phon, //	联系电话
-            islarge: this.ruleForm.islarge,
-            isthird: this.ruleForm.isthird,
-            carrytime: this.ruleForm.carrytime,
-            pic: this.ruleForm.imgId,
-            number: this.ruleForm.number,
-            itemessage: this.ruleForm.itemessage, //	标本名称
-            positon: this.ruleForm.positon, //	送达地点病床位置
-            remark: this.ruleForm.remark//	备注
-          }
-          // 添加
-          if (!this.rowid) {
-            addData(datas).then(response => {
-              this.loading = false
-              if (response.state.toLowerCase() === 'success') {
-                if (this.layerid) {
+        if (JSON.stringify(this.orderTypeData) !== '{}') {
+          this.ruleForm.type = this.orderTypeData.F_Type2
+          this.ruleForm.orthertype = this.orderTypeData.F_Type3
+        } else {
+          this.ruleForm.type = this.typeid
+        }
+        this.ruleForm.imgId = this.ruleForm.imgId.slice(0, this.ruleForm.imgId.length - 1)
+        this.$refs.ruleForm.validate((valid) => {
+          if (valid) {
+            this.loading = true
+            const datas = {
+              callid: this.ruleForm.id,
+              type: this.ruleForm.type, //	工单类别
+              source: this.ruleForm.source, //	工单来源
+              orthertype: this.ruleForm.orthertype,
+              hosid: this.ruleForm.hosid, //	院区id
+              deptid: this.ruleForm.deptid, //	申请科室id
+              deptname: this.ruleForm.deptname, // 申请科室名称
+              usercode: this.ruleForm.usercode, //	申请人编码
+              username: this.ruleForm.username, //	申请人
+              phon: this.ruleForm.phon, //	联系电话
+              islarge: this.ruleForm.islarge,
+              isthird: this.ruleForm.isthird,
+              carrytime: this.ruleForm.carrytime,
+              pic: this.ruleForm.imgId,
+              number: this.ruleForm.number,
+              itemessage: this.ruleForm.itemessage, //	标本名称
+              positon: this.ruleForm.positon, //	送达地点病床位置
+              remark: this.ruleForm.remark, //	备注
+              devmessages: this.resstr, //设备信息
+              bednum: this.ruleForm.bednum,
+              patient: this.ruleForm.patient,
+              inpatientnum: this.ruleForm.patient,
+              checkitem: this.ruleForm.checkitem,
+              yuyuetime: this.ruleForm.yuyuetime,
+              attention: this.ruleForm.attention,
+              travel: this.ruleForm.travel,
+              nursinglevel: this.ruleForm.nursinglevel,
+              withpipe: this.ruleForm.withpipe
+            }
+            // 添加
+            if (!this.rowid) {
+              addData(datas).then(response => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  if (this.layerid) {
+                    this.$parent.$layer.close(this.layerid)
+                    this.$parent.getList() // 重新加载父级数据
+                  }
+                  this.fileList = []
+                  this.resetForm()
+                  this.$message.success('恭喜你，添加成功!')
+                }
+              }).catch(() => {
+                this.loading = false
+              })
+            } else {
+              // 编辑
+              editData(datas).then(response => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  this.fileList = []
                   this.$parent.$layer.close(this.layerid)
                   this.$parent.getList() // 重新加载父级数据
+                  this.$message.success('恭喜你，编辑成功!')
                 }
-                this.fileList = []
-                this.resetForm()
-                this.$message.success('恭喜你，添加成功!')
-              }
-            }).catch(() => {
-              this.loading = false
-            })
+              }).catch(() => {
+                this.loading = false
+              })
+            }
           } else {
-            // 编辑
-            editData(datas).then(response => {
-              this.loading = false
-              if (response.state.toLowerCase() === 'success') {
-                this.fileList = []
-                this.$parent.$layer.close(this.layerid)
-                this.$parent.getList() // 重新加载父级数据
-                this.$message.success('恭喜你，编辑成功!')
-              }
-            }).catch(() => {
-              this.loading = false
-            })
+            this.$message.error('请输入有效的必填项信息!')
+            return false
           }
-        } else {
-          this.$message.error('请输入有效的必填项信息!')
-          return false
-        }
-      })
-    },
-    handle_success(res) {
-      this.imgId = res.data
-    },
-    handleFileUploaderChange(file) {
-      const self = this
-      const reader = new FileReader()
+        })
+      },
+      handle_success(res) {
+        this.imgId = res.data
+      },
+      handleFileUploaderChange(file) {
+        const self = this
+        const reader = new FileReader()
 
-      reader.readAsDataURL(file.raw)
-      reader.onload = function(event) {
-        self.imgBase64Array = this.result.split(',')[1]
-        const params = {
-          dataurl: self.imgBase64Array,
-          filename: file.name
+        reader.readAsDataURL(file.raw)
+        reader.onload = function(event) {
+          self.imgBase64Array = this.result.split(',')[1]
+          const params = {
+            dataurl: self.imgBase64Array,
+            filename: file.name
+          }
+          self.uploadImg(params)
         }
-        self.uploadImg(params)
-      }
-    },
-    uploadImg(params) {
-      console.log(params)
-      UploadImage64(params).then(response => {
-        this.loading = false
-        if (response.state.toLowerCase() === 'success') {
-          this.ruleForm.imgId += response.data.F_FileId + ','
-          console.log(this.ruleForm.imgId)
-          this.$message.success('恭喜你，添加成功!')
+      },
+      uploadImg(params) {
+        console.log(params)
+        UploadImage64(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.ruleForm.imgId += response.data.F_FileId + ','
+            console.log(this.ruleForm.imgId)
+            this.$message.success('恭喜你，添加成功!')
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+      },
+      resetForm() {
+        this.$refs.ruleForm.resetFields()
+        // this.itemInfo.clearFlag = true
+      },
+      // 三级改变时触发
+      getThirdOrderType(data) {
+        console.log(data)
+        this.ruleForm.orthertype = data.value
+        this.ruleForm.orthertypeName = data.name
+      },
+      // 院区下拉改变事件
+      getHospitals(data) {
+        this.ruleForm.hosid = data.value
+        this.ruleForm.hosname = data.name
+        // this.getDepartment()
+      },
+      // 科室下拉改变事件
+      getDepartments(data) {
+        console.log(data)
+        this.ruleForm.deptid = data.value
+        this.ruleForm.deptname = data.name
+      },
+      getRepairman(data) {
+        console.log(data)
+        this.ruleForm.usercode = data.value
+        this.ruleForm.username = data.name
+      },
+      getPositonList(data) {
+        console.log(data)
+        this.item.delivered
+      },
+      addDevItem() {
+        const params = {
+          devname: '',
+          num: 1
         }
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    resetForm() {
-      this.$refs.ruleForm.resetFields()
-      // this.itemInfo.clearFlag = true
-    },
-    // 三级改变时触发
-    getThirdOrderType(data) {
-      console.log(data)
-      this.ruleForm.orthertype = data.value
-      this.ruleForm.orthertypeName = data.name
-    },
-    // 院区下拉改变事件
-    getHospitals(data) {
-      this.ruleForm.hosid = data.value
-      this.ruleForm.hosname = data.name
-      // this.getDepartment()
-    },
-    // 科室下拉改变事件
-    getDepartments(data) {
-      console.log(data)
-      this.ruleForm.deptid = data.value
-      this.ruleForm.deptname = data.name
-    },
-    getRepairman(data) {
-      console.log(data)
-      this.ruleForm.usercode = data.value
-      this.ruleForm.username = data.name
-    },
-    getPositonList(data) {
-      console.log(data)
-      this.item.delivered
-    },
-    // 获取详情
-    getDetail(rid) {
-      getDeatil(rid).then(response => {
-        if (response.state.toLowerCase() === 'success') {
-          const res = response.model
-          console.log(response.model.HosName)
-          this.ruleForm.hosid = res.F_HosId
-          this.ruleForm.hosname = res.HosName
-          this.ruleForm.deptid = res.F_ProposerDeptId
-          this.ruleForm.deptname = res.F_ProposerDeptName
-          this.ruleForm.usercode = res.F_ProposerCode
-          this.ruleForm.username = res.F_ProposerName
-          this.ruleForm.phon = res.F_ProposerPhon
-          this.ruleForm.itemessage = res.F_ItemMessages
-          this.ruleForm.remark = res.F_Remark
+        this.devList.push(params)
+      },
+      removeDevItem(index) {
+        console.log(index)
+        this.devList.splice(index, 1)
+      },
+      getStr() {
+        var str = '';
+        for (var i = 0; i < this.devList.length; i++) {
+          str += this.devList[i].devname + ':' + this.devList[i].num + ","
+          if (str.length > 0) {
+            this.resstr = str.substring(0, str.length - 1);
+          }
         }
-      })
+      },
+      // 获取详情
+      getDetail(rid) {
+        getDeatil(rid).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            const res = response.model
+            console.log(response.model.HosName)
+            this.ruleForm.hosid = res.F_HosId
+            this.ruleForm.hosname = res.HosName
+            this.ruleForm.deptid = res.F_ProposerDeptId
+            this.ruleForm.deptname = res.F_ProposerDeptName
+            this.ruleForm.usercode = res.F_ProposerCode
+            this.ruleForm.username = res.F_ProposerName
+            this.ruleForm.phon = res.F_ProposerPhon
+            this.ruleForm.itemessage = res.F_ItemMessages
+            this.ruleForm.remark = res.F_Remark
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.btnPlus{
-  margin:5px 0px 5px 20px;
-}
-.inputNumber{
+  .btnPlus {
+    margin: 5px 0px 5px 20px;
+  }
+
+  .inputNumber {
     height: 45px;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 148px;
-  height: 148px;
-  line-height: 178px;
-  text-align: center;
-}
-/deep/.el-upload{
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 148px;
+    height: 148px;
+    line-height: 178px;
+    text-align: center;
+  }
+
+  /deep/.el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
 </style>

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

@@ -0,0 +1,7 @@
+<template>
+  <div>
+    <keep-alive>
+      <router-view />
+    </keep-alive>
+  </div>
+</template>

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

@@ -3,24 +3,69 @@
     <el-form ref="ruleForm" :model="ruleForm" label-width="100px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="名称" prop="F_name">
-            <el-input
-              v-model="ruleForm.F_name"
-              placeholder="请输入车辆信息"
-            />
+          <el-form-item label="工单类别" prop="type">
+            <el-select v-model="ruleForm.type">
+              <el-option v-for="item in typeList" :key="item.fid" :label="item.fname" :value="item.fid">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="院区" prop="hosname">
+            <select-hosname :hospitals-param="hospitalsParam" @post-hospitals="getHospitals" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="申请科室" prop="deptname">
+            <select-departments :departments-param="departmentsParam" @post-departments="getDepartments" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="出发地点" prop="startplace">
+            <el-input v-model="ruleForm.startplace" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="目的地" prop="endplace">
+            <el-input v-model="ruleForm.endplace" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="申请人" prop="username">
+            <select-repairman :repairman-param="repairmanParam" @post-repairman="getRepairman" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="联系电话" prop="phon">
+            <el-input type="text" v-model="ruleForm.phon" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="车辆要求" prop="cartype">
+            <el-radio v-model="ruleForm.cartype" :label="1">大车</el-radio>
+            <el-radio v-model="ruleForm.cartype" :label="2">小车</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="来源" prop="source">
+            <el-select v-model="ruleForm.source">
+              <el-option v-for="item in sourceList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-
       </el-row>
-
       <el-row>
         <el-col :span="16">
           <el-form-item label="备注" prop="F_Remark">
-            <el-input type="textarea" v-model="ruleForm.F_Remark" placeholder="请输入备注" />
+            <el-input type="textarea" v-model="ruleForm.remark" placeholder="请输入备注" />
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
         <el-button @click="resetForm">重置</el-button>
@@ -30,102 +75,205 @@
 </template>
 
 <script>
-// import {
-//   getDeatil,
-//   addData,
-//   editData,
-// } from "@/api/";
-
-export default {
-  name: "AddOrEdit",
-  props: {
-    rowid: {
-      type: String,
-      default: "",
+  import {
+    getList,
+    getModelDetail,
+    getAddWorkOrder,
+    getUpdateWorkOrder
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import {
+    getOrderTypeList
+  } from "@/api/commonAPI.js"
+  export default {
+    name: "AddOrEdit",
+    props: {
+      rowid: {
+        type: Number,
+        default: "",
+      },
+      layerid: {
+        type: String,
+        default: "",
+      },
+    },
+    data() {
+      return {
+        typeList: [],
+        sourceList: [{
+          value: "电话",
+          label: "电话"
+        }, {
+          value: "电脑",
+          label: "电脑"
+        }, {
+          value: "微信",
+          label: "微信"
+        }],
+        hospitalsParam: {
+          id: 0,
+          name: ''
+        },
+        departmentsParam: {
+          id: 0,
+          name: ''
+        },
+        repairmanParam: {
+          id: 0,
+          name: ''
+        },
+        ruleForm: {
+          F_ID: '',
+          startplace: '',
+          endplace: '',
+          source: '',
+          hosid: '', // 院区id
+          hosname: '', // 院区id
+          deptid: '', // 申请科室id
+          deptname: '', // 申请科室名称
+          usercode: '', // 申请人编码
+          username: '', //	申请人
+          phon: '',
+          type: '',
+          cartype: '',
+          F_CarMessage: '',
+          remark: ''
+        },
+        loading: false,
+      };
     },
-    layerid: {
-      type: String,
-      default: "",
+    created() {
+      this.getTypeOrder()
+      if (this.rowid) {
+        this.ruleForm.F_ID = this.rowid;
+        this.getDetail();
+        console.log(this.rowid)
+      }
     },
-  },
-  data() {
-    return {
-      ruleForm: {
-        F_Id: "",
-        F_name: "", //	车辆信息
-        F_Remark: "", //	备注
+    methods: {
+      getTypeOrder() {
+        const params = {
+          pid: 2,
+          typeid: 4000
+        }
+        getOrderTypeList(params.pid, params.typeid).then(res => {
+          this.typeList = res.rows
+        })
       },
-      loading: false,
-    };
-  },
-  created() {
-    if (this.rowid) {
-      this.ruleForm.F_Id = this.rowid;
-      this.getDetail(this.rowid);
-    }
-  },
-  methods: {
-    submitForm() {
-      this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-          this.loading = true;
-          const datas = {
-            F_Id: this.ruleForm.F_Id, //  主键id
-            F_name: this.ruleForm.F_name, //	车辆名称
-            F_Remark: this.ruleForm.F_Remark, //	备注
-          };
+      submitForm() {
+        this.$refs.ruleForm.validate((valid) => {
+          if (valid) {
+            this.loading = true;
+            const datas = {
+              type: this.ruleForm.type,
+              hosid: this.ruleForm.hosid, //	院区id
+              detpid: this.ruleForm.deptid, //	申请科室id
+              startplace: this.ruleForm.startplace,
+              endplace: this.ruleForm.endplace,
+              needman: this.ruleForm.usercode, //	申请人
+              phon: this.ruleForm.phon,
+              cartype: this.ruleForm.cartype,
+              source: this.ruleForm.source,
+              remark: this.ruleForm.remark, //	备注
+            };
 
-          // 添加
-          if (!this.rowid) {
-            // addData(datas)
-            //   .then((response) => {
-            //     this.loading = false;
-            //     if (response.state.toLowerCase() === "success") {
-            //       this.$parent.$layer.close(this.layerid);
-            //       this.$parent.getList(); // 重新加载父级数据
-            //       this.$message.success("恭喜你，车辆添加成功!");
-            //     }
-            //   })
-            //   .catch(() => {
-            //     this.loading = false;
-            //   });
+            // 添加
+            if (!this.rowid) {
+              getAddWorkOrder(datas)
+                .then((response) => {
+                  this.loading = false;
+                  if (response.state.toLowerCase() === "success") {
+                    this.$parent.$layer.close(this.layerid);
+                    this.$parent.getList(); // 重新加载父级数据
+                    this.$message.success("恭喜你，车辆添加成功!");
+                  }
+                })
+                .catch(() => {
+                  this.loading = false;
+                });
+            } else {
+              // 编辑
+              const datas = {
+                orderid: this.rowid,
+                type: this.ruleForm.type,
+                hosid: this.ruleForm.hosid, //	院区id
+                detpid: this.ruleForm.deptid, //	申请科室id
+                startplace: this.ruleForm.startplace,
+                endplace: this.ruleForm.endplace,
+                needman: this.ruleForm.usercode, //	申请人
+                needmanName: this.ruleForm.username, //	申请人
+                phon: this.ruleForm.phon,
+                cartype: this.ruleForm.cartype,
+                source: this.ruleForm.source,
+                remark: this.ruleForm.remark, //	备注
+              };
+              getUpdateWorkOrder(datas)
+                .then((response) => {
+                  this.loading = false;
+                  if (response.state.toLowerCase() === "success") {
+                    this.$parent.$layer.close(this.layerid);
+                    this.$parent.getList(); // 重新加载父级数据
+                    this.$message.success("恭喜你，车辆编辑成功!");
+                  }
+                })
+                .catch(() => {
+                  this.loading = false;
+                });
+            }
           } else {
-            // 编辑
-            // editData(datas)
-            //   .then((response) => {
-            //     this.loading = false;
-            //     if (response.state.toLowerCase() === "success") {
-            //       this.$parent.$layer.close(this.layerid);
-            //       this.$parent.getList(); // 重新加载父级数据
-            //       this.$message.success("恭喜你，车辆编辑成功!");
-            //     }
-            //   })
-            //   .catch(() => {
-            //     this.loading = false;
-            //   });
+            this.$message.error("请输入有效的必填项信息!");
+            return false;
           }
-        } else {
-          this.$message.error("请输入有效的必填项信息!");
-          return false;
-        }
-      });
-    },
-    resetForm() {
-      this.$refs.ruleForm.resetFields();
-    },
+        });
+      },
+      resetForm() {
+        this.$refs.ruleForm.resetFields();
+      },
 
-    // 获取详情
-    getDetail(rid) {
-      // getDeatil(rid).then((response) => {
-      //   if (response.state.toLowerCase() === "success") {
-      //     const res = response.data;
-      //     this.ruleForm.F_name = res.F_name; //车辆信息
-      //     this.ruleForm.F_Remark = res.F_Remark; //备注
-      //   }
-      // });
+      // 获取详情
+      getDetail() {
+        const params = {
+          orderid: this.rowid
+        }
+        getModelDetail(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            const res = response.model;
+            this.ruleForm.F_ID = res.F_ID
+            this.ruleForm.type = res.F_Type
+            this.ruleForm.source = res.F_Source
+            this.hospitalsParam.id = res.F_HosId
+            this.hospitalsParam.name = res.HosName
+            this.departmentsParam.id = res.F_ProposerDeptId
+            this.departmentsParam.name = res.F_ProposerDeptName
+            this.repairmanParam.id = res.F_ProposerCode
+            this.repairmanParam.name = res.F_ProposerName
+            this.ruleForm.phon = res.F_Phon
+            this.ruleForm.cartype = res.F_CarType
+            this.ruleForm.startplace = res.F_DepartPlace
+            this.ruleForm.endplace = res.F_Destination
+            this.ruleForm.F_CarMessage = res.F_CarMessage
+            this.ruleForm.remark = res.F_Remark
+          }
+        });
+      },
+      // 科室下拉改变事件
+      getDepartments(data) {
+        console.log(data)
+        this.ruleForm.deptid = data.value
+        this.ruleForm.deptname = data.name
+      },
+      // 院区下拉改变事件
+      getHospitals(data) {
+        this.ruleForm.hosid = data.value
+        this.ruleForm.hosname = data.name
+      },
+      //申请人下拉改变事件
+      getRepairman(data) {
+        console.log(data)
+        this.ruleForm.usercode = data.value
+        this.ruleForm.username = data.name
+      },
     },
-  },
-};
+  };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

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

@@ -0,0 +1,148 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="form" label-width="100px">
+      <el-col :span="20">
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="司机信息" prop="drivername">
+              <el-select v-model="form.assistmessage" @change="selectGet">
+                <el-option v-for="item in assistList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="司机电话">
+              <el-input v-model="form.phon" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="车辆信息">
+              <el-select v-model="form.carmessage" @change="selectCar">
+                <el-option v-for="item in carList" :key="item.carid" :label="item.carname" :value="item.carid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="协作人信息" prop="username">
+              <select-repairman :repairman-param="repairmanParam" @post-repairman="getRepairman" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item>
+          <el-button @click="resetForm">取 消</el-button>
+          <el-button type="primary" @click="sureAssign()">确 定</el-button>
+        </el-form-item>
+      </el-col>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import {
+    getList,
+    getAssignWorkOrder
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import {
+    getGetAllCar
+  } from '@/api/Escortservice/Escortservice.js'
+  export default {
+    name: 'Assign',
+    props: {
+      rowid: {
+        type: Number,
+        default: ''
+      },
+      layerid: {
+        type: String,
+        default: "",
+      }
+    },
+    data() {
+      return {
+        formLabelWidth: '120px',
+        form: {},
+        loading: false,
+        carList: [],
+        assistList: [{
+          value: 1,
+          label: "张三"
+        }, {
+          value: 2,
+          label: "李四"
+        }],
+        repairmanParam: {
+          id: 0,
+          name: ''
+        },
+        assistObj: {},
+        carObj: {}
+      }
+    },
+    created() {
+      this.getCar()
+    },
+    methods: {
+      selectGet(val) {
+        let obj = {}
+        obj = this.assistList.find(item => {
+          return item.value == val
+        })
+        this.assistObj = obj
+        console.log(obj.value, obj.label)
+      },
+      selectCar(val) {
+        let obj = {}
+        obj = this.carList.find(item => {
+          return item.carid == val
+        })
+        this.carObj = obj
+        console.log(obj.value, obj.label)
+      },
+      getCar() {
+        const params = {}
+        console.log(11)
+        getGetAllCar(params).then(res => {
+          this.carList = res.rows
+        })
+      },
+      getRepairman(data) {
+        this.form.usercode = data.value
+        this.form.username = data.name
+      },
+      resetForm() {
+        this.$refs.ruleForm.resetFields();
+      },
+      sureAssign() {
+        const params = {
+          orderid: this.rowid,
+          phon: this.form.phon,
+          driver: this.assistObj.value,
+          drivername: this.assistObj.label,
+          carid: this.carObj.carid,
+          carmessage: this.carObj.carname,
+          assist: this.form.usercode,
+          assistname: this.form.username
+        }
+        getAssignWorkOrder(params).then((response) => {
+          if (response.state.toLowerCase() === 'success') {
+            this.$message.success('派工成功!')
+            this.$parent.$layer.close(this.layerid)
+            this.$parent.getList(); // 重新加载父级数据
+          }
+        })
+        resolve()
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

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

@@ -4,15 +4,22 @@
       <el-col :md="24" class="order_detail_body">
         <el-card shadow="hover">
           <el-col :md="21">
-            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />工单单号：{{ orderDetailData.F_WorkOrderCode }}</h1>
+            <h1 class="title">
+              <svg-icon class="title_icon" icon-class="hongqi" />工单单号：{{ orderDetailData.F_WorkOrderCode }}
+            </h1>
           </el-col>
           <el-col :md="24" class="order_detail_content">
-
-            <el-col :md="6" class="order_detail_item"> 姓名：{{ orderDetailData.F_name }} </el-col>
-            
+            <el-col :md="6" class="order_detail_item"> 工单状态：{{ orderDetailData.F_Wostate }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 来源：{{ orderDetailData.F_Source }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 申请人：{{ orderDetailData.F_ProposerName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 协作人：{{ orderDetailData.F_AssistManName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 联系电话：{{ orderDetailData.F_Phon }} </el-col>
+            <el-col :md="6" class="order_detail_item">车辆信息：{{ orderDetailData.F_CarMessage }} </el-col>
+            <el-col :md="6" class="order_detail_item">司机信息：{{ orderDetailData.F_DriverName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 备注：{{ orderDetailData.F_Remark }} </el-col>
           </el-col>
         </el-card>
-        
+
       </el-col>
     </el-row>
     <el-row :gutter="20">
@@ -35,206 +42,254 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-// import { getDeatil } from '@/api/'
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-
-export default {
-  name: 'Detail',
-  components: {
-    Pagination
-  },
-  props: {
-    rowid: {
-      type: Number,
-      default: 0
+  import {
+    mapGetters
+  } from 'vuex'
+  import {
+    getModelDetail
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+
+  export default {
+    name: 'Detail',
+    components: {
+      Pagination
     },
-    layerid: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      activeName: 'first',
-      imgUrl: this.$store.getters.serverConfig.BASE_API,
-      orderDetailData: {
-        F_Id: '',
-        F_WorkOrderCode:'',
-        F_name: '', // 来源
-       
+    props: {
+      rowid: {
+        type: Number,
+        default: 0
       },
-      workOrderCirculationList: [] // 工单流转
-    }
-  },
-  computed: {
-    ...mapGetters(['rolecode'])
-  },
-  created() {
-    if (this.rowid) {
-      this.getDetail(this.rowid)
-      // this.getItem()
-    }
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+      layerid: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        activeName: 'first',
+        imgUrl: this.$store.getters.serverConfig.BASE_API,
+        orderDetailData: {
+          F_ID: '',
+          F_WorkOrderCode: '',
+          F_Source: '', // 来源
+          HosName: '',
+          F_ProposerDeptName: '',
+          F_ProposerName: '',
+          F_AssistManName: '',
+          F_Phon: '',
+          F_CarMessage: '',
+          F_DriverName: '',
+          F_Remark: ''
+        },
+        workOrderCirculationList: [] // 工单流转
+      }
+    },
+    computed: {
+      ...mapGetters(['rolecode'])
     },
-    // 详情
-    getDetail(rid) {
-      // getDeatil(rid).then((response) => {
-      //   const res = response.model
-      //   this.orderDetailData.F_Id = res.F_Id
-      //   this.orderDetailData.F_name = res.F_name
-        
-      // })
+    created() {
+      if (this.rowid) {
+        this.getDetail()
+        // this.getItem()
+      }
     },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event)
+      },
+      // 详情
+      getDetail() {
+        const params = {
+          orderid: this.rowid
+        }
+        getModelDetail(params).then((response) => {
+          const res = response.model
+          this.orderDetailData.F_ID = res.F_ID
+          this.orderDetailData.F_Source = res.F_Source
+          this.orderDetailData.HosName = res.HosName
+          this.orderDetailData.F_ProposerDeptName = res.F_ProposerDeptName
+          this.orderDetailData.F_ProposerName = res.F_ProposerName
+          this.orderDetailData.F_AssistManName = res.F_AssistManName
+          this.orderDetailData.F_Phon = res.F_Phon
+          this.orderDetailData.F_CarMessage = res.F_CarMessage
+          this.orderDetailData.F_DriverName = res.F_DriverName
+          this.orderDetailData.F_Remark = res.F_Remark
+        })
+      },
 
+    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.order_detail {
-  .el-col {
-    margin-bottom: 20px;
-  }
-  .el-icon-time {
-    color: #d81e06;
-  }
-  .el-card__header {
-    padding-top: 14px;
-    padding-bottom: 14px;
-    background-color: #f5f5f6;
-  }
-  .order_file {
-    .el-card__body {
-      padding: 22px 0 0 0;
-      text-align: center;
-    }
-  }
-  .order_steps {
-    .el-step__icon-inner {
-      display: none;
+  .order_detail {
+    .el-col {
+      margin-bottom: 20px;
     }
-  }
-  .order_record {
-    .el-card__body {
-      padding: 0;
+
+    .el-icon-time {
+      color: #d81e06;
     }
-    .el-tabs__header {
-      padding: 0px 20px;
+
+    .el-card__header {
+      padding-top: 14px;
+      padding-bottom: 14px;
       background-color: #f5f5f6;
-      .el-tabs__item {
-        font-size: 16px;
-        height: 47px;
-        line-height: 47px;
-      }
     }
-  }
-}
-</style>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-.order_detail {
-  .order_detail_body {
-    margin-bottom: 20px;
-    .round_img {
-      width: 90px;
-      height: 90px;
-      border-radius: 50%;
-      overflow: hidden;
-      margin: 14px;
-      img {
-        width: 100%;
-        height: 100%;
+    .order_file {
+      .el-card__body {
+        padding: 22px 0 0 0;
+        text-align: center;
       }
     }
-    .title {
-      font-size: 20px;
-      .title_icon {
-        color: #d81e06;
-        font-size: 16px;
-        margin-right: 20px;
+
+    .order_steps {
+      .el-step__icon-inner {
+        display: none;
       }
     }
-    .title_sub {
-      font-size: 14px;
-      color: #666666;
+
+    .order_record {
+      .el-card__body {
+        padding: 0;
+      }
+
+      .el-tabs__header {
+        padding: 0px 20px;
+        background-color: #f5f5f6;
+
+        .el-tabs__item {
+          font-size: 16px;
+          height: 47px;
+          line-height: 47px;
+        }
+      }
     }
-    .order_detail_content {
-      background-color: #f5f5f6;
-      padding-top: 20px;
-      color: #4c4c4c;
-      font-size: 14px;
-      .order_detail_item {
-        margin-bottom: 10px;
-        .order_content {
-          margin-top: 10px;
+  }
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .order_detail {
+    .order_detail_body {
+      margin-bottom: 20px;
+
+      .round_img {
+        width: 90px;
+        height: 90px;
+        border-radius: 50%;
+        overflow: hidden;
+        margin: 14px;
+
+        img {
+          width: 100%;
+          height: 100%;
         }
-        .order_file {
-          position: relative;
-          cursor: pointer;
-          .img_mask {
-            display: none;
-            position: absolute;
-            left: 0px;
-            top: 0px;
-            background-color: rgba(0, 0, 0, 0.3);
-            width: 100%;
-            height: 22px;
-            text-align: right;
-            z-index: 1;
-            i {
-              font-size: 20px;
-              line-height: 22px;
-              display: inline-block;
-              margin-right: 15px;
-              color: #fff;
-            }
+      }
+
+      .title {
+        font-size: 20px;
+
+        .title_icon {
+          color: #d81e06;
+          font-size: 16px;
+          margin-right: 20px;
+        }
+      }
+
+      .title_sub {
+        font-size: 14px;
+        color: #666666;
+      }
+
+      .order_detail_content {
+        background-color: #f5f5f6;
+        padding-top: 20px;
+        color: #4c4c4c;
+        font-size: 14px;
+
+        .order_detail_item {
+          margin-bottom: 10px;
+
+          .order_content {
+            margin-top: 10px;
           }
-          p {
-            margin-top: 5px;
-            padding-left: 14px;
-            padding-right: 14px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
+
+          .order_file {
+            position: relative;
+            cursor: pointer;
+
+            .img_mask {
+              display: none;
+              position: absolute;
+              left: 0px;
+              top: 0px;
+              background-color: rgba(0, 0, 0, 0.3);
+              width: 100%;
+              height: 22px;
+              text-align: right;
+              z-index: 1;
+
+              i {
+                font-size: 20px;
+                line-height: 22px;
+                display: inline-block;
+                margin-right: 15px;
+                color: #fff;
+              }
+            }
+
+            p {
+              margin-top: 5px;
+              padding-left: 14px;
+              padding-right: 14px;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .file_icon {
+              height: 68px;
+              line-height: 68px;
+              font-size: 68px;
+              color: #409eff;
+            }
           }
-          .file_icon {
-            height: 68px;
-            line-height: 68px;
-            font-size: 68px;
-            color: #409eff;
+
+          .order_file:hover .img_mask {
+            display: block;
           }
         }
-        .order_file:hover .img_mask {
-          display: block;
-        }
       }
     }
-  }
-  .green {
-    color: #00c1de;
-  }
-  .done {
-    color: #198120;
-  }
-  .red {
-    color: #d81e06;
-  }
-  .yellow {
-    color: #e6a23c;
-  }
-  .order_steps {
-    // height: 240px;
-    .el-step__icon-inner {
-      display: none;
+
+    .green {
+      color: #00c1de;
+    }
+
+    .done {
+      color: #198120;
+    }
+
+    .red {
+      color: #d81e06;
+    }
+
+    .yellow {
+      color: #e6a23c;
     }
-  }
 
-  .tab_body {
-    padding: 0 20px 20px 20px;
+    .order_steps {
+
+      // height: 240px;
+      .el-step__icon-inner {
+        display: none;
+      }
+    }
+
+    .tab_body {
+      padding: 0 20px 20px 20px;
+    }
   }
-}
 </style>

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

@@ -1,140 +1,247 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="keyword" placeholder="请输入关键词" class="filter-item" />
+      <!-- <el-input v-model="keyword" placeholder="请输入关键词" class="filter-item" /> -->
+      <el-select clearable v-model="type" placeholder="请选择工单类型">
+        <el-option v-for="item in typeList" :key="item.fid" :label="item.fname" :value="item.fid">
+        </el-option>
+      </el-select>
+      <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" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+      <el-button v-permission="'btnAdd'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
     </div>
     <el-table v-loading="loading" :data="dataLists" border stripe>
 
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <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 }}</el-button>
-        </template> -->
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_ID)">{{ scope.row.F_WorkOrderCode }}
+          </el-button>
+        </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="Name" label="姓名" align="center" />
-
+      <el-table-column :show-overflow-tooltip="true" prop="F_Type" label="类别" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.F_Type==8001">院区转运患者</div>
+          <div v-if="scope.row.F_Type==8002">转运物资</div>
+          <div v-if="scope.row.F_Type==8003">转运消供器械</div>
+          <div v-if="scope.row.F_Type==8004">转运设备</div>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="F_CarMessage" label="车辆信息" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_Phon" 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_Source" label="来源" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_CarType" label="车辆类型" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.F_CarType==1">大车</div>
+          <div v-if="scope.row.F_CarType==2">小车</div>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="F_Remark" 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" plain type="primary" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
-          <el-button size="mini" plain type="danger" @click="btn_delete(scope.row.F_Id)">删除</el-button>
+          <el-button v-permission="'btnEdit'" size="mini" type="text" @click="btn_edit(scope.row.F_ID)">编辑</el-button>
+          <el-button v-permission="'btnDel'" size="mini" type="text" @click="btn_delete(scope.row.F_ID)">删除</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>
+          <el-button v-permission="'btnSure'" size="mini" type="text" @click="btn_sure(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" />
+    <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 { getVehicleList,deleteData } from '@/api/'
-// import addOrEdit from './components/addOrEdit'
-// import detail from './components/detail'
+  import {
+    getList,
+    getAddWorkOrder,
+    getUpdateWorkOrder,
+    getDelete,
+    getModelDetail,
+    getAssignWorkOrder,
+    getSureWorkOrder
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import {
+    getGetAllCar
+  } from '@/api/Escortservice/Escortservice.js'
+  import {
+    getOrderTypeList
+  } from "@/api/commonAPI.js"
+  import addOrEdit from './components/addOrEdit'
+  import detail from './components/detail'
+  import assign from './components/assign.vue'
 
-import Pagination from '@/components/context/Pagination'
+  import Pagination from '@/components/context/Pagination'
 
-export default {
-  name: 'vehicleManagement',
-  components: {
-    Pagination
-  },
-  data() {
-    return {
-      loading: false,
-      keyword: '',
-      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, // 每页几条信息
-          keyword: this.keyword.replace(/\s+/g, '')
-        }
-        // getList(params).then((response) => {
-        //   this.loading = false
-        //   if (response.rows.length >= 0) {
-        //     this.pageParams.total = response.total
-        //     this.dataLists = response.rows
-        //   }
-        // })
-        // resolve()
-      })
+  export default {
+    name: 'vehicleScheduling',
+    components: {
+      Pagination
     },
-    btn_search() {
-      this.pageParams.pageindex = 1
-      this.getList()
-    },
-    btn_add() {
-      this.$layer.iframe({
-        content: {
-          // content: addOrEdit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: '' }
+    data() {
+      return {
+        loading: false,
+        keyword: '',
+        typeList:[],
+        type:'',
+        startTime: '',
+        pageParams: {
+          pageindex: 1, //Number(this.$store.getters.serverConfig.PAGESIZE)
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
+          total: 0
         },
-        area: ['60%', '500px'],
-        title: '添加'
-      })
-    },
-    btn_edit(editId) {
-      this.$layer.iframe({
-        content: {
-          // content: addOrEdit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: editId.toString() } // props
-        },
-        area: ['60%', '500px'],
-        title: '编辑'
-      })
+        dataLists: []
+      }
     },
-    // 详情
-    hadndleOrderCode(ordercode) {
-      this.$layer.iframe({
-        content: {
-          // content: detail, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: ordercode } // props
-        },
-        area: ['80%', '90%'],
-        title: '订单详情'
-      })
+    created() {
+      this.getList()
+      this.getTypeOrder()
+      document.onkeyup = (e) => {
+        if (e.keyCode === 13) {
+          this.getList()
+        }
+      }
     },
-    btn_delete(editId) {
-      editId = [5,6]
-      this.$confirm('您确定要删除此信息吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-      .then(() => {
-        // deleteData(editId).then((response) => {
-        //   if (response.state.toLowerCase() === 'success') {
-        //     this.getList()
-        //     this.$message.success('删除成功!')
-        //   }
-        // })
-      })
-      .catch(() => {
-        this.$message.info('已取消删除')
-      })
+    methods: {
+      getTypeOrder() {
+        const params = {
+          pid: 2,
+          typeid: 4000
+        }
+        getOrderTypeList(params.pid, params.typeid).then(res => {
+          this.typeList = res.rows
+        })
+      },
+      getList() {
+        this.loading = true
+        return new Promise((resolve) => {
+          const params = {
+            type: this.type,
+            state: -1,
+            pageindex: this.pageParams.pageindex, // 第几页
+            pagesize: this.pageParams.pagesize, // 每页几条信息
+            // keyword: this.keyword.replace(/\s+/g, ''),
+            starttime: this.startTime && this.startTime[0],
+            endtime: this.startTime && this.startTime[1]
+          }
+          getList(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_add() {
+        this.$layer.iframe({
+          content: {
+            content: addOrEdit, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              // rowid: ''
+            }
+          },
+          area: ['60%', '500px'],
+          title: '添加'
+        })
+      },
+      btn_edit(editId) {
+        this.$layer.iframe({
+          content: {
+            content: addOrEdit, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowid: editId
+            } // props
+          },
+          area: ['60%', '500px'],
+          title: '编辑'
+        })
+      },
+      // 详情
+      hadndleOrderCode(ordercode) {
+        this.$layer.iframe({
+          content: {
+            content: detail, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowid: ordercode
+            } // props
+          },
+          area: ['80%', '90%'],
+          title: '工单详情'
+        })
+      },
+      //删除
+      btn_delete(editId) {
+        const params = {
+          orderid: editId
+        }
+        this.$confirm('您确定要删除此信息吗?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            getDelete(params).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getList()
+                this.$message.success('删除成功!')
+              }
+            })
+          })
+          .catch(() => {
+            this.$message.info('已取消删除')
+          })
+      },
+      //确定工单
+      btn_sure(rowid) {
+        const params = {
+          orderid: rowid
+        }
+        this.$confirm('您要确认此工单吗?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            getSureWorkOrder(params).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getList()
+                this.$message.success('确定成功!')
+              }
+            })
+          })
+          .catch(() => {
+            this.$message.info('已取消')
+          })
+      },
+      //派车
+      btn_assign(rowid) {
+        this.$layer.iframe({
+          content: {
+            content: assign, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowid: rowid
+            } // props
+          },
+          area: ['40%', '50%'],
+          title: '派车'
+        })
+      }
     }
   }
-}
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>

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

@@ -2,93 +2,127 @@
   <div class="app-container">
     <div class="filter-container">
       <el-input v-model="keyword" 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" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button type="primary" class="filter-item" @click="btn_export"><svg-icon icon-class="daochu" />导出</el-button>
+      <el-button v-permission="'btnExport'" type="primary" class="filter-item" @click="btn_export">
+        <svg-icon icon-class="daochu" />导出
+      </el-button>
     </div>
     <el-table v-loading="loading" :data="dataLists" border stripe>
-      <el-table-column type="index" label="编号" align="center" fixed width="80" />
-      <el-table-column :show-overflow-tooltip="true" prop="name" label="姓名" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_WorkOrderCode" label="工单编号" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_Type" label="类别" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.F_Type==1">院区转运患者</div>
+          <div v-if="scope.row.F_Type==2">转运物资</div>
+          <div v-if="scope.row.F_Type==3">转运消供器械</div>
+          <div v-if="scope.row.F_Type==4">转运设备</div>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="F_CarMessage" 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_DriverName" 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_ProposerName" label="调度员" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_CarType" label="车辆类型" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.F_CarType==1">大车</div>
+          <div v-if="scope.row.F_CarType==2">小车</div>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="F_Remark" label="备注" align="center" />
     </el-table>
-    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
+    <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 { getListExpt,getListExptIsdc } from '@/api'
-import Pagination from '@/components/context/Pagination'
-// import { exportData } from '@/utils'
+  import {
+    getListExpt,
+    getListExptIsdc
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
+  import Pagination from '@/components/context/Pagination'
+  import {
+    exportData
+  } from '@/utils'
 
-export default {
-  name: 'List',
-  components: {
-    Pagination
-  },
-  data() {
-    return {
-      loading: false,
-      keyword: '',
-      pageParams: {
-        pageindex: 1,
-        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
-        total: 0
-      },
-      dataLists: []
-    }
-  },
-  created() {
-    this.getList()
-    
-    document.onkeyup = (e) => {
-      if (e.keyCode === 13) {
-        this.getList()
+  export default {
+    name: 'report',
+    components: {
+      Pagination
+    },
+    data() {
+      return {
+        loading: false,
+        keyword: '',
+        startTime: '',
+        orderId: '',
+        pageParams: {
+          pageindex: 1,
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
+          total: 0
+        },
+        dataLists: []
       }
-    }
-  },
-  methods: {
-    getList() {
-      
-      this.loading = true
-      return new Promise((resolve) => {
-        const params = {
-          pageindex: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
-          keyword: this.keyword.replace(/\s+/g, ''),
-        }
-        // getListExpt(params).then((response) => {
-        //   this.loading = false
-        //   if (response.rows.length > 0) {
-        //     this.pageParams.total = response.total
-        //     this.dataLists = response.rows
-        //   }
-        // })
-        // resolve()
-      })
     },
-    btn_search() {
-      this.pageParams.pageindex = 1
+    created() {
       this.getList()
-    },
-    btn_export() {
-      return new Promise(resolve => {
-        const params = {
-          isdc: 1,
-          pageindex: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
-          type: this.orderId,
-          keyword: this.keyword.replace(/\s+/g, '')
+
+      document.onkeyup = (e) => {
+        if (e.keyCode === 13) {
+          this.getList()
         }
-        // getListExptIsdc(params).then(response => {
-        //   if (response.headers['content-disposition']) {
-        //     exportData(response)
-        //   } else {
-        //     this.$message.error(response)
-        //   }
-        // })
-        // resolve()
-      })
+      }
+    },
+    methods: {
+      getList() {
+        this.loading = true
+        return new Promise((resolve) => {
+          const params = {
+            starttime: this.startTime && this.startTime[0],
+            endtime: this.startTime && this.startTime[1],
+            pageindex: this.pageParams.pageindex, // 第几页
+            pagesize: this.pageParams.pagesize, // 每页几条信息
+            keyword: this.keyword.replace(/\s+/g, '')
+          }
+          getListExpt(params).then((response) => {
+            this.loading = false
+            if (response.rows.length > 0) {
+              this.pageParams.total = response.total
+              this.dataLists = response.rows
+            }
+          })
+          resolve()
+        })
+      },
+      btn_search() {
+        this.pageParams.pageindex = 1
+        this.getList()
+      },
+      btn_export() {
+        return new Promise(resolve => {
+          const params = {
+            isdc: 1,
+            pageindex: this.pageParams.pageindex, // 第几页
+            pagesize: this.pageParams.pagesize, // 每页几条信息
+            keyword: this.keyword.replace(/\s+/g, ''),
+            starttime: this.startTime && this.startTime[0],
+            endtime: this.startTime && this.startTime[1]
+          }
+          getListExptIsdc(params).then(response => {
+            if (response.headers['content-disposition']) {
+              exportData(response)
+            } else {
+              this.$message.error(response)
+            }
+          })
+          resolve()
+        })
+      }
+
     }
-    
   }
-}
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>