Ver Código Fonte

患者信息

liuzhihui 3 anos atrás
pai
commit
870fb414cb

+ 12 - 4
CallCenterWeb.UI/RMYY/src/api/callScreen/callScreen.js

@@ -26,7 +26,7 @@ export function GetModelList(params) {
26 26
     params
27 27
   })
28 28
 }
29
-//坐诊信息
29
+// 坐诊信息
30 30
 export function getHos(params) {
31 31
   return request({
32 32
     url: 'Worepair/GetListyqRepairlist',
@@ -34,7 +34,7 @@ export function getHos(params) {
34 34
     params
35 35
   })
36 36
 }
37
-//药品信息
37
+// 药品信息
38 38
 export function GetDictDrugLists(params) {
39 39
   return request({
40 40
     url: 'HospitalUser/GetDictDrugList',
@@ -42,7 +42,7 @@ export function GetDictDrugLists(params) {
42 42
     params
43 43
   })
44 44
 }
45
-//药品详情信息
45
+// 药品详情信息
46 46
 export function getDrugDetail(params) {
47 47
   return request({
48 48
     url: 'HospitalUser/GetDictDrug',
@@ -50,7 +50,7 @@ export function getDrugDetail(params) {
50 50
     params
51 51
   })
52 52
 }
53
-//院区
53
+// 院区
54 54
 export function Getbeonduty(params) {
55 55
   return request({
56 56
     url: 'HospitalUser/Getbeonduty',
@@ -58,3 +58,11 @@ export function Getbeonduty(params) {
58 58
     params
59 59
   })
60 60
 }
61
+// 患者记录
62
+export function GetRcord(params) {
63
+  return request({
64
+    url: 'Patient/GetRcord',
65
+    method: 'get',
66
+    params
67
+  })
68
+}

+ 94 - 89
CallCenterWeb.UI/RMYY/src/components/context/Pagination/index.vue

@@ -1,109 +1,114 @@
1 1
 <template>
2 2
   <div :class="{'hidden':hidden}" class="pagination-container">
3
-    <el-pagination
4
-      :background="background"
5
-      :current-page.sync="currentPage"
6
-      :page-size.sync="eachPage"
7
-      :page-sizes="pageSizes"
8
-      :layout="layout"
9
-      :prev-text="prevText"
10
-      :next-text="nextText"
11
-      :total="total"
12
-      v-bind="$attrs"
13
-      @size-change="handleSizeChange"
14
-      @current-change="handleCurrentChange"/>
3
+    <el-pagination :background="background" :current-page.sync="currentPage" :page-size.sync="eachPage"
4
+      :page-sizes="pageSizes" :layout="layout" :prev-text="prevText" :next-text="nextText" :total="total"
5
+      v-bind="$attrs" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
15 6
   </div>
16 7
 </template>
17 8
 
18 9
 <script>
19
-import { scrollTo } from '@/utils/scrollTo'
10
+  import {
11
+    scrollTo
12
+  } from '@/utils/scrollTo'
20 13
 
21
-export default {
22
-  name: 'Pagination',
23
-  props: {
24
-    total: {
25
-      required: true,
26
-      type: Number
27
-    },
28
-    pageindex: {
29
-      type: Number,
30
-      default: 1
31
-    },
32
-    pagesize: {
33
-      type: Number,
34
-      default: process.env.PAGESIZE
35
-    },
36
-    pageSizes: {
37
-      type: Array,
38
-      default() {
39
-        // return process.env.PAGESIZES
40
-        return JSON.parse(this.$store.getters.serverConfig.PAGESIZES)
41
-      }
42
-    },
43
-    layout: {
44
-      type: String,
45
-      default: 'total, sizes, prev, pager, next, jumper'
46
-    },
47
-    prevText: {
48
-      type: String,
49
-      default: '上一页'
50
-    },
51
-    nextText: {
52
-      type: String,
53
-      default: '下一页'
54
-    },
55
-    background: {
56
-      type: Boolean,
57
-      default: true
58
-    },
59
-    autoScroll: {
60
-      type: Boolean,
61
-      default: true
62
-    },
63
-    hidden: {
64
-      type: Boolean,
65
-      default: false
66
-    }
67
-  },
68
-  computed: {
69
-    // 当前第几页
70
-    currentPage: {
71
-      get() {
72
-        return this.pageindex
14
+  export default {
15
+    name: 'Pagination',
16
+    props: {
17
+      total: {
18
+        required: true,
19
+        type: Number
20
+      },
21
+      pageindex: {
22
+        type: Number,
23
+        default: 1
24
+      },
25
+      pagesize: {
26
+        type: Number,
27
+        default: process.env.PAGESIZE
73 28
       },
74
-      set(val) {
75
-        this.$emit('update:pageindex', val)
29
+      pageSizes: {
30
+        type: Array,
31
+        default () {
32
+          // return process.env.PAGESIZES
33
+          return JSON.parse(this.$store.getters.serverConfig.PAGESIZES)
34
+        }
35
+      },
36
+      layout: {
37
+        type: String,
38
+        default: 'total, sizes, prev, pager, next, jumper'
39
+      },
40
+      prevText: {
41
+        type: String,
42
+        default: '上一页'
43
+      },
44
+      nextText: {
45
+        type: String,
46
+        default: '下一页'
47
+      },
48
+      background: {
49
+        type: Boolean,
50
+        default: true
51
+      },
52
+      autoScroll: {
53
+        type: Boolean,
54
+        default: true
55
+      },
56
+      hidden: {
57
+        type: Boolean,
58
+        default: false
76 59
       }
77 60
     },
78
-    // 每页几条数据
79
-    eachPage: {
80
-      get() {
81
-        return this.pagesize
61
+    computed: {
62
+      // 当前第几页
63
+      currentPage: {
64
+        get() {
65
+          return this.pageindex
66
+        },
67
+        set(val) {
68
+          this.$emit('update:pageindex', val)
69
+        }
82 70
       },
83
-      set(val) {
84
-        this.$emit('update:pagesize', val)
85
-      }
86
-    }
87
-  },
88
-  methods: {
89
-    handleSizeChange(val) {
90
-      this.$emit('pagination', { pageindex: this.currentPage, pagesize: val })
91
-      if (this.autoScroll) {
92
-        scrollTo(0, 800)
71
+      // 每页几条数据
72
+      eachPage: {
73
+        get() {
74
+          return this.pagesize
75
+        },
76
+        set(val) {
77
+          this.$emit('update:pagesize', val)
78
+        }
93 79
       }
94 80
     },
95
-    handleCurrentChange(val) {
96
-      this.$emit('pagination', { pageindex: val, pagesize: this.eachPage })
97
-      if (this.autoScroll) {
98
-        scrollTo(0, 800)
81
+    methods: {
82
+      handleSizeChange(val) {
83
+        this.$emit('pagination', {
84
+          pageindex: this.currentPage,
85
+          pagesize: val
86
+        })
87
+        if (this.autoScroll) {
88
+          scrollTo(0, 800)
89
+        }
90
+      },
91
+      handleCurrentChange(val) {
92
+        this.$emit('pagination', {
93
+          pageindex: val,
94
+          pagesize: this.eachPage
95
+        })
96
+        if (this.autoScroll) {
97
+          scrollTo(0, 800)
98
+        }
99 99
       }
100 100
     }
101 101
   }
102
-}
103 102
 </script>
104 103
 
105 104
 <style scoped>
106
-	.pagination-container.hidden {
107
-		display: none;
108
-	}
105
+  /deep/.el-input--small .el-input__inner {
106
+    height: 28px !important;
107
+  }
108
+  /deep/.el-pagination__jump{
109
+    margin-left: 15px;
110
+  }
111
+  .pagination-container.hidden {
112
+    display: none;
113
+  }
109 114
 </style>

+ 2 - 0
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -375,6 +375,7 @@
375 375
           content: '',
376 376
           cfnum: '',
377 377
           opt: '2',
378
+          clid:'',
378 379
           EmergencyTypes: '一般',
379 380
           remark: '', // 备注
380 381
           repairImageid: ''
@@ -640,6 +641,7 @@
640 641
               this.ruleForm.position = res.F_Location
641 642
               this.ruleForm.toplace = res.F_ToPlace
642 643
               this.ruleForm.content = res.F_Content
644
+              this.usercodeSearch = res.F_Applicant
643 645
               const arr = []
644 646
               res.PSInfo.forEach(function(v, n) {
645 647
                 arr.push({

+ 3 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -397,6 +397,7 @@
397 397
             this.ruleForm.repairAddress = response.data[0].F_PlaceOfRepair
398 398
             this.ruleForm.assignDepart = response.data[0].F_MaintenanceDept
399 399
             this.ruleForm.assignMant = response.data[0].F_Maintenancer
400
+            this.usercodeSearch = response.data[0].F_Applicant
400 401
             // if (response.data[0].F_Maintenancer) {
401 402
             //   this.ruleForm.assignMant = this.$store.getters.response.data[0].F_Maintenancer
402 403
             // }
@@ -485,7 +486,7 @@
485 486
                     Content: this.ruleForm.repairCenter, // 工单内容
486 487
                     PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点
487 488
                     File: this.ruleForm.repairImageid, // 附件
488
-                    F_DeviceEncode:this.ruleForm.F_DeviceEncode,//设备资产编码
489
+                    DeviceEncode:this.ruleForm.F_DeviceEncode,//设备资产编码
489 490
                     MaintenanceDept: this.ruleForm.assignDepart, // 指派部门
490 491
                     IsEnd: '0', // 是否完结
491 492
                     EmergencyTypes: this.ruleForm.EmergencyTypes,
@@ -518,7 +519,7 @@
518 519
                     Content: this.ruleForm.repairCenter, // 工单内容
519 520
                     PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点
520 521
                     File: this.ruleForm.repairImageid, // 附件
521
-                    F_DeviceEncode:this.ruleForm.F_DeviceEncode,//设备资产编码
522
+                    DeviceEncode:this.ruleForm.F_DeviceEncode,//设备资产编码
522 523
                     MaintenanceDept: this.ruleForm.assignDepart, // 指派部门
523 524
                     IsEnd: '0', // 是否完结
524 525
                     EmergencyTypes: this.ruleForm.EmergencyTypes,

+ 1 - 15
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -496,24 +496,10 @@
496 496
             this.deptid =
497 497
               this.$store.getters.deptmap[parseInt(res.F_ProposerDeptId)].ids
498 498
             this.ruleForm.needman = res.F_ProposerCode
499
+            this.usercodeSearch = res.F_ProposerCode
499 500
           }
500 501
         })
501 502
       }
502
-      // 科室下拉改变事件
503
-      // getDepartments(data) {
504
-      //   this.ruleForm.deptid = data.value
505
-      //   this.ruleForm.deptname = data.name
506
-      // },
507
-      // 院区下拉改变事件
508
-      // getHospitals(data) {
509
-      //   this.ruleForm.hosid = data.value
510
-      //   this.ruleForm.hosname = data.name
511
-      // },
512
-      // 申请人下拉改变事件
513
-      // getRepairman(data) {
514
-      //   this.ruleForm.usercode = data.value
515
-      //   this.ruleForm.username = data.name
516
-      // },
517 503
     }
518 504
   }
519 505
 </script>

+ 187 - 115
CallCenterWeb.UI/RMYY/src/views/callScreen/components/hisList.vue

@@ -5,154 +5,226 @@
5 5
     <table class="tabdept" cellspacing="0" cellpadding="0">
6 6
       <tr>
7 7
         <th>姓名:</th>
8
-        <td>张飒</td>
8
+        <td>{{hismsg.hzxm}}</td>
9 9
         <th>年龄:</th>
10
-        <td>27</td>
10
+        <td>-</td>
11 11
       </tr>
12 12
       <tr>
13 13
         <th>性别:</th>
14
-        <td></td>
14
+        <td>{{hismsg.xbmc}}</td>
15 15
         <th>联系电话:</th>
16
-        <td>13241334761</td>
16
+        <td>{{hismsg.lxdh || '-'}}</td>
17 17
       </tr>
18 18
       <tr>
19 19
         <th>出生日期:</th>
20
-        <td>1998-01-01</td>
20
+        <td>{{hismsg.csrq}}</td>
21 21
         <th>身份证号:</th>
22
-        <td>412723123451234</td>
22
+        <td>{{hismsg.zjhm}}</td>
23 23
       </tr>
24 24
       <tr>
25 25
         <th>家庭地址:</th>
26
-        <td colspan="5">郑州市二七区航海路</td>
26
+        <td colspan="5">{{hismsg.jtdz || '-'}}</td>
27 27
       </tr>
28 28
     </table>
29
-    <p style="font-weight: bold;">门诊记录</p>
30
-    <el-table border stripe>
31
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="就诊时间" align="center" />
32
-      <el-table-column :show-overflow-tooltip="true" prop="" label="就诊科室" align="center" />
33
-      <el-table-column :show-overflow-tooltip="true" prop="" label="就诊病区" align="center" />
34
-      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center" />
35
-    </el-table>
36 29
     <p style="font-weight: bold;">住院记录</p>
37
-    <el-table border stripe>
38
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="入院时间" align="center" />
39
-      <el-table-column :show-overflow-tooltip="true" prop="" label="出院时间" align="center" />
40
-      <el-table-column :show-overflow-tooltip="true" prop="" label="出院科室" align="center" />
41
-      <el-table-column :show-overflow-tooltip="true" prop="" label="出院诊断" align="center" />
42
-      <el-table-column :show-overflow-tooltip="true" prop="" label="主管医生" align="center" />
43
-      <el-table-column :show-overflow-tooltip="true" prop="" label="住院号" align="center" />
30
+    <el-table border stripe :data="zhuyuanArr" height="300">
31
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="入院时间" align="center" />
32
+      <el-table-column :show-overflow-tooltip="true" prop="DischargeDateTime" label="出院时间" align="center" />
33
+      <el-table-column :show-overflow-tooltip="true" prop="" label="出院科室" align="center">
34
+        <template slot-scope="scope">
35
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
36
+        </template>
37
+      </el-table-column>
38
+      <el-table-column :show-overflow-tooltip="true" label="出院诊断" align="center">
39
+        <template slot-scope="scope">
40
+          <span>{{scope.row.Diagnosis.Name}}</span>
41
+        </template>
42
+      </el-table-column>
43
+      <el-table-column :show-overflow-tooltip="true" prop="" label="主管医生" align="center">
44
+        <template slot-scope="scope">
45
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
46
+        </template>
47
+      </el-table-column>
48
+      <el-table-column :show-overflow-tooltip="true" prop="" label="住院号" align="center">
49
+        <template slot-scope="scope">
50
+          <span>{{scope.row.VisitNumber.CardID}}</span>
51
+        </template>
52
+      </el-table-column>
53
+    </el-table>
54
+    <p style="font-weight: bold;">门诊记录</p>
55
+    <el-table border stripe :data="menzhenArr" height="300">
56
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
57
+      <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
58
+        <template slot-scope="scope">
59
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
60
+        </template>
61
+      </el-table-column>
62
+      <el-table-column :show-overflow-tooltip="true" label="就诊病区" align="center">
63
+        <template slot-scope="scope">
64
+          <span>{{scope.row.AssignedPatientLocation.Areaname}}</span>
65
+        </template>
66
+      </el-table-column>
67
+      <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
68
+        <template slot-scope="scope">
69
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
70
+        </template>
71
+      </el-table-column>
44 72
     </el-table>
45 73
     <p style="font-weight: bold;">急诊记录</p>
46
-    <el-table border stripe>
47
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="就诊时间" align="center" />
48
-      <el-table-column :show-overflow-tooltip="true" prop="" label="就诊科室" align="center" />
49
-      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center" />
74
+    <el-table border stripe :data="jizhenArr" height="300">
75
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
76
+      <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
77
+        <template slot-scope="scope">
78
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
79
+        </template>
80
+      </el-table-column>
81
+      <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
82
+        <template slot-scope="scope">
83
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
84
+        </template>
85
+      </el-table-column>
50 86
     </el-table>
51 87
     <p style="font-weight: bold;">体检记录</p>
52
-    <el-table border stripe>
53
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="体检时间" align="center" />
54
-      <el-table-column :show-overflow-tooltip="true" prop="" label="体检科室" align="center" />
55
-      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center" />
88
+    <el-table border stripe :data="tijianArr" height="300">
89
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="体检时间" align="center" />
90
+      <el-table-column :show-overflow-tooltip="true" prop="" label="体检科室" align="center">
91
+        <template slot-scope="scope">
92
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
93
+        </template>
94
+      </el-table-column>
95
+      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center">
96
+        <template slot-scope="scope">
97
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
98
+        </template>
99
+      </el-table-column>
56 100
     </el-table>
57 101
   </div>
58 102
 </template>
59 103
 
60 104
 <script>
61
-import {
62
-  getList,
63
-  delInfos,
64
-  getTypeTree
65
-} from '@/api/knowledgeBase/knowledgeBase'
66
-
67
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
68
-import hischange from './hischange'
69
-export default {
70
-  name: 'HisList',
71
-  components: {
72
-    Pagination
73
-  },
74
-  props: {
75
-    callinNum: {
76
-      type: String,
77
-      default: ''
78
-    }
79
-  },
80
-
81
-  data() {
82
-    return {
83
-      callNum: '', // 来电号码
84
-      loading: false,
85
-      typeSecondId: '',
86
-      typeid: '',
87
-      keyword: '',
88
-      pageParams: {
89
-        pageindex: 1, // 当前第几页
90
-        pagesize: 5, // 每页几条数据
91
-        total: 0 // 总共多少数据
92
-      },
93
-      taskDataLists: [] // 列表数据
94
-    }
95
-  },
96
-  created() {
97
-    this.$bus.$on('typeSecondId', (params) => {
98
-      if (params != 0) {
99
-        this.typeSecondId = params
100
-        // console.log(this.typeSecondId,'ppp')
101
-        this.getList()
105
+  import {
106
+    getList,
107
+    delInfos,
108
+    getTypeTree
109
+  } from '@/api/knowledgeBase/knowledgeBase'
110
+  import {
111
+    GetModelList,
112
+    GetRcord
113
+  } from '@/api/callScreen/callScreen'
114
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
115
+  import hischange from './hischange'
116
+  export default {
117
+    name: 'HisList',
118
+    components: {
119
+      Pagination
120
+    },
121
+    props: {
122
+      callinNum: {
123
+        type: String,
124
+        default: ''
102 125
       }
103
-    })
104
-  },
105
-  methods: {
106
-    getList() {
107
-      this.loading = true
108
-      return new Promise(resolve => {
109
-        const params = {
110
-          pageindex: this.pageParams.pageindex, // 第几页
111
-          pagesize: this.pageParams.pagesize, // 每页几条信息
112
-          keywords: this.keyword,
113
-          typeid: this.typeSecondId
114
-        }
115
-        getList(params).then(response => {
116
-          this.loading = false
117
-          if (response.state.toLowerCase() === 'success') {
118
-            if (response.total == null) {
119
-              this.pageParams.total = 0
120
-            } else {
121
-              this.pageParams.total = response.total
122
-            }
123
-            this.taskDataLists = response.rows
124
-          }
125
-        })
126
-        resolve()
127
-      })
128 126
     },
129
-    changeHis() {
130
-      this.$layer.iframe({
131
-        content: {
132
-          content: hischange, // 传递的组件对象
133
-          parent: this, // 当前的vue对象
134
-          data: {
135
-            callinNum:this.callinNum
136
-          } // props
127
+
128
+    data() {
129
+      return {
130
+        callNum: '', // 来电号码
131
+        loading: false,
132
+        typeSecondId: '',
133
+        typeid: '',
134
+        keyword: '',
135
+        hismsg: {},
136
+        pageParams: {
137
+          pageindex: 1, // 当前第几页
138
+          pagesize: 5, // 每页几条数据
139
+          total: 0 // 总共多少数据
137 140
         },
138
-        area: ['70%', '70%'],
139
-        title: '切换患者'
141
+        zhuyuanArr: [],
142
+        menzhenArr: [],
143
+        jizhenArr: [],
144
+        tijianArr: [],
145
+        taskDataLists: [] // 列表数据
146
+      }
147
+    },
148
+    created() {
149
+      this.$bus.$on('typeSecondId', (params) => {
150
+        if (params != 0) {
151
+          this.typeSecondId = params
152
+          // console.log(this.typeSecondId,'ppp')
153
+          this.getList()
154
+        }
140 155
       })
141 156
     },
142
-    btn_search_task() {
143
-      if (this.typeSecondId) {
144
-        this.keyword = this.keyword
145
-        this.getList()
146
-      } else {
147
-        this.$message({
148
-          message: '请输入工单类型',
149
-          type: 'warning'
157
+    methods: {
158
+      getList() {
159
+        this.loading = true
160
+        return new Promise(resolve => {
161
+          const params = {
162
+            zsyh: window.localStorage.getItem('zsyh'),
163
+            hzxm: '',
164
+            sfzh: '',
165
+            zlkh: '',
166
+            jzlx: window.localStorage.getItem('jzlx'),
167
+            jzh: '',
168
+            lxdh: this.callinNum
169
+          }
170
+          GetModelList(params).then(response => {
171
+            this.loading = false
172
+            this.hismsg = response.rows[0]
173
+            this.getRecord('I', response.rows[0].zsyh)
174
+            this.getRecord('O', response.rows[0].zsyh)
175
+            this.getRecord('E', response.rows[0].zsyh)
176
+            this.getRecord('P', response.rows[0].zsyh)
177
+          })
178
+          resolve()
179
+        })
180
+      },
181
+      changeHis() {
182
+        this.$layer.iframe({
183
+          content: {
184
+            content: hischange, // 传递的组件对象
185
+            parent: this, // 当前的vue对象
186
+            data: {
187
+              callinNum: this.callinNum
188
+            } // props
189
+          },
190
+          area: ['70%', '70%'],
191
+          title: '切换患者'
192
+        })
193
+      },
194
+      btn_search_task() {
195
+        if (this.typeSecondId) {
196
+          this.keyword = this.keyword
197
+          this.getList()
198
+        } else {
199
+          this.$message({
200
+            message: '请输入工单类型',
201
+            type: 'warning'
202
+          })
203
+          return
204
+        }
205
+      },
206
+      getRecord(recordtype, zsyh) {
207
+        const params = {
208
+          PatientClass: recordtype,
209
+          GlobalPID: zsyh
210
+        }
211
+        GetRcord(params).then(res => {
212
+          if (recordtype === 'I') {
213
+            this.zhuyuanArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
214
+          }
215
+          if (recordtype === 'O') {
216
+            this.menzhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
217
+          }
218
+          if (recordtype === 'E') {
219
+            this.jizhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
220
+          }
221
+          if (recordtype === 'P') {
222
+            this.tijianArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
223
+          }
150 224
         })
151
-        return
152 225
       }
153 226
     }
154 227
   }
155
-}
156 228
 </script>
157 229
 
158 230
 <style rel="stylesheet/scss" lang="scss">

+ 104 - 113
CallCenterWeb.UI/RMYY/src/views/callScreen/components/hischange.vue

@@ -6,12 +6,8 @@
6 6
       <el-input v-model="searchData.sfzh" placeholder="请输入身份证号" class="filter-item" size="medium" clearable />
7 7
       <el-input v-model="searchData.zlkh" placeholder="请输入诊疗卡号" class="filter-item" size="medium" clearable />
8 8
       <el-select v-model="searchData.jzlx" size="medium" placeholder="请选择就诊类型">
9
-        <el-option
10
-          v-for="item in jzlxarr"
11
-          :key="item.F_DictionaryValueId"
12
-          :label="item.F_Describe"
13
-          :value="item.F_Name"
14
-        />
9
+        <el-option v-for="item in jzlxarr" :key="item.F_DictionaryValueId" :label="item.F_Describe"
10
+          :value="item.F_Name" />
15 11
       </el-select>
16 12
       <el-input v-model="searchData.jzh" placeholder="请输入就诊号" class="filter-item" size="medium" clearable />
17 13
       <el-input v-model="searchData.lxdh" placeholder="请输入联系电话" class="filter-item" size="medium" clearable />
@@ -21,7 +17,7 @@
21 17
     <el-table :data="taskDataLists" border stripe>
22 18
       <el-table-column :show-overflow-tooltip="true" align="center" width="100">
23 19
         <template slot-scope="scope">
24
-          <input :value="scope.row.zsyh" name="tabVal" type="radio" @change="handleSelectionChange" >
20
+          <input :value="scope.row.zsyh" name="tabVal" type="radio" @change="handleSelectionChange">
25 21
         </template>
26 22
       </el-table-column>
27 23
       <el-table-column :show-overflow-tooltip="true" prop="zsyh" label="主索引号" align="center" />
@@ -33,130 +29,125 @@
33 29
       <el-table-column :show-overflow-tooltip="true" prop="jtdz" label="家庭住址" align="center" />
34 30
       <el-table-column :show-overflow-tooltip="true" prop="lxdh" label="联系电话" align="center" />
35 31
     </el-table>
36
-    <pagination
37
-      v-show="pageParams.total > 0"
38
-      :total="pageParams.total"
39
-      :page-sizes="[5, 10, 15, 20]"
40
-      :pageindex.sync="pageParams.pageindex"
41
-      :pagesize.sync="pageParams.pagesize"
42
-      class="pagination"
32
+    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :page-sizes="[5, 10, 15, 20]"
33
+      :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination"
43 34
       @pagination="getList" />
44 35
     <el-button type="primary" style="margin-left:45%" @click="hisSubmit">确定</el-button>
45 36
   </div>
46 37
 </template>
47 38
 
48 39
 <script>
49
-import {
50
-  GetModelList
51
-} from '@/api/callScreen/callScreen'
52
-import {
53
-  getDicReason
54
-} from '@/api/faultRepairManagement/faultRepair'
55
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
56
-export default {
57
-  name: 'HisChange',
58
-  components: {
59
-    Pagination
60
-  },
61
-  props: {
62
-    callinNum: {
63
-      type: String,
64
-      default: ''
40
+  import {
41
+    GetModelList
42
+  } from '@/api/callScreen/callScreen'
43
+  import {
44
+    getDicReason
45
+  } from '@/api/faultRepairManagement/faultRepair'
46
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
47
+  export default {
48
+    name: 'HisChange',
49
+    components: {
50
+      Pagination
65 51
     },
66
-    layerid: {
67
-      type: String,
68
-      default: ''
69
-    }
70
-  },
71
-
72
-  data() {
73
-    return {
74
-      callNum: '', // 来电号码
75
-      loading: false,
76
-      typeSecondId: '',
77
-      typeid: '',
78
-      keyword: '',
79
-      tableRadio: '',
80
-      jzlxarr: [],
81
-      searchData: {
82
-        zsyh: '',
83
-        hzxm: '',
84
-        sfzh: '',
85
-        zlkh: '',
86
-        jzlx: '',
87
-        jzh: '',
88
-        lxdh: ''
52
+    props: {
53
+      callinNum: {
54
+        type: String,
55
+        default: ''
89 56
       },
90
-      pageParams: {
91
-        pageindex: 1, // 当前第几页
92
-        pagesize: 5, // 每页几条数据
93
-        total: 0 // 总共多少数据
94
-      },
95
-      taskDataLists: [] // 列表数据
96
-    }
97
-  },
98
-  created() {
99
-    if(this.callinNum){
100
-      this.searchData.lxdh = this.callinNum
101
-    }
102
-    this.$bus.$on('typeSecondId', (params) => {
103
-      if (params != 0) {
104
-        this.typeSecondId = params
105
-        // console.log(this.typeSecondId,'ppp')
106
-        this.getList()
57
+      layerid: {
58
+        type: String,
59
+        default: ''
107 60
       }
108
-    })
109
-    this.getList()
110
-    this.getJzlx()
111
-  },
112
-  methods: {
113
-    getList() {
114
-      // this.loading = true
115
-      return new Promise(resolve => {
116
-        const params = this.searchData
117
-        GetModelList(params).then(response => {
118
-          // this.loading = false
119
-          if (response.state.toLowerCase() === 'success') {
120
-            this.taskDataLists = response.data.rows
121
-          }
122
-        })
123
-        resolve()
124
-      })
125 61
     },
126
-    getJzlx() {
127
-      const params = {
128
-        Flag: 'JZLX',
129
-        Name: ''
62
+
63
+    data() {
64
+      return {
65
+        callNum: '', // 来电号码
66
+        loading: false,
67
+        typeSecondId: '',
68
+        typeid: '',
69
+        keyword: '',
70
+        tableRadio: '',
71
+        jzlxarr: [],
72
+        searchData: {
73
+          zsyh: '',
74
+          hzxm: '',
75
+          sfzh: '',
76
+          zlkh: '',
77
+          jzlx: '',
78
+          jzh: '',
79
+          lxdh: ''
80
+        },
81
+        pageParams: {
82
+          pageindex: 1, // 当前第几页
83
+          pagesize: 5, // 每页几条数据
84
+          total: 0 // 总共多少数据
85
+        },
86
+        taskDataLists: [] // 列表数据
130 87
       }
131
-      getDicReason(params).then(res => {
132
-        this.jzlxarr = res.rows
133
-      })
134
-    },
135
-    handleSelectionChange(val) {
136
-      console.log(val.target.value)
137
-      this.tableRadio = val
138 88
     },
139
-    hisSubmit() {
140
-      if (!this.tableRadio) {
141
-        this.$message.warning('请选择一个患者')
142
-        return
143
-      } else {
144
-        this.$parent.$layer.close(this.layerid)
89
+    created() {
90
+      if (this.callinNum) {
91
+        this.searchData.lxdh = this.callinNum
145 92
       }
93
+      this.$bus.$on('typeSecondId', (params) => {
94
+        if (params != 0) {
95
+          this.typeSecondId = params
96
+          // console.log(this.typeSecondId,'ppp')
97
+          this.getList()
98
+        }
99
+      })
100
+      this.getList()
101
+      this.getJzlx()
146 102
     },
147
-    btn_search_task() {
148
-      if (this.typeSecondId) {
149
-        this.getList()
150
-      } else {
151
-        this.$message({
152
-          message: '请输入工单类型',
153
-          type: 'warning'
103
+    methods: {
104
+      getList() {
105
+        return new Promise(resolve => {
106
+          const params = this.searchData
107
+          GetModelList(params).then(response => {
108
+            this.taskDataLists = response.rows
109
+          })
110
+          resolve()
111
+        })
112
+      },
113
+      getJzlx() {
114
+        const params = {
115
+          Flag: 'JZLX',
116
+          Name: ''
117
+        }
118
+        getDicReason(params).then(res => {
119
+          this.jzlxarr = res.rows
154 120
         })
155
-        return
121
+      },
122
+      handleSelectionChange(val) {
123
+        console.log(val.target.value)
124
+        this.tableRadio = val
125
+        // this.searchData.zsyh = val.target.value
126
+      },
127
+      hisSubmit() {
128
+        if (!this.tableRadio) {
129
+          this.$message.warning('请选择一个患者')
130
+          return
131
+        } else {
132
+          window.localStorage.setItem('zsyh',this.tableRadio.target.value)
133
+          window.localStorage.setItem('jzlx',this.searchData.jzlx)
134
+          this.$parent.$layer.close(this.layerid)
135
+          this.$parent.getList()
136
+        }
137
+      },
138
+      btn_search_task() {
139
+        if (this.typeSecondId) {
140
+          this.getList()
141
+        } else {
142
+          this.$message({
143
+            message: '请输入工单类型',
144
+            type: 'warning'
145
+          })
146
+          return
147
+        }
156 148
       }
157 149
     }
158 150
   }
159
-}
160 151
 </script>
161 152
 
162 153
 <style rel="stylesheet/scss" lang="scss">

+ 2 - 0
CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -427,6 +427,7 @@
427 427
     border-bottom: 1px solid rgb(215, 215, 215);
428 428
     padding-bottom: 10px;
429 429
   }
430
+
430 431
   .circle {
431 432
     display: inline-block;
432 433
     width: 10px;
@@ -435,6 +436,7 @@
435 436
     border: 1px solid #ff0000;
436 437
     margin-right: 10px;
437 438
   }
439
+
438 440
   .notices {
439 441
     margin-left: 15px;
440 442
     padding: 0 0 20px 0;

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/index.vue

@@ -25,8 +25,8 @@
25 25
       <el-table-column prop="F_CreateTime" label="添加时间" align="center" min-width />
26 26
       <el-table-column label="操作" align="center">
27 27
         <template slot-scope="scope">
28
-          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
29
-          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
28
+          <el-button plain type="primary" @click="handleEdit(scope.row)">编辑</el-button>
29
+          <el-button plain type="danger" @click="handleDelete(scope.row)">删除</el-button>
30 30
         </template>
31 31
       </el-table-column>
32 32
     </el-table>

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/addRepairbase/index.vue

@@ -96,7 +96,7 @@
96 96
           </el-col>
97 97
         </el-row>
98 98
         <el-form-item>
99
-          <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
99
+          <el-button type="primary" @click="submitForm('ruleForm')">提交工单</el-button>
100 100
         </el-form-item>
101 101
       </el-row>
102 102
     </el-form>

+ 153 - 162
CallCenterWeb.UI/RMYY/src/views/knowledgeBase/knowledgeList/index.vue

@@ -22,201 +22,192 @@
22 22
           <el-table-column :show-overflow-tooltip="true" prop="F_KeyWords" label="关键字" align="center" />
23 23
           <el-table-column label="操作" width="240" align="center" class-name="oparate_btn">
24 24
             <template slot-scope="scope">
25
-              <el-button
26
-                v-permission="'edit_knowledgeList'"
27
-                type="text"
25
+              <el-button v-permission="'edit_knowledgeList'" plain type="primary"
28 26
                 @click.stop="btn_edit(scope.row.F_Id)">编辑</el-button>
29
-              <el-button
30
-                v-permission="'delete_knowledgeList'"
31
-                type="text"
27
+              <el-button v-permission="'delete_knowledgeList'" plain type="danger"
32 28
                 @click.stop="btn_delete_task(scope.row.F_Id)">删除</el-button>
33 29
             </template>
34 30
           </el-table-column>
35 31
         </el-table>
36
-        <pagination
37
-          v-show="pageParams.total > 0"
38
-          :total="pageParams.total"
39
-          :pageindex.sync="pageParams.pageindex"
40
-          :pagesize.sync="pageParams.pagesize"
41
-          class="pagination"
42
-          @pagination="getListTask" />
32
+        <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
33
+          :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getListTask" />
43 34
       </el-col>
44 35
     </el-row>
45 36
   </div>
46 37
 </template>
47 38
 
48 39
 <script>
49
-// import { pickerOptions, formatterContent } from '@/utils'
40
+  // import { pickerOptions, formatterContent } from '@/utils'
50 41
 
51
-import {
52
-  getList,
53
-  delInfos,
54
-  getTypeTree
55
-} from '@/api/knowledgeBase/knowledgeBase'
56
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
57
-import addOrEdit from './components/addOrEdit'
58
-import knowledgeDetail from './components/detail.vue'
59
-import Export from './components/export'
60
-export default {
61
-  name: 'KnowledgeList',
62
-  components: {
63
-    Pagination
64
-  },
65
-  data() {
66
-    return {
67
-      keyword: '',
68
-      typeid: '',
69
-      pageParams: {
70
-        pageindex: 1, // 当前第几页
71
-        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
72
-        total: 0 // 总共多少数据
73
-      },
74
-      taskDataLists: [], // 客户信息列表数据
75
-      dataTree: [],
76
-      defaultProps: {
77
-        children: null,
78
-        label: 'text'
79
-      }
80
-    }
81
-  },
82
-  computed: {},
83
-  created() {
84
-    this.getTypeTreeList()
85
-  },
86
-  methods: {
87
-    handleNodeClick(data) {
88
-      this.typeid = data.id
89
-      this.getListTask()
90
-    },
91
-    getTypeTreeList() {
92
-      return new Promise((resolve) => {
93
-        getTypeTree().then((response) => {
94
-          if (response.state.toLowerCase() === 'success') {
95
-            this.dataTree = response.data
96
-          }
97
-        })
98
-        resolve()
99
-      })
42
+  import {
43
+    getList,
44
+    delInfos,
45
+    getTypeTree
46
+  } from '@/api/knowledgeBase/knowledgeBase'
47
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
48
+  import addOrEdit from './components/addOrEdit'
49
+  import knowledgeDetail from './components/detail.vue'
50
+  import Export from './components/export'
51
+  export default {
52
+    name: 'KnowledgeList',
53
+    components: {
54
+      Pagination
100 55
     },
101
-    getListTask() {
102
-      return new Promise((resolve) => {
103
-        const params = {
104
-          pageindex: this.pageParams.pageindex, // int 第几页
105
-          pagesize: this.pageParams.pagesize, // int 每页几条信息
106
-          keywords: this.keyword, // 客户名称
107
-          typeid: this.typeid // 联系电话
56
+    data() {
57
+      return {
58
+        keyword: '',
59
+        typeid: '',
60
+        pageParams: {
61
+          pageindex: 1, // 当前第几页
62
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
63
+          total: 0 // 总共多少数据
64
+        },
65
+        taskDataLists: [], // 客户信息列表数据
66
+        dataTree: [],
67
+        defaultProps: {
68
+          children: null,
69
+          label: 'text'
108 70
         }
109
-        getList(params).then((response) => {
110
-          this.taskDataLists = response.rows
111
-        })
112
-        resolve()
113
-      })
71
+      }
72
+    },
73
+    computed: {},
74
+    created() {
75
+      this.getTypeTreeList()
114 76
     },
115
-    btn_search_task() {
116
-      if (this.typeid) {
117
-        this.keyword = this.keyword
77
+    methods: {
78
+      handleNodeClick(data) {
79
+        this.typeid = data.id
118 80
         this.getListTask()
119
-      } else {
120
-        this.$message({
121
-          message: '请选择知识库类别',
122
-          type: 'warning'
81
+      },
82
+      getTypeTreeList() {
83
+        return new Promise((resolve) => {
84
+          getTypeTree().then((response) => {
85
+            if (response.state.toLowerCase() === 'success') {
86
+              this.dataTree = response.data
87
+            }
88
+          })
89
+          resolve()
123 90
         })
124
-        return
125
-      }
126
-    },
127
-    btn_add() {
128
-      if (this.typeid) {
129
-        console.log(typeof this.typeid)
91
+      },
92
+      getListTask() {
93
+        return new Promise((resolve) => {
94
+          const params = {
95
+            pageindex: this.pageParams.pageindex, // int 第几页
96
+            pagesize: this.pageParams.pagesize, // int 每页几条信息
97
+            keywords: this.keyword, // 客户名称
98
+            typeid: this.typeid // 联系电话
99
+          }
100
+          getList(params).then((response) => {
101
+            this.taskDataLists = response.rows
102
+          })
103
+          resolve()
104
+        })
105
+      },
106
+      btn_search_task() {
107
+        if (this.typeid) {
108
+          this.keyword = this.keyword
109
+          this.getListTask()
110
+        } else {
111
+          this.$message({
112
+            message: '请选择知识库类别',
113
+            type: 'warning'
114
+          })
115
+          return
116
+        }
117
+      },
118
+      btn_add() {
119
+        if (this.typeid) {
120
+          console.log(typeof this.typeid)
121
+          this.$layer.iframe({
122
+            content: {
123
+              content: addOrEdit, // 传递的组件对象
124
+              parent: this, // 当前的vue对象
125
+              data: {
126
+                state: 0,
127
+                typeid: this.typeid
128
+              } // props
129
+            },
130
+            area: ['70%', '75%'],
131
+            title: '添加知识库'
132
+          })
133
+        } else {
134
+          this.$message({
135
+            message: '请选择知识库类别',
136
+            type: 'warning'
137
+          })
138
+          return
139
+        }
140
+      },
141
+      btn_edit(F_Id) {
130 142
         this.$layer.iframe({
131 143
           content: {
132 144
             content: addOrEdit, // 传递的组件对象
133 145
             parent: this, // 当前的vue对象
134 146
             data: {
135
-              state: 0,
136
-              typeid: this.typeid
147
+              state: 1,
148
+              typeid: this.typeid,
149
+              F_Id: F_Id
137 150
             } // props
138 151
           },
139 152
           area: ['70%', '75%'],
140 153
           title: '添加知识库'
141 154
         })
142
-      } else {
143
-        this.$message({
144
-          message: '请选择知识库类别',
145
-          type: 'warning'
146
-        })
147
-        return
148
-      }
149
-    },
150
-    btn_edit(F_Id) {
151
-      this.$layer.iframe({
152
-        content: {
153
-          content: addOrEdit, // 传递的组件对象
154
-          parent: this, // 当前的vue对象
155
-          data: {
156
-            state: 1,
157
-            typeid: this.typeid,
158
-            F_Id: F_Id
159
-          } // props
160
-        },
161
-        area: ['70%', '75%'],
162
-        title: '添加知识库'
163
-      })
164
-    },
165
-    // 删除
166
-    btn_delete_task(F_Id) {
167
-      this.$confirm('确定要删除吗?', '提示', {
168
-        confirmButtonText: '确定',
169
-        cancelButtonText: '取消',
170
-        type: 'warning'
171
-      })
172
-        .then(() => {
173
-          const params = {
174
-            ids: F_Id
175
-          }
176
-          delInfos(params).then((response) => {
177
-            if (response.state.toLowerCase() === 'success') {
178
-              this.getListTask()
179
-              this.$message({
180
-                message: '删除成功!',
181
-                type: 'success',
182
-                duration: 1000
183
-              })
155
+      },
156
+      // 删除
157
+      btn_delete_task(F_Id) {
158
+        this.$confirm('确定要删除吗?', '提示', {
159
+            confirmButtonText: '确定',
160
+            cancelButtonText: '取消',
161
+            type: 'warning'
162
+          })
163
+          .then(() => {
164
+            const params = {
165
+              ids: F_Id
184 166
             }
167
+            delInfos(params).then((response) => {
168
+              if (response.state.toLowerCase() === 'success') {
169
+                this.getListTask()
170
+                this.$message({
171
+                  message: '删除成功!',
172
+                  type: 'success',
173
+                  duration: 1000
174
+                })
175
+              }
176
+            })
185 177
           })
178
+          .catch(() => {
179
+            this.$message.info('已取消删除')
180
+          })
181
+      },
182
+      handleRow(row) {
183
+        this.$layer.iframe({
184
+          content: {
185
+            content: knowledgeDetail, // 传递的组件对象
186
+            parent: this, // 当前的vue对象
187
+            data: {
188
+              rowid: row.F_Id.toString()
189
+            } // props
190
+          },
191
+          area: ['70%', '75%'],
192
+          title: '知识库详情'
186 193
         })
187
-        .catch(() => {
188
-          this.$message.info('已取消删除')
189
-        })
190
-    },
191
-    handleRow(row) {
192
-      this.$layer.iframe({
193
-        content: {
194
-          content: knowledgeDetail, // 传递的组件对象
195
-          parent: this, // 当前的vue对象
196
-          data: {
197
-            rowid: row.F_Id.toString()
198
-          } // props
199
-        },
200
-        area: ['70%', '75%'],
201
-        title: '知识库详情'
202
-      })
203
-    },
204
-    // 导入
205
-    btn_import() {
206
-      this.$layer.iframe({
207
-        content: {
208
-          content: Export, // 传递的组件对象
209
-          parent: this, // 当前的vue对象
210
-          data: {
194
+      },
195
+      // 导入
196
+      btn_import() {
197
+        this.$layer.iframe({
198
+          content: {
199
+            content: Export, // 传递的组件对象
200
+            parent: this, // 当前的vue对象
201
+            data: {
211 202
 
212
-          } // props
213
-        },
214
-        area: ['50%', '70%'],
215
-        title: '导入'
216
-      })
203
+            } // props
204
+          },
205
+          area: ['50%', '70%'],
206
+          title: '导入'
207
+        })
208
+      }
217 209
     }
218 210
   }
219
-}
220 211
 </script>
221 212
 
222 213
 <style>

+ 10 - 13
CallCenterWeb.UI/RMYY/src/views/reportForm/repairForm/index.vue

@@ -8,6 +8,9 @@
8 8
             value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
9 9
         </el-col>
10 10
       </el-form-item>
11
+      <el-form-item label="报工科室">
12
+        <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
13
+      </el-form-item>
11 14
       <el-form-item label="报修人:">
12 15
         <el-input v-model="ruleForm.applicant" placeholder="请输入报修人姓名或工号" size="medium" />
13 16
       </el-form-item>
@@ -103,6 +106,7 @@
103 106
         },
104 107
         activeNameEcharts: 'first',
105 108
         ruleForm: {
109
+          applicantdept:'',
106 110
           startTime: '', // 时间范围
107 111
           keyword: '', // 关键字
108 112
           ordertypeid: '',
@@ -124,19 +128,7 @@
124 128
           typeid: 0,
125 129
           pid: 0
126 130
         },
127
-        // option: {
128
-        //   xAxis: {
129
-        //     type: 'category',
130
-        //     data: ['综合调度', '业务咨询', '故障报修', '车辆调度']
131
-        //   },
132
-        //   yAxis: {
133
-        //     type: 'value'
134
-        //   },
135
-        //   series: [{
136
-        //     data: [50, 330, 124, 118],
137
-        //     type: 'line'
138
-        //   }]
139
-        // }
131
+        deptidArr:[]
140 132
       }
141 133
     },
142 134
     computed: {},
@@ -158,6 +150,9 @@
158 150
       //   const chart = echarts.init(document.getElementById('sector'))
159 151
       //   chart.setOption(this.option)
160 152
       // },
153
+      getDeptid(data) {
154
+        this.ruleForm.applicantdept=data[data.length-1]
155
+      },
161 156
       getfirstOrderType(data) {
162 157
         this.ruleForm.ordertypeid = data.value
163 158
         this.secondOrderTypeParam.typeid = 2
@@ -194,6 +189,7 @@
194 189
           applicant: this.ruleForm.applicant,
195 190
           maintenancer: this.ruleForm.maintenancer,
196 191
           createuser: this.ruleForm.createuser,
192
+          applicantdept:this.ruleForm.applicantdept,
197 193
           isexport: 1
198 194
         }
199 195
         exportExcel(exporParams, getexportList)
@@ -208,6 +204,7 @@
208 204
             endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
209 205
             category: this.ruleForm.menutype,
210 206
             state:this.ruleForm.state,
207
+            applicantdept:this.ruleForm.applicantdept,
211 208
             applicant: this.ruleForm.applicant,
212 209
             maintenancer: this.ruleForm.maintenancer,
213 210
             createuser: this.ruleForm.createuser

+ 6 - 3
CallCenterWeb.UI/RMYY/src/views/reportForm/seatWorkReport/index.vue

@@ -6,11 +6,11 @@
6 6
         <el-date-picker v-model="ruleForm.startTime" size="medium" type="daterange" format="yyyy-MM-dd"
7 7
           value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
8 8
       </el-form-item>
9
-      <el-form-item>
9
+      <!-- <el-form-item>
10 10
         <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
11
-      </el-form-item>
11
+      </el-form-item> -->
12 12
       <el-form-item>
13
-        <el-input v-model="ruleForm.woday" clearable placeholder="请输入月工作天数" class="filter-item" size="medium" />
13
+        <el-input v-model="ruleForm.usercode" clearable placeholder="请输入工号" class="filter-item" size="medium" />
14 14
       </el-form-item>
15 15
       <el-form-item>
16 16
         <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
@@ -70,6 +70,7 @@
70 70
         dataLists: [],
71 71
         ruleForm: {
72 72
           startTime: [],
73
+          usercode:'',
73 74
           dpt:'',
74 75
           woday: ''
75 76
         },
@@ -95,6 +96,7 @@
95 96
           endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
96 97
           dayss:this.ruleForm.woday,
97 98
           dpt:this.ruleForm.dpt,
99
+          usercode:this.ruleForm.usercode,
98 100
           isExport: 0
99 101
         }
100 102
         return new Promise(resolve => {
@@ -112,6 +114,7 @@
112 114
           endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
113 115
           dayss:this.ruleForm.woday,
114 116
           dpt:this.ruleForm.dpt,
117
+          usercode:this.ruleForm.usercode,
115 118
           isExport: 1
116 119
         }
117 120
         exportExcel(exporParams, getSeatListExpt)

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/scheduleManagement/classManagement/index.vue

@@ -16,8 +16,8 @@
16 16
       <el-table-column prop="F_Remark" label="备注" align="center" min-width="" />
17 17
       <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
18 18
         <template slot-scope="scope">
19
-          <el-button size="mini" type="primary" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
20
-          <el-button size="mini" type="danger" @click="btn_delete(scope.row.F_Id)">删除</el-button>
19
+          <el-button size="mini" plain type="primary" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
20
+          <el-button size="mini" plain type="danger" @click="btn_delete(scope.row.F_Id)">删除</el-button>
21 21
         </template>
22 22
       </el-table-column>
23 23
     </el-table>

+ 2 - 4
CallCenterWeb.UI/RMYY/src/views/testing/targetTesting/index.vue

@@ -7,8 +7,7 @@
7 7
         <el-col :span="10">
8 8
           <el-alert :closable="false" title="指标分类" type="success" style="margin-bottom: 5px;" />
9 9
           <el-button type="primary" class="filter-item" @click="btn_addType">添加</el-button>
10
-          <!-- <el-button type="primary" class="filter-item">修改</el-button> -->
11
-          <el-button type="primary" class="filter-item" @click="btn_deleteType">删除</el-button>
10
+          <el-button type="danger" class="filter-item" @click="btn_deleteType">删除</el-button>
12 11
           <el-table v-loading="loading" :data="dataList" border stripe highlight-current-row
13 12
             @current-change="handleCurrentChange">
14 13
             <!-- <el-table-column type="selection" width="40" /> -->
@@ -28,8 +27,7 @@
28 27
         <el-col :span="14">
29 28
           <el-alert :closable="false" title="指标列表" type="success" style="margin-bottom: 5px;" />
30 29
           <el-button type="primary" class="filter-item" @click="btn_add">添加</el-button>
31
-          <!-- <el-button type="primary" class="filter-item">修改</el-button> -->
32
-          <el-button type="primary" class="filter-item" @click="btn_delete">删除</el-button>
30
+          <el-button type="danger" class="filter-item" @click="btn_delete">删除</el-button>
33 31
           <el-button type="primary" class="filter-item" @click="getList('0')">所有指标</el-button>
34 32
           <el-table v-loading="loading" :data="dataLists" border stripe  @selection-change="changeSelectss">
35 33
             <el-table-column type="selection" width="40" />