bug

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

@@ -28,7 +28,7 @@ export function getAddWorkOrder(params) {
   return request({
     url: 'T_Car_WorkOrder/AddWorkOrder',
     method: 'post',
-    params
+    data: params
   })
 }
 // 修改
@@ -36,7 +36,7 @@ export function getUpdateWorkOrder(params) {
   return request({
     url: 'T_Car_WorkOrder/UpdateWorkOrder',
     method: 'post',
-    params
+    data: params
   })
 }
 // 删除

CallCenterWeb.UI/RMYY/src/views/telCall/welcomeManage/index.vue

@@ -2,41 +2,48 @@
   <div class="app-container">
     <div class="filter-container">
       <el-select v-model="searchData.state" placeholder="请选择状态" size="medium" clearable>
-        <el-option value="0" label="未启动"></el-option>
-        <el-option value="1" label="启动"></el-option>
-        <el-option value="2" label="已失效"></el-option>
+        <el-option value="0" label="未启动"/>
+        <el-option value="1" label="启动"/>
+        <el-option value="2" label="已失效"/>
       </el-select>
       <el-input v-model="searchData.key" placeholder="请输入关键词" class="filter-item" size="medium" clearable/>
-      <el-date-picker v-model="searchData.value1" size="medium" type="daterange" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
-        end-placeholder="结束日期">
-      </el-date-picker>
+      <el-date-picker
+        v-model="searchData.value1"
+        size="medium"
+        type="daterange"
+        clearable
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <el-button type="primary" class="filter-item" @click="btn_search">搜索</el-button>
       <el-button type="primary" class="filter-item" @click="btn_add">添加</el-button>
     </div>
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55">
+      <!--      <el-table-column type="selection" width="55">
       </el-table-column> -->
       <el-table-column prop="F_Title" label="欢迎词标题" align="center" min-width="" />
       <el-table-column label="欢迎词内容" align="center" min-width="">
         <template slot-scope="scope">
-          <span v-show='scope.row.F_Type==1'>{{scope.row.F_Content}}</span>
+          <span v-show="scope.row.F_Type==1">{{ scope.row.F_Content }}</span>
           <svg-icon v-if="scope.row.F_Type==2" class="rec_file" icon-class="bofangluyin" @click.native="playSound(scope.row.F_Files,scope.row.F_CreateBy)" />
         </template>
       </el-table-column>
       <!-- <el-table-column prop="F_Content" label="欢迎词内容" align="center" min-width="" /> -->
       <el-table-column label="类型" align="center" min-width="">
         <template slot-scope="scope">
-          <span v-show='scope.row.F_Type==1'>文本</span>
-          <span v-show='scope.row.F_Type==2'>语音文件</span>
+          <span v-show="scope.row.F_Type==1">文本</span>
+          <span v-show="scope.row.F_Type==2">语音文件</span>
         </template>
       </el-table-column>
       <el-table-column prop="F_StartTime" label="生效时间" align="center" min-width="" />
       <el-table-column prop="F_EndTime" label="失效时间" align="center" min-width="" />
       <el-table-column label="状态" align="center" min-width="">
         <template slot-scope="scope">
-          <span v-show='scope.row.F_IsState==2'>已失效</span>
-          <span v-show='scope.row.F_IsState==1'>生效中</span>
-          <span v-show='scope.row.F_IsState==0'>未启动</span>
+          <span v-show="scope.row.F_IsState==2">已失效</span>
+          <span v-show="scope.row.F_IsState==1">生效中</span>
+          <span v-show="scope.row.F_IsState==0">未启动</span>
         </template>
       </el-table-column>
       <el-table-column prop="F_CreateTime" label="添加时间" align="center" min-width="" />
@@ -48,166 +55,171 @@
         </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 {
-    getWordsLists,
-    deleteWord,
-  } from '@/api/telCall/welcomeManage'
-  import addOrEdit from './addOrEdit'
-  import audioPlayer from '@/components/context/audioPlayer'
-  import {
-    pickerOptions
-  } from '@/utils'
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+import {
+  getWordsLists,
+  deleteWord
+} from '@/api/telCall/welcomeManage'
+import addOrEdit from './addOrEdit'
+import audioPlayer from '@/components/context/audioPlayer'
+import {
+  pickerOptions
+} from '@/utils'
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
 
-  export default {
-    name: 'WelcomeManage',
-    components: {
-      Pagination
+export default {
+  name: 'WelcomeManage',
+  components: {
+    Pagination
+  },
+  filters: {
+    blackTextFilter(status) {
+      const statusMap = {
+        0: '暂时',
+        1: '永久',
+        2: '已取消'
+      }
+      return statusMap[status]
     },
-    filters: {
-      blackTextFilter(status) {
-        const statusMap = {
-          0: '暂时',
-          1: '永久',
-          2: '已取消'
-        }
-        return statusMap[status]
+    blackTypeFilter(status) {
+      const statusMap = {
+        0: '',
+        1: 'danger',
+        2: 'warning'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      searchData: {
+        state: '',
+        key: '',
+        value1: ''
       },
-      blackTypeFilter(status) {
-        const statusMap = {
-          0: '',
-          1: 'danger',
-          2: 'warning'
-        }
-        return statusMap[status]
+      pickerOptions,
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [], // 列表数据
+      multipleSelection: [],
+      selectArr: []
+    }
+  },
+  created() {
+    this.getList()
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        this.getList()
       }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          page: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          state: this.searchData.state,
+          key: this.searchData.key,
+          starttime: this.searchData.value1 && this.searchData.value1[0],
+          endtime: this.searchData.value1 && this.searchData.value1[1]
+        }
+        getWordsLists(params).then((response) => {
+          this.loading = false
+          if (response.rows.length >= 0) {
+            this.pageParams.total = response.total
+            this.dataLists = response.rows
+          }
+        })
+        resolve()
+      })
     },
-    data() {
-      return {
-        loading: false,
-        searchData: {
-          state: '',
-          key: '',
-          value1:''
-        },
-        pickerOptions,
-        pageParams: {
-          pageindex: 1, // 当前第几页
-          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-          total: 0 // 总共多少数据
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+      this.selectArr = val.map(item => item.F_Id)
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowid: ''
+          } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        dataLists: [], // 列表数据
-        multipleSelection: [],
-        selectArr: []
-      }
+        area: ['45%', '55%'],
+        title: '添加时段'
+      })
     },
-    created() {
-      this.getList()
-      document.onkeyup = (e) => {
-        if (e.keyCode === 13) {
-          this.getList()
-        }
-      }
+    btn_edit(editId) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowid: editId.toString()
+          } // props
+        },
+        area: ['45%', '55%'],
+        title: '编辑时段'
+      })
     },
-    methods: {
-      getList() {
-        this.loading = true
-        return new Promise((resolve) => {
-          const params = {
-            page: this.pageParams.pageindex, // 第几页
-            pagesize: this.pageParams.pagesize, // 每页几条信息
-            state: this.searchData.state,
-            key: this.searchData.key,
-            starttime:this.searchData.value1[0],
-            endtime:this.searchData.value1[1]
-          }
-          getWordsLists(params).then((response) => {
-            this.loading = false
-            if (response.rows.length >= 0) {
-              this.pageParams.total = response.total
-              this.dataLists = response.rows
+    btn_delete(id) {
+      // if (this.multipleSelection.length == 0) {
+      //   this.$message.error('没有要删除的选项')
+      // } else {
+      this.$confirm('您确定要删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          deleteWord(id).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('删除成功!')
             }
           })
-          resolve()
         })
-      },
-      btn_search() {
-        this.pageParams.pageindex = 1
-        this.getList()
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-        this.selectArr = val.map(item => item.F_Id)
-      },
-      btn_add() {
-        this.$layer.iframe({
-          content: {
-            content: addOrEdit, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              rowid: ''
-            } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-          },
-          area: ['45%', '55%'],
-          title: '添加时段'
+        .catch(() => {
+          this.$message('已取消删除')
         })
-      },
-      btn_edit(editId) {
-        this.$layer.iframe({
-          content: {
-            content: addOrEdit, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              rowid: editId.toString()
-            } // props
-          },
-          area: ['45%', '55%'],
-          title: '编辑时段'
-        })
-      },
-      btn_delete(id) {
-        // if (this.multipleSelection.length == 0) {
-        //   this.$message.error('没有要删除的选项')
-        // } else {
-          this.$confirm('您确定要删除吗?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            })
-            .then(() => {
-              deleteWord(id).then((response) => {
-                if (response.state.toLowerCase() === 'success') {
-                  this.getList()
-                  this.$message.success('删除成功!')
-                }
-              })
-            })
-            .catch(() => {
-              this.$message('已取消删除')
-            })
         // }
-      },
-      // 播放录音
-      playSound(rec_file,artist) {
-        this.$layer.iframe({
-          content: {
-            content: audioPlayer, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: { recFiles: rec_file,artists:artist } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-          },
-          area: ['600px', '230px'],
-          shadeClose: true,
-          title: '录音详情'
-        })
-      },
+    },
+    // 播放录音
+    playSound(rec_file, artist) {
+      this.$layer.iframe({
+        content: {
+          content: audioPlayer, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { recFiles: rec_file, artists: artist } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['600px', '230px'],
+        shadeClose: true,
+        title: '录音详情'
+      })
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

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

@@ -93,8 +93,8 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
-          stime: this.searchDate && this.searchDate[0],
-          etime: this.searchDate && this.searchDate[1],
+          starttime: this.startTime && this.startTime[0],
+          endtime: this.startTime && this.startTime[1],
           WorkOrderCode: this.ordercode,
           carname: this.carname,
           driverName: this.drivername,

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

@@ -243,13 +243,13 @@ export default {
     }
   },
   created() {
-    if (!this.callid) {
-      this.callid = window.localStorage.getItem('callidSave')
-    }
+    // if (!this.callid) {
+    //   this.callid = window.localStorage.getItem('callidSave')
+    // }
     this.getTypeOrder()
     this.getCarlist()
-    if (this.wid) {
-      this.wocode = this.wid
+    if (this.wocode) {
+      this.wocode = this.wocode
       this.getDetail('0')
     }
   },

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

@@ -34,10 +34,7 @@
       </el-table-column>
       <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>
+          <div>{{ $store.getters.workTypeMap[parseInt(scope.row.F_Type)].text }}</div>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="F_Content" label="调度内容" align="center" />
@@ -58,8 +55,8 @@
       </el-table-column>
       <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.F_State==0" size="mini" type="text" @click="btn_edit(scope.row.F_ID,scope.row.F_WorkOrderCode)">编辑</el-button>
-          <el-button v-if="scope.row.F_State==0" size="mini" type="text" @click="btn_delete(scope.row.F_WorkOrderCode)">删除
+          <el-button v-if="scope.row.F_State==-1" size="mini" type="text" @click="btn_edit(scope.row.F_ID,scope.row.F_WorkOrderCode)">编辑</el-button>
+          <el-button v-if="scope.row.F_State==-1" size="mini" type="text" @click="btn_delete(scope.row.F_WorkOrderCode)">删除
           </el-button>
           <el-button v-if="scope.row.F_State==0" size="mini" type="text" @click="btn_fenpei(scope.row.F_WorkOrderCode,scope.row)">分配</el-button>
         </template>
@@ -127,8 +124,8 @@ export default {
   },
   methods: {
     btn_distribute() {
-      if (this.multipleSelection.length < 1) {
-        this.$message.error('没有要分配的选项')
+      if (this.selectIds.length < 1) {
+        this.$message.error('请选择待分配工单')
         return
       }
       this.$layer.iframe({
@@ -163,8 +160,18 @@ export default {
       })
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val
-      this.selectIds = val.map((item) => item.F_WorkOrderCode)
+      const rows = []
+      const codes = []
+      val.forEach(function(v, n) {
+        if (v.F_State == 0) {
+          codes.push(v.F_WorkOrderCode)
+          rows.push(v)
+        }
+      })
+      this.selectIds = codes
+      this.multipleSelection = rows
+      console.log(codes)
+      // this.selectIds = val.map((item) => item.F_WorkOrderCode)
     },
     handleClick(res) {
       this.state = res.name