业务咨询

CallCenterWeb.UI/RMYY/src/api/comDispatch/addOrEditDispatch.js

@@ -15,7 +15,7 @@ export function GetequipList(params) {
     params
   })
 }
-//
+// 详情
 export function GetOrderDetail(params) {
   return request({
     url: 'Scheduling/GetWorkOrder',

CallCenterWeb.UI/RMYY/src/api/orderManagement/ywzxOrder.js

@@ -24,3 +24,19 @@ export function getDealWorkOrder(params) {
     params
   })
 }
+// 删除
+export function getDelWorkOrder(params) {
+  return request({
+    url: 'Con_WorkOrder/DelWorkOrder',
+    method: 'get',
+    params
+  })
+}
+// 撤回
+export function getWithdrawWorkOrder(params) {
+  return request({
+    url: 'Con_WorkOrder/WithdrawWorkOrder',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -188,13 +188,15 @@ import {
 } from '@/api/faultRepairManagement/faultRepair'
 
 import {
-	schedulRetractOrder,
-  	deleteSchedulingOrder,
-} from "@/api/orderManagement/orderList";
+  schedulRetractOrder,
+  	deleteSchedulingOrder
+} from '@/api/orderManagement/orderList'
 import {
   getSureWorkOrder,
   getBackWorkOrder,
-  getDealWorkOrder
+  getDealWorkOrder,
+  getDelWorkOrder,
+  getWithdrawWorkOrder
 } from '@/api/orderManagement/ywzxOrder'
 import {
   postDispatchCheckWorkOrder,
@@ -217,7 +219,7 @@ export default {
       wocode: '',
       dialogStatus: {
         dialog_zixingjiejue: false,
-	dialog_zhdd_chehui: false,
+        dialog_zhdd_chehui: false,
         dialog_zhdd_shanchu: false,
         dialog_pingjia: false,
         dialog_fanxiu: false,
@@ -228,18 +230,34 @@ export default {
         dialog_ywzx_chuli: false,
         dialog_ywzx_jiedan: false,
         dialog_ywzx_tuihui: false,
-	dialog_zhdd_bianji: false,
+        dialog_yw_chehui: false,
+        dialog_yw_shanchu: false,
+        dialog_yw_bianji: false,
+        dialog_zhdd_bianji: false,
         dialog_haocai: false,
         dialog_dispatch_tuihui: false,
-	dialog_zhdd_chehui: {
-          text: "确定要撤回吗？",
+        dialog_schbianji: false,
+        dialog_schshanchu: false,
+        dialog_schchehui: false,
+        dialog_yw_shanchu: {
+          text: '确定要删除吗？',
+          action: getDelWorkOrder,
+          type: 'confirm'
+        },
+        dialog_yw_chehui: {
+          text: '确定要撤回吗？',
+          action: getWithdrawWorkOrder,
+          type: 'confirm'
+        },
+        dialog_zhdd_chehui: {
+          text: '确定要撤回吗？',
           action: schedulRetractOrder,
-          type: "confirm",
+          type: 'confirm'
         },
         dialog_zhdd_shanchu: {
-          text: "确定要删除吗？",
+          text: '确定要删除吗？',
           action: deleteSchedulingOrder,
-          type: "confirm",
+          type: 'confirm'
         },
         dialog_dispatch_daoda: false,
         dialog_ywzx_jiedan: {
@@ -286,6 +304,16 @@ export default {
           text: '确定要撤回吗？',
           action: postwithdrawDispatchWorkOrder,
           type: 'confirm'
+        },
+        dialog_schshanchu: {
+          text: '确定要删除吗？',
+          action: postDelDispatchWorkOrder,
+          type: 'confirm'
+        },
+        dialog_schchehui: {
+          text: '确定要撤回吗？',
+          action: postwithdrawDispatchWorkOrder,
+          type: 'confirm'
         }
       },
       evaluateText: [
@@ -416,7 +444,7 @@ export default {
         type: 'warning'
       }).then(() => {
         new Promise((resolve) => {
-          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan') {
+          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan' || this.optionName == 'schshanchu' || this.optionName == 'yw_shanchu') {
             var params = {
               WorkOrderCode: this.wocode
             }

CallCenterWeb.UI/RMYY/src/views/AnnounceManagement/Notice/index.vue

@@ -3,8 +3,8 @@
     <div class="filter-container">
       <el-input v-model="keyword" placeholder="请输入标题或内容" class="filter-item" size="medium" clearable />
       <el-button type="primary" class="filter-item" @click="btn_search">搜索</el-button>
-      <el-button type="primary" class="filter-item" @click="btn_add()">发布公告</el-button>
-      <el-button type="danger" class="filter-item" @click="btn_del">批量删除</el-button>
+      <el-button v-if="isnotice == '0'" type="primary" class="filter-item" @click="btn_add()">发布公告</el-button>
+      <el-button v-if="isnotice == '0'" type="danger" class="filter-item" @click="btn_del">批量删除</el-button>
     </div>
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
       <el-table-column type="selection" width="55" />
@@ -19,7 +19,7 @@
       <el-table-column prop="F_CreateOn" label="发布时间" align="center" min-width />
       <el-table-column prop="F_EndDate" label="有效期" align="center" min-width />
       <el-table-column prop="F_Frequency" label="点击量" align="center" min-width />
-      <el-table-column label="操作" align="center"  v-if="isnotice == '0'">
+      <el-table-column v-if="isnotice == '0'" label="操作" align="center">
         <template slot-scope="scope">
           <el-button type="text" @click="btn_edit(scope.row.F_NoticeId)">编辑</el-button>
           <el-button type="text" @click="btn_top(scope.row.F_NoticeId)">置顶</el-button>
@@ -27,175 +27,180 @@
         </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 {
-    getGetList,
-    getAddNotice,
-    getSeeNotice,
-    getDelNotice,
-    getTopNotice
-  } from '@/api/AnnounceManagement/announce'
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-  import noticeAddOrEdit from './components/AddOrEdit.vue'
-  import Detail from './components/detail.vue'
-  export default {
-    name: 'Notice',
-    components: {
-      Pagination
+import {
+  getGetList,
+  getAddNotice,
+  getSeeNotice,
+  getDelNotice,
+  getTopNotice
+} from '@/api/AnnounceManagement/announce'
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+import noticeAddOrEdit from './components/AddOrEdit.vue'
+import Detail from './components/detail.vue'
+export default {
+  name: 'Notice',
+  components: {
+    Pagination
+  },
+  props: {
+  },
+  data() {
+    return {
+      loading: false,
+      isnotice: '0',
+      keyword: '',
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 1 // 总共多少数据
+      },
+      multipleSelection: [], // 选中的数据
+      selectArr: [],
+      dataLists: [] // 列表数据
+    }
+  },
+  watch: {
+    // '$route'(to, from) {
+    //   console.log(from)
+    //   if (from.name == "Dashboard") {
+    //     this.isnotice = this.$route.params.isNotice
+    //   }else{
+    //     this.isnotice = '0'
+    //   }
+    // }
+  },
+  activated() {
+    this.isnotice = this.$route.params.isNotice || '0'
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    // 复选框状态改变
+    changeSelects(val) {
+      this.multipleSelection = val
+      this.selectArr = val.map(item => item.F_NoticeId)
     },
-    props: {
+    getList() {
+      const params = {
+        page: this.pageParams.pageindex,
+        pagesize: this.pageParams.pagesize,
+        content: this.keyword
+      }
+      getGetList(params).then(res => {
+        this.dataLists = res.rows
+        this.pageParams.total = res.total
+      })
     },
-    watch: {
-      // '$route'(to, from) {
-      //   console.log(from)
-      //   if (from.name == "Dashboard") {
-      //     this.isnotice = this.$route.params.isNotice
-      //   }else{
-      //     this.isnotice = '0'
-      //   }
-      // }
+    btn_search() {
+      this.getList()
     },
-    data() {
-      return {
-        loading: false,
-        isnotice: '0',
-        keyword: '',
-        pageParams: {
-          pageindex: 1, // 当前第几页
-          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-          total: 1 // 总共多少数据
+    // 添加
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: noticeAddOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+
+          } // props
         },
-        multipleSelection: [], // 选中的数据
-        selectArr: [],
-        dataLists: [] // 列表数据
-      }
+        area: ['70%', '72%'],
+        title: '添加公告'
+      })
     },
-    activated() {
-      this.isnotice = this.$route.params.isNotice||'0'
+    btn_edit(id) {
+      this.$layer.iframe({
+        content: {
+          content: noticeAddOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowid: id.toString()
+          } // props
+        },
+        area: ['70%', '72%'],
+        title: '编辑公告'
+      })
     },
-    created() {
-      this.getList()
+    btn_detail(rowdata) {
+      this.$layer.iframe({
+        content: {
+          content: Detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowdata: rowdata.toString()
+          } // props
+        },
+        area: ['70%', '70%'],
+        title: '公告详情'
+      })
     },
-    methods: {
-      // 复选框状态改变
-      changeSelects(val) {
-        this.multipleSelection = val
-        this.selectArr = val.map(item => item.F_NoticeId)
-      },
-      getList() {
-        const params = {
-          page: this.pageParams.pageindex,
-          pagesize: this.pageParams.pagesize,
-          content: this.keyword
-        }
-        getGetList(params).then(res => {
-          this.dataLists = res.rows
-          this.pageParams.total = res.total
-        })
-      },
-      btn_search() {
-        this.getList()
-      },
-      // 添加
-      btn_add() {
-        this.$layer.iframe({
-          content: {
-            content: noticeAddOrEdit, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-
-            } // props
-          },
-          area: ['70%', '72%'],
-          title: '添加公告'
-        })
-      },
-      btn_edit(id) {
-        this.$layer.iframe({
-          content: {
-            content: noticeAddOrEdit, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              rowid: id.toString()
-            } // props
-          },
-          area: ['70%', '72%'],
-          title: '编辑公告'
-        })
-      },
-      btn_detail(rowdata) {
-        this.$layer.iframe({
-          content: {
-            content: Detail, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              rowdata: rowdata.toString()
-            } // props
-          },
-          area: ['70%', '70%'],
-          title: '公告详情'
-        })
-      },
-      btn_top(rid) {
-        this.$confirm('您确定要将此公告置顶吗?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            const params = {
-              noticeid: rid
+    btn_top(rid) {
+      this.$confirm('您确定要将此公告置顶吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const params = {
+            noticeid: rid
+          }
+          getTopNotice(params).then(res => {
+            if (res.state == 'success') {
+              this.$message.success('操作成功')
+              this.getList()
             }
-            getTopNotice(params).then(res => {
-              if (res.state == 'success') {
-                this.$message.success('操作成功')
-                this.getList()
-              }
-            })
           })
-          .catch(() => {
-            this.$message('已取消')
-          })
-      },
-      btn_delete(rid) {
-        this.ondel(rid)
-      },
-      btn_del() {
-        if (this.multipleSelection.length <= 0) {
-          this.$message.warning('没有可删除的选项')
-          return
-        }
-        const rid = this.selectArr.toString()
-        this.ondel(rid)
-      },
-      ondel(rid) {
-        this.$confirm('您确定要将此公告删除吗?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            const params = {
-              ids: rid
+        })
+        .catch(() => {
+          this.$message('已取消')
+        })
+    },
+    btn_delete(rid) {
+      this.ondel(rid)
+    },
+    btn_del() {
+      if (this.multipleSelection.length <= 0) {
+        this.$message.warning('没有可删除的选项')
+        return
+      }
+      const rid = this.selectArr.toString()
+      this.ondel(rid)
+    },
+    ondel(rid) {
+      this.$confirm('您确定要将此公告删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const params = {
+            ids: rid
+          }
+          getDelNotice(params).then(res => {
+            if (res.state == 'success') {
+              this.$message.success('删除成功')
+              this.getList()
             }
-            getDelNotice(params).then(res => {
-              if (res.state == 'success') {
-                this.$message.success('删除成功')
-                this.getList()
-              }
-            })
           })
-          .catch(() => {
-            this.$message('已取消')
-          })
-      }
+        })
+        .catch(() => {
+          this.$message('已取消')
+        })
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

CallCenterWeb.UI/RMYY/src/views/callScreen/components/AddOrEditOrder.vue

@@ -169,7 +169,7 @@ export default {
   },
   created() {
     this.genderParams()
-    console.log(this.iswomanage, '777')
+    console.log(this.r2type, '777')
   },
   methods: {
     genderParams() {

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

@@ -2,6 +2,24 @@
   <div>
     <el-form :model="ruleForm" label-width="150px" class="order_form">
       <el-col :span="24">
+        <el-row v-if="JSON.stringify(orderTypeData)==='{}'">
+          <el-col :span="10">
+            <el-form-item label="业务类别" prop="F_Type1">
+              <select-order-type
+                v-if="OrderDetailFlag"
+                :first-order-type="firstOrderTypeParam"
+                @post-first-order-type="getFirstOrderType" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="工单类别" prop="F_Type2">
+              <select-order-type-two
+                v-if="OrderDetailFlag"
+                :second-order-type="secondOrderTypeParam"
+                @post-second-order-type="getSecondOrderType" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="申请部门" prop="hosname">
@@ -69,7 +87,7 @@
         <el-row v-if="type2Arr[0]==2002">
           <el-col>
             <el-form-item label="物资信息">
-              <el-button @click="addItem()">添加</el-button>
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -97,7 +115,7 @@
         <el-row v-if="type2Arr[0]==2003">
           <el-col>
             <el-form-item label="病床信息">
-              <el-button @click="addItem()">添加</el-button>
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -125,7 +143,7 @@
         <el-row v-if="type2Arr[0]==2006">
           <el-col>
             <el-form-item label="标本信息">
-              <el-button @click="addItem()">添加</el-button>
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -153,7 +171,7 @@
         <el-row v-if="type2Arr[0]==9010">
           <el-col>
             <el-form-item label="药品信息">
-              <el-button @click="addItem()">添加</el-button>
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -210,7 +228,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="iswomanage!=1">
+        <el-row>
           <el-col :span="24">
             <el-form-item label="下步流程" prop="opt">
               <el-radio-group v-model="ruleForm.opt">
@@ -250,7 +268,7 @@
 
 <script>
 // import { addWorkOrder, getModelDetail, updateWorkOrder } from '@/api/comDispatch/hospitalBedTransfer'
-import { GetDicValueList, GetequipList, AddSchedulingWorkOrder, UpdateSchedulingWorkOrder } from '@/api/comDispatch/addOrEditDispatch'
+import { GetDicValueList, GetequipList, AddSchedulingWorkOrder, UpdateSchedulingWorkOrder, GetOrderDetail } from '@/api/comDispatch/addOrEditDispatch'
 import {
   GetPerson
 } from '@/api/commonAPI'
@@ -291,6 +309,11 @@ export default {
       },
       imgUrl: this.$store.getters.serverConfig.BASE_API + 'FaultRepair/UploadFile',
       type2Arr: [],
+      firstOrderTypeParam: {
+        typeid: 1,
+        name: '',
+        pid: 0
+      },
       hospitalsParam: {
         id: 0,
         name: ''
@@ -321,6 +344,7 @@ export default {
       drugArr: [],
       ruleForm: {
         orderType: 2003, // 工单类型
+        F_Type2: '',
         hospital: 0, // 院区
         department: '', // 科室
         deptid: 0, // 科室id
@@ -340,6 +364,7 @@ export default {
   watch: {
     'orderTypeData.F_Type2': function() {
       this.type2Arr = this.orderTypeData.type2Arr
+      this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
       console.log(this.type2Arr)
     }
   },
@@ -349,7 +374,7 @@ export default {
     this.getbeds()
     this.getbiaoben()
     this.getdrugs()
-    if (this.ordreId) {
+    if (this.wid) {
       this.getDetail()
     }
     console.log(this.iswomanage, '444')
@@ -485,27 +510,51 @@ export default {
     // },
     getDetail() {
       const datas = {
-        id: this.ordreId
+        WorkOrderCode: this.wid
       }
       // 详情
-      getModelDetail(datas).then(response => {
+      GetOrderDetail(datas).then(response => {
         if (response.state.toLowerCase() === 'success') {
-          this.ruleForm.bedNumber = Number(response.model.F_BedNeedMessage.match(/\d/g)[0])
-          this.hospitalsParam.name = response.model.HosName
-          this.ruleForm.hospital = response.model.F_HosId
-          this.ruleForm.deptid = response.model.F_ProposerDeptId
-          this.ruleForm.department = response.model.F_ProposerDeptName
-          this.departmentsParam.name = response.model.F_ProposerDeptName
-          this.repairmanParam.name = response.model.F_ProposerCode
-          this.ruleForm.usercode = response.model.F_ProposerCode
-          this.ruleForm.phone = response.model.F_ProposerPhon
-          this.ruleForm.remark = response.model.F_Remark
+          const res = response.data[0]
+          this.firstOrderTypeParam.name = res.TypeName
+          this.$emit('r2type', res.F_WorkOrderCategory)
+          this.ruleForm.F_Type2 = res.F_WorkOrderCategory
+          if (res.F_WorkOrderCategory) {
+            this.type2Arr = this.$store.getters.workTypeMap[parseInt(res.F_WorkOrderCategory)].ids.slice(1)
+            console.log(this.type2Arr, '111')
+          }
+          if (res.F_CreateUserDept) {
+            this.deptidArr = this.$store.getters.deptmap[parseInt(res.F_CreateUserDept)].ids
+            this.getRepairman(res.F_CreateUserDept, 0)
+            this.ruleForm.ApplicationDept = res.F_CreateUserDept
+            this.ruleForm.Applicant = res.F_CreateUser
+          }
+          if (res.F_DealDept) {
+            this.ruleForm.opt = '2'
+            this.deptidArr1 = this.$store.getters.deptmap[parseInt(res.F_DealDept)].ids
+            // console.log(this.$store.getters.deptmap[parseInt(res.F_DealDept)].ids)
+            this.getRepairman1(res.F_DealDept, 0)
+            this.ruleForm.DealDept = res.F_DealDept
+            this.ruleForm.clid = res.F_DealMan
+          }
+          this.ruleForm.cfnum = res.F_RemindCount
+          this.ruleForm.phone = res.F_Phone
+          this.ruleForm.position = res.F_Location
+          this.ruleForm.toplace = res.F_ToPlace
+          this.ruleForm.content = res.F_Content
+          const arr = []
+          res.PSInfo.forEach(function(v, n) {
+            arr.push({
+              devname: v.F_DicName + ',' + v.F_DicId,
+              num: v.F_Number
+            })
+          })
+          this.devList = arr
         }
       }).catch(() => {
       })
     },
     submitForm() {
-      console.log(this.devList)
       const details = []
       this.devList.forEach(function(v, n) {
         details.push({
@@ -514,8 +563,6 @@ export default {
           F_Number: v.num
         })
       })
-      console.log(details)
-      console.log(this.orderTypeData)
       if (this.ruleForm.repairImageid === '') {
         this.ruleForm.repairImageid = ''
       } else {
@@ -539,7 +586,7 @@ export default {
         // Applicantsphone: this.ruleForm.phone,
         phone: this.ruleForm.phone,
         Location: this.ruleForm.position,
-        WorkOrderCategory: this.orderTypeData.F_Type2,
+        WorkOrderCategory: this.ruleForm.F_Type2,
         ToPlace: this.ruleForm.toplace,
         Content: this.ruleForm.content,
         DealDept: this.ruleForm.DealDept,
@@ -548,28 +595,28 @@ export default {
         detailists: details
       }
       var editdatas = {
+        usertype: '0',
         WorkOrderCode: this.wid,
         ApplicationDept: this.ruleForm.ApplicationDept,
         Applicant: this.ruleForm.Applicant,
         phone: this.ruleForm.phone,
         Location: this.ruleForm.position,
-        WorkOrderCategory: this.orderTypeData.F_Type2,
+        WorkOrderCategory: this.ruleForm.F_Type2,
         ToPlace: this.ruleForm.toplace,
         Content: this.ruleForm.content,
         DealDept: this.ruleForm.DealDept,
         DealMan: this.ruleForm.clid,
-        File: this.ruleForm.repairImageid
-        // detailists: details
+        File: this.ruleForm.repairImageid,
+        detailists: details
       }
       // 添加
-      if (this.ordreId) {
+      if (this.wid) {
         editdatas.usertype = 0
         UpdateSchedulingWorkOrder(editdatas).then(response => {
           if (response.state.toLowerCase() === 'success') {
-            if (this.layerid) {
-              this.$parent.$layer.close(this.layerid)
-              this.$parent.getList() // 重新加载父级数据
-            }
+            this.$parent.$layer.closeAll()
+            // this.$parent.$layer.close(this.layerid)
+            // this.$parent.getList() // 重新加载父级数据
             this.$message.success('恭喜你，修改成功!')
           }
         }).catch(() => {
@@ -577,11 +624,9 @@ export default {
       } else {
         AddSchedulingWorkOrder(datas).then(response => {
           if (response.state.toLowerCase() === 'success') {
-            if (this.layerid) {
-              this.$parent.$layer.close(this.layerid)
-              this.$parent.getList() // 重新加载父级数据
-            }
-            // this.resetForm()
+            this.$parent.$layer.closeAll()
+            // this.$parent.$layer.close(this.layerid)
+            // this.$parent.getList() // 重新加载父级数据
             this.$message.success('恭喜你，添加成功!')
           }
         }).catch(() => {

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

@@ -5,13 +5,11 @@
         <el-row>
           <el-col :span="18">
             <el-form-item label="角色" prop="roleid">
-              <el-select @change="onChange()" v-model="ruleForm.roleid" placeholder="请选择角色">
-                <el-option v-for="item in roles" :key="item.F_RoleId" :label="item.F_RoleName+'-'+item.F_RoleCode" :value="item.F_RoleId">
-                </el-option>
+              <el-select v-model="ruleForm.roleid" placeholder="请选择角色" @change="onChange()">
+                <el-option v-for="item in roles" :key="item.F_RoleId" :label="item.F_RoleName+'-'+item.F_RoleCode" :value="item.F_RoleId"/>
               </el-select>
-              <el-select @change="$forceUpdate()" v-model="ruleForm.userid" placeholder="请选择用户">
-                <el-option v-for="item in users" :key="item.F_UserId" :label="item.F_UserName+'-'+item.F_UserCode" :value="item.F_UserId">
-                </el-option>
+              <el-select v-model="ruleForm.userid" placeholder="请选择用户" @change="$forceUpdate()">
+                <el-option v-for="item in users" :key="item.F_UserId" :label="item.F_UserName+'-'+item.F_UserCode" :value="item.F_UserId"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -42,84 +40,88 @@
 </template>
 
 <script>
-  import {
-    getRoleList,
-    getUserListIndex,
-    getSaveChatInfo
-  } from '@/api/AnnounceManagement/chart'
-  export default {
-    name: 'sendMsg',
-    props: {
-      layerid: {
-        type: String,
-        default: ''
-      },
-      roleid:{
-        type: Number,
-        default: ''
-      },
-      userid:{
-        type: Number,
-        default: ''
-      }
-    },
-    data() {
-      return {
-        ruleForm: {
-
-        },
-        roles: [],
-        users: [],
-        options: []
-      }
+import {
+  getRoleList,
+  getUserListIndex,
+  getSaveChatInfo
+} from '@/api/AnnounceManagement/chart'
+export default {
+  name: 'SendMsg',
+  props: {
+    layerid: {
+      type: String,
+      default: ''
     },
-    created() {
-      if(this.roleid){
-        this.ruleForm.roleid = this.roleid
-        this.getUserList(this.roleid)
-        this.ruleForm.userid = this.userid
-      }
-      this.getRole()
+    roleid: {
+      type: Number,
+      default: ''
     },
-    methods: {
-      getRole() {
-        const params = {}
-        getRoleList(params).then(res => {
-          if (res.state == 'success') {
-            this.roles = res.data
-          }
-        })
-      },
-      onChange() {
-        this.ruleForm.userid=''
-        this.getUserList(this.ruleForm.roleid)
+    userid: {
+      type: Number,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+
       },
-      getUserList(pid) {
-        const params = {
-          roleid: pid
+      roles: [],
+      users: [],
+      options: []
+    }
+  },
+  created() {
+    if (this.roleid) {
+      this.ruleForm.roleid = this.roleid
+      this.getUserList(this.roleid)
+      this.ruleForm.userid = this.userid
+    }
+    this.getRole()
+  },
+  methods: {
+    getRole() {
+      const params = {}
+      getRoleList(params).then(res => {
+        if (res.state == 'success') {
+          this.roles = res.data
         }
-        getUserListIndex(params).then(res => {
-          if (res.state == 'success') {
-            this.users = res.data
-          }
-        })
-      },
-      submitForm() {
-        const params = {
-          Content: this.ruleForm.con,
-          ToUserId: this.ruleForm.userid||'0',
-          ToRoleId: this.ruleForm.roleid,
-          IsToAll: this.ruleForm.IsToAll
+      })
+    },
+    onChange() {
+      this.ruleForm.userid = ''
+      this.getUserList(this.ruleForm.roleid)
+    },
+    getUserList(pid) {
+      const params = {
+        roleid: pid
+      }
+      getUserListIndex(params).then(res => {
+        if (res.state == 'success') {
+          this.users = res.data
         }
-        getSaveChatInfo(params).then((response) => {
-          if(response.state=='success'){
-            this.$message.success('发送成功')
-            this.ruleForm.con=''
-          }
-        })
+      })
+    },
+    submitForm() {
+      if (!this.ruleForm.con) {
+        this.$message.error('请输入发送内容')
+        return
       }
+      const params = {
+        Content: this.ruleForm.con,
+        ToUserId: this.ruleForm.userid || '0',
+        ToRoleId: this.ruleForm.roleid,
+        IsToAll: this.ruleForm.IsToAll
+      }
+      getSaveChatInfo(params).then((response) => {
+        if (response.state == 'success') {
+          this.$message.success('发送成功')
+          this.ruleForm.con = ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">

CallCenterWeb.UI/RMYY/src/views/orderManage/components/addOrEditInfOrder.vue

@@ -221,12 +221,6 @@ import {
   getTouSuSelect
 } from '@/api/orderManagement/orderList'
 import {
-  validateTel
-} from '@/utils/validate'
-import {
-  mapGetters
-} from 'vuex'
-import {
   GetPerson
 } from '@/api/commonAPI'
 export default {
@@ -248,9 +242,9 @@ export default {
       type: String,
       default: ''
     },
-    // callid:{
-    //   type:String,
-    //   default:''
+    // callid: {
+    //   type: String,
+    //   default: ''
     // },
     // rowid: {
     //   type: Number,
@@ -337,11 +331,6 @@ export default {
           message: '请输入工单内容',
           trigger: 'blur'
         }],
-        // F_DealOpinions: [{
-        //   required: true,
-        //   message: '请输入处理意见',
-        //   trigger: 'blur'
-        // }],
         F_FirstCheckHospital: [{
           required: true,
           message: '请输入首次检查医院',
@@ -357,11 +346,6 @@ export default {
           message: '请选择发现时间',
           trigger: 'change'
         }],
-        // F_ServiceItems: [{
-        //   required: true,
-        //   message: '请选择服务项目',
-        //   trigger: 'change'
-        // }],
         F_Cathetertype: [{
           required: true,
           message: '请输入置管类型',
@@ -408,14 +392,15 @@ export default {
           trigger: 'change'
         }]
       },
+      F_Type2: '',
       ruleForm: {
         F_CallID: '',
         F_ID: '',
         F_Source: '电话', // 业务类别
         F_Type1: '', // 工单类别
-        F_TypeName1: '', // 工单类别
+        // F_TypeName1: '', // 工单类别
         F_Type2: '', // 工单子类
-        F_TypeName2: '', // 工单子类
+        // F_TypeName2: '', // 工单子类
         // F_Type3: '', // 工单三类
         // F_TypeName3: '', // 工单三类
         identification: '',
@@ -454,15 +439,12 @@ export default {
       isButton: true
     }
   },
-  computed: {
-    ...mapGetters(['screenState'])
-  },
   watch: {
     'orderTypeData.F_Type2': function() {
-      this.typeSecondState(this.orderTypeData.F_Type2)
+      // this.typeSecondState(this.orderTypeData.F_Type2)
+      this.ruleForm.type2Arr = this.orderTypeData.type2Arr
       this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
       this.ruleForm.identification = this.orderTypeData.identification
-      this.ruleForm.type2Arr = this.orderTypeData.type2Arr
       // console.log(this.orderTypeData, '999')
       if (this.orderTypeData.type2Arr[0] == '8023') {
         this.zpdptname = '建议部门'
@@ -492,11 +474,91 @@ export default {
     this.gettsSelect()
   },
   methods: {
-    submitForm() {
-      if (JSON.stringify(this.orderTypeData) !== '{}') {
-        console.log(this.orderTypeData)
-        this.getParentOrderType()
+    // 获取详情
+    OrderDetail() {
+      const params = {
+        WorkOrderCode: this.wid
       }
+      GetOrderDetail(params).then((response) => {
+        this.loading = false
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data[0]
+          if (res) {
+            this.rowid = res.F_ID
+            this.ruleForm.F_ID = res.F_ID
+            this.ruleForm.F_Source = res.F_Source // 业务类别
+            this.ruleForm.F_Type1 = res.F_type1 // 工单类别
+            this.firstOrderTypeParam.name = res.typename1
+            this.$emit('r2type', res.F_type2)
+            this.ruleForm.F_Type2 = res.F_type2 // 工单子类
+            this.F_Type2 = res.F_type2
+            if (res.F_type2) {
+              this.ruleForm.type2Arr = this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids.slice(1)
+            }
+            this.ruleForm.F_Customer = res.F_Customer // 姓名
+            this.ruleForm.F_Sex = res.F_Sex.toString() // 性别
+            this.ruleForm.F_Phon = res.F_Phon // 电话
+            this.ruleForm.F_CusAddress = res.F_CusAddress // 家庭住址
+            this.ruleForm.F_IdCard = res.F_IdCard // 身份证号
+            this.ruleForm.F_ServiceItems = res.F_ServiceItems // 服务项目
+            this.ruleForm.F_Address = res.F_Address // 地区
+            this.ruleForm.F_FirstCheckHospital = res.F_FirstCheckHospital // 首次检查医院
+            this.ruleForm.F_NoduleSize = res.F_NoduleSize // 肺结节大小
+            this.ruleForm.F_FirstFindTime = res.F_FirstFindTime // 首次发现肺结节时间
+            this.ruleForm.F_Urgency = res.F_Urgency.toString() // 紧急程度
+            this.ruleForm.F_Cathetertype = res.F_Cathetertype // 置管类型
+            this.ruleForm.F_Catheterdept = res.F_Catheterdept // 置管科室
+            this.ruleForm.F_Cathetertime = res.F_Cathetertime // 置管时间
+            this.ruleForm.F_BedNum = res.F_BedNum // 床号
+            this.ruleForm.F_InpatientNum = res.F_InpatientNum // 住院号
+            if (res.F_DealType === '立即办理') {
+              this.ruleForm.opt = '1'
+            } else if (res.F_DealType === '提交审核') {
+              this.ruleForm.opt = '2'
+            } else if (res.F_DealType === '转派') {
+              this.ruleForm.opt = '3'
+            }
+            this.ruleForm.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
+            this.ruleForm.F_DealOpinions = res.F_DealOpinions // 处理意见
+            this.ruleForm.F_FullName = res.F_FullName
+            this.ruleForm.F_IDNumber = res.F_IDNumber
+            this.ruleForm.F_Relationship = res.F_Relationship
+            // console.log(this.ruleForm.type2Arr, '99')
+            if (this.ruleForm.type2Arr[0] == '8023') {
+              this.zpdptname = '建议部门'
+              this.zppername = '建议人'
+            }
+            if (this.ruleForm.type2Arr[0] == '8015') {
+              this.zpdptname = '投诉部门'
+              this.zppername = '投诉人'
+            }
+            if (this.ruleForm.type2Arr[0] == '8031') {
+              this.zpdptname = '表扬部门'
+              this.zppername = '表扬人'
+            }
+            if (res.F_ComplaintDept) {
+              this.deptidArr = this.$store.getters.deptmap[parseInt(res.F_ComplaintDept)].ids
+              this.getRepairman(res.F_ComplaintDept, 0)
+              this.ruleForm.F_ComplaintDept = res.F_ComplaintDept
+              this.ruleForm.F_ComplaintUser = res.F_ComplaintUser
+            }
+            if (res.DealDept) {
+              this.deptidArr1 = this.$store.getters.deptmap[parseInt(res.DealDept)].ids
+              console.log(this.$store.getters.deptmap[parseInt(res.DealDept)].ids, '00000')
+              this.getRepairman1(res.DealDept, 0)
+              this.ruleForm.clbm = res.DealDept
+              this.ruleForm.clid = res.DealUser
+            }
+          }
+        }
+      }).catch(() => {
+      })
+    },
+    submitForm() {
+      // if (JSON.stringify(this.orderTypeData) !== '{}') {
+      //   console.log(this.orderTypeData)
+      //   this.getParentOrderType()
+      // }
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.loading = true
@@ -516,8 +578,6 @@ export default {
             F_FullName: this.ruleForm.F_FullName, // 患者姓名
             F_Relationship: this.ruleForm.F_Relationship, // 患者关系
             F_IDNumber: this.ruleForm.F_IDNumber, // 患者身份证
-            // F_ServiceItems: this.ruleForm.F_ServiceItems, // 服务项目
-            // F_ServiceItems: this.ruleForm.F_Type2, // 服务项目用工单类别最后一级代替
             F_Address: this.ruleForm.F_Address, // 地区
             F_FirstCheckHospital: this.ruleForm.F_FirstCheckHospital, // 首次检查医院
             F_NoduleSize: this.ruleForm.F_NoduleSize, // 肺结节大小
@@ -566,6 +626,7 @@ export default {
           }
           if (this.wid) {
             // 编辑
+            params.F_Type2 = this.F_Type2
             updateWorkOrder(params)
               .then((response) => {
                 this.loading = false
@@ -632,40 +693,11 @@ export default {
         resolve()
       })
     },
-    getRepairman(id, state) {
-      return new Promise((resolve) => {
-        const params = {
-          deptid: id // 字典管理的工单标识
-        }
-        GetPerson(params).then((res) => {
-          if (state === 0) {
-            this.repairman = res.rows
-          } else if (state === 1) {
-            this.assignman = res.rows
-          }
-        })
-        resolve()
-      })
-    },
     changeRepairman(data) {
-      // this.ruleForm.repairmanid = data
-      // const user = this.repairman.find((o) => {
-      //   return o.usercode === data.toString()
-      // })
-      // if (user) {
-      //   this.ruleForm.repairmanphone = user.usertelphone
-      //   this.ruleForm.repairmanCallNumber = user.usertelphone
-      // }
+
     },
     changeRepairman1(data) {
-      // this.ruleForm.repairmanid = data
-      // const user = this.repairman.find((o) => {
-      //   return o.usercode === data.toString()
-      // })
-      // if (user) {
-      //   this.ruleForm.repairmanphone = user.usertelphone
-      //   this.ruleForm.repairmanCallNumber = user.usertelphone
-      // }
+
     },
     genderParams() {
       this.ruleForm.F_Customer = this.personParmsData.F_Customer // 姓名
@@ -676,21 +708,20 @@ export default {
     },
 
     // 一级改变时触发
-    getFirstOrderType(data) {
-      this.ruleForm.F_Type1 = data.value
-      this.ruleForm.F_TypeName1 = data.name
-      this.secondOrderTypeParam.typeid = 2
-      this.secondOrderTypeParam.pid = data.value
-    },
-
+    // getFirstOrderType(data) {
+    //   this.ruleForm.F_Type1 = data.value
+    //   this.ruleForm.F_TypeName1 = data.name
+    //   this.secondOrderTypeParam.typeid = 2
+    //   this.secondOrderTypeParam.pid = data.value
+    // },
     // 二级改变时触发
-    getSecondOrderType(data) {
-      this.ruleForm.F_Type2 = data.value
-      this.ruleForm.F_TypeName2 = data.name
-      this.typeSecondState(data.value)
-      this.thirdOrderTypeParam.typeid = 3
-      this.thirdOrderTypeParam.pid = data.value
-    },
+    // getSecondOrderType(data) {
+    //   this.ruleForm.F_Type2 = data.value
+    //   this.ruleForm.F_TypeName2 = data.name
+    //   this.typeSecondState(data.value)
+    //   this.thirdOrderTypeParam.typeid = 3
+    //   this.thirdOrderTypeParam.pid = data.value
+    // },
     // 三级改变时触发
     // getThirdOrderType(data) {
     //   this.ruleForm.F_Type3 = data.value
@@ -701,131 +732,39 @@ export default {
     //   this.ruleForm.F_ServiceItems = data.value
     //   this.ruleForm.F_ServiceItems = data.name
     // },
-    typeSecondState(data) {
-      switch (data) {
-        // case 1001: // 健康咨询
-        //   this.ruleForm.opt = '1'
-        //   break
-        // case 1002: // 投诉建议
-        //   this.ruleForm.opt = '2'
-        //   break
-        // case 1003: // 外聘专家咨询
-        //   this.ruleForm.opt = '1'
-        //   break
-        // case 1004: // 家庭预约上门
-        //   this.ruleForm.opt = '3'
-        //   break
-        // case 1005: // 静脉置管维护
-        //   this.ruleForm.opt = '3'
-        //   break
-        // default:
-        //   this.ruleForm.opt = '1'
-        //   break
-      }
-    },
-    // 获取详情
-    OrderDetail() {
-      return new Promise((resolve) => {
-        const params = {
-          WorkOrderCode: this.wid
-        }
-        GetOrderDetail(params).then((response) => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            const res = response.data[0]
-            if (res) {
-              this.rowid = res.F_ID
-              this.ruleForm.F_ID = res.F_ID
-              this.ruleForm.F_Source = res.F_Source // 业务类别
-              this.ruleForm.F_Type1 = res.F_type1 // 工单类别
-              this.ruleForm.F_TypeName1 = res.typename1 // 工单类别
-              this.firstOrderTypeParam.name = res.typename1
-              this.$emit('r2type', res.F_type2)
-              this.ruleForm.F_Type2 = res.F_type2 // 工单子类
-              // this.typeSecondState(res.F_type2)
-              this.ruleForm.F_TypeName2 = res.typename2 // 工单子类
-              this.secondOrderTypeParam.name = res.typename2
-              // this.ruleForm.F_Type3 = res.F_type3 // 工单三类
-              // this.ruleForm.F_TypeName3 = res.typename3 // 工单三类
-              // this.thirdOrderTypeParam.name = res.typename3
-              this.ruleForm.F_Customer = res.F_Customer // 姓名
-              this.ruleForm.F_Sex = res.F_Sex.toString() // 性别
-              this.ruleForm.F_Phon = res.F_Phon // 电话
-              this.ruleForm.F_CusAddress = res.F_CusAddress // 家庭住址
-              this.ruleForm.F_IdCard = res.F_IdCard // 身份证号
-              this.ruleForm.F_ServiceItems = res.F_ServiceItems // 服务项目
-
-              // this.inServicesParam.name = res.F_ServiceItems // 服务项目
-
-              this.ruleForm.F_Address = res.F_Address // 地区
-              this.ruleForm.F_FirstCheckHospital = res.F_FirstCheckHospital // 首次检查医院
-              this.ruleForm.F_NoduleSize = res.F_NoduleSize // 肺结节大小
-              this.ruleForm.F_FirstFindTime = res.F_FirstFindTime // 首次发现肺结节时间
-              this.ruleForm.F_Urgency = res.F_Urgency.toString() // 紧急程度
-              this.ruleForm.F_Cathetertype = res.F_Cathetertype // 置管类型
-              this.ruleForm.F_Catheterdept = res.F_Catheterdept // 置管科室
-              this.ruleForm.F_Cathetertime = res.F_Cathetertime // 置管时间
-              this.ruleForm.F_BedNum = res.F_BedNum // 床号
-              this.ruleForm.F_InpatientNum = res.F_InpatientNum // 住院号
-              if (res.F_DealType === '立即办理') {
-                this.ruleForm.opt = '1'
-              } else if (res.F_DealType === '提交审核') {
-                this.ruleForm.opt = '2'
-              } else if (res.F_DealType === '转派') {
-                this.ruleForm.opt = '3'
-              }
-              this.ruleForm.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
-              this.ruleForm.F_DealOpinions = res.F_DealOpinions // 处理意见
-              // this.OrderDetailFlag = true
-              this.ruleForm.F_FullName = res.F_FullName
-              this.ruleForm.F_IDNumber = res.F_IDNumber
-              this.ruleForm.F_Relationship = res.F_Relationship
-              if (res.F_type2) {
-                this.ruleForm.type2Arr = this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids.slice(1)
-              }
-              // console.log(this.ruleForm.type2Arr, '99')
-              if (this.ruleForm.type2Arr[0] == '8023') {
-                this.zpdptname = '建议部门'
-                this.zppername = '建议人'
-              }
-              if (this.ruleForm.type2Arr[0] == '8015') {
-                this.zpdptname = '投诉部门'
-                this.zppername = '投诉人'
-              }
-              if (this.ruleForm.type2Arr[0] == '8031') {
-                this.zpdptname = '表扬部门'
-                this.zppername = '表扬人'
-              }
-              if (res.F_ComplaintDept) {
-                this.deptidArr = this.$store.getters.deptmap[parseInt(res.F_ComplaintDept)].ids
-                this.getRepairman(res.F_ComplaintDept, 0)
-                this.ruleForm.F_ComplaintDept = res.F_ComplaintDept
-                this.ruleForm.F_ComplaintUser = res.F_ComplaintUser
-              }
-              if (res.DealDept) {
-                this.deptidArr1 = this.$store.getters.deptmap[parseInt(res.DealDept)].ids
-                console.log(this.$store.getters.deptmap[parseInt(res.DealDept)].ids, '00000')
-                this.getRepairman1(res.DealDept, 0)
-                this.ruleForm.clbm = res.DealDept
-                this.ruleForm.clid = res.DealUser
-              }
-            }
-          }
-        })
-        resolve()
-      })
-    },
+    // typeSecondState(data) {
+    // switch (data) {
+    // case 1001: // 健康咨询
+    //   this.ruleForm.opt = '1'
+    //   break
+    // case 1002: // 投诉建议
+    //   this.ruleForm.opt = '2'
+    //   break
+    // case 1003: // 外聘专家咨询
+    //   this.ruleForm.opt = '1'
+    //   break
+    // case 1004: // 家庭预约上门
+    //   this.ruleForm.opt = '3'
+    //   break
+    // case 1005: // 静脉置管维护
+    //   this.ruleForm.opt = '3'
+    //   break
+    // default:
+    //   this.ruleForm.opt = '1'
+    //   break
+    // }
+    // },
 
-    getParentOrderType() {
-      this.ruleForm.F_Type1 = this.orderTypeData.F_Type1
-      this.ruleForm.F_TypeName1 = this.orderTypeData.F_TypeName1
-      this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
-      this.ruleForm.F_TypeName2 = this.orderTypeData.F_TypeName2
-      this.ruleForm.F_Type3 = this.orderTypeData.F_Type3
-      this.ruleForm.F_TypeName3 = this.orderTypeData.F_TypeName3
-      this.ruleForm.identification = this.orderTypeData.identification
-      this.ruleForm.type2Arr = this.orderTypeData.type2Arr
-    },
+    // getParentOrderType() {
+    //   this.ruleForm.F_Type1 = this.orderTypeData.F_Type1
+    //   this.ruleForm.F_TypeName1 = this.orderTypeData.F_TypeName1
+    //   this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
+    //   this.ruleForm.F_TypeName2 = this.orderTypeData.F_TypeName2
+    //   this.ruleForm.F_Type3 = this.orderTypeData.F_Type3
+    //   this.ruleForm.F_TypeName3 = this.orderTypeData.F_TypeName3
+    //   this.ruleForm.identification = this.orderTypeData.identification
+    //   this.ruleForm.type2Arr = this.orderTypeData.type2Arr
+    // },
     // 重置工单
     resetForm() {
       this.ruleForm.F_Source = '' // 业务类别

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

@@ -3,7 +3,12 @@
     <div class="filter-container">
       <!-- <el-input v-model="searchData.name" placeholder="请输入姓名" class="filter-item" size="medium" /> -->
       <!-- <el-input v-model="searchData.phone" placeholder="请输入电话" class="filter-item" size="medium" /> -->
-      <el-input v-model="searchData.wocode" placeholder="请输入工单编号" class="filter-item" size="medium" />
+      <el-input
+        v-model="searchData.wocode"
+        placeholder="请输入工单编号"
+        class="filter-item"
+        size="medium"
+      />
       <el-date-picker
         v-model="searchTime"
         type="daterange"
@@ -14,9 +19,21 @@
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        size="medium" />
-      <el-select v-model="searchData.type" clearable placeholder="请选择业务类别" size="medium" @change="changeOrder">
-        <el-option v-for="item in orderData" :key="item.id" :label="item.text" :value="item.id" />
+        size="medium"
+      />
+      <el-select
+        v-model="searchData.type"
+        clearable
+        placeholder="请选择业务类别"
+        size="medium"
+        @change="changeOrder"
+      >
+        <el-option
+          v-for="item in orderData"
+          :key="item.id"
+          :label="item.text"
+          :value="item.id"
+        />
       </el-select>
       <el-cascader
         ref="cascader"
@@ -27,8 +44,14 @@
         placeholder="请选择工单类别"
         filterable
         clearable
-        @change="handleChange" />
-      <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="btn_search">
+        @change="handleChange"
+      />
+      <el-button
+        type="primary"
+        class="filter-btn"
+        icon="el-icon-search"
+        @click="btn_search"
+      >
         搜索
       </el-button>
       <el-button
@@ -36,7 +59,8 @@
         type="primary"
         class="filter-btn"
         icon="el-icon-s-tools"
-        @click="btn_add_list">
+        @click="btn_add_list"
+      >
         设置列
       </el-button>
     </div>
@@ -45,32 +69,77 @@
       <el-tab-pane label="待处理" name="0" />
       <el-tab-pane label="已处理" name="1" />
     </el-tabs>
-    <el-table v-loading="loading" ref="multipleTable" :data="dataLists" border stripe row-key="F_Id">
+    <el-table
+      v-loading="loading"
+      ref="multipleTable"
+      :data="dataLists"
+      border
+      stripe
+      row-key="F_Id"
+    >
       <!-- <el-table-column type="index" label="编号" align="center" fixed width="60" /> -->
-      <el-table-column v-if="fieldListFlag.F_WoCode" prop="F_WoCode" label="工单编号" align="center" min-width="110">
+      <el-table-column
+        v-if="fieldListFlag.F_WoCode"
+        prop="F_WoCode"
+        label="工单编号"
+        align="center"
+        min-width="110"
+      >
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row)">
+          <el-button
+            type="text"
+            size="small"
+            @click="hadndleOrderCode(scope.row)"
+          >
             {{ scope.row.F_WoCode }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column v-if="fieldListFlag.F_ProposerName" prop="F_ProposerName" label="姓名" align="center" min-width />
+      <el-table-column
+        v-if="fieldListFlag.F_ProposerName"
+        prop="F_ProposerName"
+        label="姓名"
+        align="center"
+        min-width
+      />
       <el-table-column
         v-if="fieldListFlag.F_SonType"
         :formatter="formtOrder"
         prop="F_SonType"
         label="工单类别"
-        align="center" />
-      <el-table-column v-if="fieldListFlag.F_Content" prop="F_Content" label="工单内容" align="center" />
-      <el-table-column v-if="fieldListFlag.StateName" prop="StateName" label="工单状态" align="center" />
-      <el-table-column v-if="fieldListFlag.F_CreateTime" prop="F_CreateTime" label="创建时间" align="center" />
-      <el-table-column label="操作" align="center" class-name="oparate_btn" fixed="right">
+        align="center"
+      />
+      <el-table-column
+        v-if="fieldListFlag.F_Content"
+        prop="F_Content"
+        label="工单内容"
+        align="center"
+      />
+      <el-table-column
+        v-if="fieldListFlag.StateName"
+        prop="StateName"
+        label="工单状态"
+        align="center"
+      />
+      <el-table-column
+        v-if="fieldListFlag.F_CreateTime"
+        prop="F_CreateTime"
+        label="创建时间"
+        align="center"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="oparate_btn"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <el-button
             v-for="item in scope.row.Buttons"
             :key="item.key"
             type="text"
-            @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)">
+            @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)"
+          >
             {{ item.value }}
           </el-button>
         </template>
@@ -82,15 +151,18 @@
       :pageindex.sync="pageParams.pageindex"
       :pagesize.sync="pageParams.pagesize"
       class="pagination"
-      @pagination="getList" />
-    <order-button-operation ref="butOption" :name.sync="buttonName" @refList="refList" />
+      @pagination="getList"
+    />
+    <order-button-operation
+      ref="butOption"
+      :name.sync="buttonName"
+      @refList="refList"
+    />
   </div>
 </template>
 
 <script>
-import {
-  getOrderTypeDrop
-} from '@/api/systemSetup/roleSetting/menuSetup'
+import { getOrderTypeDrop } from '@/api/systemSetup/roleSetting/menuSetup'
 import {
   getorderList,
   deleteOrder,
@@ -103,21 +175,16 @@ import {
   schedulRetractOrder,
   updateSchedulingOrder,
   deleteSchedulingOrder,
-  getSchedulingOrder,
+  getSchedulingOrder
 } from '@/api/orderManagement/orderList'
 
-import {
-  getOrderTypeList
-} from '@/api/commonAPI'
-import {
-  GetFiledState,
-  AddFiled
-} from '@/api/commonAPI'
+import { getOrderTypeList } from '@/api/commonAPI'
+import { GetFiledState, AddFiled } from '@/api/commonAPI'
 import fieldDATA from '@/utils/fieldsData.js'
 import addDefinedList from '@/components/context/addDefinedList'
 import addOrEditFaultRepair from '../../faultRepair/clinicalReporting/components/addRepairbase.vue'
 import RepairEdit from './repairEdit.vue'
-import scheduleEdit from "./scheduleEdit.vue";
+import scheduleEdit from './scheduleEdit.vue'
 import addOrEditOrder from '../../callScreen/components/AddOrEditOrder.vue'
 import detail from '../components/orderDetail.vue'
 import askDetail from '../components/askdetail.vue'
@@ -204,8 +271,8 @@ export default {
       if (this.buttonName === 'chehuibianji') {
         this.btn_edit(wocode)
       }
-      if (this.buttonName === "zhdd_bianji") {
-        this.btn_zhddjiedit(wocode, row.F_Type, row.F_SonType);
+      if (this.buttonName === 'zhdd_bianji') {
+        this.btn_zhddjiedit(wocode, row.F_Type, row.F_SonType)
       }
       if (this.buttonName === 'ywzx_bianji') {
         this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
@@ -233,28 +300,28 @@ export default {
           data: {
             wid: rid,
             rtype: rtype.toString(),
-	    r2type: r2type.toString(),
-	    iswomanage: '1',
-	    isedit: '1'
-	  } // props
-	},
-	area: ['70%', '70%'],
-	title: '编辑工单'
+            r2type: r2type.toString(),
+            iswomanage: '1',
+            isedit: '1'
+          } // props
+        },
+        area: ['70%', '70%'],
+        title: '编辑工单'
       })
     },
     btn_zhddjiedit(rid, rtype, r2type) {
-      console.log(rid);
+      console.log(rid)
       this.$layer.iframe({
         content: {
           content: scheduleEdit, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: {
-            ordreId: rid,
-          }, // props
+            ordreId: rid
+          } // props
         },
-        area: ["70%", "70%"],
-        title: "编辑工单",
-      });
+        area: ['70%', '70%'],
+        title: '编辑工单'
+      })
     },
     getList() {
       this.loading = true
@@ -361,24 +428,24 @@ export default {
     // },
     // 综合调度工单删除
     btn_deleteSchedulingOrder(operateId) {
-      this.deleteId = [];
-      this.deleteId.push(operateId);
-      this.$confirm("此操作将永久删除当前工单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.deleteId = []
+      this.deleteId.push(operateId)
+      this.$confirm('此操作将永久删除当前工单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteSchedulingOrder(this.deleteId).then((response) => {
-            if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("删除成功!");
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('删除成功!')
             }
-          });
+          })
         })
         .catch(() => {
-          this.$message.info("已取消删除");
-        });
+          this.$message.info('已取消删除')
+        })
     },
     hadndleOrderCode(row) {
       if (row.F_Type === 3000) {
@@ -520,10 +587,10 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/.el-tabs__item {
-    width: 185px !important;
-    text-align: center;
-    font-size: 16px !important;
-    font-weight: 600;
-  }
+/deep/.el-tabs__item {
+  width: 185px !important;
+  text-align: center;
+  font-size: 16px !important;
+  font-weight: 600;
+}
 </style>

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/scheduleEdit.vue

@@ -251,64 +251,64 @@ import {
   GetDicValueList,
   GetequipList,
   UpdateSchedulingWorkOrder,
-  GetWorkOrder,
-} from "@/api/comDispatch/addOrEditDispatch";
-import { GetPerson } from "@/api/commonAPI";
+  GetOrderDetail
+} from '@/api/comDispatch/addOrEditDispatch'
+import { GetPerson } from '@/api/commonAPI'
 export default {
-  name: "AddOrEditDispatch",
+  name: 'ScheduleEdit',
   props: {
     ordreId: {
       type: String,
-      default: "",
+      default: ''
     },
     orderTypeData: {
       type: Object,
       default() {
-        return {};
-      },
+        return {}
+      }
     },
     layerid: {
       type: String,
-      default: "",
+      default: ''
     },
     callid: {
       type: String,
-      default: "",
+      default: ''
     },
     wid: {
       type: String,
-      default: "",
+      default: ''
     },
     iswomanage: {
       type: String,
-      default: "",
-    },
+      default: ''
+    }
   },
   data() {
     return {
       headers: {
-        Authorization: localStorage.getItem("Admin-Token"),
+        Authorization: localStorage.getItem('Admin-Token')
       },
       imgUrl:
-        this.$store.getters.serverConfig.BASE_API + "FaultRepair/UploadFile",
+        this.$store.getters.serverConfig.BASE_API + 'FaultRepair/UploadFile',
       type2Arr: [],
       hospitalsParam: {
         id: 0,
-        name: "",
+        name: ''
       },
       departmentsParam: {
         id: 0,
-        name: "",
+        name: ''
       },
       repairmanParam: {
         id: 0,
-        name: "",
+        name: ''
       },
       devList: [
         {
-          devname: "",
-          num: 1,
-        },
+          devname: '',
+          num: 1
+        }
       ],
       detailists: [],
       deptidArr: [],
@@ -316,171 +316,171 @@ export default {
       repairman: [],
       repairman1: [],
       equipArr: [
-        { label: "设备1", value: "01" },
-        { label: "设备2", value: "02" },
+        { label: '设备1', value: '01' },
+        { label: '设备2', value: '02' }
       ],
       goodsArr: [
-        { label: "物资1", value: "01" },
-        { label: "物资2", value: "02" },
+        { label: '物资1', value: '01' },
+        { label: '物资2', value: '02' }
       ],
       bedsArr: [
-        { label: "床1", value: "01" },
-        { label: "床2", value: "02" },
+        { label: '床1', value: '01' },
+        { label: '床2', value: '02' }
       ],
       specimenArr: [
-        { label: "标本1", value: "01" },
-        { label: "标本2", value: "02" },
+        { label: '标本1', value: '01' },
+        { label: '标本2', value: '02' }
       ],
       drugArr: [
-        { label: "药1", value: "01" },
-        { label: "药2", value: "02" },
+        { label: '药1', value: '01' },
+        { label: '药2', value: '02' }
       ],
       ruleForm: {
-        Applicant: "", // 申请人
-        ApplicationDept: "", // 申请部门
-        Phone: "", // 联系电话
-        WorkOrderCategory: "", // 工单类别
-        Content: "", // 工单内容
-        Location: "", // 科室位置
-        ToPlace: "", // 送达地点
-        File: "", // 文件
-        DealDept: "", // 处理部门
-        DealMan: "", // 从节目
-        WorkOrderCode: "", // 工单编号
-      },
-    };
+        Applicant: '', // 申请人
+        ApplicationDept: '', // 申请部门
+        Phone: '', // 联系电话
+        WorkOrderCategory: '', // 工单类别
+        Content: '', // 工单内容
+        Location: '', // 科室位置
+        ToPlace: '', // 送达地点
+        File: '', // 文件
+        DealDept: '', // 处理部门
+        DealMan: '', // 从节目
+        WorkOrderCode: '' // 工单编号
+      }
+    }
   },
 
   created() {
-    this.getequis();
-    this.getgoods();
-    this.getbeds();
-    this.getbiaoben();
-    this.getdrugs();
-    console.log(this.ordreId);
+    this.getequis()
+    this.getgoods()
+    this.getbeds()
+    this.getbiaoben()
+    this.getdrugs()
+    console.log(this.ordreId)
     if (this.ordreId) {
-      this.getDetail();
+      this.getDetail()
     }
-    console.log(this.iswomanage, "444");
+    console.log(this.iswomanage, '444')
   },
   methods: {
     addItem() {
       const params = {
-        devname: "",
-        num: 1,
-      };
-      this.devList.push(params);
+        devname: '',
+        num: 1
+      }
+      this.devList.push(params)
     },
     removeItem(index) {
-      console.log(index);
-      this.devList.splice(index, 1);
+      console.log(index)
+      this.devList.splice(index, 1)
     },
     selectChange(val) {
-      console.log(val);
+      console.log(val)
     },
     getDeptid(data) {
-      this.ruleForm.ApplicationDept = data[data.length - 1];
-      this.getRepairman(data[data.length - 1], 0);
+      this.ruleForm.ApplicationDept = data[data.length - 1]
+      this.getRepairman(data[data.length - 1], 0)
     },
     getDeptid1(data) {
-      this.ruleForm.DealDept = data[data.length - 1];
-      this.getRepairman1(data[data.length - 1], 0);
+      this.ruleForm.DealDept = data[data.length - 1]
+      this.getRepairman1(data[data.length - 1], 0)
     },
     getRepairman(id, state) {
       return new Promise((resolve) => {
         const params = {
-          deptid: id, // 字典管理的工单标识
-        };
+          deptid: id // 字典管理的工单标识
+        }
         GetPerson(params).then((res) => {
           if (state === 0) {
-            this.repairman = res.rows;
+            this.repairman = res.rows
           } else if (state === 1) {
-            this.assignman = res.rows;
+            this.assignman = res.rows
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     getRepairman1(id, state) {
       return new Promise((resolve) => {
         const params = {
-          deptid: id, // 字典管理的工单标识
-        };
+          deptid: id // 字典管理的工单标识
+        }
         GetPerson(params).then((res) => {
           if (state === 0) {
-            this.repairman1 = res.rows;
+            this.repairman1 = res.rows
           } else if (state === 1) {
-            this.assignman1 = res.rows;
+            this.assignman1 = res.rows
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     changeRepairman(data) {},
     changeRepairman1(data) {},
     handle_success(res) {
-      this.ruleForm.repairImageid += res.data[0].F_FileId + ",";
+      this.ruleForm.repairImageid += res.data[0].F_FileId + ','
     },
     getequis() {
-      const params = {};
+      const params = {}
       GetequipList(params).then((res) => {
-        this.equipArr = res.data;
-      });
+        this.equipArr = res.data
+      })
     },
     getgoods() {
       const params = {
-        Flag: "WZXX",
-        Name: "",
-      };
+        Flag: 'WZXX',
+        Name: ''
+      }
       GetDicValueList(params).then((res) => {
-        this.goodsArr = res.rows;
-      });
+        this.goodsArr = res.rows
+      })
     },
     getbeds() {
       const params = {
-        Flag: "BCXX",
-        Name: "",
-      };
+        Flag: 'BCXX',
+        Name: ''
+      }
       GetDicValueList(params).then((res) => {
-        this.bedsArr = res.rows;
-      });
+        this.bedsArr = res.rows
+      })
     },
     getbiaoben() {
       const params = {
-        Flag: "BBXX",
-        Name: "",
-      };
+        Flag: 'BBXX',
+        Name: ''
+      }
       GetDicValueList(params).then((res) => {
-        this.specimenArr = res.rows;
-      });
+        this.specimenArr = res.rows
+      })
     },
     getdrugs() {
       const params = {
-        Flag: "YPXX",
-        Name: "",
-      };
+        Flag: 'YPXX',
+        Name: ''
+      }
       GetDicValueList(params).then((res) => {
-        this.drugArr = res.rows;
-      });
+        this.drugArr = res.rows
+      })
     },
     getDetail() {
       const datas = {
         WorkOrderCode: this.ordreId,
-        type: 0,
-      };
+        type: 0
+      }
       // 详情 GetWorkOrder
       GetWorkOrder(datas)
         .then((response) => {
-          if (response.state.toLowerCase() === "success") {
-            console.log(response);
-            const res = response.data[0];
+          if (response.state.toLowerCase() === 'success') {
+            console.log(response)
+            const res = response.data[0]
 
-            this.ruleForm.Applicant = res.F_Applicant; // 申请人
-            this.ruleForm.ApplicationDept = res.F_ApplicationDept; // 申请部门
-            this.ruleForm.Location = res.F_Location; // 科室位置
-            this.ruleForm.Phone = res.F_Phone; // 联系电话
-            this.ruleForm.WorkOrderCategory = res.F_WorkOrderCategory; // 工单类别
-            this.ruleForm.WorkOrderCode = res.F_WorkOrderCode; // 工单编号
+            this.ruleForm.Applicant = res.F_Applicant // 申请人
+            this.ruleForm.ApplicationDept = res.F_ApplicationDept // 申请部门
+            this.ruleForm.Location = res.F_Location // 科室位置
+            this.ruleForm.Phone = res.F_Phone // 联系电话
+            this.ruleForm.WorkOrderCategory = res.F_WorkOrderCategory // 工单类别
+            this.ruleForm.WorkOrderCode = res.F_WorkOrderCode // 工单编号
 
             // this.ruleForm.Content = res.F_Content; // 工单内容
             //
@@ -488,30 +488,30 @@ export default {
             // this.ruleForm.File = res.FileUrl; // 文件
             // this.ruleForm.DealDept = res.F_DealDept; // 处理部门
             // this.ruleForm.DealMan = res.F_DealMan; // 处理人
-            console.log(this.ruleForm);
+            console.log(this.ruleForm)
           }
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     submitForm() {
-      console.log(this.devList);
-      const details = [];
-      this.devList.forEach(function (v, n) {
+      console.log(this.devList)
+      const details = []
+      this.devList.forEach(function(v, n) {
         details.push({
-          F_DicId: v.devname.split(",")[1],
-          F_DicName: v.devname.split(",")[0],
-          F_Number: v.num,
-        });
-      });
-      console.log(details);
-      console.log(this.orderTypeData);
-      if (this.ruleForm.repairImageid === "") {
-        this.ruleForm.repairImageid = "";
+          F_DicId: v.devname.split(',')[1],
+          F_DicName: v.devname.split(',')[0],
+          F_Number: v.num
+        })
+      })
+      console.log(details)
+      console.log(this.orderTypeData)
+      if (this.ruleForm.repairImageid === '') {
+        this.ruleForm.repairImageid = ''
       } else {
         this.ruleForm.repairImageid = this.ruleForm.repairImageid.slice(
           0,
           this.ruleForm.repairImageid.length - 1
-        );
+        )
       }
 
       var datas = {
@@ -527,24 +527,24 @@ export default {
         DealDept: this.ruleForm.DealDept, // 处理部门
         DealMan: this.ruleForm.DealMan, // 从节目
         WorkOrderCode: this.ruleForm.WorkOrderCode, // 工单编号
-        detailists: details,
-      };
-      console.log(datas);
+        detailists: details
+      }
+      console.log(datas)
       // 添加
       if (this.ordreId) {
         UpdateSchedulingWorkOrder(datas)
           .then((response) => {
-            if (response.state.toLowerCase() === "success") {
+            if (response.state.toLowerCase() === 'success') {
               if (this.layerid) {
-                this.$parent.$layer.close(this.layerid);
-                this.$parent.getList(); // 重新加载父级数据
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList() // 重新加载父级数据
               }
-              this.$message.success("恭喜你，修改成功!");
+              this.$message.success('恭喜你，修改成功!')
             }
           })
-          .catch(() => {});
+          .catch(() => {})
       }
-    },
+    }
     // resetForm() {
     //   this.$refs.ruleForm.resetFields()
     //   this.itemessageList = [
@@ -563,8 +563,8 @@ export default {
     //     }
     //   ]
     // }
-  },
-};
+  }
+}
 </script>
 <style rel="stylesheet/scss" lang="scss">
 .addOp span {

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

@@ -90,7 +90,7 @@ import {
   schedulRetractOrder,
   updateSchedulingOrder,
   deleteSchedulingOrder,
-  getSchedulingOrder,
+  getSchedulingOrder
 } from '@/api/orderManagement/orderList'
 import {
   getOrderTypeDrop
@@ -182,8 +182,8 @@ export default {
     btnClickEvents(button, wocode, row) {
       this.buttonName = button.key
       this.$refs.butOption.butOptionMethod(this.buttonName, wocode, row)
-      if (this.buttonName === 'bianji') {
-        this.btn_edit(wocode, row.F_Type)
+      if (this.buttonName === 'bianji' || this.buttonName === 'schbianji' || this.buttonName === 'yw_bianji') {
+        this.btn_edit(wocode, row.F_Type, row.F_SonType)
       }
     },
     getList() {
@@ -249,7 +249,7 @@ export default {
       })
     },
     // 编辑
-    btn_edit(rid, rtype) {
+    btn_edit(rid, rtype, r2type) {
       this.$layer.iframe({
         content: {
           content: addOrEditOrder, // 传递的组件对象
@@ -257,6 +257,7 @@ export default {
           data: {
             wid: rid,
             rtype: rtype.toString(),
+            r2type: r2type.toString(),
             iswomanage: '1',
             isedit: '1'
           } // props

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/index.vue

@@ -4,52 +4,79 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <el-alert :closable="false" title="部门列表" type="success" />
-          <el-tree ref="treeRef" :props="defaultProps" :data="treelists" node-key="id" :highlight-current='true'
-            :default-expand-all='false' @node-click="handleNodeClick" />
+          <el-tree
+            ref="treeRef"
+            :props="defaultProps"
+            :data="treelists"
+            :highlight-current="true"
+            :default-expand-all="false"
+            node-key="id"
+            @node-click="handleNodeClick" />
         </el-col>
         <el-col :span="18">
           <el-alert :closable="false" title="用户列表" type="success" style="margin-bottom: 5px;" />
-          <el-alert :closable="false" title="上传文件需要严格按照下载的EXCEL模板进行填写！" type="warning" style="margin-bottom: 7px;">
-          </el-alert>
+          <el-alert :closable="false" title="上传文件需要严格按照下载的EXCEL模板进行填写！" type="warning" style="margin-bottom: 7px;"/>
           <el-input v-model="keyword" placeholder="请输入工号，姓名，电话" class="filter-item" size="medium" clearable />
           <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-          <el-button v-permission="'add_userManage'" type="primary" class="filter-item" icon="el-icon-plus"
+          <el-button
+            v-permission="'add_userManage'"
+            type="primary"
+            class="filter-item"
+            icon="el-icon-plus"
             @click="btn_add">添加</el-button>
-          <el-button type="primary" class="filter-item" icon="el-icon-upload2" @click='btn_onimport'>批量导入</el-button>
-          <el-button type="primary" class="filter-item" icon="el-icon-download" @click='btn_export'>批量导出</el-button>
-          <a href="/static/xls/userImport.xls" download="用户模板.xls" title="点击下载模板"
+          <el-button type="primary" class="filter-item" icon="el-icon-upload2" @click="btn_onimport">批量导入</el-button>
+          <el-button type="primary" class="filter-item" icon="el-icon-download" @click="btn_export">批量导出</el-button>
+          <a
+            href="/static/xls/userImport.xls"
+            download="用户模板.xls"
+            title="点击下载模板"
             style="line-height: 32px;color: #409EFF;font-size: 14px;">点击下载用户模板</a>
           <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
             <!-- <el-table-column type="selection" width="40" /> -->
             <el-table-column prop="F_UserCode" label="工号" align="center" min-width="" />
             <el-table-column prop="F_UserName" label="姓名" align="center" min-width="" />
             <el-table-column prop="F_DeptName" label="部门" align="center" min-width="" />
+            <el-table-column prop="F_RoleName" label="角色" align="center" min-width="" />
             <el-table-column prop="F_Telephone" label="电话" align="center" min-width="" />
             <el-table-column label="启用禁用状态" align="center" min-width="">
               <template slot-scope="scope">
-                <span style="color: #F56C6C;" v-if="scope.row.F_EnableFlag==0">禁用</span>
-                <span style="color: #67C23A;" v-if="scope.row.F_EnableFlag==1">启用</span>
+                <span v-if="scope.row.F_EnableFlag==0" style="color: #F56C6C;">禁用</span>
+                <span v-if="scope.row.F_EnableFlag==1" style="color: #67C23A;">启用</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="200" align="center" class-name="oparate_btn" fixed="right">
               <template slot-scope="scope">
-                <el-button type="danger" plain v-if="scope.row.F_EnableFlag==1" @click="onOff(scope.row.F_UserId)">禁用
+                <el-button v-if="scope.row.F_EnableFlag==1" type="danger" plain @click="onOff(scope.row.F_UserId)">禁用
                 </el-button>
-                <el-button type="success" plain v-if="scope.row.F_EnableFlag==0" @click="onOpen(scope.row.F_UserId)">启用
+                <el-button v-if="scope.row.F_EnableFlag==0" type="success" plain @click="onOpen(scope.row.F_UserId)">启用
                 </el-button>
-                <el-button v-permission="'edit_userManage'" size="mini" plain type="primary"
+                <el-button
+                  v-permission="'edit_userManage'"
+                  size="mini"
+                  plain
+                  type="primary"
                   @click="btn_edit(scope.row.F_UserId.toString(),scope.row.F_UserCode.toString())">编辑</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" />
         </el-col>
       </el-row>
     </div>
-    <el-dialog title="导入用户" :visible.sync="dialogTableVisible">
-      <el-upload :headers="headers" style="margin-bottom: 30px;" :data="importData" :on-success="handle_success"
-        :limit="1" :action="importUrl">
+    <el-dialog :visible.sync="dialogTableVisible" title="导入用户">
+      <el-upload
+        :headers="headers"
+        :data="importData"
+        :on-success="handle_success"
+        :limit="1"
+        :action="importUrl"
+        style="margin-bottom: 30px;">
         <el-button slot="trigger" size="small" type="primary">上传文件</el-button>
       </el-upload>
       <!-- <div style="margin-top: 15px;">
@@ -60,286 +87,284 @@
 </template>
 
 <script>
-  import {
-    getUserAccountLists,
-    deleteUserAccount,
-    getDelUsers,
-    getUserInput,
-    getUserExport
-  } from '@/api/systemSetup/roleSetting/userManage'
-  import {
-    getDeptTree
-  } from '@/api/systemSetup/roleSetting/userManage'
-  import {
-    pickerOptions,
-    buildTree,
-    filterTreeDatas
-  } from '@/utils'
-  import {
-    exportExcel
-  } from '@/utils'
-  import addOrEdit from './addOrEdit'
-  import modifyPass from './modifyPass.vue'
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+import {
+  getUserAccountLists,
+  deleteUserAccount,
+  getDelUsers,
+  getUserInput,
+  getUserExport
+} from '@/api/systemSetup/roleSetting/userManage'
+import {
+  getDeptTree
+} from '@/api/systemSetup/roleSetting/userManage'
+import {
+  pickerOptions,
+  buildTree,
+  filterTreeDatas
+} from '@/utils'
+import {
+  exportExcel
+} from '@/utils'
+import addOrEdit from './addOrEdit'
+import modifyPass from './modifyPass.vue'
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
 
-  export default {
-    name: 'UserManage',
-    components: {
-      Pagination
+export default {
+  name: 'UserManage',
+  components: {
+    Pagination
+  },
+  filters: {
+    userSeatFlagFilter(status) {
+      const statusMap = {
+        0: '非话务',
+        1: '话务'
+      }
+      return statusMap[status]
     },
-    filters: {
-      userSeatFlagFilter(status) {
-        const statusMap = {
-          0: '非话务',
-          1: '话务'
-        }
-        return statusMap[status]
+    userDeleteFlagFilter(status) {
+      const statusMap = {
+        0: '启用',
+        2: '禁用'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialogTableVisible: false,
+      roleId: '',
+      keyword: '',
+      deptid: '',
+      treelists: [], // 菜单树数据
+      parentid: '-1',
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      defaultProps: {
+        children: 'children',
+        label: 'text',
+        value: 'id'
+      },
+      importData: {
+        deptid: ''
       },
-      userDeleteFlagFilter(status) {
-        const statusMap = {
-          0: '启用',
-          2: '禁用'
+      // repairImageid: '',
+      headers: {
+        Authorization: localStorage.getItem('Admin-Token')
+      },
+      importUrl: this.$store.getters.serverConfig.BASE_API + 'UserAccount/UserInput',
+      multipleSelection: [], // 选中的数据
+      dataLists: [], // 列表数据
+      // 自定义菜单下拉数据的key值
+      props: {
+        value: 'id',
+        label: 'text'
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.getTreeList()
+    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, // 每页几条信息
+          key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
+          deptid: this.deptid
         }
-        return statusMap[status]
+        getUserAccountLists(params).then((response) => {
+          this.loading = false
+          this.pageParams.total = response.total
+          this.dataLists = response.rows
+        })
+        resolve()
+      })
+    },
+    btn_onimport() {
+      if (this.deptid == '') {
+        this.$message.warning('请选择部门')
+        return
       }
+      this.dialogTableVisible = true
     },
-    data() {
-      return {
-        loading: false,
-        dialogTableVisible: false,
-        roleId: '',
-        keyword: '',
-        deptid: '',
-        treelists: [], // 菜单树数据
-        parentid: '-1',
-        pageParams: {
-          pageindex: 1, // 当前第几页
-          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-          total: 0 // 总共多少数据
-        },
-        defaultProps: {
-          children: 'children',
-          label: 'text',
-          value: 'id'
-        },
-        importData: {
-          deptid: ''
+    // 复选框状态改变
+    changeSelects(val) {
+      this.multipleSelection = val
+    },
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            addDeptid: this.deptid.toString()
+          } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        // repairImageid: '',
-        headers: {
-          Authorization: localStorage.getItem('Admin-Token')
+        area: ['60%', '60%'],
+        title: '添加用户信息'
+      })
+    },
+    btn_edit(editId, usercode) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowid: editId,
+            usercodeList: usercode
+          } // props
         },
-        importUrl: this.$store.getters.serverConfig.BASE_API + 'UserAccount/UserInput',
-        multipleSelection: [], // 选中的数据
-        dataLists: [], // 列表数据
-        // 自定义菜单下拉数据的key值
-        props: {
-          value: 'id',
-          label: 'text'
-        }
-      }
+        area: ['60%', '60%'],
+        title: '编辑用户信息'
+      })
     },
-    created() {
-      this.getList()
-      this.getTreeList()
-      document.onkeyup = (e) => {
-        if (e.keyCode === 13) {
-          this.getList()
-        }
-      }
+    btn_modifyPass(editId) {
+      this.$layer.iframe({
+        content: {
+          content: modifyPass, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowid: editId
+          } // props
+        },
+        area: ['40%', '360px'],
+        title: '修改密码'
+      })
     },
-    methods: {
-      getList() {
-        this.loading = true
-        return new Promise((resolve) => {
+    btn_delete(id) {
+      this.$confirm('您确定要将此用户信息删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
           const params = {
-            page: this.pageParams.pageindex, // 第几页
-            pagesize: this.pageParams.pagesize, // 每页几条信息
-            key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
-            deptid: this.deptid
+            ids: id,
+            state: 1 // 0启用1删除2禁用
           }
-          getUserAccountLists(params).then((response) => {
-            this.loading = false
-            if (response.rows.length > 0) {
-              this.pageParams.total = response.total
-              this.dataLists = response.rows
+          deleteUserAccount(params).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('删除成功!')
             }
           })
-          resolve()
         })
-      },
-      btn_onimport() {
-        if (this.deptid == '') {
-          this.$message.warning('请选择部门')
-          return;
-        }
-        this.dialogTableVisible = true
-      },
-      // 复选框状态改变
-      changeSelects(val) {
-        this.multipleSelection = val
-      },
-      btn_search() {
-        this.pageParams.pageindex = 1
-        this.getList()
-      },
-      btn_add() {
-        this.$layer.iframe({
-          content: {
-            content: addOrEdit, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              addDeptid: this.deptid.toString()
-            } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-          },
-          area: ['60%', '60%'],
-          title: '添加用户信息'
-        })
-      },
-      btn_edit(editId, usercode) {
-        this.$layer.iframe({
-          content: {
-            content: addOrEdit, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              rowid: editId,
-              usercodeList: usercode
-            } // props
-          },
-          area: ['60%', '60%'],
-          title: '编辑用户信息'
-        })
-      },
-      btn_modifyPass(editId) {
-        this.$layer.iframe({
-          content: {
-            content: modifyPass, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              rowid: editId
-            } // props
-          },
-          area: ['40%', '360px'],
-          title: '修改密码'
+        .catch(() => {
+          this.$message.info('已取消删除')
         })
-      },
-      btn_delete(id) {
-        this.$confirm('您确定要将此用户信息删除吗?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            const params = {
-              ids: id,
-              state: 1 // 0启用1删除2禁用
-            }
-            deleteUserAccount(params).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('删除成功!')
-              }
-            })
-          })
-          .catch(() => {
-            this.$message.info('已取消删除')
-          })
-      },
-      onOpen(id) {
-        this.$confirm('您确定要将此用户启用吗?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            const params = {
-              ids: id,
-              state: 1
-            }
-            getDelUsers(params).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('启用成功!')
-              }
-            })
-          })
-          .catch(() => {
-            this.$message('已取消')
-          })
-      },
-      onOff(id) {
-        this.$confirm('您确定要将此用户禁用吗?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            const params = {
-              ids: id,
-              state: 0
+    },
+    onOpen(id) {
+      this.$confirm('您确定要将此用户启用吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const params = {
+            ids: id,
+            state: 1
+          }
+          getDelUsers(params).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('启用成功!')
             }
-            getDelUsers(params).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('禁用成功!')
-              }
-            })
           })
-          .catch(() => {
-            this.$message('已取消')
-          })
-      },
-      //树
-      getTreeList() {
-        return new Promise((resolve) => {
-          getDeptTree(this.parentid).then((response) => {
+        })
+        .catch(() => {
+          this.$message('已取消')
+        })
+    },
+    onOff(id) {
+      this.$confirm('您确定要将此用户禁用吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const params = {
+            ids: id,
+            state: 0
+          }
+          getDelUsers(params).then((response) => {
             if (response.state.toLowerCase() === 'success') {
-              this.treelists = response.data
+              this.getList()
+              this.$message.success('禁用成功!')
             }
           })
-          resolve()
         })
-      },
-      handleNodeClick(data) {
-        console.log(data)
-        if(data.parentid!='-1'){
-          this.deptid = data.id
-          this.importData.deptid = data.id
-          this.getList()
-        }
-      },
-      handle_success(res) {
-        if(res.state=='success'){
-          this.dialogTableVisible=false
-          this.getList()
-          this.$message.success('导入成功')
-        }
-      },
-      // btn_import() {
-      //   return new Promise((resolve) => {
-      //     const params = {
-      //       deptid: this.deptid
-      //     }
-      //     getUserInput(params).then((response) => {
-      //       if (response.state.toLowerCase() === 'success') {
+        .catch(() => {
+          this.$message('已取消')
+        })
+    },
+    // 树
+    getTreeList() {
+      return new Promise((resolve) => {
+        getDeptTree(this.parentid).then((response) => {
+          if (response.state.toLowerCase() === 'success') {
+            this.treelists = response.data
+          }
+        })
+        resolve()
+      })
+    },
+    handleNodeClick(data) {
+      console.log(data)
+      if (data.parentid != '-1') {
+        this.deptid = data.id
+        this.importData.deptid = data.id
+        this.getList()
+      }
+    },
+    handle_success(res) {
+      if (res.state == 'success') {
+        this.dialogTableVisible = false
+        this.getList()
+        this.$message.success('导入成功')
+      }
+    },
+    // btn_import() {
+    //   return new Promise((resolve) => {
+    //     const params = {
+    //       deptid: this.deptid
+    //     }
+    //     getUserInput(params).then((response) => {
+    //       if (response.state.toLowerCase() === 'success') {
 
-      //       }
-      //     })
-      //     resolve()
-      //   })
-      // },
-      btn_export() {
-        const exportparams = {
-          page: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
-          key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
-          deptid: this.deptid,
-          isexport: 1
-        }
-        exportExcel(exportparams, getUserExport)
+    //       }
+    //     })
+    //     resolve()
+    //   })
+    // },
+    btn_export() {
+      const exportparams = {
+        page: this.pageParams.pageindex, // 第几页
+        pagesize: this.pageParams.pagesize, // 每页几条信息
+        key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
+        deptid: this.deptid,
+        isexport: 1
       }
+      exportExcel(exportparams, getUserExport)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/addOrEditOrderType.vue

@@ -186,7 +186,10 @@ export default {
           this.ruleForm.F_RepairTimeLimit = res.fxtime
           this.ruleForm.F_Identification = res.identification
           this.ruleForm.F_AutoDept = res.autodept
-          this.deptidArr = this.$store.getters.deptmap[parseInt(res.autodept)].ids
+          this.ruleForm.F_CanReplayCount = res.canreplaycount
+          if (res.autodept) {
+            this.deptidArr = this.$store.getters.deptmap[parseInt(res.autodept)].ids
+          }
         }
       })
     },

CallCenterWeb.UI/RMYY/src/views/testing/scoreTesting/index.vue

@@ -4,8 +4,7 @@
       <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
         <el-form-item label="受话坐席">
           <el-select v-model="ruleForm.callzx" placeholder="请选择受话坐席" clearable>
-            <el-option v-for="item in seatData" :key="item.F_UserId" :label="item.F_UserName" :value="item.F_UserCode">
-            </el-option>
+            <el-option v-for="item in seatData" :key="item.F_UserId" :label="item.F_UserName" :value="item.F_UserCode"/>
           </el-select>
         </el-form-item>
         <el-form-item label="分机号">
@@ -22,18 +21,33 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="通话时间">
-          <el-date-picker clearable v-model="ruleForm.searchDate" class="filter-item" type="daterange" format="yyyy年MM月dd日"
-            value-format="yyyy-MM-dd" align="left" unlink-panels range-separator="至" start-placeholder="开始日期"
+          <el-date-picker
+            v-model="ruleForm.searchDate"
+            clearable
+            class="filter-item"
+            type="daterange"
+            format="yyyy年MM月dd日"
+            value-format="yyyy-MM-dd"
+            align="left"
+            unlink-panels
+            range-separator="至"
+            start-placeholder="开始日期"
             end-placeholder="结束日期" />
         </el-form-item>
         <el-form-item label="呼叫方向">
-          <el-select clearable v-model="ruleForm.CallWhere" class="filter-item" filterable clearable placeholder="请选择呼叫方向"
+          <el-select
+            v-model="ruleForm.CallWhere"
+            clearable
+            class="filter-item"
+            filterable
+            clearable
+            placeholder="请选择呼叫方向"
             size="medium">
             <el-option :value="0" label="呼入" />
             <el-option :value="1" label="呼出" />
           </el-select>
         </el-form-item>
-       <!-- <el-form-item label="呼叫类型">
+        <!-- <el-form-item label="呼叫类型">
           <el-select v-model="ruleForm.CallType" class="filter-item" filterable clearable placeholder="请选择呼叫类型"
             size="medium">
             <el-option :value="1" label="正常通话" />
@@ -67,8 +81,7 @@
       </el-form>
     </div>
     <el-table :data="dataLists" border stripe>
-      <el-table-column type="index" width="50" label="编号" align="center" min-width="">
-      </el-table-column>
+      <el-table-column type="index" width="50" label="编号" align="center" min-width=""/>
       <el-table-column prop="CallNumber" label="电话号码" align="center" min-width />
       <el-table-column label="录音质检" align="center" min-width>
         <template slot-scope="scope">
@@ -77,153 +90,214 @@
       </el-table-column>
       <el-table-column label="呼叫方向" align="center" min-width>
         <template slot-scope="scope">
-          <span v-if='scope.row.CallType==0'>呼入</span>
-          <span v-if='scope.row.CallType!=0'>呼出</span>
+          <span v-if="scope.row.CallType==0">呼入</span>
+          <span v-if="scope.row.CallType!=0">呼出</span>
         </template>
       </el-table-column>
       <el-table-column prop="UserCode" label="坐席工号" align="center" min-width />
-      <el-table-column prop="UserName1" label="坐席姓名" align="center" min-width />
+      <el-table-column :formatter="formtName" prop="UserName1" label="坐席姓名" align="center" min-width />
       <el-table-column prop="ExtNumber" label="分机号" align="center" min-width />
       <el-table-column prop="BeginTime" label="通话开始时间" align="center" min-width />
       <el-table-column prop="EndTime" label="通话结束时间" align="center" min-width />
-      <el-table-column prop="TalkLongTime" label="通话时长" align="center" min-width />
-      <el-table-column prop="RingLongTime" label="振铃时长" align="center" min-width />
+      <el-table-column :formatter="formtTime" prop="TalkLongTime" label="通话时长" align="center" min-width />
+      <el-table-column :formatter="formtTime1" prop="RingLongTime" label="振铃时长" align="center" min-width />
     </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 {
-    getList,
-    getPhoneType,
-    getSeatType
-  } from '@/api/testing/scoreTesting'
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-  import audioPlayer from '../components/audioplay'
-  export default {
-    name: 'ScoreTesting',
-    components: {
-      Pagination
-    },
-    filters: {},
-    data() {
-      return {
-        ruleForm: {
-          callzx: '',
-          callNum: '',
-          tel: '',
-          isquatity:'',
-          searchDate: '',
-          CallWhere: '',
-          // CallType: '',
-          // isreutrn: '',
-          // phoneType: '',
-          // searchT: 1
-        },
-        phoneData: [],
-        seatData: [],
-        recordpath: '', // 录音的路径
-        dataLists: [], // 列表数据
-        pageParams: {
-          pageindex: 1, // 当前第几页
-          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-          total: 0 // 总共多少数据
-        },
+import {
+  getList,
+  getPhoneType,
+  getSeatType
+} from '@/api/testing/scoreTesting'
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+import audioPlayer from '../components/audioplay'
+export default {
+  name: 'ScoreTesting',
+  components: {
+    Pagination
+  },
+  filters: {},
+  data() {
+    return {
+      ruleForm: {
+        callzx: '',
+        callNum: '',
+        tel: '',
+        isquatity: '',
+        searchDate: '',
+        CallWhere: ''
+        // CallType: '',
+        // isreutrn: '',
+        // phoneType: '',
+        // searchT: 1
+      },
+      phoneData: [],
+      seatData: [],
+      recordpath: '', // 录音的路径
+      dataLists: [], // 列表数据
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
       }
-    },
-    created() {
-      this.getList()
-      this.getPhone()
-      this.getSeat()
-      document.onkeyup = (e) => {
-        if (e.keyCode === 13) {
-          this.getList()
-        }
+    }
+  },
+  created() {
+    this.getList()
+    this.getPhone()
+    this.getSeat()
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        this.getList()
       }
-    },
-    mounted() {
-      // this.timer = setInterval(() => {
-      //   this.getList()
-      // }, 12000)
-    },
-    methods: {
-      getList() {
-        this.loading = true
-        return new Promise((resolve) => {
-          const params = {
-            page: this.pageParams.pageindex, // 第几页
-            pagesize: this.pageParams.pagesize, // 每页几条信息
-            usercode: this.ruleForm.callzx, //	否	string	模糊查询（呼叫号码） CallNumber
-            extnumber: this.ruleForm.callNum,
-            phone: this.ruleForm.tel, //	否	string	模糊查询（呼叫号码）
-            // actiontype: this.ruleForm.CallType,
-            starttime: this.ruleForm.searchDate && this.ruleForm.searchDate[0],
-            endtime: this.ruleForm.searchDate && this.ruleForm.searchDate[1],
-            calltype: this.ruleForm.CallWhere, // 呼叫方向
-            // phoneType: this.ruleForm.phoneType,
-            // islike: this.ruleForm.searchT
+    }
+  },
+  mounted() {
+    // this.timer = setInterval(() => {
+    //   this.getList()
+    // }, 12000)
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          page: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          usercode: this.ruleForm.callzx, //	否	string	模糊查询（呼叫号码） CallNumber
+          extnumber: this.ruleForm.callNum,
+          phone: this.ruleForm.tel, //	否	string	模糊查询（呼叫号码）
+          // actiontype: this.ruleForm.CallType,
+          starttime: this.ruleForm.searchDate && this.ruleForm.searchDate[0],
+          endtime: this.ruleForm.searchDate && this.ruleForm.searchDate[1],
+          calltype: this.ruleForm.CallWhere // 呼叫方向
+          // phoneType: this.ruleForm.phoneType,
+          // islike: this.ruleForm.searchT
+        }
+        getList(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            // this.recordpath = response.data.recordpath
+            this.pageParams.total = response.total
+            this.dataLists = response.rows
           }
-          getList(params).then((response) => {
-            this.loading = false
-            if (response.state.toLowerCase() === 'success') {
-              // this.recordpath = response.data.recordpath
-              this.pageParams.total = response.total
-              this.dataLists = response.rows
-            }
-          })
-          resolve()
         })
-      },
-      btn_search() {
-        this.getList()
-      },
-      getPhone() {
-        return new Promise((resolve) => {
-          const params = {
-            flag: "dhly"
+        resolve()
+      })
+    },
+    btn_search() {
+      this.getList()
+    },
+    getPhone() {
+      return new Promise((resolve) => {
+        const params = {
+          flag: 'dhly'
+        }
+        getPhoneType(params).then((response) => {
+          if (response.state.toLowerCase() === 'success') {
+            this.phoneData = response.data
           }
-          getPhoneType(params).then((response) => {
-            if (response.state.toLowerCase() === 'success') {
-              this.phoneData = response.data
-            }
-          })
-          resolve()
         })
-      },
-      getSeat() {
-        return new Promise((resolve) => {
-          const params = {
+        resolve()
+      })
+    },
+    getSeat() {
+      return new Promise((resolve) => {
+        const params = {
 
+        }
+        getSeatType(params).then((response) => {
+          if (response.state.toLowerCase() === 'success') {
+            this.seatData = response.data
           }
-          getSeatType(params).then((response) => {
-            if (response.state.toLowerCase() === 'success') {
-              this.seatData = response.data
-            }
-          })
-          resolve()
-        })
-      },
-      // 播放录音
-      playSound(rec_file, row) {
-        this.$layer.iframe({
-          content: {
-            content: audioPlayer, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              recFiles: rec_file,
-              rowdata: row,
-              isScore: 0 //0质检1结果
-            } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-          },
-          area: ['50%', '80%'],
-          shadeClose: true,
-          title: '录音播放下载及质检'
         })
-      },
+        resolve()
+      })
+    },
+    formtName(val) {
+      if (!val.UserName1) {
+        return '-'
+      } else {
+        return val.UserName1
+      }
+    },
+    formtTime(val) {
+      if (!val.TalkLongTime) {
+        return '0秒'
+      }
+      var secondTime = parseInt(val.TalkLongTime)
+      var minuteTime = 0
+      var hourTime = 0
+      if (secondTime > 60) {
+        minuteTime = parseInt(secondTime / 60)
+        secondTime = parseInt(secondTime % 60)
+        if (minuteTime > 60) {
+          hourTime = parseInt(minuteTime / 60)
+          minuteTime = parseInt(minuteTime % 60)
+        }
+      }
+      var result = '' + parseInt(secondTime) + '秒'
+      if (minuteTime > 0) {
+        result = '' + parseInt(minuteTime) + '分' + result
+      }
+      if (hourTime > 0) {
+        result = '' + parseInt(hourTime) + '小时' + result
+      }
+      return result
+    },
+    formtTime1(val) {
+      if (!val.RingLongTime) {
+        return '0秒'
+      }
+      var secondTime = parseInt(val.RingLongTime)
+      var minuteTime = 0
+      var hourTime = 0
+      if (secondTime > 60) {
+        minuteTime = parseInt(secondTime / 60)
+        secondTime = parseInt(secondTime % 60)
+        if (minuteTime > 60) {
+          hourTime = parseInt(minuteTime / 60)
+          minuteTime = parseInt(minuteTime % 60)
+        }
+      }
+      var result = '' + parseInt(secondTime) + '秒'
+      if (minuteTime > 0) {
+        result = '' + parseInt(minuteTime) + '分' + result
+      }
+      if (hourTime > 0) {
+        result = '' + parseInt(hourTime) + '小时' + result
+      }
+      return result
+    },
+
+    // 播放录音
+    playSound(rec_file, row) {
+      this.$layer.iframe({
+        content: {
+          content: audioPlayer, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            recFiles: rec_file,
+            rowdata: row,
+            isScore: 0 // 0质检1结果
+          } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['50%', '80%'],
+        shadeClose: true,
+        title: '录音播放下载及质检'
+      })
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>