患者信息

CallCenterWeb.UI/RMYY/src/api/callScreen/callScreen.js

@@ -26,7 +26,7 @@ export function GetModelList(params) {
     params
   })
 }
-//坐诊信息
+// 坐诊信息
 export function getHos(params) {
   return request({
     url: 'Worepair/GetListyqRepairlist',
@@ -34,7 +34,7 @@ export function getHos(params) {
     params
   })
 }
-//药品信息
+// 药品信息
 export function GetDictDrugLists(params) {
   return request({
     url: 'HospitalUser/GetDictDrugList',
@@ -42,7 +42,7 @@ export function GetDictDrugLists(params) {
     params
   })
 }
-//药品详情信息
+// 药品详情信息
 export function getDrugDetail(params) {
   return request({
     url: 'HospitalUser/GetDictDrug',
@@ -50,7 +50,7 @@ export function getDrugDetail(params) {
     params
   })
 }
-//院区
+// 院区
 export function Getbeonduty(params) {
   return request({
     url: 'HospitalUser/Getbeonduty',
@@ -58,3 +58,11 @@ export function Getbeonduty(params) {
     params
   })
 }
+// 患者记录
+export function GetRcord(params) {
+  return request({
+    url: 'Patient/GetRcord',
+    method: 'get',
+    params
+  })
+}

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

@@ -1,109 +1,114 @@
 <template>
   <div :class="{'hidden':hidden}" class="pagination-container">
-    <el-pagination
-      :background="background"
-      :current-page.sync="currentPage"
-      :page-size.sync="eachPage"
-      :page-sizes="pageSizes"
-      :layout="layout"
-      :prev-text="prevText"
-      :next-text="nextText"
-      :total="total"
-      v-bind="$attrs"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"/>
+    <el-pagination :background="background" :current-page.sync="currentPage" :page-size.sync="eachPage"
+      :page-sizes="pageSizes" :layout="layout" :prev-text="prevText" :next-text="nextText" :total="total"
+      v-bind="$attrs" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
   </div>
 </template>
 
 <script>
-import { scrollTo } from '@/utils/scrollTo'
+  import {
+    scrollTo
+  } from '@/utils/scrollTo'
 
-export default {
-  name: 'Pagination',
-  props: {
-    total: {
-      required: true,
-      type: Number
-    },
-    pageindex: {
-      type: Number,
-      default: 1
-    },
-    pagesize: {
-      type: Number,
-      default: process.env.PAGESIZE
-    },
-    pageSizes: {
-      type: Array,
-      default() {
-        // return process.env.PAGESIZES
-        return JSON.parse(this.$store.getters.serverConfig.PAGESIZES)
-      }
-    },
-    layout: {
-      type: String,
-      default: 'total, sizes, prev, pager, next, jumper'
-    },
-    prevText: {
-      type: String,
-      default: '上一页'
-    },
-    nextText: {
-      type: String,
-      default: '下一页'
-    },
-    background: {
-      type: Boolean,
-      default: true
-    },
-    autoScroll: {
-      type: Boolean,
-      default: true
-    },
-    hidden: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    // 当前第几页
-    currentPage: {
-      get() {
-        return this.pageindex
+  export default {
+    name: 'Pagination',
+    props: {
+      total: {
+        required: true,
+        type: Number
+      },
+      pageindex: {
+        type: Number,
+        default: 1
+      },
+      pagesize: {
+        type: Number,
+        default: process.env.PAGESIZE
       },
-      set(val) {
-        this.$emit('update:pageindex', val)
+      pageSizes: {
+        type: Array,
+        default () {
+          // return process.env.PAGESIZES
+          return JSON.parse(this.$store.getters.serverConfig.PAGESIZES)
+        }
+      },
+      layout: {
+        type: String,
+        default: 'total, sizes, prev, pager, next, jumper'
+      },
+      prevText: {
+        type: String,
+        default: '上一页'
+      },
+      nextText: {
+        type: String,
+        default: '下一页'
+      },
+      background: {
+        type: Boolean,
+        default: true
+      },
+      autoScroll: {
+        type: Boolean,
+        default: true
+      },
+      hidden: {
+        type: Boolean,
+        default: false
       }
     },
-    // 每页几条数据
-    eachPage: {
-      get() {
-        return this.pagesize
+    computed: {
+      // 当前第几页
+      currentPage: {
+        get() {
+          return this.pageindex
+        },
+        set(val) {
+          this.$emit('update:pageindex', val)
+        }
       },
-      set(val) {
-        this.$emit('update:pagesize', val)
-      }
-    }
-  },
-  methods: {
-    handleSizeChange(val) {
-      this.$emit('pagination', { pageindex: this.currentPage, pagesize: val })
-      if (this.autoScroll) {
-        scrollTo(0, 800)
+      // 每页几条数据
+      eachPage: {
+        get() {
+          return this.pagesize
+        },
+        set(val) {
+          this.$emit('update:pagesize', val)
+        }
       }
     },
-    handleCurrentChange(val) {
-      this.$emit('pagination', { pageindex: val, pagesize: this.eachPage })
-      if (this.autoScroll) {
-        scrollTo(0, 800)
+    methods: {
+      handleSizeChange(val) {
+        this.$emit('pagination', {
+          pageindex: this.currentPage,
+          pagesize: val
+        })
+        if (this.autoScroll) {
+          scrollTo(0, 800)
+        }
+      },
+      handleCurrentChange(val) {
+        this.$emit('pagination', {
+          pageindex: val,
+          pagesize: this.eachPage
+        })
+        if (this.autoScroll) {
+          scrollTo(0, 800)
+        }
       }
     }
   }
-}
 </script>
 
 <style scoped>
-	.pagination-container.hidden {
-		display: none;
-	}
+  /deep/.el-input--small .el-input__inner {
+    height: 28px !important;
+  }
+  /deep/.el-pagination__jump{
+    margin-left: 15px;
+  }
+  .pagination-container.hidden {
+    display: none;
+  }
 </style>

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

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

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

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

CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -496,24 +496,10 @@
             this.deptid =
               this.$store.getters.deptmap[parseInt(res.F_ProposerDeptId)].ids
             this.ruleForm.needman = res.F_ProposerCode
+            this.usercodeSearch = res.F_ProposerCode
           }
         })
       }
-      // 科室下拉改变事件
-      // getDepartments(data) {
-      //   this.ruleForm.deptid = data.value
-      //   this.ruleForm.deptname = data.name
-      // },
-      // 院区下拉改变事件
-      // getHospitals(data) {
-      //   this.ruleForm.hosid = data.value
-      //   this.ruleForm.hosname = data.name
-      // },
-      // 申请人下拉改变事件
-      // getRepairman(data) {
-      //   this.ruleForm.usercode = data.value
-      //   this.ruleForm.username = data.name
-      // },
     }
   }
 </script>

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

@@ -5,154 +5,226 @@
     <table class="tabdept" cellspacing="0" cellpadding="0">
       <tr>
         <th>姓名:</th>
-        <td>张飒</td>
+        <td>{{hismsg.hzxm}}</td>
         <th>年龄:</th>
-        <td>27</td>
+        <td>-</td>
       </tr>
       <tr>
         <th>性别:</th>
-        <td>男</td>
+        <td>{{hismsg.xbmc}}</td>
         <th>联系电话:</th>
-        <td>13241334761</td>
+        <td>{{hismsg.lxdh || '-'}}</td>
       </tr>
       <tr>
         <th>出生日期:</th>
-        <td>1998-01-01</td>
+        <td>{{hismsg.csrq}}</td>
         <th>身份证号:</th>
-        <td>412723123451234</td>
+        <td>{{hismsg.zjhm}}</td>
       </tr>
       <tr>
         <th>家庭地址:</th>
-        <td colspan="5">郑州市二七区航海路</td>
+        <td colspan="5">{{hismsg.jtdz || '-'}}</td>
       </tr>
     </table>
-    <p style="font-weight: bold;">门诊记录</p>
-    <el-table border stripe>
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="就诊时间" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="就诊科室" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="就诊病区" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center" />
-    </el-table>
     <p style="font-weight: bold;">住院记录</p>
-    <el-table border stripe>
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="入院时间" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="出院时间" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="出院科室" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="出院诊断" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="主管医生" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="住院号" align="center" />
+    <el-table border stripe :data="zhuyuanArr" height="300">
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="入院时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="DischargeDateTime" label="出院时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="" label="出院科室" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" label="出院诊断" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.Diagnosis.Name}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="" label="主管医生" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="" label="住院号" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.VisitNumber.CardID}}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <p style="font-weight: bold;">门诊记录</p>
+    <el-table border stripe :data="menzhenArr" height="300">
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" label="就诊病区" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AssignedPatientLocation.Areaname}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+        </template>
+      </el-table-column>
     </el-table>
     <p style="font-weight: bold;">急诊记录</p>
-    <el-table border stripe>
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="就诊时间" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="就诊科室" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center" />
+    <el-table border stripe :data="jizhenArr" height="300">
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+        </template>
+      </el-table-column>
     </el-table>
     <p style="font-weight: bold;">体检记录</p>
-    <el-table border stripe>
-      <el-table-column :show-overflow-tooltip="true" fixed prop="" label="体检时间" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="体检科室" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center" />
+    <el-table border stripe :data="tijianArr" height="300">
+      <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="体检时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="" label="体检科室" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
 
 <script>
-import {
-  getList,
-  delInfos,
-  getTypeTree
-} from '@/api/knowledgeBase/knowledgeBase'
-
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-import hischange from './hischange'
-export default {
-  name: 'HisList',
-  components: {
-    Pagination
-  },
-  props: {
-    callinNum: {
-      type: String,
-      default: ''
-    }
-  },
-
-  data() {
-    return {
-      callNum: '', // 来电号码
-      loading: false,
-      typeSecondId: '',
-      typeid: '',
-      keyword: '',
-      pageParams: {
-        pageindex: 1, // 当前第几页
-        pagesize: 5, // 每页几条数据
-        total: 0 // 总共多少数据
-      },
-      taskDataLists: [] // 列表数据
-    }
-  },
-  created() {
-    this.$bus.$on('typeSecondId', (params) => {
-      if (params != 0) {
-        this.typeSecondId = params
-        // console.log(this.typeSecondId,'ppp')
-        this.getList()
+  import {
+    getList,
+    delInfos,
+    getTypeTree
+  } from '@/api/knowledgeBase/knowledgeBase'
+  import {
+    GetModelList,
+    GetRcord
+  } from '@/api/callScreen/callScreen'
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+  import hischange from './hischange'
+  export default {
+    name: 'HisList',
+    components: {
+      Pagination
+    },
+    props: {
+      callinNum: {
+        type: String,
+        default: ''
       }
-    })
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      return new Promise(resolve => {
-        const params = {
-          pageindex: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
-          keywords: this.keyword,
-          typeid: this.typeSecondId
-        }
-        getList(params).then(response => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            if (response.total == null) {
-              this.pageParams.total = 0
-            } else {
-              this.pageParams.total = response.total
-            }
-            this.taskDataLists = response.rows
-          }
-        })
-        resolve()
-      })
     },
-    changeHis() {
-      this.$layer.iframe({
-        content: {
-          content: hischange, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: {
-            callinNum:this.callinNum
-          } // props
+
+    data() {
+      return {
+        callNum: '', // 来电号码
+        loading: false,
+        typeSecondId: '',
+        typeid: '',
+        keyword: '',
+        hismsg: {},
+        pageParams: {
+          pageindex: 1, // 当前第几页
+          pagesize: 5, // 每页几条数据
+          total: 0 // 总共多少数据
         },
-        area: ['70%', '70%'],
-        title: '切换患者'
+        zhuyuanArr: [],
+        menzhenArr: [],
+        jizhenArr: [],
+        tijianArr: [],
+        taskDataLists: [] // 列表数据
+      }
+    },
+    created() {
+      this.$bus.$on('typeSecondId', (params) => {
+        if (params != 0) {
+          this.typeSecondId = params
+          // console.log(this.typeSecondId,'ppp')
+          this.getList()
+        }
       })
     },
-    btn_search_task() {
-      if (this.typeSecondId) {
-        this.keyword = this.keyword
-        this.getList()
-      } else {
-        this.$message({
-          message: '请输入工单类型',
-          type: 'warning'
+    methods: {
+      getList() {
+        this.loading = true
+        return new Promise(resolve => {
+          const params = {
+            zsyh: window.localStorage.getItem('zsyh'),
+            hzxm: '',
+            sfzh: '',
+            zlkh: '',
+            jzlx: window.localStorage.getItem('jzlx'),
+            jzh: '',
+            lxdh: this.callinNum
+          }
+          GetModelList(params).then(response => {
+            this.loading = false
+            this.hismsg = response.rows[0]
+            this.getRecord('I', response.rows[0].zsyh)
+            this.getRecord('O', response.rows[0].zsyh)
+            this.getRecord('E', response.rows[0].zsyh)
+            this.getRecord('P', response.rows[0].zsyh)
+          })
+          resolve()
+        })
+      },
+      changeHis() {
+        this.$layer.iframe({
+          content: {
+            content: hischange, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              callinNum: this.callinNum
+            } // props
+          },
+          area: ['70%', '70%'],
+          title: '切换患者'
+        })
+      },
+      btn_search_task() {
+        if (this.typeSecondId) {
+          this.keyword = this.keyword
+          this.getList()
+        } else {
+          this.$message({
+            message: '请输入工单类型',
+            type: 'warning'
+          })
+          return
+        }
+      },
+      getRecord(recordtype, zsyh) {
+        const params = {
+          PatientClass: recordtype,
+          GlobalPID: zsyh
+        }
+        GetRcord(params).then(res => {
+          if (recordtype === 'I') {
+            this.zhuyuanArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
+          }
+          if (recordtype === 'O') {
+            this.menzhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
+          }
+          if (recordtype === 'E') {
+            this.jizhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
+          }
+          if (recordtype === 'P') {
+            this.tijianArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
+          }
         })
-        return
       }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">

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

@@ -6,12 +6,8 @@
       <el-input v-model="searchData.sfzh" placeholder="请输入身份证号" class="filter-item" size="medium" clearable />
       <el-input v-model="searchData.zlkh" placeholder="请输入诊疗卡号" class="filter-item" size="medium" clearable />
       <el-select v-model="searchData.jzlx" size="medium" placeholder="请选择就诊类型">
-        <el-option
-          v-for="item in jzlxarr"
-          :key="item.F_DictionaryValueId"
-          :label="item.F_Describe"
-          :value="item.F_Name"
-        />
+        <el-option v-for="item in jzlxarr" :key="item.F_DictionaryValueId" :label="item.F_Describe"
+          :value="item.F_Name" />
       </el-select>
       <el-input v-model="searchData.jzh" placeholder="请输入就诊号" class="filter-item" size="medium" clearable />
       <el-input v-model="searchData.lxdh" placeholder="请输入联系电话" class="filter-item" size="medium" clearable />
@@ -21,7 +17,7 @@
     <el-table :data="taskDataLists" border stripe>
       <el-table-column :show-overflow-tooltip="true" align="center" width="100">
         <template slot-scope="scope">
-          <input :value="scope.row.zsyh" name="tabVal" type="radio" @change="handleSelectionChange" >
+          <input :value="scope.row.zsyh" name="tabVal" type="radio" @change="handleSelectionChange">
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="zsyh" label="主索引号" align="center" />
@@ -33,130 +29,125 @@
       <el-table-column :show-overflow-tooltip="true" prop="jtdz" label="家庭住址" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="lxdh" label="联系电话" align="center" />
     </el-table>
-    <pagination
-      v-show="pageParams.total > 0"
-      :total="pageParams.total"
-      :page-sizes="[5, 10, 15, 20]"
-      :pageindex.sync="pageParams.pageindex"
-      :pagesize.sync="pageParams.pagesize"
-      class="pagination"
+    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :page-sizes="[5, 10, 15, 20]"
+      :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination"
       @pagination="getList" />
     <el-button type="primary" style="margin-left:45%" @click="hisSubmit">确定</el-button>
   </div>
 </template>
 
 <script>
-import {
-  GetModelList
-} from '@/api/callScreen/callScreen'
-import {
-  getDicReason
-} from '@/api/faultRepairManagement/faultRepair'
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-export default {
-  name: 'HisChange',
-  components: {
-    Pagination
-  },
-  props: {
-    callinNum: {
-      type: String,
-      default: ''
+  import {
+    GetModelList
+  } from '@/api/callScreen/callScreen'
+  import {
+    getDicReason
+  } from '@/api/faultRepairManagement/faultRepair'
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+  export default {
+    name: 'HisChange',
+    components: {
+      Pagination
     },
-    layerid: {
-      type: String,
-      default: ''
-    }
-  },
-
-  data() {
-    return {
-      callNum: '', // 来电号码
-      loading: false,
-      typeSecondId: '',
-      typeid: '',
-      keyword: '',
-      tableRadio: '',
-      jzlxarr: [],
-      searchData: {
-        zsyh: '',
-        hzxm: '',
-        sfzh: '',
-        zlkh: '',
-        jzlx: '',
-        jzh: '',
-        lxdh: ''
+    props: {
+      callinNum: {
+        type: String,
+        default: ''
       },
-      pageParams: {
-        pageindex: 1, // 当前第几页
-        pagesize: 5, // 每页几条数据
-        total: 0 // 总共多少数据
-      },
-      taskDataLists: [] // 列表数据
-    }
-  },
-  created() {
-    if(this.callinNum){
-      this.searchData.lxdh = this.callinNum
-    }
-    this.$bus.$on('typeSecondId', (params) => {
-      if (params != 0) {
-        this.typeSecondId = params
-        // console.log(this.typeSecondId,'ppp')
-        this.getList()
+      layerid: {
+        type: String,
+        default: ''
       }
-    })
-    this.getList()
-    this.getJzlx()
-  },
-  methods: {
-    getList() {
-      // this.loading = true
-      return new Promise(resolve => {
-        const params = this.searchData
-        GetModelList(params).then(response => {
-          // this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            this.taskDataLists = response.data.rows
-          }
-        })
-        resolve()
-      })
     },
-    getJzlx() {
-      const params = {
-        Flag: 'JZLX',
-        Name: ''
+
+    data() {
+      return {
+        callNum: '', // 来电号码
+        loading: false,
+        typeSecondId: '',
+        typeid: '',
+        keyword: '',
+        tableRadio: '',
+        jzlxarr: [],
+        searchData: {
+          zsyh: '',
+          hzxm: '',
+          sfzh: '',
+          zlkh: '',
+          jzlx: '',
+          jzh: '',
+          lxdh: ''
+        },
+        pageParams: {
+          pageindex: 1, // 当前第几页
+          pagesize: 5, // 每页几条数据
+          total: 0 // 总共多少数据
+        },
+        taskDataLists: [] // 列表数据
       }
-      getDicReason(params).then(res => {
-        this.jzlxarr = res.rows
-      })
-    },
-    handleSelectionChange(val) {
-      console.log(val.target.value)
-      this.tableRadio = val
     },
-    hisSubmit() {
-      if (!this.tableRadio) {
-        this.$message.warning('请选择一个患者')
-        return
-      } else {
-        this.$parent.$layer.close(this.layerid)
+    created() {
+      if (this.callinNum) {
+        this.searchData.lxdh = this.callinNum
       }
+      this.$bus.$on('typeSecondId', (params) => {
+        if (params != 0) {
+          this.typeSecondId = params
+          // console.log(this.typeSecondId,'ppp')
+          this.getList()
+        }
+      })
+      this.getList()
+      this.getJzlx()
     },
-    btn_search_task() {
-      if (this.typeSecondId) {
-        this.getList()
-      } else {
-        this.$message({
-          message: '请输入工单类型',
-          type: 'warning'
+    methods: {
+      getList() {
+        return new Promise(resolve => {
+          const params = this.searchData
+          GetModelList(params).then(response => {
+            this.taskDataLists = response.rows
+          })
+          resolve()
+        })
+      },
+      getJzlx() {
+        const params = {
+          Flag: 'JZLX',
+          Name: ''
+        }
+        getDicReason(params).then(res => {
+          this.jzlxarr = res.rows
         })
-        return
+      },
+      handleSelectionChange(val) {
+        console.log(val.target.value)
+        this.tableRadio = val
+        // this.searchData.zsyh = val.target.value
+      },
+      hisSubmit() {
+        if (!this.tableRadio) {
+          this.$message.warning('请选择一个患者')
+          return
+        } else {
+          window.localStorage.setItem('zsyh',this.tableRadio.target.value)
+          window.localStorage.setItem('jzlx',this.searchData.jzlx)
+          this.$parent.$layer.close(this.layerid)
+          this.$parent.getList()
+        }
+      },
+      btn_search_task() {
+        if (this.typeSecondId) {
+          this.getList()
+        } else {
+          this.$message({
+            message: '请输入工单类型',
+            type: 'warning'
+          })
+          return
+        }
       }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">

CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -427,6 +427,7 @@
     border-bottom: 1px solid rgb(215, 215, 215);
     padding-bottom: 10px;
   }
+
   .circle {
     display: inline-block;
     width: 10px;
@@ -435,6 +436,7 @@
     border: 1px solid #ff0000;
     margin-right: 10px;
   }
+
   .notices {
     margin-left: 15px;
     padding: 0 0 20px 0;

CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/index.vue

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

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

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

CallCenterWeb.UI/RMYY/src/views/knowledgeBase/knowledgeList/index.vue

@@ -22,201 +22,192 @@
           <el-table-column :show-overflow-tooltip="true" prop="F_KeyWords" label="关键字" align="center" />
           <el-table-column label="操作" width="240" align="center" class-name="oparate_btn">
             <template slot-scope="scope">
-              <el-button
-                v-permission="'edit_knowledgeList'"
-                type="text"
+              <el-button v-permission="'edit_knowledgeList'" plain type="primary"
                 @click.stop="btn_edit(scope.row.F_Id)">编辑</el-button>
-              <el-button
-                v-permission="'delete_knowledgeList'"
-                type="text"
+              <el-button v-permission="'delete_knowledgeList'" plain type="danger"
                 @click.stop="btn_delete_task(scope.row.F_Id)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          v-show="pageParams.total > 0"
-          :total="pageParams.total"
-          :pageindex.sync="pageParams.pageindex"
-          :pagesize.sync="pageParams.pagesize"
-          class="pagination"
-          @pagination="getListTask" />
+        <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
+          :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getListTask" />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-// import { pickerOptions, formatterContent } from '@/utils'
+  // import { pickerOptions, formatterContent } from '@/utils'
 
-import {
-  getList,
-  delInfos,
-  getTypeTree
-} from '@/api/knowledgeBase/knowledgeBase'
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-import addOrEdit from './components/addOrEdit'
-import knowledgeDetail from './components/detail.vue'
-import Export from './components/export'
-export default {
-  name: 'KnowledgeList',
-  components: {
-    Pagination
-  },
-  data() {
-    return {
-      keyword: '',
-      typeid: '',
-      pageParams: {
-        pageindex: 1, // 当前第几页
-        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
-      },
-      taskDataLists: [], // 客户信息列表数据
-      dataTree: [],
-      defaultProps: {
-        children: null,
-        label: 'text'
-      }
-    }
-  },
-  computed: {},
-  created() {
-    this.getTypeTreeList()
-  },
-  methods: {
-    handleNodeClick(data) {
-      this.typeid = data.id
-      this.getListTask()
-    },
-    getTypeTreeList() {
-      return new Promise((resolve) => {
-        getTypeTree().then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            this.dataTree = response.data
-          }
-        })
-        resolve()
-      })
+  import {
+    getList,
+    delInfos,
+    getTypeTree
+  } from '@/api/knowledgeBase/knowledgeBase'
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+  import addOrEdit from './components/addOrEdit'
+  import knowledgeDetail from './components/detail.vue'
+  import Export from './components/export'
+  export default {
+    name: 'KnowledgeList',
+    components: {
+      Pagination
     },
-    getListTask() {
-      return new Promise((resolve) => {
-        const params = {
-          pageindex: this.pageParams.pageindex, // int 第几页
-          pagesize: this.pageParams.pagesize, // int 每页几条信息
-          keywords: this.keyword, // 客户名称
-          typeid: this.typeid // 联系电话
+    data() {
+      return {
+        keyword: '',
+        typeid: '',
+        pageParams: {
+          pageindex: 1, // 当前第几页
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+          total: 0 // 总共多少数据
+        },
+        taskDataLists: [], // 客户信息列表数据
+        dataTree: [],
+        defaultProps: {
+          children: null,
+          label: 'text'
         }
-        getList(params).then((response) => {
-          this.taskDataLists = response.rows
-        })
-        resolve()
-      })
+      }
+    },
+    computed: {},
+    created() {
+      this.getTypeTreeList()
     },
-    btn_search_task() {
-      if (this.typeid) {
-        this.keyword = this.keyword
+    methods: {
+      handleNodeClick(data) {
+        this.typeid = data.id
         this.getListTask()
-      } else {
-        this.$message({
-          message: '请选择知识库类别',
-          type: 'warning'
+      },
+      getTypeTreeList() {
+        return new Promise((resolve) => {
+          getTypeTree().then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.dataTree = response.data
+            }
+          })
+          resolve()
         })
-        return
-      }
-    },
-    btn_add() {
-      if (this.typeid) {
-        console.log(typeof this.typeid)
+      },
+      getListTask() {
+        return new Promise((resolve) => {
+          const params = {
+            pageindex: this.pageParams.pageindex, // int 第几页
+            pagesize: this.pageParams.pagesize, // int 每页几条信息
+            keywords: this.keyword, // 客户名称
+            typeid: this.typeid // 联系电话
+          }
+          getList(params).then((response) => {
+            this.taskDataLists = response.rows
+          })
+          resolve()
+        })
+      },
+      btn_search_task() {
+        if (this.typeid) {
+          this.keyword = this.keyword
+          this.getListTask()
+        } else {
+          this.$message({
+            message: '请选择知识库类别',
+            type: 'warning'
+          })
+          return
+        }
+      },
+      btn_add() {
+        if (this.typeid) {
+          console.log(typeof this.typeid)
+          this.$layer.iframe({
+            content: {
+              content: addOrEdit, // 传递的组件对象
+              parent: this, // 当前的vue对象
+              data: {
+                state: 0,
+                typeid: this.typeid
+              } // props
+            },
+            area: ['70%', '75%'],
+            title: '添加知识库'
+          })
+        } else {
+          this.$message({
+            message: '请选择知识库类别',
+            type: 'warning'
+          })
+          return
+        }
+      },
+      btn_edit(F_Id) {
         this.$layer.iframe({
           content: {
             content: addOrEdit, // 传递的组件对象
             parent: this, // 当前的vue对象
             data: {
-              state: 0,
-              typeid: this.typeid
+              state: 1,
+              typeid: this.typeid,
+              F_Id: F_Id
             } // props
           },
           area: ['70%', '75%'],
           title: '添加知识库'
         })
-      } else {
-        this.$message({
-          message: '请选择知识库类别',
-          type: 'warning'
-        })
-        return
-      }
-    },
-    btn_edit(F_Id) {
-      this.$layer.iframe({
-        content: {
-          content: addOrEdit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: {
-            state: 1,
-            typeid: this.typeid,
-            F_Id: F_Id
-          } // props
-        },
-        area: ['70%', '75%'],
-        title: '添加知识库'
-      })
-    },
-    // 删除
-    btn_delete_task(F_Id) {
-      this.$confirm('确定要删除吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          const params = {
-            ids: F_Id
-          }
-          delInfos(params).then((response) => {
-            if (response.state.toLowerCase() === 'success') {
-              this.getListTask()
-              this.$message({
-                message: '删除成功！',
-                type: 'success',
-                duration: 1000
-              })
+      },
+      // 删除
+      btn_delete_task(F_Id) {
+        this.$confirm('确定要删除吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            const params = {
+              ids: F_Id
             }
+            delInfos(params).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getListTask()
+                this.$message({
+                  message: '删除成功！',
+                  type: 'success',
+                  duration: 1000
+                })
+              }
+            })
           })
+          .catch(() => {
+            this.$message.info('已取消删除')
+          })
+      },
+      handleRow(row) {
+        this.$layer.iframe({
+          content: {
+            content: knowledgeDetail, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowid: row.F_Id.toString()
+            } // props
+          },
+          area: ['70%', '75%'],
+          title: '知识库详情'
         })
-        .catch(() => {
-          this.$message.info('已取消删除')
-        })
-    },
-    handleRow(row) {
-      this.$layer.iframe({
-        content: {
-          content: knowledgeDetail, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: {
-            rowid: row.F_Id.toString()
-          } // props
-        },
-        area: ['70%', '75%'],
-        title: '知识库详情'
-      })
-    },
-    // 导入
-    btn_import() {
-      this.$layer.iframe({
-        content: {
-          content: Export, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: {
+      },
+      // 导入
+      btn_import() {
+        this.$layer.iframe({
+          content: {
+            content: Export, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
 
-          } // props
-        },
-        area: ['50%', '70%'],
-        title: '导入'
-      })
+            } // props
+          },
+          area: ['50%', '70%'],
+          title: '导入'
+        })
+      }
     }
   }
-}
 </script>
 
 <style>

CallCenterWeb.UI/RMYY/src/views/reportForm/repairForm/index.vue

@@ -8,6 +8,9 @@
             value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         </el-col>
       </el-form-item>
+      <el-form-item label="报工科室">
+        <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
+      </el-form-item>
       <el-form-item label="报修人：">
         <el-input v-model="ruleForm.applicant" placeholder="请输入报修人姓名或工号" size="medium" />
       </el-form-item>
@@ -103,6 +106,7 @@
         },
         activeNameEcharts: 'first',
         ruleForm: {
+          applicantdept:'',
           startTime: '', // 时间范围
           keyword: '', // 关键字
           ordertypeid: '',
@@ -124,19 +128,7 @@
           typeid: 0,
           pid: 0
         },
-        // option: {
-        //   xAxis: {
-        //     type: 'category',
-        //     data: ['综合调度', '业务咨询', '故障报修', '车辆调度']
-        //   },
-        //   yAxis: {
-        //     type: 'value'
-        //   },
-        //   series: [{
-        //     data: [50, 330, 124, 118],
-        //     type: 'line'
-        //   }]
-        // }
+        deptidArr:[]
       }
     },
     computed: {},
@@ -158,6 +150,9 @@
       //   const chart = echarts.init(document.getElementById('sector'))
       //   chart.setOption(this.option)
       // },
+      getDeptid(data) {
+        this.ruleForm.applicantdept=data[data.length-1]
+      },
       getfirstOrderType(data) {
         this.ruleForm.ordertypeid = data.value
         this.secondOrderTypeParam.typeid = 2
@@ -194,6 +189,7 @@
           applicant: this.ruleForm.applicant,
           maintenancer: this.ruleForm.maintenancer,
           createuser: this.ruleForm.createuser,
+          applicantdept:this.ruleForm.applicantdept,
           isexport: 1
         }
         exportExcel(exporParams, getexportList)
@@ -208,6 +204,7 @@
             endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
             category: this.ruleForm.menutype,
             state:this.ruleForm.state,
+            applicantdept:this.ruleForm.applicantdept,
             applicant: this.ruleForm.applicant,
             maintenancer: this.ruleForm.maintenancer,
             createuser: this.ruleForm.createuser

CallCenterWeb.UI/RMYY/src/views/reportForm/seatWorkReport/index.vue

@@ -6,11 +6,11 @@
         <el-date-picker v-model="ruleForm.startTime" size="medium" type="daterange" format="yyyy-MM-dd"
           value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
-        <el-input v-model="ruleForm.woday" clearable placeholder="请输入月工作天数" class="filter-item" size="medium" />
+        <el-input v-model="ruleForm.usercode" clearable placeholder="请输入工号" class="filter-item" size="medium" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
@@ -70,6 +70,7 @@
         dataLists: [],
         ruleForm: {
           startTime: [],
+          usercode:'',
           dpt:'',
           woday: ''
         },
@@ -95,6 +96,7 @@
           endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
           dayss:this.ruleForm.woday,
           dpt:this.ruleForm.dpt,
+          usercode:this.ruleForm.usercode,
           isExport: 0
         }
         return new Promise(resolve => {
@@ -112,6 +114,7 @@
           endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
           dayss:this.ruleForm.woday,
           dpt:this.ruleForm.dpt,
+          usercode:this.ruleForm.usercode,
           isExport: 1
         }
         exportExcel(exporParams, getSeatListExpt)

CallCenterWeb.UI/RMYY/src/views/scheduleManagement/classManagement/index.vue

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

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

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