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

src/api/his/his.js

@@ -410,6 +410,18 @@ export function GetHisHospitalChargePatientInfo (params) {
 
 
 
+export function getHisHospitalPrescriptionList (params) {
+  return request({
+    url: '/api/hospitalprescription/list',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
+
 
 
 

src/api/project/project.js

@@ -437,7 +437,7 @@ export function getTodaySchedulePatient(params){
 }
 
 export function getHisPatientDetail(params){
-  console.log("params99999",params)
+  console.log("params99999",params);
   return request({
     url:"/api/hispatient/gethispatientdetail",
     method:"Get",
@@ -454,12 +454,11 @@ export function getAllDePartmentList(params){
   })
 }
 
-export function getPrescriptionList(id,params){
+export function getPrescriptionList(id,p_type){
 
   return request({
-    url:"/api/hispatient/getprescription?patient_id="+id,
+    url:"/api/hispatient/getprescription?patient_id="+id+"&p_type="+p_type,
     method:"Get",
-    params:params
   })
 }
 
@@ -527,7 +526,7 @@ export function getUnRegisterHisPatientList (params) {
 
 
 export function postProjectInformation(params){
-  
+
   return request({
     url:"/api/postprojectinformation",
     method:"post",
@@ -541,4 +540,4 @@ export function getInvoice(params){
     method:"get",
     params:params
   })
-}
+}

src/lang/zh.js

@@ -244,7 +244,8 @@ export default {
     objectTableDisinfect:'物表消毒',
 
 
-    hospitalStation:"住院工作站"
+    hospitalStation:"住院工作站",
+    pastInquiries:"既往查询",
 
   },
   navbar: {

src/router/modules/outpatientRecord.js

@@ -29,6 +29,11 @@ export default {
       component: () => import('@/xt_pages/hospitalStation/doctorDesk'),
       name: 'outpatientDoctorStationDoctorDesk',
       meta: { title: 'outpatientDoctorStationDoctorDesk', noCache: true }
+    }, {
+      path: '/outpatientRecord/pastInquiries',
+      component: () => import('@/xt_pages/hospitalStation/pastInquiries'),
+      name: 'pastInquiries',
+      meta: { title: 'pastInquiries', noCache: true }
     },
     {
       path: '/outpatientRecord/outpatientChargesManagement',
@@ -36,6 +41,12 @@ export default {
       name: 'hospitalChargesManagement',
       meta: { title: 'hospitalChargesManagement', noCache: true }
     },
+    {
+      path: '/outpatientRecord/summary',
+      component: () => import('@/xt_pages/hospitalStation/summary'),
+      name: 'summary',
+      meta: { title: 'summary', noCache: true }
+    },
 
 
   ]

src/xt_pages/data/components/consumables.vue

@@ -4,7 +4,7 @@
       <div class="cell clearfix" style="margin-bottom:0;">
         <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model="keywords"
                   class="filter-item"/>
-        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" 
+        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索
         </el-button>
         <label class="title"><span class="name">是否启用</span> : </label>
@@ -60,9 +60,9 @@
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
       </div>
-     
+
     </div>
-    
+
      <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
         <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
@@ -330,7 +330,7 @@
               production_type:""
             },
             isVisibility: false,
-       
+
           }
         },
         selectDrug:[],
@@ -358,19 +358,26 @@
     },
     methods: {
       putOnUnRecord(id){
-        var that = this
+        var that = this;
         let params = {
           ids:id.toString(),
           record_type: 2,
           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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
               // for (let i = 0; i < that.tableData.length; i++) {
               //   if (that.tableData[i].id == that.currentObject.id) {
@@ -384,24 +391,32 @@
         })
       },
       putOnRecord(id){
-        var that = this
+        var that = this;
 
         let params = {
           ids:id.toString(),
           record_type: 2,
           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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
 
 
+
             }
 
 
@@ -411,7 +426,7 @@
         })
       },
       GDYBBatchPutOnRecord(){
-        var that = this
+        var that = this;
         var ids = [];
         var idMap = {};
         for (const index in this.selectDrug) {
@@ -422,14 +437,21 @@
           ids:ids.join(','),
           record_type: 2,
           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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
 
 
@@ -463,9 +485,9 @@
       },
       getGoodKind(id){
         // var data = this.getDictionaryDataConfig('system','good_kind')
-        var data = this.goodKindList
-       
-        var name = ""
+        var data = this.goodKindList;
+
+        var name = "";
         for(let i = 0; i < data.length; i++){
           if(id == data[i].value){
             name = data[i].name
@@ -482,18 +504,18 @@
         this.getList()
       },
       handleGoodInfoEdit: function(index, row) {
-        this.getAllDealer()
-        this.getAllManufacturer()
-        this.getAllGoodType()
-        this.goodInfo.editGoodId = row.id
-        this.goodInfo.editGoodIndex = index
+        this.getAllDealer();
+        this.getAllManufacturer();
+        this.getAllGoodType();
+        this.goodInfo.editGoodId = row.id;
+        this.goodInfo.editGoodIndex = index;
 
         let params = {
           id: row.id
-        }
+        };
         GetGoodInfo(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
 
@@ -519,33 +541,33 @@
             }
 
             this.goodInfo.goodInfoDialog.formValue.specification_name =
-              response.data.data.goodInfo.specification_name
+              response.data.data.goodInfo.specification_name;
             this.goodInfo.goodInfoDialog.formValue.buy_price =
-              response.data.data.goodInfo.buy_price
+              response.data.data.goodInfo.buy_price;
             this.goodInfo.goodInfoDialog.formValue.sell_price =
-              response.data.data.goodInfo.sell_price
+              response.data.data.goodInfo.sell_price;
             this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count =
-              response.data.data.goodInfo.expiry_date_warn_day_count
+              response.data.data.goodInfo.expiry_date_warn_day_count;
             this.goodInfo.goodInfoDialog.formValue.stock_warn_count =
-              response.data.data.goodInfo.stock_warn_count
-            this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString()
+              response.data.data.goodInfo.stock_warn_count;
+            this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString();
             this.goodInfo.goodInfoDialog.formValue.remark =
-              response.data.data.goodInfo.remark
-            this.goodInfo.goodInfoDialog.isCreated = 2
-            this.goodInfo.good_code = response.data.data.goodInfo.good_code
+              response.data.data.goodInfo.remark;
+            this.goodInfo.goodInfoDialog.isCreated = 2;
+            this.goodInfo.good_code = response.data.data.goodInfo.good_code;
             this.goodInfo.goodInfoDialog.formValue.good_type_id =
-              response.data.data.goodInfo.good_type_id
+              response.data.data.goodInfo.good_type_id;
 
 
             this.goodInfo.goodInfoDialog.formValue.good_name =
-              response.data.data.goodInfo.good_name
+              response.data.data.goodInfo.good_name;
 
 
             this.goodInfo.goodInfoDialog.formValue.pinyin =
-              response.data.data.goodInfo.pinyin
+              response.data.data.goodInfo.pinyin;
 
             this.goodInfo.goodInfoDialog.formValue.wubi =
-              response.data.data.goodInfo.wubi
+              response.data.data.goodInfo.wubi;
 
 
 
@@ -565,11 +587,11 @@
 
 
             this.goodInfo.goodInfoDialog.formValue.retail_price =
-              response.data.data.goodInfo.retail_price
+              response.data.data.goodInfo.retail_price;
 
 
             this.goodInfo.goodInfoDialog.formValue.medical_insurance_number =
-              response.data.data.goodInfo.medical_insurance_number
+              response.data.data.goodInfo.medical_insurance_number;
 
 
             if (response.data.data.goodInfo.is_special_diseases <= 0) {
@@ -667,11 +689,11 @@
                 response.data.data.goodInfo.is_doctor_use.toString()
             }
 
-            this.goodInfo.goodInfoDialog.formValue.agent =response.data.data.goodInfo.agent
+            this.goodInfo.goodInfoDialog.formValue.agent =response.data.data.goodInfo.agent;
 
-            this.goodInfo.goodInfoDialog.formValue.good_number = response.data.data.goodInfo.good_number
+            this.goodInfo.goodInfoDialog.formValue.good_number = response.data.data.goodInfo.good_number;
 
-            this.goodInfo.goodInfoDialog.formValue.social_security_directory_code = response.data.data.goodInfo.social_security_directory_code
+            this.goodInfo.goodInfoDialog.formValue.social_security_directory_code = response.data.data.goodInfo.social_security_directory_code;
 
             if(response.data.data.production_type<=0){
                this.goodInfo.goodInfoDialog.production_type = ''
@@ -698,14 +720,14 @@
           .then(() => {
             let params = {
               id: row.id
-            }
+            };
 
             deleteGoodInfo(params).then(response => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
               } else {
-                this.goodInfo.goodInfoData.splice(index, 1)
+                this.goodInfo.goodInfoData.splice(index, 1);
                 this.$message.success('删除成功')
               }
             })
@@ -714,7 +736,7 @@
           })
       },
       getList() {
-        this.goodInfo.loading = true
+        this.goodInfo.loading = true;
         let params = {
           page: this.page,
           limit: this.limit,
@@ -724,17 +746,17 @@
           is_charge: this.is_charge,
           is_mark:this.is_record,
           manufacturer:this.manufacturer,
-        }
-      
+        };
+
         getGoodInfoList(params).then(response => {
           if (response.data.state == 0) {
-            this.goodInfo.loading = false
-            this.$message.error(response.data.msg)
+            this.goodInfo.loading = false;
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.goodInfo.loading = false
-            this.total = response.data.data.total
-            this.goodInfo.goodInfoData = []
+            this.goodInfo.loading = false;
+            this.total = response.data.data.total;
+            this.goodInfo.goodInfoData = [];
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.goodInfo.goodInfoData.push(response.data.data.list[i])
             }
@@ -746,20 +768,20 @@
         row.index = rowIndex
       },
       onRowClick(row, event, column) {
-        this.goodInfo.goodInfoData = []
-        this.goodType.tableCurrentIndex = row.index
-        this.goodInfo.goodInfoDialog.formValue.good_id = row.id
+        this.goodInfo.goodInfoData = [];
+        this.goodType.tableCurrentIndex = row.index;
+        this.goodInfo.goodInfoDialog.formValue.good_id = row.id;
         let params = {
           id: row.id
-        }
-        this.goodInfo.loading = true
+        };
+        this.goodInfo.loading = true;
         GetGoodInfoByGoodId(params).then(response => {
           if (response.data.state == 0) {
-            this.goodInfo.loading = false
-            this.$message.error(response.data.msg)
+            this.goodInfo.loading = false;
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.goodInfo.loading = false
+            this.goodInfo.loading = false;
             this.getList()
 
             // for (let i = 0; i < response.data.data.list.length; i++) {
@@ -769,24 +791,24 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-       
+
         if (val.isCreated == 2) {
           //修改
-          val['id'] = this.goodInfo.editGoodId
-          val['good_code'] = this.goodInfo.good_code
-        
-          
+          val['id'] = this.goodInfo.editGoodId;
+          val['good_code'] = this.goodInfo.good_code;
+
+
+
 
 
-          
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
-              this.$message.error("同一耗材类型同一规格名称不能重复录入!")
+              this.$message.error("同一耗材类型同一规格名称不能重复录入!");
               return false
             } else {
-              this.$refs.addConsumable.hide()
-              this.getList()
+              this.$refs.addConsumable.hide();
+              this.getList();
               // this.goodInfo.goodInfoData[
               //   this.goodInfo.editGoodIndex
               //   ].specification_name =
@@ -810,20 +832,20 @@
             }
           })
         } else if (val.isCreated == 1) {
-         
-          
+
+
           if(val.is_reuse == ""){
              val.is_reuse = 0
           }else{
             val.is_reuse = parseInt(val.is_reuse)
           }
-          
+
           if(val.stock_warn_count == ""){
              val.stock_warn_count = 0
           }else{
             val.stock_warn_count = parseInt(val.stock_warn_count)
           }
-         
+
           //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {
@@ -831,8 +853,8 @@
               // return false
               this.$message.error("同一耗材类型同一规格名称不能重复录入!")
             } else {
-              this.$refs.addConsumable.hide()
-              this.getList()
+              this.$refs.addConsumable.hide();
+              this.getList();
               // this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
               this.$message.success('新增成功')
             }
@@ -843,12 +865,12 @@
         this.$refs.addConsumable.hide()
       },
       showInfoDialog: function() {
-        this.getAllDealer()
-        this.getAllManufacturer()
-        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        this.getAllDealer();
+        this.getAllManufacturer();
+        this.goodInfo.goodInfoDialog.formValue.goodType = [];
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
             for (let i = 0; i < response.data.data.goodType.length; i++) {
@@ -860,93 +882,93 @@
               )
             }
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
-              this.$message.error('请先新增商品类型')
-              return
+              this.$message.error('请先新增商品类型');
+
             } else {
-              this.goodInfo.goodInfoDialog.isVisibility = true
+              this.goodInfo.goodInfoDialog.isVisibility = true;
               this.goodInfo.goodInfoDialog.isCreated = 1
             }
           }
-        })
+        });
         this.$refs.addConsumable.show()
 
       },
       getAllDealer: function() {
-        this.goodInfo.goodInfoDialog.formValue.dealers = []
+        this.goodInfo.goodInfoDialog.formValue.dealers = [];
         GetAllDeals().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
             for (let i = 0; i < response.data.data.dealer.length; i++) {
               this.goodInfo.goodInfoDialog.formValue.dealers.push(
                 response.data.data.dealer[i]
-              )
+              );
               this.dealers.push(response.data.data.dealer[i])
             }
           }
         })
       },
       getAllManufacturer: function() {
-        this.goodInfo.goodInfoDialog.formValue.manufacturers = []
+        this.goodInfo.goodInfoDialog.formValue.manufacturers = [];
         GetAllManufacturer().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            var obj = {id:0,manufacturer_name:"全部"}
-            this.manufacturers.push(obj)
+            var obj = {id:0,manufacturer_name:"全部"};
+            this.manufacturers.push(obj);
             for (let i = 0; i < response.data.data.manufacturer.length; i++) {
               this.goodInfo.goodInfoDialog.formValue.manufacturers.push(
                 response.data.data.manufacturer[i]
-              )
+              );
               this.manufacturers.push(response.data.data.manufacturer[i])
             }
-           
+
           }
         })
       },
       getAllGoodType: function() {
-        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        this.goodInfo.goodInfoDialog.formValue.goodType = [];
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
               }
-              this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
-              this.goodType.push(response.data.data.goodType[i]) 
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i]);
+              this.goodType.push(response.data.data.goodType[i])
             }
           }
         })
       },
       handleSizeChange(val) {
-        this.limit = val
+        this.limit = val;
         this.getList()
       },
       handleCurrentChange(val) {
-        this.page = val
+        this.page = val;
         this.getList()
       },
       searchAction() {
-        this.is_use = ""
-        this.is_charge = ""
-        this.good_kind = ""
+        this.is_use = "";
+        this.is_charge = "";
+        this.good_kind = "";
         this.getList()
       },clickSelfPayment(id){
       this.$refs.selfPayment.show(id,2)
       },
       openForm() {
 
-        this.getAllDealer()
-        this.getAllManufacturer()
-        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        this.getAllDealer();
+        this.getAllManufacturer();
+        this.goodInfo.goodInfoDialog.formValue.goodType = [];
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
             for (let i = 0; i < response.data.data.goodType.length; i++) {
@@ -958,46 +980,46 @@
               )
             }
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
-              this.$message.error('请先新增商品类型')
-              return
+              this.$message.error('请先新增商品类型');
+
             } else {
-              this.goodInfo.goodInfoDialog.isVisibility = true
+              this.goodInfo.goodInfoDialog.isVisibility = true;
               this.goodInfo.goodInfoDialog.isCreated = 1
             }
           }
-        })
-        this.goodInfo.goodInfoDialog.formValue.good_id = ''
-        this.goodInfo.goodInfoDialog.formValue.specification_name = ''
-        this.goodInfo.goodInfoDialog.formValue.buy_price = ''
-        this.goodInfo.goodInfoDialog.formValue.sell_price = ''
-        this.goodInfo.goodInfoDialog.formValue.remark = ''
-        this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
-        this.goodInfo.goodInfoDialog.formValue.good_type_id = ''
-        this.goodInfo.goodInfoDialog.formValue.dealer = ''
-        this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
-        this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
-        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
-        this.goodInfo.goodInfoDialog.formValue.good_name = ''
-        this.goodInfo.goodInfoDialog.formValue.pinyin = ''
-        this.goodInfo.goodInfoDialog.formValue.wubi = ''
-        this.goodInfo.goodInfoDialog.formValue.good_kind = ''
-        this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = ''
-        this.goodInfo.goodInfoDialog.formValue.retail_price = ''
-        this.goodInfo.goodInfoDialog.formValue.medical_insurance_number = ''
-        this.goodInfo.goodInfoDialog.formValue.is_special_diseases = ''
-        this.goodInfo.goodInfoDialog.formValue.is_record = ''
-        this.goodInfo.goodInfoDialog.formValue.statistics_category = ''
-        this.goodInfo.goodInfoDialog.formValue.good_status = ''
-        this.goodInfo.goodInfoDialog.formValue.default_count = ''
-        this.goodInfo.goodInfoDialog.formValue.sign = ''
-        this.goodInfo.goodInfoDialog.formValue.is_default = ''
-        this.goodInfo.goodInfoDialog.formValue.is_charge_use = ''
-        this.goodInfo.goodInfoDialog.formValue.is_charge_predict = ''
-        this.goodInfo.goodInfoDialog.formValue.is_statistics_work = ''
-        this.goodInfo.goodInfoDialog.formValue.sort = ''
-        this.goodInfo.goodInfoDialog.formValue.is_doctor_use = ''
-        this.goodInfo.goodInfoDialog.formValue.agent = ''
-        this.goodInfo.goodInfoDialog.formValue.good_number = ''
+        });
+        this.goodInfo.goodInfoDialog.formValue.good_id = '';
+        this.goodInfo.goodInfoDialog.formValue.specification_name = '';
+        this.goodInfo.goodInfoDialog.formValue.buy_price = '';
+        this.goodInfo.goodInfoDialog.formValue.sell_price = '';
+        this.goodInfo.goodInfoDialog.formValue.remark = '';
+        this.goodInfo.goodInfoDialog.formValue.manufacturer = '';
+        this.goodInfo.goodInfoDialog.formValue.good_type_id = '';
+        this.goodInfo.goodInfoDialog.formValue.dealer = '';
+        this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = '';
+        this.goodInfo.goodInfoDialog.formValue.stock_warn_count = '';
+        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2';
+        this.goodInfo.goodInfoDialog.formValue.good_name = '';
+        this.goodInfo.goodInfoDialog.formValue.pinyin = '';
+        this.goodInfo.goodInfoDialog.formValue.wubi = '';
+        this.goodInfo.goodInfoDialog.formValue.good_kind = '';
+        this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = '';
+        this.goodInfo.goodInfoDialog.formValue.retail_price = '';
+        this.goodInfo.goodInfoDialog.formValue.medical_insurance_number = '';
+        this.goodInfo.goodInfoDialog.formValue.is_special_diseases = '';
+        this.goodInfo.goodInfoDialog.formValue.is_record = '';
+        this.goodInfo.goodInfoDialog.formValue.statistics_category = '';
+        this.goodInfo.goodInfoDialog.formValue.good_status = '';
+        this.goodInfo.goodInfoDialog.formValue.default_count = '';
+        this.goodInfo.goodInfoDialog.formValue.sign = '';
+        this.goodInfo.goodInfoDialog.formValue.is_default = '';
+        this.goodInfo.goodInfoDialog.formValue.is_charge_use = '';
+        this.goodInfo.goodInfoDialog.formValue.is_charge_predict = '';
+        this.goodInfo.goodInfoDialog.formValue.is_statistics_work = '';
+        this.goodInfo.goodInfoDialog.formValue.sort = '';
+        this.goodInfo.goodInfoDialog.formValue.is_doctor_use = '';
+        this.goodInfo.goodInfoDialog.formValue.agent = '';
+        this.goodInfo.goodInfoDialog.formValue.good_number = '';
 
         this.$refs.addConsumable.show(0)
       },
@@ -1038,26 +1060,26 @@
               ids.push(this.selectDrug[index].id);
               idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
             }
-          
-            var idss = ids.join(',')
+
+            var idss = ids.join(',');
             let params = {
               ids:idss,
               admin_user_id:this.$store.getters.xt_user.user.id
-            }
-          
+            };
 
-            var that = this
+
+            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.data.msg)
+                  that.$message.error(response.data.data.msg);
                   return false
                 } else {
                  if(response.data.data.msg == ""){
-                  that.$message.success("备案成功!")
+                  that.$message.success("备案成功!");
                   that.getList()
                }
                if(response.data.data.msg!=""){
-                  that.$message.error(response.data.data.msg)
+                  that.$message.error(response.data.data.msg);
                   that.getList()
                 }
                 }
@@ -1067,24 +1089,24 @@
      },
       toReturn(id,isMark){
 
-         var that = this
+         var that = this;
          let params = {
              'id':id,
              'type_id':3,
              'is_mark':isMark,
              'admin_user_id':this.$store.getters.xt_user.user.id,
-          }
+          };
          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.data.msg)
+               that.$message.error(response.data.data.msg);
                return false
             } else {
               if(response.data.data.msg == ""){
-                  that.$message.success("备案成功!")
+                  that.$message.success("备案成功!");
                   that.getList()
                }
                if(response.data.data.msg!=""){
-                  that.$message.error(response.data.data.msg)
+                  that.$message.error(response.data.data.msg);
                   that.getList()
                }
              }
@@ -1098,37 +1120,37 @@
          this.getList()
       },
       handleSuccess({ results, header }) {
-       
+
         if (header != undefined && header.length > 0) {
-            
-          var isHasMedicalInsuranceLevel = header.includes('*医保等级')
-         
-          var isHasGoodUnit = header.includes('*单位')
-        
-          var isHasStockWarnCount = header.includes('*库存警戒')
-       
-          var isHasManuFacturer =  header.includes('*生产厂商')
-         
-          var isHasGoodName = header.includes('*耗材名称')
-        
-          var isHasGoodKand = header.includes('*耗材种类')
-          
-          var isHasSpecificationName = header.includes('*规格型号')
-        
-          var isHasBuyPrice = header.includes('*零价')
-                
+
+          var isHasMedicalInsuranceLevel = header.includes('*医保等级');
+
+          var isHasGoodUnit = header.includes('*单位');
+
+          var isHasStockWarnCount = header.includes('*库存警戒');
+
+          var isHasManuFacturer =  header.includes('*生产厂商');
+
+          var isHasGoodName = header.includes('*耗材名称');
+
+          var isHasGoodKand = header.includes('*耗材种类');
+
+          var isHasSpecificationName = header.includes('*规格型号');
+
+          var isHasBuyPrice = header.includes('*零价');
+
           if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer  && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
-            this.dialogVisible = true
+            this.dialogVisible = true;
             return
           }
         }else {
-          this.dialogVisible = true
+          this.dialogVisible = true;
           return
         }
-       
-       var tableData = []
+
+       var tableData = [];
        for(let i=1;i<results.length;i++){
-         let obj = {"good_kind_id":0,"good_type_id":0,"medical_insurance_id":0,"dealer_id":0,"statistic_id":0,"manufacturer_id":0,"unit_id":0}
+         let obj = {"good_kind_id":0,"good_type_id":0,"medical_insurance_id":0,"dealer_id":0,"statistic_id":0,"manufacturer_id":0,"unit_id":0};
          for (var key in results[i]) {
 
            if (results[i]['*耗材名称'] === undefined) {
@@ -1138,7 +1160,7 @@
                obj['good_name'] = results[i][key].replace(/\s/g,"")
               }
            }
-           
+
            if (results[i]['*耗材种类'] === undefined) {
                 obj['good_kind'] = ''
               } else {
@@ -1250,7 +1272,7 @@
                obj['is_special_diseases'] = results[i][key].replace(/\s/g,"")
               }
            }
-          
+
            if (results[i]['是否备案'] === undefined) {
                 obj['is_record'] = ''
               } else {
@@ -1266,7 +1288,7 @@
                obj['statistics_category'] = results[i][key].replace(/\s/g,"")
               }
            }
-          
+
           if (results[i]['状态'] === undefined) {
                 obj['good_status'] = ''
               } else {
@@ -1274,7 +1296,7 @@
                obj['good_status'] = results[i][key].replace(/\s/g,"")
               }
            }
-           
+
 
           if (results[i]['社保目录编码'] === undefined) {
                 obj['social_security_directory_code'] = ''
@@ -1310,12 +1332,12 @@
 
 
          }
-         tableData.push(obj)
-        var goodUnit =  this.$store.getters.good_unit
-       
+         tableData.push(obj);
+        var goodUnit =  this.$store.getters.good_unit;
+
+
+        for(let i=0;i<tableData.length;i++){
 
-        for(let i=0;i<tableData.length;i++){ 
-      
          for(let c=0;c<goodUnit.length;c++){
             if(tableData[i].good_unit == goodUnit[c].name){
                tableData[i].unit_id = goodUnit[c].id
@@ -1324,9 +1346,9 @@
 
         }
        }
-       
+
        for(let i=0;i<tableData.length;i++){
-          tableData[i].stock_warn_count = parseInt(tableData[i].stock_warn_count)
+          tableData[i].stock_warn_count = parseInt(tableData[i].stock_warn_count);
 
           if(tableData[i].is_special_diseases == "是"){
               tableData[i].is_special_diseases = 1
@@ -1342,7 +1364,7 @@
              tableData[i].is_record = 2
           }
 
-         
+
 
           if(tableData[i].special_medical == "是"){
              tableData[i].special_medical = "1"
@@ -1351,9 +1373,9 @@
              tableData[i].special_medical = "2"
           }
        }
-        
+
        for(let i=0;i<tableData.length;i++){
-         
+
           if(tableData[i].is_special_diseases == ""){
              tableData[i].is_special_diseases = 0
           }else{
@@ -1365,21 +1387,21 @@
           }else{
             tableData[i].is_record = parseInt(tableData[i].is_record)
           }
-         
-        
+
+
        }
-       
+
        let params = {
-          'goods':tableData 
-        }
-     
-       
-       
+          'goods':tableData
+        };
+
+
+
         postGoodInformation(params).then(response=>{
            if(response.data.state == 1){
-             var msg =  response.data.data.msg
-             this.$message.success("导入成功!")
-             this.getList()
+             var msg =  response.data.data.msg;
+             this.$message.success("导入成功!");
+             this.getList();
              this.getInitializtion()
            }else{
              this.$message.error("导入失败,请下载日志查看")
@@ -1387,9 +1409,9 @@
         })
       },
       generateTxt: function(log) {
-        var content = ''
-        var errlog = log.err_logs
-        content = this.getContent(log)
+        var content = '';
+        var errlog = log.err_logs;
+        content = this.getContent(log);
         for (let i = 0; i < errlog.length; i++) {
           if (content.length == 0) {
             content = errlog[i].err_msg
@@ -1398,13 +1420,13 @@
           }
         }
 
-        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
+        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' });
         if (typeof url === 'object' && url instanceof Blob) {
           url = URL.createObjectURL(url) // 创建blob地址
         }
-        const aLink = document.createElement('a')
-        aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt'
+        const aLink = document.createElement('a');
+        aLink.href = url;
+        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt';
         aLink.click()
 
       },
@@ -1412,23 +1434,23 @@
         return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
       },
       timestampToTime(timestamp) {
-        var date = new Date(timestamp * 1000)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-        var Y = date.getFullYear() + '年'
-        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月'
-        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
-        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
-        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
-        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
+        var date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年';
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
+        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 ';
+        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时';
+        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分';
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒';
         return Y + M + D + h + m + s
       },
        generateLog() {
         let params = {
           'log_type': 5
-        }
+        };
         generateLog(params).then(
           response => {
             if (response.data.state === 1) {
-              this.logs = response.data.data.logs
+              this.logs = response.data.data.logs;
               this.exportLogVisible = true
             } else {
               this.$message.error(response.data.msg)
@@ -1440,22 +1462,22 @@
       getInitializtion(){
        getInitializtion().then(response=>{
          if(response.data.state == 1){
-           var goodKindList = response.data.data.goodKindList
-          
+           var goodKindList = response.data.data.goodKindList;
+
            this.goodKindList = goodKindList
-         
+
 
          }
        })
       }
 
-    }, 
+    },
     created() {
-      this.getList()
-      this.getAllDealer()
-      this.getAllManufacturer()
-      this.getAllGoodType()
-      this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit
+      this.getList();
+      this.getAllDealer();
+      this.getAllManufacturer();
+      this.getAllGoodType();
+      this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit;
       this.getInitializtion()
     }
   }

src/xt_pages/data/components/drugs.vue

@@ -59,7 +59,7 @@
         <!-- <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
         <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button> -->
       </div>
-      
+
     </div>
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
@@ -199,7 +199,7 @@
       :total="total"
     >
     </el-pagination>
-   
+
 
     <el-dialog
       title="提示"
@@ -410,7 +410,7 @@
     },
     methods: {
       GDYBBatchPutOnRecord(){
-        var that = this
+        var that = this;
         var ids = [];
         var idMap = {};
         for (const index in this.selectDrug) {
@@ -421,14 +421,21 @@
           ids:ids.join(','),
           record_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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
 
 
@@ -439,11 +446,11 @@
 
       },
       handleSizeChange(val) {
-        this.limit = val
+        this.limit = val;
         this.getList()
       },
       handleCurrentChange(val) {
-        this.page = val
+        this.page = val;
         this.getList()
       },
       changeInject(val) {
@@ -471,7 +478,7 @@
         return ''
       },
       getDealer(id){
-        var name = ""
+        var name = "";
         for(let i=0;i<this.dealer.length;i++){
           if(this.dealer[i].id == id){
              name = this.dealer[i].dealer_name
@@ -480,11 +487,11 @@
         return name
       },
       goodInfoDialogComfirm: function(val) {
-        
+
         //修改自备药
-        var untit = ""
-        var untis = getDataConfig('hemodialysis','units')
-        
+        var untit = "";
+        var untis = getDataConfig('hemodialysis','units');
+
         for(let i=0;i<untis.length;i++){
            if(val.min_unit == untis[i].id){
               untit = untis[i].name
@@ -492,28 +499,28 @@
         }
         if (val.id > 0) {
           //修改
-          val['id'] = this.current_id
+          val['id'] = this.current_id;
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              this.$message.error(response.data.msg);
               return false
             } else {
-              this.$refs.addDrugs.hide()
-              this.getList()
+              this.$refs.addDrugs.hide();
+              this.getList();
               this.$message.success('修改成功')
             }
           })
         } else if (val.id == 0) {
           //新增
-         
+
 
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              this.$message.error(response.data.msg);
               return false
             } else {
-              this.$refs.addDrugs.hide()
-              this.getList()
+              this.$refs.addDrugs.hide();
+              this.getList();
               this.$message.success('新增成功')
             }
           })
@@ -523,14 +530,14 @@
         this.$refs.addDrugs.hide()
       },
       getAllManufacturer: function() {
-        this.manufacturers = []
+        this.manufacturers = [];
         GetAllManufacturer().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-              var obj = {id:0,manufacturer_name:"全部"}
-              this.manufacturers.push(obj)
+              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])
@@ -549,18 +556,18 @@
         // this.$refs.maintain.show();
       },
       openForm(id) {
-        this.current_id = id
-        this.getAllManufacturer()
+        this.current_id = id;
+        this.getAllManufacturer();
         if (id > 0) {
           let params = {
             id: this.current_id
-          }
+          };
           getBaseDrugLib(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              this.$message.error(response.data.msg);
               return false
             } else {
-           
+
               for (let key in response.data.data.drug) {
                 this.formValue[key] = response.data.data.drug[key]
               }
@@ -635,7 +642,7 @@
                 this.formValue.prescription_mark = this.formValue.prescription_mark.toString()
               }
 
-              this.formValue.record_date = this.getTime(this.formValue.record_date)
+              this.formValue.record_date = this.getTime(this.formValue.record_date);
 
               if(this.formValue.drug_category == 0){
                   this.formValue.drug_category = ""
@@ -673,7 +680,7 @@
               if(this.formValue.hosp_appr_flag == 0){
                 this.formValue.hosp_appr_flag = ""
               }
-              
+
               this.$refs.addDrugs.show(id, this.formValue)
 
             }
@@ -687,7 +694,7 @@
       },
 
        deleteDurg(id,index){
-      
+
             this.$confirm('确认删除吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -695,10 +702,10 @@
          }).then(() => {
               const params = {
                 id:id,
-              }
+              };
             deleteDurg(params).then(response => {
               if (response.data.state == 1) {
-                  var msg = response.data.data.msg
+                  var msg = response.data.data.msg;
                   this.list.splice(index, 1);
                   this.$message.success("删除成功")
               } else {
@@ -719,15 +726,15 @@
           is_inject: this.is_inject,
           manufacturer:this.manufacturer,
           is_record:this.is_record
-        }
+        };
         getBaseDrugLibList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.total = response.data.data.total
-            this.list = []
-           
+            this.total = response.data.data.total;
+            this.list = [];
+
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
@@ -738,19 +745,27 @@
         return getDataConfig(module, filed_name)
       },
       putOnUnRecord(id){
-        var that = this
+        var that = this;
         let params = {
           ids:id.toString(),
           record_type: 1,
           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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+
             }else{
               // for (let i = 0; i < that.tableData.length; i++) {
               //   if (that.tableData[i].id == that.currentObject.id) {
@@ -764,21 +779,28 @@
         })
       },
       putOnRecord(id){
-        var that = this
+        var that = this;
 
         let params = {
           ids:id.toString(),
           record_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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
 
 
@@ -804,25 +826,25 @@
       //   })
       // },
       toReturn(id,isMark){
-     
-         var that = this
+
+         var that = this;
          let params = {
              'id':id,
              'type_id':1,
              'is_mark':isMark,
              'admin_user_id':this.$store.getters.xt_user.user.id
-          }
+          };
          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.data.msg)
+               that.$message.error(response.data.data.msg);
                return false
             } else {
               if(response.data.data.msg == ""){
-                  that.$message.success("备案成功!")
+                  that.$message.success("备案成功!");
                   that.getList()
                }
                if(response.data.data.msg!=""){
-                  that.$message.error(response.data.data.msg)
+                  that.$message.error(response.data.data.msg);
                   that.getList()
                }
 
@@ -878,25 +900,25 @@
           idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
         }
 
-        var idss = ids.join(',')
+        var idss = ids.join(',');
         let params = {
           ids:idss,
           admin_user_id:this.$store.getters.xt_user.user.id
-        }
+        };
 
-        var that = this
+        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.data.msg)
+               that.$message.error(response.data.data.msg);
                return false
             } else {
                if(response.data.data.msg == ""){
-                  that.$message.success("备案成功!")
+                  that.$message.success("备案成功!");
                   that.getList()
                }
                if(response.data.data.msg!=""){
-                  that.$message.error(response.data.data.msg)
+                  that.$message.error(response.data.data.msg);
                    that.getList()
                }
              }
@@ -906,51 +928,51 @@
      },
 
       handleSuccessTwo({ results, header }) {
-     
+
         if (header != undefined && header.length > 0) {
-            
-          var isHasDrugName = header.includes('*药品名称')
-         
-          var isHasDrugSpec = header.includes('*药品规格')
-        
-          var isHasDrugType =  header.includes('*药品类型')
-        
-          var isHasDrugStockLimit =  header.includes('*库存警戒')
-         
-          var isHasDrugOriginPlace= header.includes('*产地')
-         
-          var isHasDrugDosageForm = header.includes('*药品剂型')
-        
-          var isHasMaxUnit= header.includes('*最大单位')
-
-          var isHasMinUnit= header.includes('*最小单位')
-
-          var isHasUnitMatrixing= header.includes("*单位换算")
-        
-          var isHasRetailPrice = header.includes('*单零售价')
-        
-          var isHasLastPrice = header.includes('*上次进价')
-
-          var isHasDrugClassifye = header.includes('*药物分类')
-
-         var isHasManufacturer = header.includes('*生产厂商')
-
-         var isHasDrugDose = header.includes('*剂量')
-           
-         var isDrugDoseUnit = header.includes('*剂量单位')
-     
+
+          var isHasDrugName = header.includes('*药品名称');
+
+          var isHasDrugSpec = header.includes('*药品规格');
+
+          var isHasDrugType =  header.includes('*药品类型');
+
+          var isHasDrugStockLimit =  header.includes('*库存警戒');
+
+          var isHasDrugOriginPlace= header.includes('*产地');
+
+          var isHasDrugDosageForm = header.includes('*药品剂型');
+
+          var isHasMaxUnit= header.includes('*最大单位');
+
+          var isHasMinUnit= header.includes('*最小单位');
+
+          var isHasUnitMatrixing= header.includes("*单位换算");
+
+          var isHasRetailPrice = header.includes('*单零售价');
+
+          var isHasLastPrice = header.includes('*上次进价');
+
+          var isHasDrugClassifye = header.includes('*药物分类');
+
+         var isHasManufacturer = header.includes('*生产厂商');
+
+         var isHasDrugDose = header.includes('*剂量');
+
+         var isDrugDoseUnit = header.includes('*剂量单位');
+
           if (!(isHasDrugName  && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
-            this.dialogVisible = true
+            this.dialogVisible = true;
             return
           }
         }else {
-          this.dialogVisible = true
+          this.dialogVisible = true;
           return
         }
-       
-       var tableData = []
+
+       var tableData = [];
        for(let i=1;i<results.length;i++){
-         let obj = {"drug_type_id":0,"drug_dosage_form_id":0,"medical_insurance_level_id":0,"drug_classify_id":0,"manufacturer_id":0,"dealer_id":0,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0,"drug_category_id":0}
+         let obj = {"drug_type_id":0,"drug_dosage_form_id":0,"medical_insurance_level_id":0,"drug_classify_id":0,"manufacturer_id":0,"dealer_id":0,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0,"drug_category_id":0};
          for (var key in results[i]) {
 
            if (results[i]['*药品名称'] === undefined) {
@@ -985,7 +1007,7 @@
                obj['drug_type'] = results[i][key].replace(/\s/g,"")
               }
            }
-           
+
 
            if (results[i]['*库存警戒'] === undefined) {
                 obj['drug_stock_limit'] = ''
@@ -1052,7 +1074,7 @@
                obj['retail_price'] = results[i][key].replace(/\s/g,"")
               }
            }
-           
+
 
          if (results[i]['*上次进价'] === undefined) {
                 obj['last_price'] = ''
@@ -1103,7 +1125,7 @@
               }
            }
 
-          
+
 
             if (results[i]['别名拼音'] === undefined) {
                 obj['drug_alias_pinyin'] = ''
@@ -1232,7 +1254,7 @@
                 obj['social_security_directory_code'] = results[i][key].replace(/\s/g,"")
               }
            }
-           
+
 
             if (results[i]['备案日期'] === undefined) {
                 obj['record_date'] = ''
@@ -1292,11 +1314,11 @@
 
 
          }
-         var newArr = []
-         tableData.push(obj)
-       
-        for(let i=0;i<tableData.length;i++){ 
-          
+         var newArr = [];
+         tableData.push(obj);
+
+        for(let i=0;i<tableData.length;i++){
+
          if(tableData[i].is_special_diseases == ""){
             tableData[i].is_special_diseases = 0
          }
@@ -1308,8 +1330,8 @@
             tableData[i].is_special_diseases = 2
          }
 
-      
-          
+
+
           if(tableData[i].is_record == ""){
              tableData[i].is_record = 0
           }
@@ -1319,7 +1341,7 @@
           if(tableData[i].is_record == "否"){
             tableData[i].is_record = 2
           }
-         
+
           if(tableData[i].prescription_mark == ""){
               tableData[i].prescription_mark = 0
           }
@@ -1327,13 +1349,13 @@
              tableData[i].prescription_mark =1
           }
           if(tableData[i].prescription_mark == "否"){
-            tableData[i].prescription_mark =2 
+            tableData[i].prescription_mark =2
           }
 
           if(tableData[i].hosp_appr_flag == ""){
              tableData[i].hosp_appr_flag = 0
-          } 
-          
+          }
+
           if(tableData[i].hosp_appr_flag == "无需审批"){
               tableData[i].hosp_appr_flag = 1
           }
@@ -1346,29 +1368,29 @@
           if(tableData[i].lmt_used_flag == ""){
              tableData[i].lmt_used_flag = 0
           }
-          
+
           if(tableData[i].lmt_used_flag == "否"){
               tableData[i].lmt_used_flag = 0
           }
 
-            
+
           if(tableData[i].lmt_used_flag == "是"){
               tableData[i].lmt_used_flag = 1
           }
-      
+
         }
        }
-     
+
        let params = {
-          'drugs':tableData 
-        }
-   
+          'drugs':tableData
+        };
+
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
-             var msg =  response.data.data.msg
-             this.getList()
-             this.getAllManufacturer()
-             this.GetAllConfig()
+             var msg =  response.data.data.msg;
+             this.getList();
+             this.getAllManufacturer();
+             this.GetAllConfig();
              this.$message.success("导入成功!")
 
            }else{
@@ -1377,9 +1399,9 @@
         })
       },
       generateTxt: function(log) {
-        var content = ''
-        var errlog = log.err_logs
-        content = this.getContent(log)
+        var content = '';
+        var errlog = log.err_logs;
+        content = this.getContent(log);
         for (let i = 0; i < errlog.length; i++) {
           if (content.length == 0) {
             content = errlog[i].err_msg
@@ -1388,13 +1410,13 @@
           }
         }
 
-        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
+        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' });
         if (typeof url === 'object' && url instanceof Blob) {
           url = URL.createObjectURL(url) // 创建blob地址
         }
-        const aLink = document.createElement('a')
-        aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt'
+        const aLink = document.createElement('a');
+        aLink.href = url;
+        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt';
         aLink.click()
 
       },
@@ -1402,23 +1424,23 @@
         return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
       },
       timestampToTime(timestamp) {
-        var date = new Date(timestamp * 1000)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-        var Y = date.getFullYear() + '年'
-        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月'
-        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
-        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
-        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
-        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
+        var date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年';
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
+        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 ';
+        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时';
+        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分';
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒';
         return Y + M + D + h + m + s
       },
        generateLog() {
         let params = {
           'log_type': 4
-        }
+        };
         generateLog(params).then(
           response => {
             if (response.data.state === 1) {
-              this.logs = response.data.data.logs
+              this.logs = response.data.data.logs;
               this.exportLogVisible = true
             } else {
               this.$message.error(response.data.msg)
@@ -1429,14 +1451,14 @@
       getDictionaryDataConfig(module,filed_name){
         return getDictionaryDataConfig(module,filed_name)
       },
-     
+
     },
     created() {
-     
-      this.getList()
-      this.getAllManufacturer()
+
+      this.getList();
+      this.getAllManufacturer();
       this.GetAllConfig()
-      
+
     }
   }
 </script>

src/xt_pages/data/components/project.vue

@@ -239,19 +239,26 @@ export default {
     },
     methods:{
       putOnUnRecord(id){
-        var that = this
+        var that = this;
         let params = {
           ids:id.toString(),
           record_type: 3,
           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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
               // for (let i = 0; i < that.tableData.length; i++) {
               //   if (that.tableData[i].id == that.currentObject.id) {
@@ -265,21 +272,28 @@ export default {
         })
       },
       putOnRecord(id){
-        var that = this
+        var that = this;
 
         let params = {
           ids:id.toString(),
           record_type: 3,
           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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
 
 
@@ -292,7 +306,7 @@ export default {
         })
       },
       GDYBBatchPutOnRecord(){
-        var that = this
+        var that = this;
         var ids = [];
         var idMap = {};
         for (const index in this.selectDrug) {
@@ -303,14 +317,21 @@ export default {
           ids:ids.join(','),
           record_type: 3,
           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)
+            that.$message.error(response.data.data.msg);
             return false
           } else {
             if(response.data.data.failed_code == -10){
-              that.$message.error(response.data.data.msg)
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
             }else{
 
 
@@ -324,11 +345,11 @@ export default {
          this.getlist()
         },
         handleSizeChange(val) {
-            this.limit = val
+            this.limit = val;
             this.getlist()
         },
         handleCurrentChange(val) {
-            this.page = val
+            this.page = val;
             this.getlist()
         },
         searchAction(){
@@ -346,8 +367,8 @@ export default {
            this.$refs.editProject.show(id)
         },
         getCostClassify(id){
-          var costClassify = getDictionaryDataConfig('system','cost_classify')
-          var name = ""
+          var costClassify = getDictionaryDataConfig('system','cost_classify');
+          var name = "";
           for(let i=0;i<costClassify.length;i++){
              if(id == costClassify[i].id){
                name = costClassify[i].name
@@ -356,8 +377,8 @@ export default {
           return name
         },
         getExecutiveSection(id){
-          var executiveSection =  this.departMentList
-          var name = ""
+          var executiveSection =  this.departMentList;
+          var name = "";
           for(let i=0;i<executiveSection.length;i++){
             if(id == executiveSection[i].id){
                name = executiveSection[i].name
@@ -374,15 +395,15 @@ export default {
                limit:this.limit,
                page:this.page,
                is_mark:this.is_mark,
-            }
+            };
 
           getProjectList(params).then(response=>{
              if(response.data.state == 1){
-               var projecList = response.data.data.projecList
-              
-               this.tableData = projecList
-               var total = response.data.data.total
-            
+               var projecList = response.data.data.projecList;
+
+               this.tableData = projecList;
+               var total = response.data.data.total;
+
                this.total = total
              }
           })
@@ -395,8 +416,8 @@ export default {
            }).then(() => {
             deleteHisProject(id).then(response => {
                if (response.data.state == 1) {
-                 var msg = response.data.data.msg
-                 this.$message.success("删除成功")
+                 var msg = response.data.data.msg;
+                 this.$message.success("删除成功");
                 this.tableData.splice(index, 1);
                 }
              });
@@ -408,13 +429,13 @@ export default {
         },
 
         toRecord(){
-         var that = this
+         var that = this;
          axios.get('http://127.0.0.1:9532/sz/api/treatment/get').then(function(response) {
           if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
+               that.$message.error(response.data.msg);
                return false
             } else {
-              that.$message({ message: '备案成功', type: 'success' })
+              that.$message({ message: '备案成功', type: 'success' });
               that.getlist()
              }
            }).catch(function(error) {
@@ -422,27 +443,27 @@ export default {
       },
 
      toReturn(id,isMark){
-      
-         var that = this
+
+         var that = this;
          let params = {
              'id':id,
              'type_id':2,
              'is_mark':isMark,
              'admin_user_id':this.$store.getters.xt_user.user.id,
-          }
-      
+          };
+
 
          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.data.msg)
+               that.$message.error(response.data.data.msg);
                return false
             } else {
               if(response.data.data.msg == ""){
-                  that.$message.success("备案成功!")
+                  that.$message.success("备案成功!");
                   that.getlist()
                }
                if(response.data.data.msg!=""){
-                  that.$message.error(response.data.data.msg)
+                  that.$message.error(response.data.data.msg);
                   that.getlist()
                }
              }
@@ -478,24 +499,24 @@ export default {
           idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
         }
 
-        var idss = ids.join(',')
+        var idss = ids.join(',');
         let params = {
           ids:idss,
           admin_user_id:this.$store.getters.xt_user.user.id
-        }
-      
-        var that = this
+        };
+
+        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.data.msg)
+               that.$message.error(response.data.data.msg);
                return false
             } else {
               if(response.data.data.msg == ""){
-                  that.$message.success("备案成功!")
+                  that.$message.success("备案成功!");
                   that.getlist()
                }
                if(response.data.data.msg!=""){
-                  that.$message.error(response.data.data.msg)
+                  that.$message.error(response.data.data.msg);
                   that.getlist()
                }
              }
@@ -508,11 +529,11 @@ export default {
         var params = {
             limit:this.limit,
             page:this.page,
-        }
+        };
         getDePartmentList(params).then(response=>{
             if(response.data.state == 1){
-            var department =   response.data.data.departMentList
-           
+            var department =   response.data.data.departMentList;
+
             this.departMentList = department
             }
         })
@@ -521,30 +542,30 @@ export default {
 
         if (header != undefined && header.length > 0) {
 
-          var isHasProjectName = header.includes('*项目名称')
+          var isHasProjectName = header.includes('*项目名称');
 
-          var isHasProjectPrice = header.includes('*零价')
+          var isHasProjectPrice = header.includes('*零价');
 
-          var isHasProjectUnit = header.includes('*单位')
+          var isHasProjectUnit = header.includes('*单位');
 
-          var isHasProjectCostClassify = header.includes('*费用类别')
+          var isHasProjectCostClassify = header.includes('*费用类别');
 
-          var isHasProjectExecutiveSection = header.includes('*执行科室')
+          var isHasProjectExecutiveSection = header.includes('*执行科室');
 
-          var isHasProjectMedicalCoverage = header.includes('*医保等级')
+          var isHasProjectMedicalCoverage = header.includes('*医保等级');
 
           if (!(isHasProjectName && isHasProjectPrice && isHasProjectUnit && isHasProjectCostClassify && isHasProjectExecutiveSection && isHasProjectMedicalCoverage )) {
-            this.dialogVisible = true
+            this.dialogVisible = true;
             return
           }
         }else {
-          this.dialogVisible = true
+          this.dialogVisible = true;
           return
         }
 
-       var tableData = []
+       var tableData = [];
        for(let i=1;i<results.length;i++){
-         let obj = {"cost_classify_id":0,"medical_insurance_level_id":0,"executive_section_id":0,"tube_color_id":0,"statistical_classification_id":0,"category":0,"specail_project":0,"medical_status":0}
+         let obj = {"cost_classify_id":0,"medical_insurance_level_id":0,"executive_section_id":0,"tube_color_id":0,"statistical_classification_id":0,"category":0,"specail_project":0,"medical_status":0};
          for (var key in results[i]) {
            if (results[i]['*项目名称'] === undefined) {
                 obj['project_name'] = ''
@@ -738,8 +759,8 @@ export default {
               }
           }
          }
-         tableData.push(obj)
-         
+         tableData.push(obj);
+
 
         for(let i=0;i<tableData.length;i++){
 
@@ -805,13 +826,13 @@ export default {
        }
        let params = {
           'projects':tableData
-        }
-       console.log("params222",params)
+        };
+       console.log("params222",params);
 
         postProjectInformation(params).then(response=>{
            if(response.data.state == 1){
-             var msg =  response.data.data.msg
-             this.$message.success("导入成功!")
+             var msg =  response.data.data.msg;
+             this.$message.success("导入成功!");
              this.getlist()
            }else{
              this.$message.error("导入失败")
@@ -819,9 +840,9 @@ export default {
         })
       },
       generateTxt: function(log) {
-        var content = ''
-        var errlog = log.err_logs
-        content = this.getContent(log)
+        var content = '';
+        var errlog = log.err_logs;
+        content = this.getContent(log);
         for (let i = 0; i < errlog.length; i++) {
           if (content.length == 0) {
             content = errlog[i].err_msg
@@ -830,38 +851,38 @@ export default {
           }
         }
 
-        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
+        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' });
         if (typeof url === 'object' && url instanceof Blob) {
           url = URL.createObjectURL(url) // 创建blob地址
         }
-        const aLink = document.createElement('a')
-        aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt'
+        const aLink = document.createElement('a');
+        aLink.href = url;
+        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt';
         aLink.click()
 
       },
       getContent(log) {
-       
+
         return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
       },
       timestampToTime(timestamp) {
-        var date = new Date(timestamp * 1000)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-        var Y = date.getFullYear() + '年'
-        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月'
-        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
-        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
-        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
-        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
+        var date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年';
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
+        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 ';
+        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时';
+        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分';
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒';
         return Y + M + D + h + m + s
       },
        generateLog() {
         let params = {
           'log_type': 6
-        }
+        };
         generateLog(params).then(
           response => {
             if (response.data.state === 1) {
-              this.logs = response.data.data.logs
+              this.logs = response.data.data.logs;
               this.exportLogVisible = true
             } else {
               this.$message.error(response.data.msg)
@@ -874,7 +895,7 @@ export default {
       },
     },
     created(){
-      this.getlist()
+      this.getlist();
       this.getDartmentList()
 
     }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -372,7 +372,7 @@
           </el-table-column>
 
 
-          
+
 
           <el-table-column
             prop="heparin"
@@ -387,12 +387,12 @@
           <el-table-column
             prop="heparin"
             align="center"
-            label="抗凝剂" 
+            label="抗凝剂"
             width="140"
             v-if="isShow('抗凝剂')"
           >
             <template slot-scope="scope">
-             <span v-if="scope.row.monitor_anticoagulant == 1">无肝素</span> 
+             <span v-if="scope.row.monitor_anticoagulant == 1">无肝素</span>
              <span v-if="scope.row.monitor_anticoagulant == 2">普通肝素</span>
              <span v-if="scope.row.monitor_anticoagulant == 3">低分子肝素</span>
              <span v-if="scope.row.monitor_anticoagulant == 4">阿加曲班</span>
@@ -402,7 +402,7 @@
              <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
              <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
              <span v-if="scope.row.monitor_anticoagulant_value!=''">（{{ scope.row.monitor_anticoagulant_value ? scope.row.monitor_anticoagulant_value : ""  }}）</span>
-             
+
             </template>
           </el-table-column>
 
@@ -453,7 +453,7 @@
             v-if="isShow('病情变化')"
           >
           </el-table-column>
-          
+
           <el-table-column
             prop="dispose"
             align="center"
@@ -684,7 +684,7 @@
                 </div>
             </el-form-item>
           </el-col>
-        
+
          <el-col :span="8" v-if="isShow('血压监测部位')">
             <el-form-item label="血压监测部位：">
               <div style="display:flex;">
@@ -706,8 +706,8 @@
             </el-form-item>
          </el-col>
 
-        
-      
+
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -894,7 +894,7 @@ export default {
         dispose: '', // 处理
         result: '', // 结果,
         blood_oxygen_saturation: '',
-        urr:'', 
+        urr:'',
         blood_sugar:'',//血糖
         monitor_anticoagulant:'',
         monitor_anticoagulant_value:"",
@@ -929,21 +929,21 @@ export default {
     }
   },
   created() {
-    this.template_id = this.$store.getters.xt_user.template_info.template_id
-    this.org_id = this.$store.getters.xt_user.template_info.org_id
-    var date = this.$route.query.date
-    var patient_id = this.$route.query.patient_id
-    this.patient_id = patient_id
-    this.schedule_date = date
-    this.form.monitoring_date = date
+    this.template_id = this.$store.getters.xt_user.template_info.template_id;
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
+    var date = this.$route.query.date;
+    var patient_id = this.$route.query.patient_id;
+    this.patient_id = patient_id;
+    this.schedule_date = date;
+    this.form.monitoring_date = date;
     // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
-    this.form.operate_time = new Date().getTime()
-    var symptoms = getDataConfig('hemodialysis', 'symptoms')
-    console.log("sysmptoms3333333333",symptoms)
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
-    console.log("抗凝剂",this.anticoagulantsConfit)
-    this.bloodPressureMmonitoringSite = getDataConfig('hemodialysis','blood_pressure_monitoring_site')
+    this.form.operate_time = new Date().getTime();
+    var symptoms = getDataConfig('hemodialysis', 'symptoms');
+    console.log("sysmptoms3333333333",symptoms);
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
+    //console.log("抗凝剂",this.anticoagulantsConfit)
+    this.bloodPressureMmonitoringSite = getDataConfig('hemodialysis','blood_pressure_monitoring_site');
     this.complicationList = getDataConfig('hemodialysis','complication')
 
   },
@@ -1029,7 +1029,7 @@ export default {
     },
 
     isShow(name) {
-      var filedList = store.getters.xt_user.fileds
+      var filedList = store.getters.xt_user.fileds;
       for (let i = 0; i < filedList.length; i++) {
         if (filedList[i].module == 4 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
           return true
@@ -1041,7 +1041,7 @@ export default {
       this.cancelEditAction()
     },
     show() {
-      this.getPermission()
+      this.getPermission();
       this.visible = true
     },
     hide() {
@@ -1052,67 +1052,67 @@ export default {
     },
 
     newRecordAction: function() {
-      this.setEditMonitor(null)
-      this.$refs.table.setCurrentRow(null)
-      this.edit = true
-      this.isAdd = true
+      this.setEditMonitor(null);
+      this.$refs.table.setCurrentRow(null);
+      this.edit = true;
+      this.isAdd = true;
       this.getLastRecordTody()
     },
     getLastRecordTody() {
       const params = {
         patient_id: this.patient_id
-      }
+      };
 
       getTodayMonitor(params).then(rs => {
-        console.log("机构ID",this.org_id)
-        
-        var resp = rs.data.data
-       
-        this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
-        this.form.temperature = '' // this.last_monitor_record.pulse_frequency;
-
-        this.form.pulse_frequency = '' // this.last_monitor_record.pulse_frequency;
-        this.form.breathing_rated =  resp.monitor.breathing_rated ? resp.monitor.breathing_rated : ''
-        this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
-        this.form.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
-        this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
+        console.log("机构ID",this.org_id);
+
+        var resp = rs.data.data;
+
+        this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date());
+        this.form.temperature = ''; // this.last_monitor_record.pulse_frequency;
+
+        this.form.pulse_frequency = ''; // this.last_monitor_record.pulse_frequency;
+        this.form.breathing_rated =  resp.monitor.breathing_rated ? resp.monitor.breathing_rated : '';
+        this.form.systolic_bp = ''; // this.last_monitor_record.systolic_blood_pressure;
+        this.form.diastolic_bp = ''; // this.last_monitor_record.diastolic_blood_pressure;
+        this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : '';
         // 静脉压
         if(this.org_id == 10060){
           this.form.venous_pressure = resp.monitor.venous_pressure
         }else{
           this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
         }
-        
-        this.form.venous_pressure_type = resp.monitor.venous_pressure_type ? resp.monitor.venous_pressure_type : 1
-        this.form.arterial_pressure = resp.monitor.arterial_pressure ? resp.monitor.arterial_pressure : '' // this.last_monitor_record.arterial_pressure;
-        this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type ? resp.monitor.arterial_pressure_type : 1
+
+        this.form.venous_pressure_type = resp.monitor.venous_pressure_type ? resp.monitor.venous_pressure_type : 1;
+        this.form.arterial_pressure = resp.monitor.arterial_pressure ? resp.monitor.arterial_pressure : ''; // this.last_monitor_record.arterial_pressure;
+        this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type ? resp.monitor.arterial_pressure_type : 1;
         if(this.org_id == 10060){
           this.form.transmembrane_pressure = resp.monitor.transmembrane_pressure;
         }else{
           this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
         }
-        this.form.transmembrane_pressure_type = resp.monitor.transmembrane_pressure_type ? resp.monitor.transmembrane_pressure_type : 1
-        this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate ? resp.monitor.ultrafiltration_rate : ''
-        this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
-        this.form.sodium_concentration = resp.monitor.sodium_concentration ? resp.monitor.sodium_concentration : ''
-        this.form.dialysate_temperature = resp.monitor.dialysate_temperature ? resp.monitor.dialysate_temperature : ''
-        this.form.temperature =  resp.monitor.temperature ? resp.monitor.temperature : ''
-        this.form.replacement_rate = resp.monitor.replacement_rate ? resp.monitor.replacement_rate : ''
-        this.form.heparin = resp.monitor.heparin ? resp.monitor.heparin : ''
-        this.form.dialysate_flow = resp.monitor.dialysate_flow ? resp.monitor.dialysate_flow : ''
-        this.form.displacement_quantity =  resp.monitor.displacement_quantity ? resp.monitor.displacement_quantity : '' // this.last_monitor_record.displacement_quantity;
-        this.form.conductivity =   ''
-        this.form.displacement_flow_quantity = resp.monitor.displacement_flow_quantity ? resp.monitor.displacement_flow_quantity : ''
-        this.form.ktv =  resp.monitor.ktv ? resp.monitor.ktv : '' // this.last_monitor_record.ktv;
-        this.form.symptom =  resp.monitor.symptom ? resp.monitor.symptom : '' // this.last_monitor_record.symptom;
-        this.form.dispose =  resp.monitor.dispose ? resp.monitor.dispose : '' // this.last_monitor_record.dispose;
-        this.form.result =  resp.monitor.result ? resp.monitor.result : '' // this.last_monitor_record.result;
-        this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation ? resp.monitor.blood_oxygen_saturation : ''
-        this.form.urr = resp.monitor.urr?resp.monitor.urr:''
-        this.form.blood_sugar = resp.monitor.blood_sugar?resp.monitor.blood_sugar:''
-        this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:''
-        this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:''
-        this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:""
+        this.form.transmembrane_pressure_type = resp.monitor.transmembrane_pressure_type ? resp.monitor.transmembrane_pressure_type : 1;
+        this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate ? resp.monitor.ultrafiltration_rate : '';
+        this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : '';
+        this.form.sodium_concentration = resp.monitor.sodium_concentration ? resp.monitor.sodium_concentration : '';
+        this.form.dialysate_temperature = resp.monitor.dialysate_temperature ? resp.monitor.dialysate_temperature : '';
+        this.form.temperature =  resp.monitor.temperature ? resp.monitor.temperature : '';
+        this.form.replacement_rate = resp.monitor.replacement_rate ? resp.monitor.replacement_rate : '';
+        this.form.heparin = resp.monitor.heparin ? resp.monitor.heparin : '';
+        this.form.dialysate_flow = resp.monitor.dialysate_flow ? resp.monitor.dialysate_flow : '';
+        this.form.displacement_quantity =  resp.monitor.displacement_quantity ? resp.monitor.displacement_quantity : ''; // this.last_monitor_record.displacement_quantity;
+        this.form.conductivity =   '';
+        this.form.displacement_flow_quantity = resp.monitor.displacement_flow_quantity ? resp.monitor.displacement_flow_quantity : '';
+        this.form.ktv =  resp.monitor.ktv ? resp.monitor.ktv : ''; // this.last_monitor_record.ktv;
+        this.form.symptom =  resp.monitor.symptom ? resp.monitor.symptom : ''; // this.last_monitor_record.symptom;
+        this.form.dispose =  resp.monitor.dispose ? resp.monitor.dispose : ''; // this.last_monitor_record.dispose;
+        this.form.result =  resp.monitor.result ? resp.monitor.result : ''; // this.last_monitor_record.result;
+        this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation ? resp.monitor.blood_oxygen_saturation : '';
+        this.form.urr = resp.monitor.urr?resp.monitor.urr:'';
+        this.form.blood_sugar = resp.monitor.blood_sugar?resp.monitor.blood_sugar:'';
+        this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:'';
+        this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:'';
+        this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:"";
         this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:""
 
       })
@@ -1120,18 +1120,18 @@ export default {
 
     modifyRecordAction: function() {
       if (this.table_current_row == null) {
-        this.$message.error('请选择一条监测记录')
+        this.$message.error('请选择一条监测记录');
         return
       }
-      this.creator = this.table_current_row.creator
-      this.setEditMonitor(this.table_current_row)
-      this.$refs.table.setCurrentRow(null)
-      this.edit = true
+      this.creator = this.table_current_row.creator;
+      this.setEditMonitor(this.table_current_row);
+      this.$refs.table.setCurrentRow(null);
+      this.edit = true;
       this.isAdd = false
     },
     cancelEditAction: function() {
-      this.setEditMonitor(null)
-      this.$refs.table.setCurrentRow(null)
+      this.setEditMonitor(null);
+      this.$refs.table.setCurrentRow(null);
       this.edit = false
     },
     tableCurrentRowChange: function(currentRow) {
@@ -1141,142 +1141,142 @@ export default {
     },
     setEditMonitor: function(monitor) {
       if (monitor == null || monitor == undefined) {
-        this.form.id = 0
+        this.form.id = 0;
         // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
         // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
-        this.form.operate_time = new Date().getTime()
-        this.form.systolic_bp = ''
-        this.form.diastolic_bp = ''
-        this.form.pulse_frequency = ''
-        this.form.breathing_rated = ''
-        this.form.blood_flow_volume = ''
-        this.form.temperature = ''
-        this.form.venous_pressure = ''
-        this.form.venous_pressure_type = 1
-        this.form.transmembrane_pressure = ''
-        this.form.transmembrane_pressure_type = 1
-        this.form.ultrafiltration_volume = ''
-        this.form.ultrafiltration_rate = ''
-        this.form.arterial_pressure = ''
-        this.form.arterial_pressure_type = 1
-        this.form.sodium_concentration = ''
-        this.form.dialysate_temperature = ''
-        this.form.replacement_rate = ''
-        this.form.displacement_quantity = ''
-        this.form.conductivity = ''
-        this.form.displacement_flow_quantity = ''
-        this.form.heparin = ''
-        this.form.dialysate_flow = ''
-        this.form.ktv = ''
-        this.form.symptom = ''
-        this.form.dispose = ''
-        this.form.result = ''
-        this.symptom_selecteds = []
-        this.dispose_selecteds = []
-        this.result_selecteds = []
-        this.form.urr = ''
-        this.form.blood_sugar = ''
-        this.form.monitor_anticoagulant = ''
+        this.form.operate_time = new Date().getTime();
+        this.form.systolic_bp = '';
+        this.form.diastolic_bp = '';
+        this.form.pulse_frequency = '';
+        this.form.breathing_rated = '';
+        this.form.blood_flow_volume = '';
+        this.form.temperature = '';
+        this.form.venous_pressure = '';
+        this.form.venous_pressure_type = 1;
+        this.form.transmembrane_pressure = '';
+        this.form.transmembrane_pressure_type = 1;
+        this.form.ultrafiltration_volume = '';
+        this.form.ultrafiltration_rate = '';
+        this.form.arterial_pressure = '';
+        this.form.arterial_pressure_type = 1;
+        this.form.sodium_concentration = '';
+        this.form.dialysate_temperature = '';
+        this.form.replacement_rate = '';
+        this.form.displacement_quantity = '';
+        this.form.conductivity = '';
+        this.form.displacement_flow_quantity = '';
+        this.form.heparin = '';
+        this.form.dialysate_flow = '';
+        this.form.ktv = '';
+        this.form.symptom = '';
+        this.form.dispose = '';
+        this.form.result = '';
+        this.symptom_selecteds = [];
+        this.dispose_selecteds = [];
+        this.result_selecteds = [];
+        this.form.urr = '';
+        this.form.blood_sugar = '';
+        this.form.monitor_anticoagulant = '';
         this.form.monitor_anticoagulant_value = ''
       } else {
         (this.form.id = monitor.id),
         // this.form.operate_date = monitor.operate_date
         // this.form.monitoring_time = monitor.monitoring_time
-        (this.form.operate_time = monitor.operate_time * 1000)
-        this.form.systolic_bp = monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : ''
-        this.form.temperature = monitor.temperature ? monitor.temperature : ''
-        this.form.diastolic_bp = monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : ''
-        this.form.pulse_frequency = monitor.pulse_frequency ? monitor.pulse_frequency : ''
-        this.form.breathing_rated = monitor.breathing_rate ? monitor.breathing_rate : ''
-        this.form.blood_flow_volume = monitor.blood_flow_volume ? monitor.blood_flow_volume : ''
-        this.form.venous_pressure = monitor.venous_pressure ? monitor.venous_pressure : ''
-        this.form.venous_pressure_type = monitor.venous_pressure_type ? monitor.venous_pressure_type : ''
-        this.form.transmembrane_pressure = monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ''
-        this.form.transmembrane_pressure_type = monitor.transmembrane_pressure_type ? monitor.transmembrane_pressure_type : ''
-        this.form.ultrafiltration_volume = monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : ''
-        this.form.ultrafiltration_rate = monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : ''
-        this.form.arterial_pressure = monitor.arterial_pressure ? monitor.arterial_pressure : ''
-        this.form.arterial_pressure_type = monitor.arterial_pressure_type ? monitor.arterial_pressure_type : ''
-        this.form.sodium_concentration = monitor.sodium_concentration ? monitor.sodium_concentration : ''
-        this.form.dialysate_temperature = monitor.dialysate_temperature ? monitor.dialysate_temperature : ''
-        this.form.replacement_rate = monitor.replacement_rate ? monitor.replacement_rate : ''
-        this.form.displacement_quantity = monitor.displacement_quantity ? monitor.displacement_quantity : ''
-        this.form.conductivity = monitor.conductivity ? monitor.conductivity : ''
-        this.form.displacement_flow_quantity = monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : ''
-        this.form.heparin = monitor.heparin ? monitor.heparin : ''
-        this.form.dialysate_flow = monitor.dialysate_flow ? monitor.dialysate_flow : ''
-
-        this.form.ktv = monitor.ktv ? monitor.ktv : ''
-        this.form.symptom = monitor.symptom
-        this.form.dispose = monitor.dispose
-        this.form.result = monitor.result
-        this.form.blood_oxygen_saturation = monitor.blood_oxygen_saturation
-        this.form.urr = monitor.urr?monitor.urr:''
-        this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:''
-        this.form.monitor_anticoagulant = monitor.monitor_anticoagulant?monitor.monitor_anticoagulant:''
-        this.form.monitor_anticoagulant_value = monitor.monitor_anticoagulant_value?monitor.monitor_anticoagulant_value:""
+        (this.form.operate_time = monitor.operate_time * 1000);
+        this.form.systolic_bp = monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : '';
+        this.form.temperature = monitor.temperature ? monitor.temperature : '';
+        this.form.diastolic_bp = monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : '';
+        this.form.pulse_frequency = monitor.pulse_frequency ? monitor.pulse_frequency : '';
+        this.form.breathing_rated = monitor.breathing_rate ? monitor.breathing_rate : '';
+        this.form.blood_flow_volume = monitor.blood_flow_volume ? monitor.blood_flow_volume : '';
+        this.form.venous_pressure = monitor.venous_pressure ? monitor.venous_pressure : '';
+        this.form.venous_pressure_type = monitor.venous_pressure_type ? monitor.venous_pressure_type : '';
+        this.form.transmembrane_pressure = monitor.transmembrane_pressure ? monitor.transmembrane_pressure : '';
+        this.form.transmembrane_pressure_type = monitor.transmembrane_pressure_type ? monitor.transmembrane_pressure_type : '';
+        this.form.ultrafiltration_volume = monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '';
+        this.form.ultrafiltration_rate = monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '';
+        this.form.arterial_pressure = monitor.arterial_pressure ? monitor.arterial_pressure : '';
+        this.form.arterial_pressure_type = monitor.arterial_pressure_type ? monitor.arterial_pressure_type : '';
+        this.form.sodium_concentration = monitor.sodium_concentration ? monitor.sodium_concentration : '';
+        this.form.dialysate_temperature = monitor.dialysate_temperature ? monitor.dialysate_temperature : '';
+        this.form.replacement_rate = monitor.replacement_rate ? monitor.replacement_rate : '';
+        this.form.displacement_quantity = monitor.displacement_quantity ? monitor.displacement_quantity : '';
+        this.form.conductivity = monitor.conductivity ? monitor.conductivity : '';
+        this.form.displacement_flow_quantity = monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : '';
+        this.form.heparin = monitor.heparin ? monitor.heparin : '';
+        this.form.dialysate_flow = monitor.dialysate_flow ? monitor.dialysate_flow : '';
+
+        this.form.ktv = monitor.ktv ? monitor.ktv : '';
+        this.form.symptom = monitor.symptom;
+        this.form.dispose = monitor.dispose;
+        this.form.result = monitor.result;
+        this.form.blood_oxygen_saturation = monitor.blood_oxygen_saturation;
+        this.form.urr = monitor.urr?monitor.urr:'';
+        this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:'';
+        this.form.monitor_anticoagulant = monitor.monitor_anticoagulant?monitor.monitor_anticoagulant:'';
+        this.form.monitor_anticoagulant_value = monitor.monitor_anticoagulant_value?monitor.monitor_anticoagulant_value:"";
         // 设置三个下拉框的值，直接调用事件偷懒
-        this.symptomTextareaBlur()
-        this.disposeTextareaBlur()
+        this.symptomTextareaBlur();
+        this.disposeTextareaBlur();
         this.resultTextareaBlur()
       }
     },
 
     submitAction: function() {
-      
+
       // TODO loading
-      var is_new = this.form.id
-      this.form.operate_time = parseInt(this.form.operate_time / 1000)
-      this.form.systolic_bp = parseFloat(this.form.systolic_bp) == NaN ? 0 : parseFloat(this.form.systolic_bp)
-      this.form.diastolic_bp = parseFloat(this.form.diastolic_bp) == NaN ? 0 : parseFloat(this.form.diastolic_bp)
-      this.form.temperature = parseFloat(this.form.temperature) == NaN ? 0 : parseFloat(this.form.temperature)
-      this.form.pulse_frequency = parseFloat(this.form.pulse_frequency) == NaN ? 0 : parseFloat(this.form.pulse_frequency)
-      this.form.breathing_rated = parseFloat(this.form.breathing_rated) == NaN ? 0 : parseFloat(this.form.breathing_rated)
-      this.form.blood_flow_volume = parseFloat(this.form.blood_flow_volume) == NaN ? 0 : parseFloat(this.form.blood_flow_volume)
-      this.form.venous_pressure = parseFloat(this.form.venous_pressure) == NaN ? 0 : parseFloat(this.form.venous_pressure)
-      this.form.venous_pressure_type = parseFloat(this.form.venous_pressure_type) == NaN ? 1 : parseFloat(this.form.venous_pressure_type)
-      this.form.transmembrane_pressure = parseFloat(this.form.transmembrane_pressure) == NaN ? 0 : parseFloat(this.form.transmembrane_pressure)
-      this.form.transmembrane_pressure_type = parseFloat(this.form.transmembrane_pressure_type) == NaN ? 1 : parseFloat(this.form.transmembrane_pressure_type)
-      this.form.ultrafiltration_volume = parseFloat(this.form.ultrafiltration_volume) == NaN ? 0 : parseFloat(this.form.ultrafiltration_volume)
-      this.form.ultrafiltration_rate = parseFloat(this.form.ultrafiltration_rate) == NaN ? 0 : parseFloat(this.form.ultrafiltration_rate)
-      this.form.arterial_pressure = parseFloat(this.form.arterial_pressure) == NaN ? 0 : parseFloat(this.form.arterial_pressure)
-      this.form.arterial_pressure_type = parseFloat(this.form.arterial_pressure_type) == NaN ? 1 : parseFloat(this.form.arterial_pressure_type)
-      this.form.sodium_concentration = parseFloat(this.form.sodium_concentration) == NaN ? 0 : parseFloat(this.form.sodium_concentration)
-      this.form.dialysate_temperature = parseFloat(this.form.dialysate_temperature) == NaN ? 0 : parseFloat(this.form.dialysate_temperature)
-      this.form.replacement_rate = parseFloat(this.form.replacement_rate) == NaN ? 0 : parseFloat(this.form.replacement_rate)
-      this.form.displacement_quantity = parseFloat(this.form.displacement_quantity) == NaN ? 0 : parseFloat(this.form.displacement_quantity)
-      this.form.conductivity = parseFloat(this.form.conductivity) == NaN ? 0 : parseFloat(this.form.conductivity)
-      this.form.displacement_flow_quantity = parseFloat(this.form.displacement_flow_quantity) == NaN ? 0 : parseFloat(this.form.displacement_flow_quantity)
-      this.form.heparin = parseFloat(this.form.heparin) == NaN ? 0 : parseFloat(this.form.heparin)
-      this.form.dialysate_flow = parseFloat(this.form.dialysate_flow) == NaN ? 0 : parseFloat(this.form.dialysate_flow)
-      this.form.ktv = parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv)
-      this.form.monitoring_date = parseInt(this.form.monitoring_date)
-      this.form.urr = this.form.urr
-      this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
-      this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
-      this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
-      this.form.blood_pressure_monitoring_site = parseInt(this.form.blood_pressure_monitoring_site)
-      this.form.complication = parseInt(this.form.complication)
-      let mode = '1'
+      var is_new = this.form.id;
+      this.form.operate_time = parseInt(this.form.operate_time / 1000);
+      this.form.systolic_bp = parseFloat(this.form.systolic_bp) == NaN ? 0 : parseFloat(this.form.systolic_bp);
+      this.form.diastolic_bp = parseFloat(this.form.diastolic_bp) == NaN ? 0 : parseFloat(this.form.diastolic_bp);
+      this.form.temperature = parseFloat(this.form.temperature) == NaN ? 0 : parseFloat(this.form.temperature);
+      this.form.pulse_frequency = parseFloat(this.form.pulse_frequency) == NaN ? 0 : parseFloat(this.form.pulse_frequency);
+      this.form.breathing_rated = parseFloat(this.form.breathing_rated) == NaN ? 0 : parseFloat(this.form.breathing_rated);
+      this.form.blood_flow_volume = parseFloat(this.form.blood_flow_volume) == NaN ? 0 : parseFloat(this.form.blood_flow_volume);
+      this.form.venous_pressure = parseFloat(this.form.venous_pressure) == NaN ? 0 : parseFloat(this.form.venous_pressure);
+      this.form.venous_pressure_type = parseFloat(this.form.venous_pressure_type) == NaN ? 1 : parseFloat(this.form.venous_pressure_type);
+      this.form.transmembrane_pressure = parseFloat(this.form.transmembrane_pressure) == NaN ? 0 : parseFloat(this.form.transmembrane_pressure);
+      this.form.transmembrane_pressure_type = parseFloat(this.form.transmembrane_pressure_type) == NaN ? 1 : parseFloat(this.form.transmembrane_pressure_type);
+      this.form.ultrafiltration_volume = parseFloat(this.form.ultrafiltration_volume) == NaN ? 0 : parseFloat(this.form.ultrafiltration_volume);
+      this.form.ultrafiltration_rate = parseFloat(this.form.ultrafiltration_rate) == NaN ? 0 : parseFloat(this.form.ultrafiltration_rate);
+      this.form.arterial_pressure = parseFloat(this.form.arterial_pressure) == NaN ? 0 : parseFloat(this.form.arterial_pressure);
+      this.form.arterial_pressure_type = parseFloat(this.form.arterial_pressure_type) == NaN ? 1 : parseFloat(this.form.arterial_pressure_type);
+      this.form.sodium_concentration = parseFloat(this.form.sodium_concentration) == NaN ? 0 : parseFloat(this.form.sodium_concentration);
+      this.form.dialysate_temperature = parseFloat(this.form.dialysate_temperature) == NaN ? 0 : parseFloat(this.form.dialysate_temperature);
+      this.form.replacement_rate = parseFloat(this.form.replacement_rate) == NaN ? 0 : parseFloat(this.form.replacement_rate);
+      this.form.displacement_quantity = parseFloat(this.form.displacement_quantity) == NaN ? 0 : parseFloat(this.form.displacement_quantity);
+      this.form.conductivity = parseFloat(this.form.conductivity) == NaN ? 0 : parseFloat(this.form.conductivity);
+      this.form.displacement_flow_quantity = parseFloat(this.form.displacement_flow_quantity) == NaN ? 0 : parseFloat(this.form.displacement_flow_quantity);
+      this.form.heparin = parseFloat(this.form.heparin) == NaN ? 0 : parseFloat(this.form.heparin);
+      this.form.dialysate_flow = parseFloat(this.form.dialysate_flow) == NaN ? 0 : parseFloat(this.form.dialysate_flow);
+      this.form.ktv = parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
+      this.form.monitoring_date = parseInt(this.form.monitoring_date);
+      this.form.urr = this.form.urr;
+      this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar);
+      this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant);
+      this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
+      this.form.blood_pressure_monitoring_site = parseInt(this.form.blood_pressure_monitoring_site);
+      this.form.complication = parseInt(this.form.complication);
+      let mode = '1';
       if (this.form.id > 0) {
-        mode = '2'
+        mode = '2';
         if (this.creator > 0 && this.creator != this.$store.getters.xt_user.user.id) {
           mode = '3'
         }
       }
       editMonitor(this.patient_id, this.schedule_date, this.form, mode).then(
-        
+
         rs => {
-          var resp = rs.data
+          var resp = rs.data;
           if (resp.state == 1) {
-            var monitor = resp.data.monitor
+            var monitor = resp.data.monitor;
             if (this.isAdd) {
-              this.monitors.unshift(monitor)
-              this.monitors.sort((a, b) => b.operate_time - a.operate_time)
+              this.monitors.unshift(monitor);
+              this.monitors.sort((a, b) => b.operate_time - a.operate_time);
               this.monitors.reverse()
             } else {
               for (let index = 0; index < this.monitors.length; index++) {
-                const m = this.monitors[index]
+                const m = this.monitors[index];
                 if (m.id == monitor.id) {
                   for (const key in monitor) {
                     m[key] = monitor[key]
@@ -1287,36 +1287,36 @@ export default {
             }
             this.reset()
           } else {
-            this.form.systolic_bp = parseFloat(this.form.systolic_bp) == NaN ? 0 : parseFloat(this.form.systolic_bp)
-            this.form.diastolic_bp = parseFloat(this.form.diastolic_bp) == NaN ? 0 : parseFloat(this.form.diastolic_bp)
-            this.form.temperature = parseFloat(this.form.temperature) == NaN ? 0 : parseFloat(this.form.temperature)
-            this.form.pulse_frequency = parseFloat(this.form.pulse_frequency) == NaN ? 0 : parseFloat(this.form.pulse_frequency)
-            this.form.breathing_rated = parseFloat(this.form.breathing_rated) == NaN ? 0 : parseFloat(this.form.breathing_rated)
-            this.form.blood_flow_volume = parseFloat(this.form.blood_flow_volume) == NaN ? 0 : parseFloat(this.form.blood_flow_volume)
-            this.form.venous_pressure = parseFloat(this.form.venous_pressure) == NaN ? 0 : parseFloat(this.form.venous_pressure)
-            this.form.venous_pressure_type = parseFloat(this.form.venous_pressure_type) == NaN ? 1 : parseFloat(this.form.venous_pressure_type)
-            this.form.transmembrane_pressure = parseFloat(this.form.transmembrane_pressure) == NaN ? 0 : parseFloat(this.form.transmembrane_pressure)
-            this.form.transmembrane_pressure_type = parseFloat(this.form.transmembrane_pressure_type) == NaN ? 1 : parseFloat(this.form.transmembrane_pressure_type)
-            this.form.ultrafiltration_volume = parseFloat(this.form.ultrafiltration_volume) == NaN ? 0 : parseFloat(this.form.ultrafiltration_volume)
-            this.form.ultrafiltration_rate = parseFloat(this.form.ultrafiltration_rate) == NaN ? 0 : parseFloat(this.form.ultrafiltration_rate)
-            this.form.arterial_pressure = parseFloat(this.form.arterial_pressure) == NaN ? 0 : parseFloat(this.form.arterial_pressure)
-            this.form.arterial_pressure_type = parseFloat(this.form.arterial_pressure_type) == NaN ? 1 : parseFloat(this.form.arterial_pressure_type)
-            this.form.sodium_concentration = parseFloat(this.form.sodium_concentration) == NaN ? 0 : parseFloat(this.form.sodium_concentration)
-            this.form.dialysate_temperature = parseFloat(this.form.dialysate_temperature) == NaN ? 0 : parseFloat(this.form.dialysate_temperature)
-            this.form.replacement_rate = parseFloat(this.form.replacement_rate) == NaN ? 0 : parseFloat(this.form.replacement_rate)
-            this.form.displacement_quantity = parseFloat(this.form.displacement_quantity) == NaN ? 0 : parseFloat(this.form.displacement_quantity)
-            this.form.conductivity = parseFloat(this.form.conductivity) == NaN ? 0 : parseFloat(this.form.conductivity)
-            this.form.displacement_flow_quantity = parseFloat(this.form.displacement_flow_quantity) == NaN ? 0 : parseFloat(this.form.displacement_flow_quantity)
-            this.form.heparin = parseFloat(this.form.heparin) == NaN ? 0 : parseFloat(this.form.heparin)
-            this.form.dialysate_flow = parseFloat(this.form.dialysate_flow) == NaN ? 0 : parseFloat(this.form.dialysate_flow)
-
-            this.form.ktv = parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv)
-            this.form.urr = this.form.urr
-            this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
-            this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
-            this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
-            this.form.blood_pressure_monitoring_site = this.form.blood_pressure_monitoring_site
-            this.form.complication = this.form.complication
+            this.form.systolic_bp = parseFloat(this.form.systolic_bp) == NaN ? 0 : parseFloat(this.form.systolic_bp);
+            this.form.diastolic_bp = parseFloat(this.form.diastolic_bp) == NaN ? 0 : parseFloat(this.form.diastolic_bp);
+            this.form.temperature = parseFloat(this.form.temperature) == NaN ? 0 : parseFloat(this.form.temperature);
+            this.form.pulse_frequency = parseFloat(this.form.pulse_frequency) == NaN ? 0 : parseFloat(this.form.pulse_frequency);
+            this.form.breathing_rated = parseFloat(this.form.breathing_rated) == NaN ? 0 : parseFloat(this.form.breathing_rated);
+            this.form.blood_flow_volume = parseFloat(this.form.blood_flow_volume) == NaN ? 0 : parseFloat(this.form.blood_flow_volume);
+            this.form.venous_pressure = parseFloat(this.form.venous_pressure) == NaN ? 0 : parseFloat(this.form.venous_pressure);
+            this.form.venous_pressure_type = parseFloat(this.form.venous_pressure_type) == NaN ? 1 : parseFloat(this.form.venous_pressure_type);
+            this.form.transmembrane_pressure = parseFloat(this.form.transmembrane_pressure) == NaN ? 0 : parseFloat(this.form.transmembrane_pressure);
+            this.form.transmembrane_pressure_type = parseFloat(this.form.transmembrane_pressure_type) == NaN ? 1 : parseFloat(this.form.transmembrane_pressure_type);
+            this.form.ultrafiltration_volume = parseFloat(this.form.ultrafiltration_volume) == NaN ? 0 : parseFloat(this.form.ultrafiltration_volume);
+            this.form.ultrafiltration_rate = parseFloat(this.form.ultrafiltration_rate) == NaN ? 0 : parseFloat(this.form.ultrafiltration_rate);
+            this.form.arterial_pressure = parseFloat(this.form.arterial_pressure) == NaN ? 0 : parseFloat(this.form.arterial_pressure);
+            this.form.arterial_pressure_type = parseFloat(this.form.arterial_pressure_type) == NaN ? 1 : parseFloat(this.form.arterial_pressure_type);
+            this.form.sodium_concentration = parseFloat(this.form.sodium_concentration) == NaN ? 0 : parseFloat(this.form.sodium_concentration);
+            this.form.dialysate_temperature = parseFloat(this.form.dialysate_temperature) == NaN ? 0 : parseFloat(this.form.dialysate_temperature);
+            this.form.replacement_rate = parseFloat(this.form.replacement_rate) == NaN ? 0 : parseFloat(this.form.replacement_rate);
+            this.form.displacement_quantity = parseFloat(this.form.displacement_quantity) == NaN ? 0 : parseFloat(this.form.displacement_quantity);
+            this.form.conductivity = parseFloat(this.form.conductivity) == NaN ? 0 : parseFloat(this.form.conductivity);
+            this.form.displacement_flow_quantity = parseFloat(this.form.displacement_flow_quantity) == NaN ? 0 : parseFloat(this.form.displacement_flow_quantity);
+            this.form.heparin = parseFloat(this.form.heparin) == NaN ? 0 : parseFloat(this.form.heparin);
+            this.form.dialysate_flow = parseFloat(this.form.dialysate_flow) == NaN ? 0 : parseFloat(this.form.dialysate_flow);
+
+            this.form.ktv = parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
+            this.form.urr = this.form.urr;
+            this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar);
+            this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant);
+            this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
+            this.form.blood_pressure_monitoring_site = this.form.blood_pressure_monitoring_site;
+            this.form.complication = this.form.complication;
             this.$message.error(resp.msg)
           }
         }
@@ -1370,7 +1370,7 @@ export default {
     },
     deleteRecordAction: function() {
       if (this.table_current_row == null) {
-        this.$message.error('请选择一条监测记录')
+        this.$message.error('请选择一条监测记录');
         return
       }
 
@@ -1380,7 +1380,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          let mode = '4'
+          let mode = '4';
           if (
             this.table_current_row.creator > 0 &&
             this.table_current_row.creator !=
@@ -1393,14 +1393,14 @@ export default {
             patient_id: this.patient_id,
             record_id: this.table_current_row.id,
             mode: mode
-          }
+          };
 
           postDelMonitorInfo(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              this.$message.error(response.data.msg);
               return false
             } else {
-              const record_id = response.data.data.record_id
+              const record_id = response.data.data.record_id;
               for (let i = 0; i < this.monitors.length; i++) {
                 if (this.monitors[i].id == record_id) {
                   this.monitors.splice(i, 1)
@@ -1425,23 +1425,23 @@ export default {
           }
         })
         .then(res => {
-          console.log(res)
+          console.log(res);
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {
-            this.is_has_create = res.data.data.is_has_create
-            this.is_has_exce = res.data.data.is_has_exce
-            this.is_has_check = res.data.data.is_has_check
-            this.is_has_modify = res.data.data.is_has_modify
-            this.is_has_modify_other = res.data.data.is_has_modify_other
-            this.is_has_modify_exce = res.data.data.is_has_modify_exce
-            this.is_has_del = res.data.data.is_has_del
+            this.is_has_create = res.data.data.is_has_create;
+            this.is_has_exce = res.data.data.is_has_exce;
+            this.is_has_check = res.data.data.is_has_check;
+            this.is_has_modify = res.data.data.is_has_modify;
+            this.is_has_modify_other = res.data.data.is_has_modify_other;
+            this.is_has_modify_exce = res.data.data.is_has_modify_exce;
+            this.is_has_del = res.data.data.is_has_del;
             this.is_has_del_other = res.data.data.is_has_del_other
           }
         })
     },
     getBloodPressure(id){
-       var name = ""
+       var name = "";
        for(let i=0;i<this.bloodPressureMmonitoringSite.length;i++){
          if(id == this.bloodPressureMmonitoringSite[i].id){
             name = this.bloodPressureMmonitoringSite[i].name
@@ -1450,7 +1450,7 @@ export default {
        return name
     },
     getComplication(id){
-      var name = ""
+      var name = "";
       for(let i=0;i<this.complicationList.length;i++){
          if(id == this.complicationList[i].id){
             name = this.complicationList[i].name

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1941,7 +1941,7 @@
             isLoading = true;
             createHisPrescription(data, params).then(response => {
               if (response.data.state == 1) {
-                this.$emit('change');
+                this.$emit('change',this.patientInfo.id);
                 this.$message.success('保存成功')
               }
             })

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -197,7 +197,7 @@
         radio: 1,
         record_date: '',
         crumbs: [
-          {path: false, name: '门诊医生站'},
+          {path: false, name: '住院工作站'},
           {path: false, name: '医生工作台'}
         ],
         titleType: '电子处方',
@@ -232,9 +232,40 @@
       }
     },
     methods: {
-      changeOther(){
+      changeOther(patient_id){
         this.radio = 2;
-        this.change()
+
+        let params = {
+          'record_date': this.record_date,
+          'type': this.radio
+        };
+        this.patientTableData = [];
+
+        getHospitalPatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false
+          } else {
+            this.patientTableData = response.data.data.list;
+            this.patientTableDataTwo = response.data.data.list;
+            this.cal_one = response.data.data.total_one;
+            this.cal_two = response.data.data.total_two;
+            this.admin_info = response.data.data.info;
+            if (this.patientTableData.length > 0) {
+              for(let i = 0; i < this.patientTableData.length; i++){
+                if (this.patientTableData[i].id == patient_id){
+                  this.$refs.tab.setCurrentRow(this.patientTableData[i]);
+                  this.oldCurrentRow = this.patientTableData[i];
+                  this.getPatientInfo(this.patientTableData[i])
+                }
+              }
+            }
+            this.prescriptionList = response.data.data.list.prescription
+            // this.patientid = this.patientTableData[0].patient_id
+
+          }
+        })
+
 
       },
       setData(val) {
@@ -293,7 +324,8 @@
       //   })
       //
       // },
-      change(patient_id) {
+
+      change() {
         let params = {
           'record_date': this.record_date,
           'type': this.radio
@@ -311,14 +343,12 @@
             this.cal_two = response.data.data.total_two;
             this.admin_info = response.data.data.info;
 
-
-
-
             if (this.patientTableData.length > 0) {
-              this.$refs.tab.setCurrentRow(this.patientTableData[0]);
-              this.oldCurrentRow = this.patientTableData[0];
 
-              this.getPatientInfo(this.patientTableData[0])
+                this.$refs.tab.setCurrentRow(this.patientTableData[0]);
+                this.oldCurrentRow = this.patientTableData[0];
+                this.getPatientInfo(this.patientTableData[0])
+
             }
 
             this.prescriptionList = response.data.data.list.prescription
@@ -1904,7 +1934,7 @@
       },
 
       getPrescriptionList(id) {
-        getPrescriptionList(id).then(response => {
+        getPrescriptionList(id,1).then(response => {
           if (response.data.state == 1) {
             this.centerDialogVisible = true;
             var list = response.data.data.list;

src/xt_pages/hospitalStation/index.vue

@@ -544,7 +544,14 @@
                 } else {
                   that.loadingone = false;
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
                     that.$message({message: '登记成功', type: 'success'});
                     that.form.name = '';

src/xt_pages/hospitalStation/newStatementPrint.vue

@@ -175,7 +175,14 @@
                 that.charge_admin = response.data.data.charge_admin;
 
 
-                console.log(that.info);
+                that.info['p_admin'] =  that.p_admin;
+                that.info['charge_admin'] =  that.charge_admin;
+
+                that.info['date'] =  response.data.data.date;
+                that.info['number'] =  response.data.data.number;
+                that.info['order_infos'] =  response.data.data.order_infos;
+                that.info['diagnosis'] =  response.data.data.diagnosis;
+
 
                 that.info['bed_cost_total'] = response.data.data.bedCostTotal;
                 that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;

src/xt_pages/hospitalStation/newStatementPrintTwo.vue

@@ -97,7 +97,14 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg)
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
 

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -426,8 +426,8 @@
         curMonthPrescriptions: null,
         month_total: 0,
         crumbs: [
-          { path: false, name: '门诊收费' },
-          { path: false, name: '门诊收费管理' }
+          { path: false, name: '住院工作站' },
+          { path: false, name: '住院收费管理' }
         ],
         current_index: 0,
         cal_one: '',
@@ -594,10 +594,17 @@
               } else {
                 if (response.data.data.failed_code == -10) {
 
-                  that.$message.error(response.data.data.msg)
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
-                  that.changeRadio(2);
+                  that.changeRadioAndPatient(2);
                   that.radio = 2;
                   that.$refs.charge.hide();
                   that.state = '已收费';
@@ -630,10 +637,17 @@
               } else {
                 if (response.data.data.failed_code == -10) {
 
-                  that.$message.error(response.data.data.msg)
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
-                  that.changeRadio(2);
+                  that.changeRadioAndPatient(2);
                   that.radio = 2;
                   that.$refs.charge.hide();
                   that.loadingtwo = false;
@@ -658,7 +672,7 @@
               return false
             } else {
               this.$refs.charge.hide();
-              this.changeRadio(2);
+              this.changeRadioAndPatient(2);
               this.radio = 2;
 
               this.loadingtwo = false;
@@ -697,7 +711,14 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg);
+                  // that.$message.error(response.data.data.msg);
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
                   that.$refs.register9504.hide();
@@ -782,7 +803,14 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg);
+                  // that.$message.error(response.data.data.msg);
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
                   that.$refs.register.hide();
@@ -855,7 +883,14 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg);
+                  // that.$message.error(response.data.data.msg);
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
                   that.$refs.register.hide();
@@ -1417,10 +1452,17 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
                     that.$message.success("出院成功");
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
                   }
 
                 }
@@ -1513,9 +1555,16 @@
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
                     } else {
-                      that.changeRadio(1);
+                      that.changeRadioAndPatient(1);
                       that.$message({ message: '退费成功', type: 'success', duration: 5000 });
                       that.loadingtwo = false
                     }
@@ -1551,7 +1600,7 @@
                   return false
                 } else {
                   this.radio = 1;
-                  this.changeRadio(1);
+                  this.changeRadioAndPatient(1);
                   this.$message({ message: '退费成功', type: 'success' });
                   this.loadingtwo = false
 
@@ -1599,9 +1648,16 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
 
                     that.$message({ message: '撤销出院成功', type: 'success', duration: 5000 })
                   }
@@ -1642,9 +1698,16 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
 
                     that.$message({ message: '撤销入院成功', type: 'success', duration: 5000 })
                   }
@@ -1682,10 +1745,17 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
                     that.radio = 1;
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
                     that.$message({ message: '退号成功', type: 'success', duration: 5000 })
                   }
 
@@ -1977,10 +2047,17 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg)
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
                 } else {
                   that.$message.success("上传明细成功");
-                  that.changeRadio(1);
+                  that.changeRadioAndPatient(1);
                 }
 
               }
@@ -2009,11 +2086,18 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
                     that.$message.success("撤销明细成功");
 
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
                   }
 
                 }
@@ -2030,7 +2114,162 @@
         console.log(id);
         this.radioStatus = id;
         this.getPatientList()
+      },      changeRadioAndPatient(id) {
+        // console.log(id)
+        // this.radioStatus = id
+        // this.getPatientList()
+        let temp_id = id;
+
+        let params = {
+          'record_date': this.record_date
+        };
+        GetHisHospitalChargePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false
+          } else {
+            this.patientTableData = [];
+            this.hisPatientDatas = [];
+            this.all_table_data = [];
+            let one_count = 0;
+            let two_count = 0;
+            let three_count = 0;
+
+            if (this.activeName == 'first') { //日结
+
+              for (let i = 0; i < response.data.data.list.length; i++) {
+                this.all_table_data.push(response.data.data.list[i]);
+                if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+                  one_count = one_count + 1
+                }
+
+                if (response.data.data.list[i].his_patient.order.order_status == 2) {
+                  two_count = two_count + 1
+                }
+
+                // if (response.data.data.list[i].order.order_status == 3) {
+                //   three_count = three_count + 1
+                // }
+              }
+
+            } else { //月结
+
+              for (let i = 0; i < response.data.data.list_two.length; i++) {
+                this.hisPatientDatas.push(response.data.data.list_two[i]);
+                if (response.data.data.list_two[i].his_patient.order.order_status == 0 || response.data.data.list_two[i].his_patient.order.order_status == 1) {
+                  one_count = one_count + 1
+                }
+
+                if (response.data.data.list_two[i].his_patient.order.order_status == 2) {
+                  two_count = two_count + 1
+                }
+
+                if (response.data.data.list_two[i].his_patient.order.order_status == 3) {
+                  three_count = three_count + 1
+                }
+              }
+
+            }
+
+            this.cal_one = one_count;
+            this.cal_two = two_count;
+            this.cal_three = three_count;
+
+            switch (temp_id) {
+
+              case 1:
+                this.patientTableData = [];
+                if (this.activeName == 'first') {
+
+                  for (let i = 0; i < this.all_table_data.length; i++) {
+                    if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1) {
+                      this.patientTableData.push(this.all_table_data[i])
+                    }
+
+                  }
+
+                } else {
+                  for (let i = 0; i < this.hisPatientDatas.length; i++) {
+                    if (this.hisPatientDatas[i].his_patient.order.order_status == 0 || this.hisPatientDatas[i].his_patient.order.order_status == 1) {
+                      this.patientTableData.push(this.hisPatientDatas[i])
+                    }
+
+                  }
+
+                }
+
+                break;
+              case 2:
+                this.patientTableData = [];
+                if (this.activeName == 'first') {
+
+                  for (let i = 0; i < this.all_table_data.length; i++) {
+                    if (this.all_table_data[i].his_patient.order.order_status == 2) {
+                      this.patientTableData.push(this.all_table_data[i])
+                    }
+
+                  }
+                } else {
+                  for (let i = 0; i < this.hisPatientDatas.length; i++) {
+                    if (this.hisPatientDatas[i].his_patient.order.order_status == 2) {
+                      this.patientTableData.push(this.hisPatientDatas[i])
+                    }
+                  }
+
+                }
+                break;
+              case 3:
+                this.patientTableData = [];
+
+                if (this.activeName == 'first') {
+
+                  for (let i = 0; i < this.all_table_data.length; i++) {
+
+                    if (this.all_table_data[i].his_patient.order.order_status == 3) {
+                      this.patientTableData.push(this.all_table_data[i])
+                    }
+
+                  }
+                } else {
+
+                  for (let i = 0; i < this.hisPatientDatas.length; i++) {
+
+                    if (this.hisPatientDatas[i].his_patient.order.order_status == 3) {
+                      this.patientTableData.push(this.hisPatientDatas[i])
+                    }
+
+                  }
+
+                }
+                break;
+              case 4:
+                this.patientTableData = [];
+                if (this.activeName == 'first') {
+
+                  this.patientTableData = this.all_table_data
+                } else {
+
+                  this.patientTableData = this.hisPatientDatas
+                }
+                break
+
+            }
+
+
+            for(let i = 0; i < this.patientTableData.length; i++){
+              if(this.patientInfo.id == this.patientTableData[i].id){
+                this.current_index = i;
+                this.$refs.tab.setCurrentRow(this.patientTableData[i]);
+                this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].his_patient.order.number,this.patientTableData[i].his_patient.id)
+
+              }
+            }
+
+          }
+        })
+
       },
+
       changeRadio(id) {
         // console.log(id)
         // this.radioStatus = id
@@ -2179,7 +2418,8 @@
           }
         })
 
-      }, formatDecimal(num, decimal) {
+      },
+      formatDecimal(num, decimal) {
         num = num.toString();
         let index = num.indexOf('.');
         if (index !== -1) {
@@ -2656,10 +2896,17 @@
                 } else {
 
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
 
                   } else {
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
                     that.$message({ message: '预结算成功', type: 'success' })
                   }
 
@@ -2698,10 +2945,17 @@
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
 
                     } else {
-                      that.changeRadio(1);
+                      that.changeRadioAndPatient(1);
                       that.$message({ message: '退费成功', type: 'success' })
                     }
                   }
@@ -2727,7 +2981,14 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
                     that.$message({ message: '查询成功', type: 'success' })
                   }
@@ -2754,7 +3015,14 @@
                 } else {
                   if (response.data.data.failed_code == -10) {
 
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
 
                   } else {
 
@@ -2801,10 +3069,17 @@
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
 
                     } else {
-                      that.changeRadio(1);
+                      that.changeRadioAndPatient(1);
                       that.$message({ message: '退号成功', type: 'success' })
                     }
                   }

src/xt_pages/hospitalStation/pastInquiries.vue

@@ -0,0 +1,188 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input size="small" style="width:150px;" v-model="keywords"
+                  class="filter-item"/>
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索
+        </el-button>
+        <el-date-picker v-model="record_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
+                        :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择日期时间" align="right"></el-date-picker>
+      </div>
+      <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
+        <el-table-column align="center" prop="name" label="姓名" width="100">
+          <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="处方日期" width="200">
+          <template slot-scope="scope"> {{scope.row.ctime?getTimes(scope.row.ctime):''}}</template>
+
+        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="患者类型">-->
+          <!--<template slot-scope="scope">{{}}</template>-->
+        <!--</el-table-column>-->
+        <el-table-column align="center" prop="name" label="处方号">
+          <template slot-scope="scope">{{scope.row.prescription_number?scope.row.prescription_number:''}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="开立医生">
+          <template slot-scope="scope">{{scope.row.doctor?scope.row.doctor:''}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="诊断">
+          <template slot-scope="scope">{{getDiagnosis(scope.row.diagnosis)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="状态" width="100">
+          <template slot-scope="scope">
+            <div v-if="  scope.row.id > 0">已就诊</div>
+            <div v-else>未就诊</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="handerShowDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <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>
+      <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
+    </div>
+  </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import inquiriesDetail from './components/inquiriesDetail'
+  import { getHisHospitalPrescriptionList } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  import { getInitData} from '@/api/his/his'
+  export default {
+    components: {
+      BreadCrumb,
+      inquiriesDetail
+    },
+    data() {
+      return {
+        keywords:"",
+        total:0,
+        record_date:"",
+        page:1,
+        limit:10,
+        crumbs: [
+          { path: false, name: '住院工作站' },
+          { path: false, name: '既往查询' }
+        ],
+        tableData: [],
+        diagnoses:[]
+      }
+    },
+    methods: {
+      searchAction(){
+        this.page = 1;
+        this.limit = 10;
+        this.getHisPrescriptionList()
+
+      },
+      handleScheduleDateChange(){
+        this.page = 1;
+        this.limit = 10;
+        this.getHisPrescriptionList()
+
+      },
+      handleCurrentChange(page) {
+        this.page = page;
+        this.getHisPrescriptionList()
+
+      },
+
+      handleSizeChange(limit) {
+        this.limit = limit;
+        this.getHisPrescriptionList()
+
+
+      },
+      getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      },
+      handerShowDetail(row) {
+        if(row.id == 0){
+          this.$message.error("未就诊");
+          return
+        }
+        this.$refs.inquiriesDetail.show(row.id)
+      }, getHisPrescriptionList() {
+        let params = {
+          record_date:this.record_date,
+          page: this.page,
+          limit: this.limit,
+          keywords: this.keywords,
+        };
+        getHisHospitalPrescriptionList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false
+          } else {
+            this.tableData = response.data.data.order;
+            this.total = response.data.data.total;
+            this.$nextTick(() => {
+              this.$refs.table.doLayout(); //解决表格错位
+            });
+          }
+        })
+
+      },
+       getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false
+          } else {
+            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() {
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay);
+
+
+      this.getHisPrescriptionList();
+      this.getInitData()
+
+    }
+  }
+</script>

src/xt_pages/hospitalStation/statementPrint.vue

@@ -176,6 +176,21 @@ export default {
               that.info = response.data.data.info;
               console.log(that.info);
 
+              that.p_admin = response.data.data.printor_admin;
+              that.charge_admin = response.data.data.charge_admin;
+              that.order_infos = response.data.data;
+
+
+
+              that.info['p_admin'] =  that.p_admin;
+              that.info['charge_admin'] =  that.charge_admin;
+
+              that.info['date'] =  response.data.data.date;
+              that.info['number'] =  response.data.data.number;
+              that.info['order_infos'] =  response.data.data.order_infos;
+              that.info['diagnosis'] =  response.data.data.diagnosis;
+
+
               that.info['bed_cost_total'] = response.data.data.bedCostTotal;
               that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
               that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -83,17 +83,18 @@
       </tr>
       <tr>
         <td>住院号</td>
-        <td></td>
+        <td>{{info.number}}</td>
         <td>科别</td>
         <td width="100"></td>
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
-        <td></td>
+        <td>{{info.begndate}}</td>
         <td>出院日期</td>
-        <td width="100"></td>
+        <td width="100">{{info.enddate}}</td>
         <td>住院天数</td>
-        <td></td>
+        <td>{{getDay(info.begndate,info.enddate)}}</td>
+
       </tr>
       <tr>
         <td>险种</td>
@@ -278,11 +279,11 @@
       </tr>
       <tr>
         <td>收款人:</td>
-        <td colspan="2">{{charge_admin.user_name}}</td>
+        <td colspan="2">{{info.charge_admin.user_name}}</td>
         <td>审核人:</td>
-        <td colspan="2"></td>
+        <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>制单人:</td>
-        <td colspan="2">{{p_admin.user_name}}</td>
+        <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>打印日期</td>
         <td colspan="2">{{getNowTime()}}</td>
       </tr>
@@ -321,6 +322,19 @@
         }
       }
     },methods:{
+      getDay(dateString1,dateString2){
+          var  startDate = Date.parse(dateString1);
+          var  endDate = Date.parse(dateString2);
+          if (startDate>endDate){
+            return 0;
+          }
+          if (startDate==endDate){
+            return 1;
+          }
+          var days=(endDate - startDate)/(1*24*60*60*1000);
+          return  days;
+
+        },
       getNowTime: function () {
         let dateTime;
         let yy = new Date().getFullYear();

src/xt_pages/hospitalStation/summary.vue

@@ -66,7 +66,7 @@
         >
         </el-table-column>
         <el-table-column align="center" prop="name" label="就诊号">
-          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+          <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
@@ -104,7 +104,7 @@
               结算单
             </el-button>
             <el-button size="mini" type="primary" @click="toRefund(scope.row)"
-                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106  || $store.getters.xt_user.org_id== 9990)">
+                       v-if="(scope.row.order_status == 2 || $store.getters.xt_user.org_id== 9990)">
               退费
             </el-button>
             <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
@@ -250,7 +250,14 @@
             } else {
 
               if (response.data.data.failed_code == -10) {
-                that.$message.error(response.data.data.msg)
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
 
               } else {
                 that.$message.success("上传成功");
@@ -287,11 +294,9 @@
           }).then(() => {
             let params = {
               'order_id': row.id,
-              'patient_id': row.patient_id,
-              'record_time': that.getTimes(row.settle_accounts_date),
-              'admin_user_id': that.$store.getters.xt_user.user.id,
+              'admin_user_id': this.$store.getters.xt_user.user.id,
             };
-            axios.get('http://127.0.0.1:9532/api/refund/post', {
+            axios.get('http://127.0.0.1:9532/zh/api/refund', {
               params: params
             })
               .then(function (response) {
@@ -300,7 +305,14 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
                     that.$message({message: '退费成功', type: 'success', duration: 5000});
                     that.getHisOrderList()
@@ -363,7 +375,8 @@
       export_detail() {
         let params = {
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          p_type: 1,
         };
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
@@ -520,7 +533,8 @@
           keywords: this.keywords,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.admin_user_id
+          type: this.admin_user_id,
+          p_type: 1,
         };
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {
@@ -550,7 +564,6 @@
         }
       },
       invoicePrint(obj){
-        console.log(obj);
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -364,7 +364,13 @@
               return false
             } else {
               if (response.data.data.failed_code == -10) {
-                that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
               } else {
                 that.result = response.data.data.result;
 

src/xt_pages/outpatientCharges/listPrint.vue

@@ -51,12 +51,12 @@
       }
     },
     created() {
-      this.getInfo(this.paramsObj.id)
-      this.org_id = this.$store.getters.xt_user.org_id
+      this.getInfo(this.paramsObj.id);
+      this.org_id = this.$store.getters.xt_user.org_id;
       if(this.org_id == 10106){
         this.getInfo10106(this.paramsObj.id)
       }
-      
+
     },
 
     methods: {
@@ -66,41 +66,41 @@
       getInfo(order_id) {
         let params = {
           id: order_id
-        }
+        };
         getHisOrderDetail(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.order = response.data.data.order
-            this.patient = response.data.data.patient
-            console.log(this.patient)
-            this.admin = response.data.data.admin_info
+            this.order = response.data.data.order;
+            this.patient = response.data.data.patient;
+            console.log(this.patient);
+            this.admin = response.data.data.admin_info;
 
 
             for (let i = 0; i < response.data.data.order_info.length; i++) {
-              var infos = response.data.data.order_info[i]
+              var infos = response.data.data.order_info[i];
               let obj = {
                 med_chrgitm_type: this.getType(infos.med_chrgitm_type),
                 price: infos.pric,
                 count: infos.cnt
-              }
+              };
               if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
-                obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
-                obj['name'] = infos.project.project.project_name
-                obj['spec'] = 1
+                obj['p_time'] = this.getTimes(infos.project.prescription.ctime);
+                obj['name'] = infos.project.project.project_name;
+                obj['spec'] = 1;
                 obj['unit'] = infos.project.project.unit
 
               }
 
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
-                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
-                obj['name'] = infos.advice.advice_name
-                obj['spec'] = infos.advice.drug.drug_spec
+                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime);
+                obj['name'] = infos.advice.advice_name;
+                obj['spec'] = infos.advice.drug.drug_spec;
                 obj['unit'] = infos.advice.drug.max_unit
 
               }
-              this.list.push(obj)
+              this.list.push(obj);
               this.list.sort(function(a, b) {
                 return b.p_time < a.p_time ? 1 : -1
               })
@@ -112,57 +112,57 @@
       getType(med_chrgitm_type) {
         switch (med_chrgitm_type) {
           case '01':
-            return '床位费'
-            break
+            return '床位费';
+            break;
           case '02':
-            return '诊察费'
+            return '诊察费';
 
-            break
+            break;
           case '03':
-            return '检查费'
+            return '检查费';
 
-            break
+            break;
           case '04':
-            return '化验费'
-            break
+            return '化验费';
+            break;
           case '05':
-            return '治疗费'
+            return '治疗费';
 
-            break
+            break;
           case '06':
-            return '手术费'
+            return '手术费';
 
-            break
+            break;
           case '07':
-            return '护理费'
+            return '护理费';
 
-            break
+            break;
           case '08':
-            return '材料费'
+            return '材料费';
 
-            break
+            break;
           case '09':
-            return '西药费'
+            return '西药费';
 
-            break
+            break;
           case '10':
-            return '中药饮片费'
+            return '中药饮片费';
 
-            break
+            break;
           case '11':
-            return '中成药费'
+            return '中成药费';
 
-            break
+            break;
           case '12':
-            return '一般诊疗费'
+            return '一般诊疗费';
 
-            break
+            break;
           case '13':
-            return '挂号费'
+            return '挂号费';
 
-            break
+            break;
           case '14':
-            return '其他费'
+            return '其他费';
 
             break
 
@@ -172,7 +172,7 @@
       printThisPage() {
         if(this.org_id != 10106){
           const style =
-          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}';
           printJS({
             printable: 'list-print',
             type: 'html',
@@ -189,7 +189,7 @@
             scanStyles: false
           });
         }
-        
+
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
@@ -203,7 +203,7 @@
       getInfo10106(order_id) {
         if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
 
-          var that = this
+          var that = this;
 
           axios.get('http://127.0.0.1:9532/api/settle/query', {
             params: {
@@ -213,57 +213,67 @@
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
               } else {
-                console.log("logloglog")
+                console.log("logloglog");
+
+                console.log(response.data.data.info);
+                that.info = response.data.data.info;
+                that.p_admin = response.data.data.printor_admin;
+                that.charge_admin = response.data.data.charge_admin;
+                that.order_infos = response.data.data;
+
+
+
+                that.info['p_admin'] =  that.p_admin;
+                that.info['charge_admin'] =  that.charge_admin;
 
-                console.log(response.data.data.info)
-                that.info = response.data.data.info
-                that.p_admin = response.data.data.printor_admin
-                that.charge_admin = response.data.data.charge_admin
-                that.order_infos = response.data.data
+                that.info['date'] =  response.data.data.date;
+                that.info['number'] =  response.data.data.number;
+                that.info['order_infos'] =  response.data.data.order_infos;
+                that.info['diagnosis'] =  response.data.data.diagnosis;
 
 
-                console.log(that.info)
+                console.log(that.info);
 
-                that.info['bed_cost_total'] = response.data.data.bedCostTotal
-                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
-                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal;
+                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
+                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
 
-                that.info['operation_cost_total'] = response.data.data.operationCostTotal
-                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
-                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+                that.info['operation_cost_total'] = response.data.data.operationCostTotal;
+                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
+                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
 
-                that.info['other_cost_total'] = response.data.data.otherCostTotal
-                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
-                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+                that.info['other_cost_total'] = response.data.data.otherCostTotal;
+                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
+                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
 
-                that.info['material_cost_total'] = response.data.data.materialCostTotal
-                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
-                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+                that.info['material_cost_total'] = response.data.data.materialCostTotal;
+                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
+                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
 
-                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
-                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
-                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
+                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
+                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
 
-                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
-                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
-                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
+                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
 
-                that.info['check_cost_total'] = response.data.data.checkCostTotal
-                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
-                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+                that.info['check_cost_total'] = response.data.data.checkCostTotal;
+                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
+                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
 
 
-                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
-                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
-                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
+                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
+                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
 
-                that.info['treat_cost_total'] = response.data.data.treatCostTotal
-                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
-                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal;
+                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
+                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
                 console.log(this.info)
               }
             })

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -90,7 +90,7 @@
             scanStyles: false
           });
         }
-        
+
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
@@ -104,7 +104,7 @@
       getAllDoctorList(){
         getAllDoctorList().then(response=>{
           if(response.data.state == 1){
-            var doctor =  response.data.data.doctor
+            var doctor =  response.data.data.doctor;
 
             this.doctorList = doctor
           }
@@ -113,15 +113,15 @@
       getAllHisPatientList(){
         const params = {
           record_date:this.record_date
-        }
+        };
         getAllHisPatientList(params).then(response=>{
           if(response.data.state == 1){
-            this.patientTableData = response.data.data.list
-            this.patientTableDataTwo = response.data.data.list
+            this.patientTableData = response.data.data.list;
+            this.patientTableDataTwo = response.data.data.list;
 
-            console.log('222', this.patientTableData)
-            let cal_one = 0
-            let cal_two = 0
+            console.log('222', this.patientTableData);
+            let cal_one = 0;
+            let cal_two = 0;
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
                 cal_one = cal_one + 1
@@ -133,16 +133,16 @@
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
-            this.cal_one = cal_one
+            this.cal_one = cal_one;
             this.cal_two = cal_two
           }
         })
       },
 
       changePatient(row){
-        console.log("row",row)
-        this.patient_id = row.patient_id
-        this.record_date = this.record_date
+        console.log("row",row);
+        this.patient_id = row.patient_id;
+        this.record_date = this.record_date;
         this.prescription_id = this.prescription_id
         //   var params = {
         //     patient_id:row.patient_id,
@@ -171,7 +171,7 @@
       getInfo(order_id) {
         if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
 
-          var that = this
+          var that = this;
 
           axios.get('http://127.0.0.1:9532/api/settle/query', {
             params: {
@@ -181,57 +181,67 @@
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
               } else {
-                console.log("logloglog")
+                console.log("logloglog");
+
+                console.log(response.data.data.info);
+                that.info = response.data.data.info;
+                that.p_admin = response.data.data.printor_admin;
+                that.charge_admin = response.data.data.charge_admin;
+                that.order_infos = response.data.data;
+
 
-                console.log(response.data.data.info)
-                that.info = response.data.data.info
-                that.p_admin = response.data.data.printor_admin
-                that.charge_admin = response.data.data.charge_admin
-                that.order_infos = response.data.data
 
+                that.info['p_admin'] =  that.p_admin;
+                that.info['charge_admin'] =  that.charge_admin;
 
-                console.log(that.info)
+                that.info['date'] =  response.data.data.date;
+                that.info['number'] =  response.data.data.number;
+                that.info['order_infos'] =  response.data.data.order_infos;
+                that.info['diagnosis'] =  response.data.data.diagnosis;
 
-                that.info['bed_cost_total'] = response.data.data.bedCostTotal
-                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
-                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
 
-                that.info['operation_cost_total'] = response.data.data.operationCostTotal
-                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
-                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+                console.log(that.info);
 
-                that.info['other_cost_total'] = response.data.data.otherCostTotal
-                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
-                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal;
+                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
+                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
 
-                that.info['material_cost_total'] = response.data.data.materialCostTotal
-                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
-                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+                that.info['operation_cost_total'] = response.data.data.operationCostTotal;
+                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
+                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
 
-                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
-                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
-                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+                that.info['other_cost_total'] = response.data.data.otherCostTotal;
+                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
+                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
 
-                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
-                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
-                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+                that.info['material_cost_total'] = response.data.data.materialCostTotal;
+                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
+                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
 
+                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
+                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
+                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
 
-                that.info['check_cost_total'] = response.data.data.checkCostTotal
-                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
-                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
+                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
 
-                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
-                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
-                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+                that.info['check_cost_total'] = response.data.data.checkCostTotal;
+                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
+                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
 
-                that.info['treat_cost_total'] = response.data.data.treatCostTotal
-                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
-                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+
+                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
+                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
+                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal;
+                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
+                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
                 console.log(this.info)
               }
             })
@@ -244,14 +254,14 @@
     },
 
     created() {
-      this.org_id = this.$store.getters.xt_user.org_id
+      this.org_id = this.$store.getters.xt_user.org_id;
       this.getInfo(this.paramsObj.order_id)
-      
+
     },
     watch:{
       paramsObj:{//深度监听，可监听到对象、数组的变化
         handler(val, oldVal){
-          this.paramsObj = val
+          this.paramsObj = val;
           this.getInfo(this.paramsObj.order_id)
 
         },

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -87,66 +87,73 @@
       },
       getInfo(obj) {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
-          var that = this
+          var that = this;
           axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
             params: obj
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg)
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
 
-                  console.log("～～～～")
-                  that.info = response.data.data.result
-                  console.log(that.info)
+                  console.log("～～～～");
+                  that.info = response.data.data.result;
+                  console.log(that.info);
 
-                  that.info['org_code'] = response.data.data.org_code
-                  that.info['patient_name'] = response.data.data.patient_name
-                  that.info['doctor_code'] = response.data.data.doctor_code
-                  that.info['doctor_name'] = response.data.data.doctor_name
+                  that.info['org_code'] = response.data.data.org_code;
+                  that.info['patient_name'] = response.data.data.patient_name;
+                  that.info['doctor_code'] = response.data.data.doctor_code;
+                  that.info['doctor_name'] = response.data.data.doctor_name;
                   if(response.data.data.health_card_no_two.length == 0){
                     that.info['health_card_no'] = response.data.data.health_card_no
                   }else{
                     that.info['health_card_no'] = response.data.data.health_card_no_two
                   }
 
-                  that.info['order_number'] = response.data.data.order_number
+                  that.info['order_number'] = response.data.data.order_number;
 
-                  that.info['department'] =  response.data.data.department
-                  that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie
+                  that.info['department'] =  response.data.data.department;
+                  that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie;
 
-                  that.info['before_money'] =  response.data.data.before_money
-                  that.info['after_money'] =   response.data.data.after_money
+                  that.info['before_money'] =  response.data.data.before_money;
+                  that.info['after_money'] =   response.data.data.after_money;
 
-                  that.info['org_name'] = that.$store.getters.xt_user.org.org_name
-                  console.log("～～～～" + that.info)
+                  that.info['org_name'] = that.$store.getters.xt_user.org.org_name;
+                  console.log("～～～～" + that.info);
 
-                  var name_arr = []
-                  var spec_arr = []
-                  var count_arr = []
-                  var price_arr = []
-                  var total_arr = []
+                  var name_arr = [];
+                  var spec_arr = [];
+                  var count_arr = [];
+                  var price_arr = [];
+                  var total_arr = [];
                   for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
-                    name_arr.push(that.info.transBody.outputlist1[i].ake006)
-                    spec_arr.push(that.info.transBody.outputlist1[i].aka074)
-                    count_arr.push(that.info.transBody.outputlist1[i].akc226)
-                    price_arr.push(that.info.transBody.outputlist1[i].akc225)
+                    name_arr.push(that.info.transBody.outputlist1[i].ake006);
+                    spec_arr.push(that.info.transBody.outputlist1[i].aka074);
+                    count_arr.push(that.info.transBody.outputlist1[i].akc226);
+                    price_arr.push(that.info.transBody.outputlist1[i].akc225);
                     total_arr.push(that.info.transBody.outputlist1[i].akc264)
                   }
 
-                  console.log("～～～" + that.info)
+                  console.log("～～～" + that.info);
 
-                  that.info['name_arr'] = name_arr
-                  that.info['spec_arr'] = spec_arr
-                  that.info['count_arr'] = count_arr
-                  that.info['price_arr'] = price_arr
-                  that.info['total_arr'] = total_arr
-                  that.info['record_date'] = obj.record_time
+                  that.info['name_arr'] = name_arr;
+                  that.info['spec_arr'] = spec_arr;
+                  that.info['count_arr'] = count_arr;
+                  that.info['price_arr'] = price_arr;
+                  that.info['total_arr'] = total_arr;
+                  that.info['record_date'] = obj.record_time;
 
                   console.log("～～" + that.info)
 
@@ -167,7 +174,7 @@
     watch:{
       paramsObj:{//深度监听，可监听到对象、数组的变化
         handler(val, oldVal){
-          this.paramsObj = val
+          this.paramsObj = val;
           this.getInfo(this.paramsObj)
 
         },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -628,10 +628,17 @@
               } else {
                 if (response.data.data.failed_code == -10) {
 
-                  that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+
 
                 } else {
-                  that.changeRadio(2);
+                  that.changeRadioAndPatient(2);
                   that.radio = 2;
                   that.$refs.charge.hide();
                   that.state = '已收费';
@@ -663,13 +670,18 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
-                  that.$message.error(response.data.data.msg)
 
                 } else {
-                  that.changeRadio(2);
+                  that.changeRadioAndPatient(2);
                   that.radio = 2;
-
                   that.$refs.charge.hide();
                   that.loadingtwo = false;
                   that.state = '已收费';
@@ -678,6 +690,8 @@
                   that.cal_one = this.cal_one - 1;
                   that.cal_two = this.cal_two + 1;
                   that.patientTableData.splice(this.current_index, 1)
+
+
                 }
               }
             })
@@ -693,7 +707,7 @@
               return false
             } else {
               this.$refs.charge.hide();
-              this.changeRadio(2);
+              this.changeRadioAndPatient(2);
               this.radio = 2;
 
               this.loadingtwo = false;
@@ -732,7 +746,14 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg);
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+
 
                 } else {
                   that.$refs.register9504.hide();
@@ -817,7 +838,14 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg);
+                  // that.$message.error(response.data.data.msg);
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
                   that.$refs.register.hide();
@@ -890,7 +918,14 @@
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg);
+                  // that.$message.error(response.data.data.msg);
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
                 } else {
                   that.$refs.register.hide();
@@ -1527,9 +1562,17 @@
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
+
                     } else {
-                      that.changeRadio(1);
+                      that.changeRadioAndPatient(1);
                       that.$message({ message: '退费成功', type: 'success', duration: 5000 });
                       that.loadingtwo = false
                     }
@@ -1565,7 +1608,7 @@
                   return false
                 } else {
                   this.radio = 1;
-                  this.changeRadio(1);
+                  this.changeRadioAndPatient(1);
                   this.$message({ message: '退费成功', type: 'success' });
                   this.loadingtwo = false
 
@@ -1670,10 +1713,18 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+
                   } else {
                     that.radio = 1;
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
                     that.$message({ message: '退号成功', type: 'success', duration: 5000 })
                   }
 
@@ -1945,7 +1996,160 @@
         console.log(id);
         this.radioStatus = id;
         this.getPatientList()
+      },      changeRadioAndPatient(id) {
+        // console.log(id)
+        // this.radioStatus = id
+        // this.getPatientList()
+        let temp_id = id;
+
+        let params = {
+          'record_date': this.record_date
+        };
+        getChargeHisPatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false
+          } else {
+            this.patientTableData = [];
+            this.hisPatientDatas = [];
+            this.all_table_data = [];
+            let one_count = 0;
+            let two_count = 0;
+            let three_count = 0;
+
+            if (this.activeName == 'first') { //日结
+
+              for (let i = 0; i < response.data.data.list.length; i++) {
+                this.all_table_data.push(response.data.data.list[i]);
+                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+                  one_count = one_count + 1
+                }
+
+                if (response.data.data.list[i].order.order_status == 2) {
+                  two_count = two_count + 1
+                }
+
+                // if (response.data.data.list[i].order.order_status == 3) {
+                //   three_count = three_count + 1
+                // }
+              }
+
+            } else { //月结
+
+              for (let i = 0; i < response.data.data.list_two.length; i++) {
+                this.hisPatientDatas.push(response.data.data.list_two[i]);
+                if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
+                  one_count = one_count + 1
+                }
+
+                if (response.data.data.list_two[i].order.order_status == 2) {
+                  two_count = two_count + 1
+                }
+
+                if (response.data.data.list_two[i].order.order_status == 3) {
+                  three_count = three_count + 1
+                }
+              }
+
+            }
+
+            this.cal_one = one_count;
+            this.cal_two = two_count;
+            this.cal_three = three_count;
+
+            switch (temp_id) {
+
+              case 1:
+                this.patientTableData = [];
+                if (this.activeName == 'first') {
+
+                  for (let i = 0; i < this.all_table_data.length; i++) {
+                    if ((this.all_table_data[i].order && this.all_table_data[i].order.order_status == 0) || (this.all_table_data[i].order && this.all_table_data[i].order.order_status == 1)) {
+                      this.patientTableData.push(this.all_table_data[i])
+                    }
+
+                  }
+
+                } else {
+                  for (let i = 0; i < this.hisPatientDatas.length; i++) {
+                    if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
+                      this.patientTableData.push(this.hisPatientDatas[i])
+                    }
+
+                  }
+
+                }
+
+                break;
+              case 2:
+                this.patientTableData = [];
+                if (this.activeName == 'first') {
+
+                  for (let i = 0; i < this.all_table_data.length; i++) {
+                    if (this.all_table_data[i].order.order_status == 2) {
+                      this.patientTableData.push(this.all_table_data[i])
+                    }
+
+                  }
+                } else {
+                  for (let i = 0; i < this.hisPatientDatas.length; i++) {
+                    if (this.hisPatientDatas[i].order.order_status == 2) {
+                      this.patientTableData.push(this.hisPatientDatas[i])
+                    }
+                  }
+
+                }
+                break;
+              case 3:
+                this.patientTableData = [];
+
+                if (this.activeName == 'first') {
+
+                  for (let i = 0; i < this.all_table_data.length; i++) {
+
+                    if (this.all_table_data[i].order.order_status == 3) {
+                      this.patientTableData.push(this.all_table_data[i])
+                    }
+
+                  }
+                } else {
+
+                  for (let i = 0; i < this.hisPatientDatas.length; i++) {
+
+                    if (this.hisPatientDatas[i].order.order_status == 3) {
+                      this.patientTableData.push(this.hisPatientDatas[i])
+                    }
+
+                  }
+
+                }
+                break;
+              case 4:
+                this.patientTableData = [];
+                if (this.activeName == 'first') {
+
+                  this.patientTableData = this.all_table_data
+                } else {
+
+                  this.patientTableData = this.hisPatientDatas
+                }
+                break
+
+            }
+
+            this.current_index = 0;
+
+            for (let i = 0; i < this.patientTableData.length; i++){
+              if(this.patientInfo.id == this.patientTableData[i].id)
+              this.$refs.tab.setCurrentRow(this.patientTableData[i]);
+              this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
+            }
+
+          }
+        })
+
       },
+
       changeRadio(id) {
         // console.log(id)
         // this.radioStatus = id
@@ -2014,7 +2218,7 @@
                 if (this.activeName == 'first') {
 
                   for (let i = 0; i < this.all_table_data.length; i++) {
-                    if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
+                    if ((this.all_table_data[i].order && this.all_table_data[i].order.order_status == 0) || (this.all_table_data[i].order && this.all_table_data[i].order.order_status == 1)) {
                       this.patientTableData.push(this.all_table_data[i])
                     }
 
@@ -2088,13 +2292,17 @@
             }
 
             this.current_index = 0;
-            this.$refs.tab.setCurrentRow(this.patientTableData[0]);
-            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
+
+            for (let i = 0; i < this.patientTableData.length; i++){
+                this.$refs.tab.setCurrentRow(this.patientTableData[0]);
+                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
+            }
 
           }
         })
 
-      }, formatDecimal(num, decimal) {
+      },
+      formatDecimal(num, decimal) {
         num = num.toString();
         let index = num.indexOf('.');
         if (index !== -1) {
@@ -2571,10 +2779,17 @@
                 } else {
 
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
 
                   } else {
-                    that.changeRadio(1);
+                    that.changeRadioAndPatient(1);
                     that.$message({ message: '预结算成功', type: 'success' })
                   }
 
@@ -2613,10 +2828,16 @@
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
 
                     } else {
-                      that.changeRadio(1);
+                      that.changeRadioAndPatient(1);
                       that.$message({ message: '退费成功', type: 'success' })
                     }
                   }
@@ -2642,7 +2863,14 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+
                   } else {
                     that.$message({ message: '查询成功', type: 'success' })
                   }
@@ -2669,7 +2897,14 @@
                 } else {
                   if (response.data.data.failed_code == -10) {
 
-                    that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+
 
                   } else {
 
@@ -2716,10 +2951,17 @@
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
+
 
                     } else {
-                      that.changeRadio(1);
+                      that.changeRadioAndPatient(1);
                       that.$message({ message: '退号成功', type: 'success' })
                     }
                   }

src/xt_pages/outpatientCharges/settlementPrint.vue

@@ -77,7 +77,7 @@ export default {
 
       const style =
         '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
-        const style1 = "@media print{#prescription-print{font-size:14px;}.title{text-align: center;font-size: 22px;font-weight: bold;}.row{display: flex;justify-content: space-between;}.under_line{border-bottom: 1px solid #999;width: 95%;text-align: center;margin-left: 2px;display: inline-block;}.inline_block{display: inline-block;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 14px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; /* 解决边框冲突 */border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid;text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}}"
+        const style1 = "@media print{#prescription-print{font-size:14px;}.title{text-align: center;font-size: 22px;font-weight: bold;}.row{display: flex;justify-content: space-between;}.under_line{border-bottom: 1px solid #999;width: 95%;text-align: center;margin-left: 2px;display: inline-block;}.inline_block{display: inline-block;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 14px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; /* 解决边框冲突 */border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid;text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}}";
         printJS({
             printable: "prescription-print",
             type: "html",
@@ -97,7 +97,7 @@ export default {
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
+               var doctor =  response.data.data.doctor;
 
                this.doctorList = doctor
              }
@@ -106,15 +106,15 @@ export default {
     getAllHisPatientList(){
          const params = {
            record_date:this.record_date
-         }
+         };
       getAllHisPatientList(params).then(response=>{
          if(response.data.state == 1){
-            this.patientTableData = response.data.data.list
-            this.patientTableDataTwo = response.data.data.list
+            this.patientTableData = response.data.data.list;
+            this.patientTableDataTwo = response.data.data.list;
 
-            console.log('222', this.patientTableData)
-            let cal_one = 0
-            let cal_two = 0
+            console.log('222', this.patientTableData);
+            let cal_one = 0;
+            let cal_two = 0;
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
                 cal_one = cal_one + 1
@@ -126,16 +126,16 @@ export default {
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
-            this.cal_one = cal_one
+            this.cal_one = cal_one;
             this.cal_two = cal_two
          }
       })
     },
 
     changePatient(row){
-      console.log("row",row)
-      this.patient_id = row.patient_id
-      this.record_date = this.record_date
+      console.log("row",row);
+      this.patient_id = row.patient_id;
+      this.record_date = this.record_date;
       this.prescription_id = this.prescription_id
       //   var params = {
       //     patient_id:row.patient_id,
@@ -164,7 +164,7 @@ export default {
     getInfo(order_id) {
       if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990 || this.$store.getters.xt_user.org_id == 0) {
 
-        var that = this
+        var that = this;
 
         axios.get('http://127.0.0.1:9532/api/settle/query', {
           params: {
@@ -175,57 +175,61 @@ export default {
         })
           .then(function (response) {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              this.$message.error(response.data.msg);
               return false
             } else {
-              console.log("logloglog")
+              console.log("logloglog");
+
+              console.log(response.data.data.info);
+              that.info = response.data.data.info;
+              that.p_admin = response.data.data.printor_admin;
+              that.charge_admin = response.data.data.charge_admin;
+              console.log(that.info);
+
 
-              console.log(response.data.data.info)
-              that.info = response.data.data.info
-              that.p_admin = response.data.data.printor_admin
-              that.charge_admin = response.data.data.charge_admin
-              console.log(that.info)
+              // that.info['bed_cost_total'] = response.data.data.bedCostTotal
 
-              that.info['bed_cost_total'] = response.data.data.bedCostTotal
-              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
-              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
 
-              that.info['operation_cost_total'] = response.data.data.operationCostTotal
-              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
-              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+              that.info['bed_cost_total'] = response.data.data.bedCostTotal;
+              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
+              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
 
-              that.info['other_cost_total'] = response.data.data.otherCostTotal
-              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
-              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+              that.info['operation_cost_total'] = response.data.data.operationCostTotal;
+              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
+              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
 
-              that.info['material_cost_total'] = response.data.data.materialCostTotal
-              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
-              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+              that.info['other_cost_total'] = response.data.data.otherCostTotal;
+              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
+              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
 
-              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
-              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
-              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+              that.info['material_cost_total'] = response.data.data.materialCostTotal;
+              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
+              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
 
-              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
-              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
-              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
+              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
+              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
 
+              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
+              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
+              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
-              that.info['check_cost_total'] = response.data.data.checkCostTotal
-              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
-              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
 
+              that.info['check_cost_total'] = response.data.data.checkCostTotal;
+              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
+              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
 
-              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
-              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
-              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
 
-              that.info['treat_cost_total'] = response.data.data.treatCostTotal
-              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
-              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
-              that.info['date'] =  response.data.data.date
-              that.info['number'] =  response.data.data.number
-              that.info['order_infos'] =  response.data.data.order_infos
+              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
+              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
+              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
+
+              that.info['treat_cost_total'] = response.data.data.treatCostTotal;
+              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
+              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
+              that.info['date'] =  response.data.data.date;
+              that.info['number'] =  response.data.data.number;
+              that.info['order_infos'] =  response.data.data.order_infos;
               that.info['diagnosis'] =  response.data.data.diagnosis
 
             }
@@ -237,13 +241,13 @@ export default {
     }
   },
   created() {
-    this.getInfo(this.paramsObj.order_id)
+    this.getInfo(this.paramsObj.order_id);
     this.org_id = this.$store.getters.xt_user.org_id
   },
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
-        this.paramsObj = val
+        this.paramsObj = val;
         this.getInfo(this.paramsObj.order_id)
 
       },
@@ -299,7 +303,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -89,7 +89,7 @@ export default {
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
+               var doctor =  response.data.data.doctor;
 
                this.doctorList = doctor
              }
@@ -98,15 +98,15 @@ export default {
     getAllHisPatientList(){
          const params = {
            record_date:this.record_date
-         }
+         };
       getAllHisPatientList(params).then(response=>{
          if(response.data.state == 1){
-            this.patientTableData = response.data.data.list
-            this.patientTableDataTwo = response.data.data.list
+            this.patientTableData = response.data.data.list;
+            this.patientTableDataTwo = response.data.data.list;
 
-            console.log('222', this.patientTableData)
-            let cal_one = 0
-            let cal_two = 0
+            console.log('222', this.patientTableData);
+            let cal_one = 0;
+            let cal_two = 0;
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
                 cal_one = cal_one + 1
@@ -118,16 +118,16 @@ export default {
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
-            this.cal_one = cal_one
+            this.cal_one = cal_one;
             this.cal_two = cal_two
          }
       })
     },
 
     changePatient(row){
-      console.log("row",row)
-      this.patient_id = row.patient_id
-      this.record_date = this.record_date
+      console.log("row",row);
+      this.patient_id = row.patient_id;
+      this.record_date = this.record_date;
       this.prescription_id = this.prescription_id
       //   var params = {
       //     patient_id:row.patient_id,
@@ -156,7 +156,7 @@ export default {
     getInfo(order_id) {
       if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
 
-        var that = this
+        var that = this;
 
         axios.get('http://127.0.0.1:9532/api/settle/query', {
           params: {
@@ -167,55 +167,65 @@ export default {
         })
           .then(function (response) {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              this.$message.error(response.data.msg);
               return false
             } else {
-              console.log("logloglog")
+              console.log("logloglog");
+
+              console.log(response.data.data.info);
+              that.info = response.data.data.info;
+              console.log(that.info);
+
+
+              that.info['p_admin'] =  that.p_admin;
+              that.info['charge_admin'] =  that.charge_admin;
+
+              that.info['date'] =  response.data.data.date;
+              that.info['number'] =  response.data.data.number;
+              that.info['order_infos'] =  response.data.data.order_infos;
+              that.info['diagnosis'] =  response.data.data.diagnosis;
 
-              console.log(response.data.data.info)
-              that.info = response.data.data.info
-              console.log(that.info)
 
-              that.info['bed_cost_total'] = response.data.data.bedCostTotal
-              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
-              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
+              that.info['bed_cost_total'] = response.data.data.bedCostTotal;
+              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
+              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
 
-              that.info['operation_cost_total'] = response.data.data.operationCostTotal
-              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
-              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+              that.info['operation_cost_total'] = response.data.data.operationCostTotal;
+              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
+              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
 
-              that.info['other_cost_total'] = response.data.data.otherCostTotal
-              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
-              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+              that.info['other_cost_total'] = response.data.data.otherCostTotal;
+              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
+              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
 
-              that.info['material_cost_total'] = response.data.data.materialCostTotal
-              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
-              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+              that.info['material_cost_total'] = response.data.data.materialCostTotal;
+              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
+              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
 
-              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
-              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
-              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
+              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
+              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
 
-              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
-              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
-              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
+              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
+              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
 
-              that.info['check_cost_total'] = response.data.data.checkCostTotal
-              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
-              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+              that.info['check_cost_total'] = response.data.data.checkCostTotal;
+              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
+              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
 
 
-              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
-              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
-              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
+              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
+              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
 
-              that.info['treat_cost_total'] = response.data.data.treatCostTotal
-              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
-              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
-              that.info['date'] =  response.data.data.date
-              that.info['number'] =  response.data.data.number
-              that.info['order_infos'] =  response.data.data.order_infos
+              that.info['treat_cost_total'] = response.data.data.treatCostTotal;
+              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
+              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
+              that.info['date'] =  response.data.data.date;
+              that.info['number'] =  response.data.data.number;
+              that.info['order_infos'] =  response.data.data.order_infos;
               that.info['diagnosis'] =  response.data.data.diagnosis
 
             }
@@ -229,14 +239,14 @@ export default {
   },
 
   created() {
-    this.getInfo(this.paramsObj.order_id)
-    this.org_id = this.$store.getters.xt_user.org_id
+    this.getInfo(this.paramsObj.order_id);
+    this.org_id = this.$store.getters.xt_user.org_id;
     console.log("this.org_id",this.org_id)
   },
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
-        this.paramsObj = val
+        this.paramsObj = val;
         this.getInfo(this.paramsObj.order_id)
 
       },

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -83,17 +83,18 @@
       </tr>
       <tr>
         <td>住院号</td>
-        <td></td>
+        <td>{{info.number}}</td>
         <td>科别</td>
         <td width="100"></td>
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
-        <td></td>
+        <td>{{info.begndate}}</td>
         <td>出院日期</td>
-        <td width="100"></td>
+        <td width="100">{{info.enddate}}</td>
         <td>住院天数</td>
-        <td></td>
+        <td>{{getDay(info.begndate,info.enddate)}}</td>
+
       </tr>
       <tr>
         <td>险种</td>
@@ -278,11 +279,11 @@
       </tr>
       <tr>
         <td>收款人:</td>
-        <td colspan="2">{{charge_admin ? charge_admin.user_name : ''}}</td>
+        <td colspan="2">{{info.charge_admin.user_name}}</td>
         <td>审核人:</td>
-        <td colspan="2"></td>
+        <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>制单人:</td>
-        <td colspan="2">{{p_admin ? p_admin.user_name : ''}}</td>
+        <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>打印日期</td>
         <td colspan="2">{{getNowTime()}}</td>
       </tr>
@@ -321,19 +322,32 @@
         }
       }
     },methods:{
+      getDay(dateString1,dateString2){
+          var  startDate = Date.parse(dateString1);
+          var  endDate = Date.parse(dateString2);
+          if (startDate>endDate){
+            return 0;
+          }
+          if (startDate==endDate){
+            return 1;
+          }
+          var days=(endDate - startDate)/(1*24*60*60*1000);
+          return  days;
+
+        },
       getNowTime: function () {
-        let dateTime
-        let yy = new Date().getFullYear()
-        let mm = new Date().getMonth() + 1
-        let dd = new Date().getDate()
-        let hh = new Date().getHours()
+        let dateTime;
+        let yy = new Date().getFullYear();
+        let mm = new Date().getMonth() + 1;
+        let dd = new Date().getDate();
+        let hh = new Date().getHours();
         let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
           :
-          new Date().getMinutes()
+          new Date().getMinutes();
         let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
           :
-          new Date().getSeconds()
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+          new Date().getSeconds();
+        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
         return dateTime
       },
 

src/xt_pages/outpatientCharges/summary.vue

@@ -104,7 +104,7 @@
                             结算单
                         </el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
                             退费
                         </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
@@ -248,7 +248,7 @@
 
       },toRefund(row){
         if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
-          var that = this
+          var that = this;
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -259,19 +259,26 @@
               'patient_id': row.patient_id,
               'record_time': that.getTimes(row.settle_accounts_date),
               'admin_user_id': that.$store.getters.xt_user.user.id,
-            }
+            };
             axios.get('http://127.0.0.1:9532/api/refund/post', {
               params: params
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
+                  that.$message.error(response.data.msg);
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   } else {
-                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                    that.$message({ message: '退费成功', type: 'success', duration: 5000 });
                     that.getHisOrderList()
 
                   }
@@ -293,13 +300,13 @@
               'patient_id': this.patientInfo.id,
               'record_time': this.record_date
 
-            }
+            };
             Refund(params).then(response => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
               } else {
-                this.$message({ message: '退费成功', type: 'success' })
+                this.$message({ message: '退费成功', type: 'success' });
                 this.getHisOrderList()
               }
             })
@@ -309,51 +316,52 @@
       },
       toPrint(row) {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
-          this.statementVisible9504 = true
+          this.statementVisible9504 = true;
           let obj = {
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
             admin_user_id: this.$store.getters.xt_user.user.id
-          }
+          };
           this.orderObj9504 = obj
         } else {
-          this.statementVisible = true
+          this.statementVisible = true;
           let obj = {
             order_id: row.id
-          }
+          };
           this.orderObj = obj
         }
 
       },
       settlementPrint(row){
-        this.settlementVisible = true
+        this.settlementVisible = true;
         let obj = {
           order_id: row.id
-        }
+        };
         this.settlementObj = obj
       },
       export_detail() {
         let params = {
           start_time: this.start_time,
-          end_time: this.end_time
-        }
+          end_time: this.end_time,
+          p_type: 2,
+        };
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
 
-            let list = []
+            let list = [];
             for (let i = 0; i < response.data.data.order.length; i++) {
-              let order = response.data.data.order[i]
-              let number = ''
-              let name = ''
-              let department = ''
-              let doctor_name = ''
-              let balance_accounts = ''
+              let order = response.data.data.order[i];
+              let number = '';
+              let name = '';
+              let department = '';
+              let doctor_name = '';
+              let balance_accounts = '';
 
-              let order_status = ''
+              let order_status = '';
 
               if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
@@ -414,13 +422,13 @@
                 '收费日期': '',
                 '收费状态': order_status,
                 '退费日期': ''
-              }
+              };
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
-              const data = this.formatJson(filterVal, list)
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const data = this.formatJson(filterVal, list);
               excel.export_json_to_excel({
                 header: tHeader,
                 data,
@@ -435,30 +443,30 @@
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
       changeDoctor() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       },
       handleSizeChange(limit) {
-        this.limit = limit
+        this.limit = limit;
         this.getHisOrderList()
 
       }, handleCurrentChange(page) {
-        this.page = page
+        this.page = page;
         this.getHisOrderList()
 
       },
       handleStartTimeChange() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       }, handleEndTimeChange() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       },
       searchAction() {
-        this.page = 1
+        this.page = 1;
         this.getHisOrderList()
 
       },
@@ -479,14 +487,15 @@
           keywords: this.keywords,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.admin_user_id
-        }
+          type: this.admin_user_id,
+          p_type: 2,
+        };
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.tableData = response.data.data.order
+            this.tableData = response.data.data.order;
             this.total = response.data.data.total
           }
         })
@@ -494,7 +503,7 @@
       }, getDoctorList() {
         getDoctorList().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
             this.doctors = response.data.data.doctors
@@ -509,7 +518,7 @@
         }
       },
       invoicePrint(obj){
-        console.log(obj)
+        console.log(obj);
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,
@@ -517,15 +526,15 @@
           age:obj.age,
           gend:obj.gend,
           setl_time:obj.setl_time
-        }
-        this.invoiceParams = paramsObj
+        };
+        this.invoiceParams = paramsObj;
         this.invoiceVisible = true
       }
     }, created() {
 
 
-      this.fetchAllAdminUsers()
-      this.getDoctorList()
+      this.fetchAllAdminUsers();
+      this.getDoctorList();
       this.getHisOrderList()
 
 

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -215,106 +215,106 @@
       getItemName(number) {
         switch (number) {
           case '01':
-            return '床位费'
-            break
+            return '床位费';
+            break;
           case '02':
-            return '西药费'
+            return '西药费';
 
-            break
+            break;
           case '03':
-            return '中药费'
+            return '中药费';
 
-            break
+            break;
           case '04':
-            return '中成药费'
+            return '中成药费';
 
-            break
+            break;
           case '05':
-            return '中草药费'
+            return '中草药费';
 
-            break
+            break;
           case '06':
-            return '检查费'
+            return '检查费';
 
-            break
+            break;
           case '07':
-            return '治疗费'
+            return '治疗费';
 
-            break
+            break;
           case '08':
-            return '放射费'
+            return '放射费';
 
-            break
+            break;
           case '09':
-            return '手术费'
+            return '手术费';
 
-            break
+            break;
           case '10':
-            return '化验费'
+            return '化验费';
 
-            break
+            break;
           case '11':
-            return '输血费'
+            return '输血费';
 
-            break
+            break;
           case '12':
-            return '输氧费'
+            return '输氧费';
 
-            break
+            break;
           case '13':
-            return '其它费'
+            return '其它费';
 
-            break
+            break;
           case '14':
-            return '麻醉费'
+            return '麻醉费';
 
-            break
+            break;
           case '15':
-            return '材料费'
+            return '材料费';
 
-            break
+            break;
           case '16':
-            return '特殊检查费'
+            return '特殊检查费';
 
-            break
+            break;
           case '17':
-            return '特殊治疗费'
+            return '特殊治疗费';
 
-            break
+            break;
           case '18':
-            return '诊疗费(诊查费)'
+            return '诊疗费(诊查费)';
 
-            break
+            break;
           case '19':
-            return '护理费'
+            return '护理费';
 
-            break
+            break;
           case '20':
-            return '诊金'
+            return '诊金';
 
-            break
+            break;
           case '21':
-            return '检查费（CT）'
+            return '检查费（CT）';
 
-            break
+            break;
           case '22':
-            return '检查费（MRT）'
+            return '检查费（MRT）';
 
-            break
+            break;
           case '23':
-            return '检查费（其他）'
+            return '检查费（其他）';
 
-            break
+            break;
           case '24':
-            return '特需服务费'
+            return '特需服务费';
 
-            break
+            break;
           case '25':
-            return '杂费'
+            return '杂费';
 
-            break
+            break;
           case '26':
-            return '挂号费'
+            return '挂号费';
             break
 
         }
@@ -325,20 +325,20 @@
           record_date: record_date,
           patient_id: patient_id,
           prescription_id: prescription_id
-        }
-        console.log('params', params)
+        };
+        console.log('params', params);
         getChargePrint(params).then(response => {
           if (response.data.state == 1) {
-            var list = response.data.data.list
-            console.log('list9999999999', list)
-            this.list = list
-            var prescription = response.data.data.prescription
-            console.log('prescription', prescription)
-            this.prescription = prescription
-            var patient = response.data.data.patient
-            console.log('patient', patient)
-            this.patient = patient
-            var histpatient = response.data.data.hisPatient
+            var list = response.data.data.list;
+            console.log('list9999999999', list);
+            this.list = list;
+            var prescription = response.data.data.prescription;
+            console.log('prescription', prescription);
+            this.prescription = prescription;
+            var patient = response.data.data.patient;
+            console.log('patient', patient);
+            this.patient = patient;
+            var histpatient = response.data.data.hisPatient;
             console.log('hispatient', histpatient)
           }
         })
@@ -347,41 +347,48 @@
     created() {
 
       if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
-        this.orgname = xtuser.org.org_name
+        this.orgname = xtuser.org.org_name;
         var form = {
           'order_id': this.paramsObj.order_id,
           'patient_id': this.paramsObj.patient_id,
           'record_time': this.paramsObj.record_date,
           'admin_user_id': this.$store.getters.xt_user.user.id
-        }
-        var that = this
+        };
+        var that = this;
         axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
           params: form
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
+              that.$message.error(response.data.msg);
               return false
             } else {
               if (response.data.data.failed_code == -10) {
-                that.$message.error(response.data.data.msg)
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
               } else {
-                that.result = response.data.data.result
-
-                that.org_code = response.data.data.org_code
-                that.patient_name = response.data.data.patient_name
-                that.doctor_code = response.data.data.doctor_code
-                that.doctor_name = response.data.data.doctor_name
-                that.name_arr = []
-                that.spec_arr = []
-                that.count_arr = []
-                that.price_arr = []
-                that.total_arr = []
+                that.result = response.data.data.result;
+
+                that.org_code = response.data.data.org_code;
+                that.patient_name = response.data.data.patient_name;
+                that.doctor_code = response.data.data.doctor_code;
+                that.doctor_name = response.data.data.doctor_name;
+                that.name_arr = [];
+                that.spec_arr = [];
+                that.count_arr = [];
+                that.price_arr = [];
+                that.total_arr = [];
                 for (let i = 0; i < that.result.transBody.outputlist1.length; i++) {
-                  that.name_arr.push(that.result.transBody.outputlist1[i].ake006)
-                  that.spec_arr.push(that.result.transBody.outputlist1[i].aka074)
-                  that.count_arr.push(that.result.transBody.outputlist1[i].akc226)
-                  that.price_arr.push(that.result.transBody.outputlist1[i].akc225)
+                  that.name_arr.push(that.result.transBody.outputlist1[i].ake006);
+                  that.spec_arr.push(that.result.transBody.outputlist1[i].aka074);
+                  that.count_arr.push(that.result.transBody.outputlist1[i].akc226);
+                  that.price_arr.push(that.result.transBody.outputlist1[i].akc225);
                   that.total_arr.push(that.result.transBody.outputlist1[i].akc264)
                 }
 
@@ -394,13 +401,13 @@
           })
 
       } else {
-        var record_date = this.paramsObj.record_date
-        console.log('record_date', record_date)
-        var patient_id = this.paramsObj.patient_id
-        console.log('patient_id', patient_id)
-        var prescription_id = this.paramsObj.prescription_id
-        this.getChargePrint(record_date, patient_id, prescription_id)
-        var xtuser = this.$store.getters.xt_user
+        var record_date = this.paramsObj.record_date;
+        console.log('record_date', record_date);
+        var patient_id = this.paramsObj.patient_id;
+        console.log('patient_id', patient_id);
+        var prescription_id = this.paramsObj.prescription_id;
+        this.getChargePrint(record_date, patient_id, prescription_id);
+        var xtuser = this.$store.getters.xt_user;
         this.orgname = xtuser.org.org_name
 
       }
@@ -409,11 +416,11 @@
     watch: {
       paramsObj: {//深度监听，可监听到对象、数组的变化
         handler(val, oldVal) {
-          this.paramsObj = val
-          this.patient_id = this.paramsObj.patient_id
-          var record_date = this.paramsObj.record
-          this.record_date = record_date
-          var prescription_id = this.paramsObj.prescription_id
+          this.paramsObj = val;
+          this.patient_id = this.paramsObj.patient_id;
+          var record_date = this.paramsObj.record;
+          this.record_date = record_date;
+          var prescription_id = this.paramsObj.prescription_id;
           this.prescription_id = prescription_id
 
         },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -482,7 +482,7 @@
         ],
         isLastOrNextVisible: false,
         multipleTableHeight: '',
-        register_type: '',
+        register_type: 1,
         value: '0',
         search_project_keyword: '',
         form: {
@@ -515,7 +515,7 @@
         departmentOptions: [],
         departmentValue: '',
         total: 0,
-        state1: '',
+        state1: 1,
         request_record_date: '',
         state2: '',
         customTabIndex: 1,
@@ -550,7 +550,7 @@
         department: [],
         sick: [],
         diagnoses: [],
-        diagnose: '',
+        diagnose: 1,
         curTotal: 0,
         prescription_id: 0,
         tempDrugs: [],

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -232,9 +232,41 @@
       }
     },
     methods: {
-      changeOther(){
+      changeOther(patient_id){
         this.radio = 2;
-        this.change()
+        let params = {
+          'record_date': this.record_date,
+          'type': this.radio
+        };
+        this.patientTableData = [];
+
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false
+          } else {
+            this.patientTableData = response.data.data.list;
+            this.patientTableDataTwo = response.data.data.list;
+            this.cal_one = response.data.data.total_one;
+            this.cal_two = response.data.data.total_two;
+            this.admin_info = response.data.data.info;
+
+
+            if (this.patientTableData.length > 0) {
+              for(let i = 0; i < this.patientTableData.length; i++){
+                if (this.patientTableData[i].id == patient_id){
+                  this.$refs.tab.setCurrentRow(this.patientTableData[i]);
+                  this.oldCurrentRow = this.patientTableData[i];
+                  this.getPatientInfo(this.patientTableData[i])
+                }
+              }
+
+            }
+
+            this.prescriptionList = response.data.data.list.prescription
+
+          }
+        })
 
       },
       setData(val) {
@@ -1906,7 +1938,7 @@
       },
 
       getPrescriptionList(id) {
-        getPrescriptionList(id).then(response => {
+        getPrescriptionList(id,2).then(response => {
           if (response.data.state == 1) {
             this.centerDialogVisible = true;
             var list = response.data.data.list;

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -279,13 +279,13 @@
     },
     methods: {
       changeStatus(id){
-        this.keywords = ""
+        this.keywords = "";
         this.getList()
       },
       getName(value){
-        console.log(value)
+        console.log(value);
         for(let i = 0; i < this.insutype_arr.length; i++){
-          console.log(this.insutype_arr[i].value)
+          console.log(this.insutype_arr[i].value);
           if(this.insutype_arr[i].value == value){
             return this.insutype_arr[i].label
           }
@@ -296,28 +296,35 @@
         let params ={
           id_card_no:this.currentObject.id_card_no,
           admin_user_id:  this.$store.getters.xt_user.user.id,
-        }
-        var that = this
+        };
+        var that = this;
         axios.get('http://127.0.0.1:9532/api/patient/info', {
           params: params
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
+              that.$message.error(response.data.msg);
               return false
             } else {
 
               if(response.data.data.failed_code == -10){
-                that.$message.error(response.data.data.msg)
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
               }else{
-                that.dialogFormVisible = true
-                that.insutypes = []
-                that.psn_no =  response.data.data.info.output.baseinfo.psn_no
+                that.dialogFormVisible = true;
+                that.insutypes = [];
+                that.psn_no =  response.data.data.info.output.baseinfo.psn_no;
                 for (let i =0; i < response.data.data.info.output.insuinfo.length; i++){
                   let obj = {
                     value:response.data.data.info.output.insuinfo[i].insutype,
                     label:""
-                  }
+                  };
                   for(let b = 0; b < that.insutype_arr.length; b++){
                     if(that.insutype_arr[b].value == response.data.data.info.output.insuinfo[i].insutype){
                       obj.label = that.insutype_arr[b].label
@@ -342,7 +349,7 @@
       },
       putOnRecord(type, row) {
         if (type == 1) {
-          this.currentObject = row
+          this.currentObject = row;
 
           this.getGdybPatientInfo()
 
@@ -356,21 +363,28 @@
               'id': row.record.id,
               'admin_user_id': this.$store.getters.xt_user.user.id
 
-            }
-            var that = this
+            };
+            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)
+                  that.$message.error(response.data.msg);
                   return false
                 } else {
 
                   if(response.data.data.failed_code == -10){
-                    that.$message.error(response.data.data.msg)
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
                   }else{
-                    row.record.is_cancel = 2
+                    row.record.is_cancel = 2;
                     that.$message({ message: '撤销成功', type: 'success' })
                   }
                 }
@@ -400,11 +414,11 @@
       getInitData() {
         getInitData().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.doctorList = response.data.data.doctors
-            this.department = response.data.data.department
+            this.doctorList = response.data.data.doctors;
+            this.department = response.data.data.department;
             this.sick = response.data.data.sick
 
           }
@@ -416,22 +430,22 @@
       },
       confirm() {
         if(this.currentObject.record.doctor_id == '' || this.currentObject.record.doctor_id  == 0){
-          this.$message.error("请选择医生")
+          this.$message.error("请选择医生");
           return
         }
 
         if(this.currentObject.record.department_id == '' || this.currentObject.record.department_id  == 0){
-          this.$message.error("请选择科室")
+          this.$message.error("请选择科室");
           return
         }
 
         if(this.currentObject.record.sick_type == '' || this.currentObject.record.sick_type  == 0){
-          this.$message.error("请选择疾病类型")
+          this.$message.error("请选择疾病类型");
           return
         }
 
         if(this.currentObject.record.insutype_value == '' || this.currentObject.record.insutype_value  == 0){
-          this.$message.error("请选择险种")
+          this.$message.error("请选择险种");
           return
         }
 
@@ -444,32 +458,39 @@
           doctor_id: this.currentObject.record.doctor_id,
           department_id:this.currentObject.record.department_id,
           admin_user_id: this.$store.getters.xt_user.user.id
-        }
+        };
 
-        var that = this
+        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)
+              that.$message.error(response.data.msg);
               return false
             } else {
               if(response.data.data.failed_code == -10){
-                that.$message.error(response.data.data.msg)
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
               }else{
-                that.$message.success("备案成功")
-                that.dialogFormVisible = false
+                that.$message.success("备案成功");
+                that.dialogFormVisible = false;
                 for (let i = 0; i < that.tableData.length; i++) {
                   if (that.tableData[i].id == that.currentObject.id) {
-                    that.tableData[i].record.is_cancel =response.data.data.result.is_cancel
-                    that.tableData[i].record.id = response.data.data.result.id
-                    that.tableData[i].record.trt_dcla_detl_sn = response.data.data.result.trt_dcla_detl_sn
-                    that.tableData[i].record.psn_no = response.data.data.result.psn_no
-                    that.tableData[i].record.doctor_id = response.data.data.result.doctor_id
-                    that.tableData[i].record.department_id = response.data.data.result.department_id
-                    that.tableData[i].record.ctime = response.data.data.result.ctime
-                    that.tableData[i].record.insutype = response.data.data.result.insutype
+                    that.tableData[i].record.is_cancel =response.data.data.result.is_cancel;
+                    that.tableData[i].record.id = response.data.data.result.id;
+                    that.tableData[i].record.trt_dcla_detl_sn = response.data.data.result.trt_dcla_detl_sn;
+                    that.tableData[i].record.psn_no = response.data.data.result.psn_no;
+                    that.tableData[i].record.doctor_id = response.data.data.result.doctor_id;
+                    that.tableData[i].record.department_id = response.data.data.result.department_id;
+                    that.tableData[i].record.ctime = response.data.data.result.ctime;
+                    that.tableData[i].record.insutype = response.data.data.result.insutype;
                     that.tableData[i].record.sick_type = response.data.data.result.sick_type
 
                   }
@@ -510,19 +531,19 @@
           'limit': this.limit,
           'keywords': this.keywords,
           'is_put_on_record':this.is_put_on_record
-        }
-        this.tableData = []
-        this.patientLoading = true
+        };
+        this.tableData = [];
+        this.patientLoading = true;
         getRecordList(params).then(response => {
           if (response.data.state == 0) {
-            this.patientLoading = false
+            this.patientLoading = false;
 
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.patientLoading = false
-            this.tableData = response.data.data.list
-            this.total = response.data.data.total
+            this.patientLoading = false;
+            this.tableData = response.data.data.list;
+            this.total = response.data.data.total;
 
             for (let i = 0; i < this.tableData.length; i++) {
 
@@ -545,11 +566,11 @@
 
       },
       handleSizeChange(limit) {
-        this.limit = limit
+        this.limit = limit;
         this.getList()
       },
       handleCurrentChange(page) {
-        this.page = page
+        this.page = page;
         this.getList()
 
       }, searchAction() {
@@ -557,8 +578,8 @@
       }
     },
     created() {
-      this.getList()
-      this.getInitData()
+      this.getList();
+      this.getInitData();
       this.fetchAllAdminUsers()
 
     }

src/xt_pages/outpatientRegistration/index.vue

@@ -965,7 +965,14 @@
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
                     } else {
                       that.$message({ message: '挂号成功', type: 'success' });
                       that.form.settlementValue = '';
@@ -1019,7 +1026,14 @@
                     that.loadingone = false;
 
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg);
+                      // that.$message.error(response.data.data.msg);
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
 
                     } else {
                       that.$message({ message: '挂号成功', type: 'success' });
@@ -1226,7 +1240,14 @@
                     that.loadingone = false;
 
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
                     } else {
                       that.$message({ message: '挂号成功', type: 'success' });
                       that.form.settlementValue = '';
@@ -1277,7 +1298,14 @@
                   } else {
                     that.loadingone = false;
                     if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
                     } else {
                       that.$message({ message: '挂号成功', type: 'success' });
                       that.form.settlementValue = '';

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -454,7 +454,7 @@
 </template>
 
 <script>
-  const moment = require('moment')
+  const moment = require('moment');
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { changePatient, getHisPatient, getHisPatientHistory } from '@/api/project/project'
   import { uParseTime } from '@/utils/tools'
@@ -604,12 +604,12 @@
       // this.tableData = arr
       //获取所有挂号号的患者
 
-      this.creator = this.$store.getters.xt_user.user.user_name
-      var today = moment().startOf('day').format('YYYY-MM-DD')
-      var todayUnix = Date.parse(today) / 1000
-      this.startUnix = todayUnix - 28800
+      this.creator = this.$store.getters.xt_user.user.user_name;
+      var today = moment().startOf('day').format('YYYY-MM-DD');
+      var todayUnix = Date.parse(today) / 1000;
+      this.startUnix = todayUnix - 28800;
 
-      this.getlist()
+      this.getlist();
       this.getDictionaryDataConfig()
     },
     methods: {
@@ -634,22 +634,22 @@
       //     this.tableData = a
       // },
       changeStart(val) {
-        this.start_time = val
+        this.start_time = val;
         this.getlist()
       },
       changeEnd(val) {
-        this.end_time = val
+        this.end_time = val;
         this.getlist()
       },
       changeRegister(val) {
         this.getlist()
       },
       handleSizeChange(val) {
-        this.limit = val
+        this.limit = val;
         this.getlist()
       },
       handleCurrentChange(val) {
-        this.page = val
+        this.page = val;
         this.getlist()
       },
       getlist() {
@@ -660,29 +660,29 @@
           register_type: this.register_type,
           limit: this.limit,
           page: this.page
-        }
-        console.log('params', params)
+        };
+        console.log('params', params);
         getHisPatientHistory(params).then(response => {
           if (response.data.state == 1) {
-            var history = response.data.data.history
-
-            console.log('history', history)
-            this.tableData = history
-            var total = response.data.data.total
-            console.log('total', total)
-            this.total = total
-            var department = response.data.data.department
-            console.log('department', department)
-            this.departMent = department
-            var doctor = response.data.data.doctor
-            console.log('doctor', doctor)
+            var history = response.data.data.history;
+
+            console.log('history', history);
+            this.tableData = history;
+            var total = response.data.data.total;
+            console.log('total', total);
+            this.total = total;
+            var department = response.data.data.department;
+            console.log('department', department);
+            this.departMent = department;
+            var doctor = response.data.data.doctor;
+            console.log('doctor', doctor);
             this.doctorList = doctor
           }
         })
 
       },
       getDepartMent(id) {
-        var name = ''
+        var name = '';
         for (let i = 0; i < this.departMent.length; i++) {
           if (id == this.departMent[i].id) {
             name = this.departMent[i].name
@@ -691,7 +691,7 @@
         return name
       },
       getDoctor(id) {
-        var user_name = ''
+        var user_name = '';
         for (let i = 0; i < this.doctorList.length; i++) {
           if (id == this.doctorList[i].admin_user_id) {
             user_name = this.doctorList[i].user_name
@@ -700,7 +700,7 @@
         return user_name
       },
       getMedicalTreatment(id) {
-        var name = ''
+        var name = '';
         for (let i = 0; i < this.medicalCare.length; i++) {
           if (this.medicalCare[i].id == id) {
             name = this.medicalCare[i].name
@@ -714,7 +714,7 @@
         }
         return ''
       }, toReturnSZPatient(val) {
-        var that = this
+        var that = this;
         this.$confirm('是否退号', '退号', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
@@ -730,14 +730,21 @@
           })
             .then(function(response) {
               if (response.data.state == 0) {
-                that.$message.error(response.data.msg)
+                that.$message.error(response.data.msg);
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                  // that.$message.error(response.data.data.msg)
 
                 } else {
-                  that.getlist()
+                  that.getlist();
                   that.$message({ message: '退号成功', type: 'success' })
                 }
               }
@@ -748,7 +755,7 @@
         })
       },
       toReturnPatient(row) {
-        var that = this
+        var that = this;
         this.$confirm('确认退号吗?', '退号', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
@@ -760,19 +767,26 @@
             'patient_id': row.patient_id,
             'record_time': this.getTime(row.record_date, '{y}-{m}-{d}'),
             'admin_user_id': this.$store.getters.xt_user.user.id
-          }
+          };
           axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
             params: params
           })
             .then(function(response) {
               if (response.data.state == 0) {
-                that.$message.error(response.data.msg)
+                that.$message.error(response.data.msg);
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  that.$message.error(response.data.data.msg)
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
                 } else {
-                  that.$message({ message: '退号成功', type: 'success', duration: 5000 })
+                  that.$message({ message: '退号成功', type: 'success', duration: 5000 });
                   that.getlist()
                 }
               }
@@ -795,101 +809,101 @@
       },
 
       querySearchAsync(keyword, cb) {
-        let key = ''
+        let key = '';
         if (keyword != undefined) {
           key = keyword
         }
-        let searchArray = []
+        let searchArray = [];
 
         var params = {
           keyword: key
-        }
-        console.log('params', params)
+        };
+        console.log('params', params);
         getHisPatient(params).then(response => {
           if (response.data.state == 1) {
-            searchArray = response.data.data.patient
-            console.log('searcharrya', searchArray)
+            searchArray = response.data.data.patient;
+            console.log('searcharrya', searchArray);
             cb(searchArray)
           }
-        })
+        });
         return searchArray
       },
 
       handleSelect(val) {
-        this.search_input = val.name
+        this.search_input = val.name;
         this.getlist()
       },
       handleClose(done) {
         done()
       },
       open(obj) {
-        this.dialogVisible = true
-        this.form = obj
+        this.dialogVisible = true;
+        this.form = obj;
         console.log(obj)
       },
       getDictionaryDataConfig(type) {
-        let arr = getDictionaryDataConfig('system', 'social_type')
-        let str = ''
+        let arr = getDictionaryDataConfig('system', 'social_type');
+        let str = '';
         arr.map(item => {
           if (item.id == type) {
             str = item.name
           }
-        })
+        });
         return str
       },
       getCertificates(type) {
-        let arr = this.certificates
-        let str = ''
+        let arr = this.certificates;
+        let str = '';
         arr.map(item => {
           if (item.value == type) {
             str = item.label
           }
-        })
+        });
         return str
       },
       getSettlement(type) {
-        let arr = this.settlement
-        let str = ''
+        let arr = this.settlement;
+        let str = '';
         arr.map(item => {
           if (item.value == type) {
             str = item.label
           }
-        })
+        });
         return str
       },
       getMedicalCare(type) {
-        let arr = this.medicalCare
-        let str = ''
+        let arr = this.medicalCare;
+        let str = '';
         arr.map(item => {
           if (item.id == type) {
             str = item.name
           }
-        })
+        });
         return str
       },
       getRegister(type) {
-        let arr = this.newRegister
-        let str = ''
+        let arr = this.newRegister;
+        let str = '';
         arr.map(item => {
           if (item.value == type) {
             str = item.label
           }
-        })
+        });
         return str
       },
       getDepartMent(type) {
-        let arr = this.departMent
-        let str = ''
+        let arr = this.departMent;
+        let str = '';
         arr.map(item => {
           if (item.id == type) {
             str = item.name
           }
-        })
+        });
         return str
       },
 
       getBanlance(id) {
-        var label = ''
+        var label = '';
         for (let i = 0; i < this.settlement.length; i++) {
           if (id == this.settlement[i].value) {
             label = this.settlement[i].label

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -10,7 +10,7 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgName}}</div>
           <div class="order-title">药品出库登记表</div>
-         
+
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -37,7 +37,7 @@
               <td style="line-height: 50px">
                 <span>{{getUnit(item.drug_id)}}</span>
               </td>
-            
+
               <td style="line-height: 50px">
                   {{item.count}}
               </td>
@@ -58,7 +58,7 @@
              </tr>
             </tbody>
           </table>
-        
+
 
           <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
@@ -133,7 +133,7 @@
     },
     methods: {
       getDateTwo(){
-        var ptime = Math.round(new Date().getTime() / 1000)
+        var ptime = Math.round(new Date().getTime() / 1000);
         return "打印日期："+uParseTime(ptime, '{y}-{m}-{d}')
       },
       getTime(value, temp) {
@@ -146,9 +146,9 @@
         return ''
       },
       printThisPage() {
-        var ptime = Math.round(new Date().getTime() / 1000)
-        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
-        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}');
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
         printJS({
           printable: 'dialysis-print-box',
           type: 'html',
@@ -156,9 +156,9 @@
           scanStyles: false
         })
       },
-   
+
       getUnit(id){
-        var name = ""
+        var name = "";
         for(let i=0;i<this.goodUnit.length;i++){
           if(this.goodUnit[i].id == id){
             name = this.goodUnit[i].name
@@ -169,22 +169,22 @@
     GetOrderDetail: function(order_id) {
             const params = {
             'id': order_id
-            }
+            };
             getDrugWarehouseOutInfo(params).then(response => {
             if (response.data.state == 0) {
 
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
             } else {
               for (let i = 0; i < response.data.data.list.length; i++) {
                 this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
                }
-               var total_price = 0
+               var total_price = 0;
                for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
                  total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
                }
-               this.allPrice = total_price
-               this.warehousingOutInfo.info = response.data.data.info
+               this.allPrice = total_price;
+               this.warehousingOutInfo.info = response.data.data.info;
                this.handleSpanTempArr()
             }
             })
@@ -197,14 +197,14 @@
           is_use: this.is_use,
           is_charge: this.is_charge,
           is_inject: this.is_inject
-        }
+        };
         getBaseDrugLibList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.total = response.data.data.total
-            this.list = []
+            this.total = response.data.data.total;
+            this.list = [];
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
@@ -213,7 +213,7 @@
         })
       },
       getUnit(id){
-        var name = ""
+        var name = "";
         for(let i=0;i<this.list.length;i++){
           if(this.list[i].id == id){
             name = this.list[i].min_unit
@@ -222,46 +222,46 @@
         return name
       },
       handleSpanTempArr(){
-        this.tempArr = []
+        this.tempArr = [];
 
         for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
           if (i === 0) {
-            this.tempArr.push(1)
+            this.tempArr.push(1);
             this.pos = 0
           } else {
             // 判断当前元素与上一个元素是否相同
             if (this.warehousingOutInfo.warehousingOutData[i].drug_id === this.warehousingOutInfo.warehousingOutData[i - 1].drug_id) {
-              this.tempArr[this.pos] += 1
+              this.tempArr[this.pos] += 1;
               this.tempArr.push(0)
             } else {
-              this.tempArr.push(1)
+              this.tempArr.push(1);
               this.pos = i
             }
           }
         }
 
-        let sameRowArr = [], sIdx = 0
+        let sameRowArr = [], sIdx = 0;
         this.warehousingOutInfo.warehousingOutData.forEach((item, index) => {
-          item.index = index
+          item.index = index;
           if (index === 0) {
             sameRowArr.push([index])
           } else {
             if (item.drug_id === this.warehousingOutInfo.warehousingOutData[index - 1].drug_id) {
               sameRowArr[sIdx].push(index)
             } else {
-              sIdx = sIdx + 1
+              sIdx = sIdx + 1;
               sameRowArr.push([index])
             }
           }
-        })
+        });
         this.sameRowArr = sameRowArr
       },
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
-      const order_id = this.$route.query.id
+      const order_id = this.$route.query.id;
       this.orgId = this.$store.getters.xt_user.org.id;
-      this.GetOrderDetail(order_id)
+      this.GetOrderDetail(order_id);
       this.getList()
     }
 

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -25,7 +25,7 @@
                                     <td width="80">耗材名称</td>
                                     <td width="80">规格型号</td>
                                     <td width="80">单位</td>
-                                    <td width="80">出货数量</td> 
+                                    <td width="80">出货数量</td>
                                     <td width="80">出库价格</td>
                                     <td width="80">总价</td>
                                     <td width="80">批号</td>
@@ -79,7 +79,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList } from "@/api/stock";
 import print from 'print-js'
-const moment = require('moment')
+const moment = require('moment');
 export default {
     components:{
         BreadCrumb
@@ -121,7 +121,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }';
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -134,12 +134,12 @@ export default {
         GetConfigInfo() {
             GetAllConfig().then(response => {
             if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
             } else {
-                this.manufacturer = response.data.data.manufacturer
-                this.dealer = response.data.data.dealer
-                this.goodInfo = response.data.data.goodInfo
+                this.manufacturer = response.data.data.manufacturer;
+                this.dealer = response.data.data.dealer;
+                this.goodInfo = response.data.data.goodInfo;
                 this.goodType = response.data.data.goodType
             }
             })
@@ -147,27 +147,27 @@ export default {
        GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
-        }
+        };
         getWarehouseOutInfo(params).then(response => {
           if (response.data.state == 0) {
 
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-           
+
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
-            this.warehousingOutInfo.info = response.data.data.info
-            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
-            var total_price = 0
+            this.warehousingOutInfo.info = response.data.data.info;
+            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData);
+            var total_price = 0;
             for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
               total_price += this.getOutStockCount(this.warehousingOutInfo.warehousingOutData[i].good_id)*this.warehousingOutInfo.warehousingOutData[i].price
             }
-           this.allPrice = total_price
+           this.allPrice = total_price;
 
-           var wareoutList =  response.data.data.wareoutList
-           console.log("出库数据",wareoutList)
+           var wareoutList =  response.data.data.wareoutList;
+           console.log("出库数据",wareoutList);
            this.wareoutList = wareoutList
           }
         })
@@ -176,18 +176,18 @@ export default {
        GetTotalCount(time){
           var params = {
            warehouse_out_time:time
-          }
+          };
         GetOutStockTotalCount(params).then(response=>{
            if(response.data.state == 1){
-              var stockCount = response.data.data.stockCount
-              console.log("stockCount",stockCount)
+              var stockCount = response.data.data.stockCount;
+              console.log("stockCount",stockCount);
               this.stockCount = stockCount
            }
         })
       },
-      
+
        getSpecificationName: function(id) {
-        let name = ''
+        let name = '';
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == id) {
             name = this.goodInfo[i].specification_name
@@ -196,7 +196,7 @@ export default {
         return name
       },
        getTypeName: function(id) {
-        let name = ''
+        let name = '';
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == id) {
             name = this.goodType[i].type_name
@@ -205,7 +205,7 @@ export default {
         return name
       },
        getTypeNameOne: function(id) {
-        let name = ''
+        let name = '';
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == id) {
             name = this.goodInfo[i].good_name
@@ -214,7 +214,7 @@ export default {
         return name
       },
       getOutStockCount(id){
-         var count = 0 
+         var count = 0;
          for(let i=0;i<this.stockCount.length;i++){
             if(id == this.stockCount[i].good_id){
               count = this.stockCount[i].count
@@ -223,7 +223,7 @@ export default {
          return count
       },
        getList() {
-        this.goodInfo.loading = true
+        this.goodInfo.loading = true;
         let params = {
           page: this.page,
           limit: this.limit,
@@ -231,13 +231,13 @@ export default {
           is_use:this.is_use,
           good_kind:this.good_kind,
           is_charge: this.is_charge,
-        }
+        };
         getGoodInfoList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.list = []
+            this.list = [];
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
@@ -246,7 +246,7 @@ export default {
         })
       },
       getUnit(id){
-        var name = ""
+        var name = "";
         for(let i=0;i<this.list.length;i++){
           if(id == this.list[i].id){
              name = this.list[i].good_unit
@@ -265,7 +265,7 @@ export default {
       },
 
       getWarehouseOutInfoCount(warehouse_out_id,good_id){
-        var count = 0 
+        var count = 0;
          for(let i=0;i<this.wareoutList.length;i++){
             if(warehouse_out_id == this.wareoutList[i].warehouse_out_id && good_id == this.wareoutList[i].good_id){
                 count = this.wareoutList[i].count
@@ -273,16 +273,16 @@ export default {
          }
         return count
       }
-      
+
     },
     created(){
       this.orgName = this.$store.getters.xt_user.org.org_name;
       this.orgId = this.$store.getters.xt_user.org.id;
       const order_id = this.$route.query.id;
-      const warehouse_out_time = this.$route.query.warehouse_out_time
-      this.GetConfigInfo()
-      this.GetOrderDetail(order_id)
-      this.GetTotalCount(warehouse_out_time)
+      const warehouse_out_time = this.$route.query.warehouse_out_time;
+      this.GetConfigInfo();
+      this.GetOrderDetail(order_id);
+      this.GetTotalCount(warehouse_out_time);
       this.getList()
     }
 }
@@ -311,7 +311,7 @@ export default {
       border: 1px solid;
       border-collapse: collapse;
       padding: 2px;
-      
+
 
       thead {
         tr {