1

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

@@ -166,7 +166,7 @@ export function DeptRepairListNewExpt(params) {
     params
   })
 }
-//综合调度情况
+// 综合调度情况
 export function IntegratedDispatch(params) {
   return request({
     url: 'Report/IntegratedDispatch',
@@ -182,3 +182,19 @@ export function IntegratedDispatchExpt(params) {
     params
   })
 }
+// 报工撤工趋势图
+export function RepairNumber(params) {
+  return request({
+    url: 'Report/RepairNumber',
+    method: 'get',
+    params
+  })
+}
+// 撤单
+export function RevokeNumber(params) {
+  return request({
+    url: 'Report/RevokeNumber',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -184,6 +184,40 @@
           <!-- 会诊结束 -->
           <!-- 门诊开始 -->
           <el-row v-if="worktypeInfo3 === 'menzhen'">
+            <el-col :span="24" v-if="!this.wid">
+              <el-form-item label="患者信息">
+                <el-tag :key="tag" v-for="(tag,index) in dynamicTags" size="medium" closable :class="{'bortag':currentIndex==index}"
+                :disable-transitions="false" style="margin-right: 10px;" @close="colsePatient(index,tag)" @click="changePatient(index,tag)"> {{tag}}</el-tag>
+                <el-button icon="el-icon-plus" size="mini" @click="addPatient">新增患者</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="worktypeInfo3 === 'menzhen'">
+            <el-col :span="12" v-if="patientMsgAll[currentIndex]">
+              <el-form-item label="患者姓名">
+                <el-input
+                  v-model="patientMsgAll[currentIndex].name"
+                  placeholder="请输入患者姓名"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="patientMsgAll[currentIndex]">
+              <el-form-item label="患者电话">
+                <el-input
+                  v-model="patientMsgAll[currentIndex].tel"
+                  placeholder="请输入患者电话"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="patientMsgAll[currentIndex]">
+              <el-form-item label="接诊院区">
+                <el-select clearable v-model="patientMsgAll[currentIndex].jzyq">
+                  <el-option v-for="(item,index) in hospitalDataLists" :key="index" :value="item.T_Woid" :label="item.T_Woname"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="worktypeInfo3 === 'menzhen'">
             <el-col :span="12">
               <el-form-item label="双向转诊单">
                 <el-radio-group v-model="ruleForm.F_sxzzd">
@@ -392,13 +426,13 @@
             <el-col v-if="iswomanage != 1" :span="12">
               <el-form-item label="处理方式" prop="opt">
                 <el-radio-group v-model="ruleForm.opt">
-                  <el-radio label="1">立即办理</el-radio>
+                  <el-radio label="1" v-if="worktypeInfo3 !== 'menzhen'">立即办理</el-radio>
                   <el-radio label="3">转派</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="ruleForm.opt == '3' && iswomanage != 1">
+          <el-row v-if="ruleForm.opt == '3' && iswomanage != 1 && worktypeInfo3 !== 'menzhen'">
             <el-col :span="12">
               <el-form-item label="转派科室" prop="clbm">
                 <select-dept-tree
@@ -438,6 +472,7 @@
 </template>
 
 <script>
+import {getListyqRepairlist} from "@/api/systemSetup/roleSetting/hospitalArea";
 import {
   addOrEdittOrder,
   updateWorkOrder,
@@ -510,6 +545,17 @@ export default {
 
   data() {
     return {
+      dynamicTags: ['患者1'],
+      currentIndex:0,
+      currentPatient:'患者1',//患者信息切换
+      hospitalDataLists:[],
+      // patientArrData:['患者1'],
+      patientMsgAll:[
+      {
+        name:"",
+        tel:"",
+        jzyq:""
+      }],
       zpdptname: '',
       zppername: '',
       typeid: 1,
@@ -703,6 +749,10 @@ export default {
         this.zpdptname = '被表扬科室'
         this.zppername = '被表扬人'
       }
+      if(this.worktypeInfo3 === 'menzhen'){
+        this.getListyq()
+        this.ruleForm.opt = '3'
+      }
       if (this.ruleForm.F_Type2) {
         this.getAuto()
       }
@@ -734,6 +784,45 @@ export default {
     this.getRelations()
   },
   methods: {
+    getListyq(){
+      const params = {
+        pageindex: 1, // 第几页
+        pagesise: 100, // 每页几条信息
+      };
+      getListyqRepairlist(params).then(res=>{
+         this.hospitalDataLists = res.rows;
+      })
+    },
+    addPatient(){
+      var item = this.dynamicTags[this.dynamicTags.length-1]
+      const index = Number(item.substr(item.length-1,1))+1
+      this.dynamicTags.push('患者'+index)
+      this.patientMsgAll.push({
+        name:'',
+        tel:'',
+        jzyq:''
+      })
+      if(this.dynamicTags.length>1){
+        this.currentIndex = this.dynamicTags.length-1
+      }else{
+        this.currentIndex = 0
+      }
+    },
+    changePatient(index,data){
+      this.currentIndex = index
+    },
+    colsePatient(index,tag){
+      if(this.dynamicTags.length==1){
+        return
+      }
+      if(index>0){
+        this.currentIndex = index-1
+      }else{
+        this.currentIndex = 0
+      }
+      this.patientMsgAll.splice(index, 1)
+      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+    },
     getAuto() {
       this.deptidArr1 = []
       this.repairman1 = []
@@ -963,6 +1052,12 @@ export default {
               this.ruleForm.F_Relationship = res.F_Relationship
               this.ruleForm.EmergencyTypes = res.F_EmergencyTypes
               // 门会诊开始
+              this.currentIndex = 0
+              this.patientMsgAll = [{
+                name: res.F_FullName,
+                tel: res.F_hzdh,
+                jzyq: res.F_JzYq
+              }]
               this.ruleForm.F_Yqname = res.F_ssyy
               if(res.F_sxzzd){
                 this.ruleForm.F_sxzzd = res.F_sxzzd.toString()
@@ -1009,6 +1104,8 @@ export default {
         .catch(() => {})
     },
     async submitForm() {
+      // console.log(this.patientMsgAll)
+      // return
       if (this.telTopRightState == '通话中') {
         this.$message('请挂断后再提交工单')
         return
@@ -1017,11 +1114,11 @@ export default {
         this.$message.error('请选择工单类别')
         return
       }
-      var resTypeArr = this.$store.getters.workTypeMap[parseInt(this.ruleForm.F_Type2)].ids
-      if(resTypeArr[0] != 1000){
-        this.$message.error('业务类别与工单类别不匹配，请重新选择')
-        return
-      }
+      // var resTypeArr = this.$store.getters.workTypeMap[parseInt(this.ruleForm.F_Type2)].ids
+      // if(resTypeArr[0] != 1000){
+      //   this.$message.error('业务类别与工单类别不匹配，请重新选择')
+      //   return
+      // }
       if (this.iswomanage == 1) {
         this.ruleForm.clbm = ''
         this.ruleForm.clid = ''
@@ -1037,10 +1134,18 @@ export default {
           this.ruleForm.F_sbxq = ''
           this.ruleForm.F_ryxq = ''
         }
+        const indexnum = this.patientMsgAll.findIndex((o) => {
+          return !o.name || !o.tel || !o.jzyq
+        })
+        if (indexnum >= 0) {
+          this.$message.error('请填入对应患者信息')
+          return
+        }
       }
       if(this.worktypeInfo3 == 'huizhen'){
         this.ruleForm.F_lyfs = ''
         this.ruleForm.F_sxzzd = ''
+        this.patientMsgAll = null
       }
       await this.clickEye()
       this.$refs.ruleForm.validate((valid) => {
@@ -1087,6 +1192,7 @@ export default {
             F_lyfs: this.ruleForm.F_lyfs,//来院方式
             F_sqhzsj: this.ruleForm.F_sqhzsj,//申请会诊时间
             F_jzsj: this.ruleForm.F_jzsj,//就诊时间
+            Hzxx: this.patientMsgAll
           }
           // 添加
           if (!this.wid) {
@@ -1302,3 +1408,13 @@ export default {
   }
 }
 </style>
+<style rel="stylesheet/scss" lang="scss" scoped="scoped">
+  .bortag{
+    font-weight: bold;
+  }
+  /deep/.el-radio-button__inner {
+    margin-right: 15px;
+    border-radius: 0 !important;
+    border: 1px solid rgb(205, 205, 205);
+  }
+</style>

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeServiceReport/index.vue

@@ -213,9 +213,9 @@ export default {
     getTreeList() {
       return new Promise((resolve) => {
         getOrderTypeDrop(this.pid).then((response) => {
-          if (response.state.toLowerCase() === "success") {
-            this.orderData = response.data;
-          }
+          // if (response.state.toLowerCase() === "success") {
+            this.orderData = JSON.parse(response)
+          // }
         });
         resolve();
       });

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeWorkReport/cpns/LineBack.vue

@@ -0,0 +1,85 @@
+<template>
+  <div>
+    <back-chart ref="backChart"></back-chart>
+  </div>
+</template>
+<script>
+import backChart from "./backChart.vue";
+import { RepairNumber,RevokeNumber } from "@/api/leadConcern/leadConcern";
+
+export default {
+  components: { backChart },
+  name: "LineBack",
+  data() {
+    return {
+      cardData: [
+        { text: "总量", value: 0 },
+        { text: "故障报修", value: 0 },
+        { text: "综合调度", value: 0 },
+        { text: "车辆调度", value: 0 },
+      ],
+    };
+  },
+  mounted() {
+    // this.getDeptRepairReport();
+  },
+  methods: {
+    initLineChart(getParams) {
+      delete getParams.deptid;
+      this.getDeptRepairReport(getParams);
+      this.getDeptRevokeReport(getParams);
+    },
+    getDeptRepairReport(getParams) {
+      const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      RepairNumber(getParams).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          const res = response.data;
+          const deptnameData = [];
+          const allnumData = [];
+          const gzbxData = [];
+          const zhddData = [];
+          const clddData = [];
+          res.forEach((element) => {
+            deptnameData.push(element.deptname);
+            allnumData.push(element.allnum);
+            gzbxData.push(element.gzbx);
+            zhddData.push(element.zhdd);
+            clddData.push(element.cldd);
+          });
+          this.$refs.backChart.initChart(
+            deptnameData,
+            allnumData,
+            gzbxData,
+            zhddData,
+            clddData
+          );
+        }
+        loading.close();
+      });
+    },
+    getDeptRevokeReport(getParams){
+      RevokeNumber(getParams).then((response) => {
+         if (response.state.toLowerCase() === "success") {
+           const res = response.data.dtall;
+           const deptarr = []
+           const numarr = []
+           res.forEach((element) => {
+             deptarr.push(element.deptname)
+             numarr.push(element.allnum)
+           });
+           this.$refs.backChart.initChartTwo(
+             deptarr,
+             numarr
+           );
+         }
+      })
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeWorkReport/cpns/LineChart.vue

@@ -2,9 +2,9 @@
   <div id="gzbx_chart2" :class="className" :style="{ height: height, width: width }" />
 </template>
 <script>
-  import {
-    mapDeptRepairReport
-  } from "@/api/leadConcern/leadConcern";
+  // import {
+  //   mapDeptRepairReport
+  // } from "@/api/leadConcern/leadConcern";
   // import getdate from "@/utils/getdate";
   export default {
     props: {
@@ -69,12 +69,12 @@
           },
           tooltip: {
             trigger: "axis",
-            axisPointer: { 
+            axisPointer: {
               type: 'cross',
              crossStyle: {
                 color: '#999'
               }
             },
             formatter(params) {
-              console.log(params)
+              // console.log(params)
               let str = params[0].name + '<br />'
               params.forEach(item => {
                 if (item.seriesName === '总量' || item.seriesName === '完成量') {

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeWorkReport/cpns/backChart.vue

@@ -0,0 +1,187 @@
+<template>
+  <div>
+    <div id="gzbx_chart3" :class="className" style="margin: 0 auto;" :style="{ height: height, width: width }" />
+    <div id="gzbx_chart4" :class="className" style="margin: 0 auto;margin-top: 20px;" :style="{ height: height, width: width }" />
+  </div>
+</template>
+<script>
+  // import {
+  //   mapDeptRepairReport
+  // } from "@/api/leadConcern/leadConcern";
+  // import getdate from "@/utils/getdate";
+  export default {
+    props: {
+      className: {
+        type: String,
+        default: "chart",
+      },
+      width: {
+        type: String,
+        default: "1600px",
+      },
+      height: {
+        type: String,
+        default: "300px",
+      },
+      chartsTwoValue: {
+        type: String,
+        default: "1",
+      },
+      dataType: {
+        type: String,
+        default: "1",
+      },
+    },
+    watch: {
+      chartsTwoValue: function() {
+        this.statisticsTopFiveReport();
+      },
+      dataType: function() {
+        this.statisticsTopFiveReport();
+      },
+    },
+    data() {
+      return {
+        gzbxData: [],
+        chart: null,
+        echartsData: [],
+        userNameData: [],
+        committedData: [],
+        uncommittedData: [],
+      };
+    },
+    mounted() {
+      // this.getDeptRepairReport();
+      // this.initChart();
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return;
+      }
+      this.chart.dispose();
+      this.chart = null;
+    },
+    methods: {
+      initChart(xAxisData, seriesData1, seriesData2, seriesData3,seriesData4) {
+        const myChart = this.$echarts.init(
+          document.getElementById("gzbx_chart3")
+        );
+        myChart.setOption({
+          title: {
+            text: "",
+          },
+          tooltip: {
+            trigger: "axis",
+            show: true,
+            formatter(params) {
+              console.log(params)
+              // let str = params[0].name + '<br />'
+              let str = '';
+              var num = 0;
+              var addstr = params[0].name + '<br />';
+              params.forEach(item => {
+                num += item.data
+                if (item.seriesName === '故障报修' || item.seriesName === '综合调度' || item.seriesName === '车辆调度') {
+                  str += `${item.marker}${item.seriesName}: ${item.data}<br />`
+                }
+              })
+              addstr += `总量: ${num}<br />`
+              return "<div style='color:#fff'>" + addstr + str + "</div>"
+            }
+          },
+          legend: {
+            data: ["故障报修", "综合调度","车辆调度"],
+          },
+          grid: {
+            left: "3%",
+            right: "4%",
+            bottom: "3%",
+            containLabel: true,
+          },
+          toolbox: {
+            feature: {
+              saveAsImage: {},
+            },
+          },
+          xAxis: {
+            type: "category",
+            boundaryGap: false,
+            data: xAxisData,
+            axisLabel:{interval: 0}
+          },
+          yAxis: {
+            type: "value",
+          },
+          color:["#8babde","#a3d7c4","#e3d29f"],
+          series: [
+            // {
+            //   name: "总量",
+            //   type: "line",
+            //   data: seriesData1,
+            // },
+            {
+              name: "故障报修",
+              type: "line",
+              data: seriesData2,
+            },
+            {
+              name: "综合调度",
+              type: "line",
+              data: seriesData3,
+            },
+            {
+              name: "车辆调度",
+              type: "line",
+              data: seriesData4,
+            },
+          ],
+        });
+      },
+      initChartTwo(xAxisData, seriesData1){
+        const myChart2 = this.$echarts.init(
+          document.getElementById("gzbx_chart4")
+        );
+        myChart2.setOption({
+          title: {
+            text: "科室撤单趋势图",
+          },
+          tooltip: {
+            trigger: "axis",
+            show: true,
+          },
+          legend: {
+            // data: ["总量"],
+            show:false
+          },
+          grid: {
+            left: "3%",
+            right: "4%",
+            bottom: "3%",
+            containLabel: true,
+          },
+          toolbox: {
+            feature: {
+              saveAsImage: {},
+            },
+          },
+          xAxis: {
+            type: "category",
+            boundaryGap: false,
+            data: xAxisData,
+            axisLabel:{interval: 0}
+          },
+          yAxis: {
+            type: "value",
+          },
+          color:["#8babde","#bad7cd","#e3d8b5"],
+          series: [{
+              name: "撤单总量",
+              type: "line",
+              data: seriesData1,
+            },
+          ],
+        });
+      }
+    },
+  };
+</script>

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeWorkReport/index.vue

@@ -14,15 +14,20 @@
           end-placeholder="结束日期"
         />
       </el-form-item>
-      <el-form-item label="报工科室">
+      <el-form-item label="报工科室" v-if="activeName != 'second'">
         <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
       </el-form-item>
+     <el-form-item label="院区" v-if="activeName === 'second'">
+        <el-select v-model="ruleForm.yqid" placeholder="请选择院区" clearable size="medium">
+          <el-option v-for="(item,index) in hospitalDataLists" :key="index" :value="item.T_Woid" :label="item.T_Woname"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" size="medium" @click="btn_search_task"
           >查询</el-button
         >
         <el-button
-          v-if="activeName === 'second'"
+          v-if="activeName === 'third'"
           type="primary"
           size="medium"
           @click="btn_export"
@@ -34,7 +39,10 @@
       <el-tab-pane label="趋势图" name="first">
         <report-charts ref="reportCharts"></report-charts>
       </el-tab-pane>
-      <el-tab-pane label="表格" name="second">
+      <el-tab-pane label="报工撤工趋势图" name="second">
+        <line-back ref="LineBack"></line-back>
+      </el-tab-pane>
+      <el-tab-pane label="表格" name="third">
         <report-list ref="reportList"></report-list>
       </el-tab-pane>
     </el-tabs>
@@ -44,13 +52,15 @@
 <script>
 import reportCharts from "./cpns/reportCharts";
 import reportList from "./cpns/reportList";
+import LineBack from "./cpns/LineBack";
 import { deptRepairReportExpt,DeptRepairListNewExpt } from "@/api/leadConcern/leadConcern";
 
 import { getNowDate, exportExcel, getFirstDayInCurrentMonth } from "@/utils";
+import { getListyqRepairlist } from "@/api/systemSetup/roleSetting/hospitalArea";
 
 export default {
   name: "officeWorkReportNew",
-  components: { reportCharts, reportList },
+  components: { reportCharts, reportList,LineBack },
   data() {
     return {
       startTime: [
@@ -64,7 +74,7 @@ export default {
         yqid: "",
         deptid: "", // 部门id
       },
-
+      hospitalDataLists:[],
       deptidArr: [],
       activeName: "first",
     };
@@ -75,16 +85,26 @@ export default {
   },
   methods: {
     getDeptid(data) {
+      console.log(data)
       if (data.length > 1) {
         delete this.ruleForm.yqid;
         this.ruleForm.deptid = data[data.length - 1];
       } else {
         delete this.ruleForm.deptid;
-        this.ruleForm.yqid = data[data.length - 1];
+        this.ruleForm.yqid = Number(data[data.length - 1]);
       }
     },
-    handleClick(tab, event) {
-      console.log(tab, event);
+    handleClick(tab) {
+      console.log(tab.name);
+      if(tab.name == 'second'){
+        const params = {
+          pageindex: 1, // 第几页
+          pagesise: 100, // 每页几条信息
+        }
+        getListyqRepairlist(params).then(res=>{
+          this.hospitalDataLists = res.rows;
+        })
+      }
     },
     btn_search_task() {
       this.ruleForm.starttime = this.startTime && this.startTime[0];
@@ -92,6 +112,7 @@ export default {
       this.ruleForm.isdc = 0;
       this.$refs.reportCharts.initLineChart(this.ruleForm);
       this.$refs.reportList.getList(this.ruleForm);
+      this.$refs.LineBack.initLineChart(this.ruleForm);
     },
     btn_export() {
       this.ruleForm.isdc = 1;