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

src/xt_pages/data/components/drugs.vue

@@ -264,8 +264,9 @@
           is_charge_predict: '',//是否收费预估项
           is_statistics_work: '',//是否统计工作量
           is_charge_use: '',//是否收费常用项
-          drug_code: ''
-
+          drug_code: '',
+          hosp_appr_flag:'',
+          lmt_used_flag:'',
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -316,6 +317,8 @@
           social_security_directory_code:'',
           is_mark:'',
           prescription_mark:'',
+          hosp_appr_flag:'',
+          lmt_used_flag:'',
 
         },
 
@@ -602,6 +605,9 @@
               if(this.formValue.prescription_mark == 0){
                   this.formValue.prescription_mark = ""
               }
+              if(this.formValue.hosp_appr_flag == 0){
+                this.formValue.hosp_appr_flag = ""
+              }
               this.$refs.addDrugs.show(id, this.formValue)
 
             }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -141,11 +141,11 @@
                         >退号
                         </el-button>
 
-                        <el-button
-                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"
-                                size="small" @click="open(11)" type="primary"
-                        >撤销明细
-                        </el-button>
+                        <!--<el-button-->
+                                <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"-->
+                                <!--size="small" @click="open(11)" type="primary"-->
+                        <!--&gt;撤销明细-->
+                        <!--</el-button>-->
 
                     </div>
                     <!--<el-button size="small" @click="query" type="primary"-->
@@ -1629,27 +1629,36 @@
           // this.$refs.print.getInfo(this.order.id)
 
         } else if (index == 10) {
-          let params = {
+          var that = this
+          this.$confirm('是否退号', '退号', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'patient_id': this.patientInfo.id,
+              'record_time': this.record_date,
+              'org_id': this.$store.getters.xt_user.org_id,
+              '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)
+                  return false
+                } else {
+                  that.radio = 1
+                  that.changeRadio(1)
+                  that.$message({ message: '退号成功', type: 'success',duration:5000 })
 
-            'patient_id': this.patientInfo.id,
-            'record_time': this.record_date,
-            'org_id': this.$store.getters.xt_user.org_id
-          }
-          axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
-            params: params
+                }
+              })
+              .catch(function(error) {
+              })
+          }).catch(() => {
           })
-            .then(function(response) {
-              if (response.data.state == 0) {
-                that.$message.error(response.data.msg)
-                that.loadingtwo = false
-                return false
-              } else {
-                that.$message({ message: '退号成功', type: 'success' })
-                that.loadingtwo = false
-              }
-            })
-            .catch(function(error) {
-            })
         } else if (index == 11) {
           let params = {
             'order_id': this.order.id,
@@ -1667,7 +1676,8 @@
                 that.loadingtwo = false
                 return false
               } else {
-                that.$message({ message: '退号成功', type: 'success' })
+                // that.$message({ message: '退号成功', type: 'success' })
+                that.$message({ message: '退明细成功', type: 'success',duration:5000 })
                 that.loadingtwo = false
               }
             })

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -12,6 +12,14 @@
                                @click="searchAction">
                         搜索
                     </el-button>
+                    <!--<el-select v-model="is_put_on_record" style="width:160px;" placeholder="请选择" @change="changeStatus">-->
+                        <!--<el-option-->
+                                <!--v-for="item,index in datas"-->
+                                <!--:key="index"-->
+                                <!--:label="item.name"-->
+                                <!--:value="item.id">-->
+                        <!--</el-option>-->
+                    <!--</el-select>-->
                 </div>
                 <!--<el-button size="small" type="primary" @click="dialogFormVisible = t 。rue">医保对账</el-button>-->
             </div>
@@ -109,9 +117,12 @@
 
                 <el-table-column prop="date" label="操作" width="80" align="center" fixed="right">
                     <template slot-scope="scope">
-                        <el-button type="primary" size="small" icon="el-icon-refresh-left">
-                            <span v-if="scope.row.record.is_cancel == 0 ||scope.row.record.is_cancel == 2" @click="putOnRecord(1,scope.row)">备案</span>
-                            <span v-if="scope.row.record.is_cancel == 1" @click="putOnRecord(2,scope.row)">撤消</span>
+                        <el-button type="primary" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 0 ||scope.row.record.is_cancel == 2" >
+                            <span @click="putOnRecord(1,scope.row)">备案</span>
+                        </el-button>
+
+                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
+                            <span @click="putOnRecord(2,scope.row)">撤消</span>
                         </el-button>
                     </template>
                 </el-table-column>
@@ -166,6 +177,19 @@
     },
     data() {
       return {
+        is_put_on_record:0,
+        datas: [
+          {
+            id: 0,
+            name: '全部'
+          }, {
+            id: 1,
+            name: '已备案'
+          }, {
+            id: 2,
+            name: '未备案'
+          }
+        ],
         currentObject: null,
         crumbs: [
           { path: false, name: '门诊收费' },
@@ -254,6 +278,10 @@
       }
     },
     methods: {
+      changeStatus(id){
+        this.keywords = ""
+        this.getList()
+      },
       getName(value){
         console.log(value)
         for(let i = 0; i < this.insutype_arr.length; i++){
@@ -380,6 +408,26 @@
 
       },
       confirm() {
+        if(this.currentObject.record.doctor_id == '' || this.currentObject.record.doctor_id  == 0){
+          this.$message.error("请选择医生")
+          return
+        }
+
+        if(this.currentObject.record.department_id == '' || this.currentObject.record.department_id  == 0){
+          this.$message.error("请选择科室")
+          return
+        }
+
+        if(this.currentObject.record.sick_type == '' || this.currentObject.record.sick_type  == 0){
+          this.$message.error("请选择疾病类型")
+          return
+        }
+
+        if(this.currentObject.record.insutype_value == '' || this.currentObject.record.insutype_value  == 0){
+          this.$message.error("请选择险种")
+          return
+        }
+
         let params = {
           record_type: 0,
           patient_id: this.currentObject.id,
@@ -407,8 +455,8 @@
                 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 == 1
-                    that.tableData[i].record.id == response.data.data.result.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
@@ -453,7 +501,8 @@
         let params = {
           'page': this.page,
           'limit': this.limit,
-          'keywords': this.keywords
+          'keywords': this.keywords,
+          'is_put_on_record':this.is_put_on_record
         }
         this.tableData = []
         this.patientLoading = true
@@ -478,6 +527,10 @@
                 this.tableData[i].record.department_id = ''
               }
 
+              if (this.tableData[i].record.sick_type == 0) {
+                this.tableData[i].record.sick_type = ''
+              }
+
             }
 
           }