Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/lang/zh.js

@@ -237,7 +237,7 @@ export default {
     basicConfig:'基础配置',
 
     histemplate:'处方模版',
-
+    outpatientSickRecord:"人员定点病种备案",
     airDisinfect:'空气消毒',
     objectTableDisinfect:'物表消毒'
 

src/router/index.js

@@ -28,7 +28,6 @@ import outpatientDoctorStation from './modules/outpatientDoctorStation'
 import outpatientCharges from './modules/outpatientCharges'
 import outpatientPharmacy from './modules/outpatientPharmacy'
 import outpatientRecord from './modules/outpatientRecord'
-
 import kuyiShopping from './modules/kuyiShopping'
 import createPatient from './modules/createPatient'
 import dialysisRecord from './modules/dialysisRecord'

src/router/modules/outpatientRecord.js

@@ -13,10 +13,10 @@ export default {
   },
   children: [
     {
-      path: '/outpatientRecord/outpatientRecord',
-      component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
-      name: 'outpatientRecord',
-      meta: { title: 'outpatientRecord', noCache: true }
+        path: '/outpatientRecord/outpatientRecord',
+        component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
+        name: 'outpatientSickRecord',
+        meta: { title: 'outpatientSickRecord', noCache: true }
     },
   ]
 }

src/views/layout/Layout.vue

@@ -123,7 +123,7 @@ export default {
   },
   created(){
     console.log('permission_routers',this.permission_routers)
-    let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
+    let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord']
     let bingli = ['User','createPatient']
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement']

src/views/layout/components/Sidebar/index.vue

@@ -69,7 +69,7 @@ export default {
     navTitle:{
       handler(newVal,oldVal){
         if(newVal == '门诊管理'){
-          let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
+          let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {

src/xt_pages/data/components/consumables.vue

@@ -872,11 +872,17 @@
             var that = this
             axios.get('http://127.0.0.1:9532/sz/api/goods/get',{ params: params }).then(function(response) {
             if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
+                  that.$message.error(response.data.data.msg)
                   return false
                 } else {
-                  that.$message({ message: '备案成功', type: 'success' })
+                 if(response.data.data.msg == ""){
+                  that.$message.success("备案成功!")
                   that.getList()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                  that.getList()
+                }
                 }
               }).catch(function(error) {
             })
@@ -893,11 +899,17 @@
           }
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+               that.$message.error(response.data.data.msg)
                return false
             } else {
-              that.$message({ message: '操作成功', type: 'success' })
-              that.getList()
+              if(response.data.data.msg == ""){
+                  that.$message.success("备案成功!")
+                  that.getList()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                  that.getList()
+               }
              }
            }).catch(function(error) {
         })

src/xt_pages/data/components/drugs.vue

@@ -57,6 +57,9 @@
       <div>
         <el-button type="primary" @click="openForm(0)">新增</el-button>
         <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
+
+        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+
       </div>
     </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
@@ -66,7 +69,7 @@
           align="center"
           type="selection"
           width="55"
-       ></el-table-column>        
+       ></el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
 
       <el-table-column prop="date" label="药品名称" align="center" width="100">
@@ -138,10 +141,17 @@
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
           <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
-        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+
+        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >
           <span v-if="scope.row.is_mark == 0">备案</span>
           <span v-if="scope.row.is_mark == 1">撤消</span>
         </el-button>
+
+
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+            <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
+            <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -207,7 +217,7 @@
         is_record:"",
         is_inject: '',
         list: [],
-    
+
         isCreated: 1,
         manufacturers: [],
         title: '',
@@ -327,12 +337,34 @@
             label: '未备案'
           }],
         value: '',
-       
+
         dealer:[],
         selectDrug:[],
       }
     },
     methods: {
+      GDYBBatchPutOnRecord(){
+        var that = this
+        let params = {
+          'type':1,
+          'admin_user_id':this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+          }
+        }).catch(function(error) {
+        })
+
+      },
       handleSizeChange(val) {
         this.limit = val
         this.getList()
@@ -401,7 +433,7 @@
         } else if (val.id == 0) {
           //新增
           console.log("vale222222",val)
-         
+
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -426,11 +458,11 @@
           } else {
               var obj = {id:0,manufacturer_name:"全部"}
               this.manufacturers.push(obj)
-          
+
             for (let i = 0; i < response.data.data.manufacturer.length; i++) {
               this.manufacturers.push(response.data.data.manufacturer[i])
             }
-          
+
           }
         })
       },
@@ -531,10 +563,10 @@
               }
 
               this.formValue.record_date = this.getTime(this.formValue.record_date)
-               
+
               if(this.formValue.drug_category == 0){
                   this.formValue.drug_category = ""
-              } 
+              }
               if(this.formValue.drug_control == 0){
                   this.formValue.drug_control = ""
               }
@@ -561,7 +593,7 @@
               }
               if(this.formValue.is_mark == 0){
                  this.formValue.is_mark = ""
-              }  
+              }
               if(this.formValue.prescription_mark == 0){
                   this.formValue.prescription_mark = ""
               }
@@ -627,6 +659,59 @@
       },
      getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)
+      },putOnUnRecord(id){
+        var that = this
+        let params = {
+          'id':id,
+          'type':0,
+          'admin_user_id':this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/uncheckcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+              // for (let i = 0; i < that.tableData.length; i++) {
+              //   if (that.tableData[i].id == that.currentObject.id) {
+              //     that.tableData[i].record.is_cancel == 1
+              //   }
+              // }
+            }
+
+          }
+        }).catch(function(error) {
+        })
+      },putOnRecord(id){
+        var that = this
+        let params = {
+          'id':id,
+          'type':0,
+          'admin_user_id':this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+              // for (let i = 0; i < that.tableData.length; i++) {
+              //   if (that.tableData[i].id == that.currentObject.id) {
+              //     that.tableData[i].record.is_cancel == 1
+              //   }
+              // }
+            }
+
+
+
+          }
+        }).catch(function(error) {
+        })
       },
       // toRecord(){
       //    var that = this
@@ -652,11 +737,18 @@
           }
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+               that.$message.error(response.data.data.msg)
                return false
             } else {
-              that.$message({ message: '操作成功', type: 'success' })
-              that.getList()
+              if(response.data.data.msg == ""){
+                  that.$message.success("备案成功!")
+                  that.getList()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                  that.getList()
+               }
+
              }
            }).catch(function(error) {
         })
@@ -668,7 +760,7 @@
           return false;
         } else {
           this.dealer = response.data.data.dealer;
-         
+
         }
        });
       },
@@ -708,32 +800,34 @@
           ids.push(this.selectDrug[index].id);
           idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
         }
-      
+
         var idss = ids.join(',')
         let params = {
           ids:idss,
           admin_user_id:this.$store.getters.xt_user.user.id
         }
-       
+
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/drug/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+
+               that.$message.error(response.data.data.msg)
                return false
             } else {
-              if(response.data.msg != ""){
-                that.$message.success(response.data.msg)
-              }
-              if(response.data.msg == ""){
-               that.$message.success("备案成功")
-              }
-              that.getList()
+               if(response.data.data.msg == ""){
+                  that.$message.success("备案成功!")
+                  that.getList()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                   that.getList()
+               }
              }
            }).catch(function(error) {
         })
        });
      },
-    }, 
+    },
     created() {
       this.getList()
       this.getAllManufacturer()

src/xt_pages/data/components/editInspection.vue

@@ -30,7 +30,7 @@
                         </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="组套类型 : " prop="name" style="width:50%">
+                <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
                     <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
                         <el-option
                         v-for="item in options"
@@ -211,7 +211,13 @@ export default {
                  this.form.pinyin = projectTeamDetail.pinyin
                  this.form.wubi  = projectTeamDetail.wubi
                  this.form.tube_color = projectTeamDetail.tube_color
+                 if(projectTeamDetail.tube_color == 0){
+                    this.form.tube_color = ""
+                 }
                  this.form.team_type = projectTeamDetail.team_type
+                 if(projectTeamDetail.team_type == 0){
+                    this.form.team_type = ""
+                 }     
                  this.form.remark = projectTeamDetail.remark
                  this.form.item_id = projectTeamDetail.item_id
                 //  console.log("project",projectTeamDetail)

src/xt_pages/data/components/project.vue

@@ -278,11 +278,17 @@ export default {
          
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+               that.$message.error(response.data.data.msg)
                return false
             } else {
-              that.$message({ message: '操作成功', type: 'success' })
-              that.getlist()
+              if(response.data.data.msg == ""){
+                  that.$message.success("备案成功!")
+                  that.getlist()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                  that.getlist()
+               }
              }
            }).catch(function(error) {
         })
@@ -325,11 +331,17 @@ export default {
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/treatment/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+               that.$message.error(response.data.data.msg)
                return false
             } else {
-              that.$message({ message: '备案成功', type: 'success' })
-              that.getList()
+              if(response.data.data.msg == ""){
+                  that.$message.success("备案成功!")
+                  that.getlist()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                  that.getlist()
+               }
              }
            }).catch(function(error) {
         })

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -314,6 +314,9 @@
         diagnoses:[],
         sick:[],
         allergic_history:"",
+        form:{
+          id:0,
+        }
       }
     },
     methods: {
@@ -365,7 +368,8 @@
             "remark":this.case_history.remark,
             "sick":this.case_history.sick,
             "diagnose":this.case_history.diagnose,
-            "allergic_history":this.allergic_history
+            "allergic_history":this.allergic_history,
+            "id":this.form.id,
           }
           console.log("prams222",params)
           createCaseHistory(params).then(response => {
@@ -402,7 +406,7 @@
                 this.case_history.remark = templatedetail.remark
                 this.case_history.sick = templatedetail.sick
                 this.case_history.diagnose = templatedetail.diagnose
-                // this.allergic_history = templatedetail.allergic_history
+                
               }
           })
         },
@@ -569,7 +573,8 @@
         if(this.case_history.diagnose == 0){
            this.case_history.diagnose = ""
         }
-        // this.allergic_history = this.case_history.allergic_history
+        this.form.id = this.case_history.id
+        this.allergic_history = this.case_history.allergic_history
         
       }
     }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -743,6 +743,7 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
+            console.log("病历222222",this.case_history)
             this.info = response.data.data.info
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
@@ -970,8 +971,7 @@
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
-                // var case_history = response.data.data.case_history
-                // console.log("礼拜2222222222",this.case_history)
+                console.log("数据列表是多少",this.case_history)
                 var month_prescriptions = response.data.data.month_prescriptions
                 this.setMonthPrescription(month_prescriptions)
                 this.doctors = response.data.data.doctors
@@ -1144,9 +1144,7 @@
               this.patientInfo = response.data.data.xt_info
               this.hisPatientInfo = response.data.data.his_info
               this.case_history = response.data.data.case_history
-              // var case_history = response.data.data.case_history
-              // console.log("礼拜2223332222222",this.case_history)
-              // this.case_history = case_history
+              console.log("数据是22222多少",this.case_history)
               this.info = response.data.data.info
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -17,7 +17,7 @@
               <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
               <div>地址：{{item.patient.home_address}}</div>
-              <div style="display:flex;width:50%;">临床诊断：{{item.patient.diagnose}}</div>
+              <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
           </div>
           <div class="prescriptionBox">
               <div class="Rp">Rp:</div>
@@ -85,7 +85,8 @@ export default {
         department:[],
         prescriptions:[],
         projectList:[],
-        orgname:""
+        orgname:"",
+        diagnoses:[],
       }
     },
    methods:{
@@ -132,6 +133,7 @@ export default {
             console.log("adviceprint9999",advicePrint)
             this.advicePrint = advicePrint
             this.prescriptions = advicePrint
+            console.log("处方222222",this.prescriptions)
             var hisPatient = response.data.data.hisPatient
             console.log("hisPatient",hisPatient)
             this.hisPatient = hisPatient
@@ -157,7 +159,8 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-           
+            this.diagnoses = response.data.data.diagnose
+            console.log("争端",this.diagnoses)
           }
        })
      },
@@ -222,6 +225,16 @@ export default {
         return project_name
      },
 
+     getDiagnosis(id){
+        var name = ""
+        for(let i=0;i<this.diagnoses.length;i++){
+          if(id == this.diagnoses[i].id){
+             name = this.diagnoses[i].class_name
+          }
+        }
+        return name
+     }
+
    },
    created(){
       this.getAllDoctorList()

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -33,7 +33,7 @@
             <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}</div>
             <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
             <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
-            <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
+            <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
         </div>
 
         <div class="prescriptionBox">
@@ -221,6 +221,7 @@
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import {getAllDoctorList,getPrescriptionPrint} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
 export default {
     props:{
       patient_id:Number,
@@ -247,7 +248,8 @@ export default {
           {value: 6,label:'职工'},
           {value: 7,label:'合同'}
          ],
-         hisPatient:{}
+         hisPatient:{},
+         diagnoses:[]
       }
     },
    methods:{
@@ -371,12 +373,31 @@ export default {
 
         return total + addtotal
       },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.diagnoses = response.data.data.diagnose
+            console.log("争端",this.diagnoses)
+          }
+       })
+     },
+     getDiagnosis(id){
+        var name = ""
+        for(let i=0;i<this.diagnoses.length;i++){
+          if(id == this.diagnoses[i].id){
+             name = this.diagnoses[i].class_name
+          }
+        }
+        return name
+     }
    },
    created(){
+      this.getInitData()
       this.getAllDoctorList()
       this.getPrescriptionPrint()
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
+
    },
    watch:{
      patient_id:function(val){

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -17,6 +17,7 @@
             </div>
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      v-loading="patientLoading"
                       highlight-current-row>
                 <el-table-column
                         prop="date"
@@ -30,7 +31,7 @@
                     <template slot-scope="scope">{{scope.row.trt_dcla_detl_sn}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="时间">
-                    <template slot-scope="scope">{{getTimes(scope.row.ctime)}}</template>
+                    <template slot-scope="scope" v-if="scope.row.ctime > 0">{{getTimes(scope.row.ctime)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="姓名">
                     <template slot-scope="scope">{{scope.row.name}}</template>
@@ -50,15 +51,16 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" width="160" label="鉴定定点医药机构">
                     <template slot-scope="scope">
-                        {{scope.row.org_name}}
+                        {{$store.getters.xt_user.org.org_name}}
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生">
                     <template slot-scope="scope">
-                        <el-select v-model="scope.row.doctor_id" placeholder="请选择">
+                        <el-select v-model="scope.row.record.doctor_id" placeholder="请选择"
+                                   @change="changeDoctor(scope.row,scope.row.record.doctor_id)">
                             <el-option
-                                    v-for="item in doctorList"
-                                    :key="item.admin_user_id"
+                                    v-for="(item,index) in doctorList"
+                                    :key="index"
                                     :label="item.user_name"
                                     :value="item.admin_user_id">
                             </el-option>
@@ -67,7 +69,8 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="科室">
                     <template slot-scope="scope">
-                        <el-select style="margin-right:5px;width:140px;" v-model="scope.row.department_id" placeholder="请选择">
+                        <el-select style="margin-right:5px;width:140px;" v-model="scope.row.record.department_id"
+                                   placeholder="请选择">
                             <el-option
                                     v-for="(item,index) in department"
                                     :key="index"
@@ -79,7 +82,6 @@
                 </el-table-column>
 
 
-
                 <el-table-column align="center" prop="name" label="险种类型">
                     <template slot-scope="scope">
                         <div v-if="scope.row.insutype == '310'">职工基本医疗保险</div>
@@ -105,11 +107,11 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column prop="date" label="操作" width="250" align="center" fixed="right">
+                <el-table-column prop="date" label="操作" width="80" align="center" fixed="right">
                     <template slot-scope="scope">
                         <el-button type="primary" size="small" icon="el-icon-refresh-left">
-                            <span v-if="scope.row.is_cancel == 0">备案</span>
-                            <span v-if="scope.row.is_cancel == 2">撤消</span>
+                            <span v-if="scope.row.record.is_cancel == 0 ||scope.row.record.is_cancel == 2" @click="putOnRecord(1,scope.row)">备案</span>
+                            <span v-if="scope.row.record.is_cancel == 1" @click="putOnRecord(2,scope.row)">撤消</span>
                         </el-button>
                     </template>
                 </el-table-column>
@@ -118,7 +120,7 @@
             <el-dialog title="备案" :visible.sync="dialogFormVisible">
                 <el-form :model="form" label-width="100px">
                     <el-form-item label="险种类型" :label-width="formLabelWidth">
-                        <el-select v-model=" insutype" placeholder="请选择" style="width: 200px;">
+                        <el-select v-model="insutype" placeholder="请选择" style="width: 200px;">
                             <el-option
                                     v-for="item in insutypes"
                                     :key="item.value"
@@ -135,14 +137,25 @@
             </el-dialog>
         </div>
 
-
+        <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :page-sizes="[10, 50, 100]"
+                :page-size="10"
+                background
+                style="margin-top:20px;float: right"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="total"
+
+        >
+        </el-pagination>
     </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getRecordList,getAllDoctorList,getInitData } from '@/api/his/his'
+  import { getAllDoctorList, getInitData, getRecordList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
@@ -153,14 +166,16 @@
     },
     data() {
       return {
+        currentObject: null,
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '医保费用对照' }
         ],
         tableData: [],
-        doctorList:[],
-        department:[],
-        sick:[],
+        doctorList: [],
+        department: [],
+        patientLoading: false,
+        sick: [],
         limit: 10,
         page: 1,
         dialogFormVisible: false,
@@ -170,7 +185,7 @@
         end_time: '',
         insutype: '',
         check_type: '',
-
+        keywords: '',
         options: [
           {
             value: 1,
@@ -211,6 +226,61 @@
       }
     },
     methods: {
+      putOnRecord(type, row) {
+        if (type == 1) {
+          this.dialogFormVisible = true
+          this.currentObject = row
+        } else {
+          this.$confirm('是否撤销备案', '撤销备案', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'id': row.id,
+              'admin_user_id': this.$store.getters.xt_user.user.id
+
+            }
+            var that = this
+            axios.get('http://127.0.0.1:9532/api/psn/ncds/unputonrecord', {
+              params: params
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+
+                  if(response.data.data.failed_code == -10){
+                    that.$message.error(response.data.data.msg)
+                  }else{
+                    row.record.is_cancel = 2
+                    that.$message({ message: '撤销成功', type: 'success' })
+                  }
+                }
+              })
+              .catch(function(error) {
+
+              })
+
+          }).catch(() => {
+
+          })
+
+        }
+
+      },
+      changeDoctor(row, id) {
+        for (let i = 0; i < this.doctorList.length; i++) {
+          if (id == this.doctorList[i].admin_user_id) {
+            if (this.doctorList[i].department_id == 0) {
+              row.record.department_id = ''
+            } else {
+              row.record.department_id = this.doctorList[i].department_id
+            }
+          }
+        }
+      },
       getInitData() {
         getInitData().then(response => {
           if (response.data.state == 0) {
@@ -225,69 +295,40 @@
         })
 
       },
-      getSickName(id){
-
+      getSickName(id) {
 
       },
       confirm() {
-        if (this.check_type == 1) {
-          let params = {
-            start_time: this.start_time,
-            end_time: this.end_time,
-            insutype: this.insutype,
-            clr_type: '11'
-          }
-
-          var that = this
-
-          if (this.$store.getters.xt_user.org_id == 9919) {
-            axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
-              params: params
-            })
-              .then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
-                  return false
-                } else {
-                  this.page = 1
-                  this.limit = 10
-                  this.keywords = ''
-                  this.getList()
+        let params = {
+          record_type: 0,
+          patient_id: this.currentObject.id,
+          admin_user_id: this.$store.getters.xt_user.user.id
+        }
 
+        var that = this
+        axios.get('http://127.0.0.1:9532/api/psn/ncds/putonrecord', {
+          params: params
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              if(response.data.data.failed_code == -10){
+                that.$message.error(response.data.data.msg)
+              }else{
+                for (let i = 0; i < that.tableData.length; i++) {
+                  if (that.tableData[i].id == that.currentObject.id) {
+                    that.tableData[i].record.is_cancel == 1
+                  }
                 }
-              })
-              .catch(function(error) {
-
-              })
-
-          }
-
-        } else {
-          let params = {
-            start_time: this.start_time,
-            end_time: this.end_time
-          }
-          var that = this
-          axios.get('http://127.0.0.1:9532/api/checkdetailaccount/get', {
-            params: params
-          })
-            .then(function(response) {
-              if (response.data.state == 0) {
-                that.$message.error(response.data.msg)
-                return false
-              } else {
-                this.page = 1
-                this.limit = 10
-                this.keywords = ''
-                this.getList()
               }
-            })
-            .catch(function(error) {
 
-            })
-
-        }
+            }
+          })
+          .catch(function(error) {
 
+          })
       },
       getInsutype(type) {
 
@@ -316,16 +357,32 @@
           'page': this.page,
           'limit': this.limit,
           'keywords': this.keywords
-
         }
         this.tableData = []
-        getList(params).then(response => {
+        this.patientLoading = true
+        getRecordList(params).then(response => {
           if (response.data.state == 0) {
+            this.patientLoading = false
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.patientLoading = false
             this.tableData = response.data.data.list
             this.total = response.data.data.total
+
+            for (let i = 0; i < this.tableData.length; i++) {
+
+              if (this.tableData[i].record.doctor_id == 0) {
+                this.tableData[i].record.doctor_id = ''
+
+              }
+              if (this.tableData[i].record.department_id == 0) {
+                this.tableData[i].record.department_id = ''
+              }
+
+            }
+
           }
         })
 
@@ -338,10 +395,13 @@
         this.page = page
         this.getList()
 
+      }, searchAction() {
+        this.getList()
       }
     },
     created() {
       this.getList()
+      this.getInitData()
       this.fetchAllAdminUsers()
 
     }

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -299,6 +299,7 @@
 
       },
       changeProject(val) {
+        console.log("Val222222",val)
         this.query.page = 1
         let item_inspection_reference = []
         for (let i = 0; i < this.all_inspection_reference.length; i++) {
@@ -307,6 +308,7 @@
           }
         }
         this.item_columns = item_inspection_reference
+        
         var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
         console.log("projectInfo",projectInfo)
         this.query.project_id = projectInfo.project_id
@@ -338,7 +340,7 @@
               let project = []
               let item = []
               this.all_inspection_reference = resp.data.references
-               console.log("====",this.all_inspection_reference)
+               console.log("====hhh",this.all_inspection_reference)
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
                 project.push(this.all_inspection_reference[i])
               }
@@ -356,7 +358,7 @@
                   item.push(this.all_inspection_reference[i])
                 }
               }
-             console.log("item",item)
+             console.log("item9999888888",item)
               this.item_columns = item
               this.item_name = item[0].item_name
 
@@ -475,7 +477,7 @@
         GetInspectionIndexTable(params)
           .then(rs => {
             var resp = rs.data
-            console.log("resp",resp)
+            console.log("resp22222",resp)
             if (resp.state == 1) {
               this.tableData = []
               for (let i = 0; i < resp.data.data.length; i++) {

src/xt_pages/role/admin.vue

@@ -396,7 +396,7 @@ export default {
           ids.push(this.selectDrug[index].user_id);
           idMap[this.selectDrug[index].user_id] = this.selectDrug[index].user_id;
         }
-        console.log('ids222222222',ids)
+        
         var idss = ids.join(',')
         let params = {
           ids:idss,
@@ -406,11 +406,18 @@ export default {
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/doctor/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+               that.$message.error(response.data.data.msg)
                return false
             } else {
-              that.$message({ message: '操作成功', type: 'success' })
-              that.adminMainView()
+              that.$message.error(response.data.data.msg)
+              if(response.data.data.msg == ""){
+                  that.$message.success("登记成功!")
+                  that.adminMainView()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                  that.adminMainView()
+               }
              }
            }).catch(function(error) {
         })
@@ -423,15 +430,21 @@ export default {
            "is_mark":is_mark,
            "admin_user_id":this.$store.getters.xt_user.user.id
         }
-        console.log("params222222222",params)
+        
          axios.get('http://127.0.0.1:9532/sz/api/medical/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+               that.$message.error(response.data.data.msg)
                return false
             } else {
-              // that.$message({ message: '操作成功', type: 'success' })
-              this.$message.error(response.data.msg)
-              that.adminMainView()
+             
+              if(response.data.data.msg == ""){
+                  that.$message.success("登记成功!")
+                  that.adminMainView()
+               }
+               if(response.data.data.msg!=""){
+                  that.$message.error(response.data.data.msg)
+                  that.adminMainView()
+               }
              }
            }).catch(function(error) {
         })

src/xt_pages/user/patients.vue

@@ -655,7 +655,7 @@
         ],
         lapsetoRules: {
           lapseto_type: [{ required: true, message: '请选择治疗状态' }],
-          lapseto_time: [{ required: true, message: '请选择转归时间' }]
+          lapseto_time: [{ required: true, message: '请选择时间' }]
         },
         currentIndex: -1,
         LapsetoDialogVisible: false,