数据

src/xt_pages/data/components/drugTableSon.vue

@@ -389,11 +389,13 @@
         });
       },
       createData() {
-        
+        if(this.temp.code == undefined){
+           this.temp.code = ""
+        }
         this.$refs["dataForm"].validate(valid => {
           if (valid) {
             console.log("33333333",this.temp)
-           
+            
             createDictionaryChildConfig(this.temp).then(response => {
               if (!response.data) {
                 // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -22,15 +22,17 @@
             <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人
             </el-radio>
             <!--<el-radio :label=3>已退费<span-->
-              <!--style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人-->
+            <!--style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人-->
             <!--</el-radio>-->
             <el-radio :label=4>全部</el-radio>
 
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
-          <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
+          <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                     @click="searchAction">
             搜索
           </el-button>
         </div>
@@ -45,14 +47,53 @@
               <template slot-scope="scope">{{scope.row.name}}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="就诊号" width="110">
-              <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
+              <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}
+              </template>
             </el-table-column>
           </el-table>
         </div>
       </div>
+
       <div class="mainRight">
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
+          <el-button v-loading="loadingone" size="small"
+                     @click="sz_open(1)"
+
+                     type="primary">深圳挂号
+          </el-button>
+
+          <el-button v-loading="loadingtwo"
+                     v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
+                     size="small"
+                     @click="sz_open(3)"
+                     type="primary">深圳收费
+          </el-button>
+
+          <el-button size="small" @click="sz_open(5)" type="primary"
+                     v-if="this.order.order_status == 2"
+          >
+            深圳退费
+          </el-button>
+
+          <!--<el-button size="small" @click="sz_open(8)" type="primary"-->
+          <!--&gt;-->
+          <!--跨月退费-->
+          <!--</el-button>-->
+
+          <el-button  size="small" @click="sz_open(6)" type="primary"
+                      v-if="this.order.order_status == 2"
+          >深圳结算单
+          </el-button>
+
+          <el-button
+            v-if="$store.getters.xt_user.org_id == 4  ||  this.$store.getters.xt_user.org_id == 3877"
+            size="small" @click="sz_open(7)" type="primary"
+          >深圳撤销明细
+          </el-button>
+
+
+
           <!-- <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
           <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button> -->
           <el-button size="small" @click="open(3)" type="primary">打印</el-button>
@@ -69,23 +110,26 @@
 
 
           <!--<el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"-->
-                     <!--@click="open(20)"-->
-                     <!--type="primary">预结算！-->
+          <!--@click="open(20)"-->
+          <!--type="primary">预结算！-->
           <!--</el-button>-->
 
           <!--<el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3" size="small"-->
-                     <!--@click="open(21)"-->
-                     <!--type="primary">收费！-->
+          <!--@click="open(21)"-->
+          <!--type="primary">收费！-->
           <!--</el-button>-->
 
 
-          <el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3" size="small"
+          <el-button v-loading="loadingtwo"
+                     v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3"
+                     size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
 
           <el-button size="small" @click="open(5)" type="primary"
-                     v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">退费
+                     v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
+            退费
           </el-button>
 
           <!--<el-button size="small" @click="open(5)" type="primary"-->
@@ -105,8 +149,9 @@
           >结算单
           </el-button>
 
-          <el-button v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877"
-                     size="small" @click="open(10)" type="primary"
+          <el-button
+            v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877"
+            size="small" @click="open(10)" type="primary"
           >退号
           </el-button>
 
@@ -126,13 +171,16 @@
           <!--&gt;查待遇-->
           <!--</el-button>-->
 
-          <el-button  size="small" @click="query" type="primary"
+          <el-button size="small" @click="query" type="primary"
           >查询
           </el-button>
 
 
         </div>
 
+
+
+
         <div class="mainCenter" v-loading="loading">
           <el-tabs class="settlementTabs" v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="日结" name="first">
@@ -140,7 +188,8 @@
                 <div class="centerLeft">
                   <div class="tabsBox">
                     <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
-                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" @tab-click="tabclickEvent">
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                             @tab-click="tabclickEvent">
                       <el-tab-pane
                         v-for="(item, index) in prescriptions"
                         :key="index"
@@ -294,7 +343,8 @@
                     <li style="width:50%;">医生：{{ info.doctor }}</li>
                     <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>
                     <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>
-                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}</li>
+                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}
+                    </li>
 
                     <li style="width:100%;">判断结果：{{info.diagnosis}}</li>
                     <!--<li style="width:100%;">是否有传染病：</li>-->
@@ -568,7 +618,48 @@
         }
 
         this.loadingtwo = true
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
+        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538){
+
+          var that = this
+          axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
+            params: form
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                that.$refs.charge.hide()
+                return false
+              } else {
+                if (response.data.data.failed_code == -10){
+
+                  that.$message.error(response.data.data.msg)
+
+                }else{
+                  that.changeRadio(2)
+                  that.radio = 2
+
+                  that.$refs.charge.hide()
+                  that.loadingtwo = false
+                  that.state = '已收费'
+                  that.$message({ message: '收费成功', type: 'success' })
+                  that.loadingtwo = false
+                  that.cal_one = this.cal_one - 1
+                  that.cal_two = this.cal_two + 1
+                  that.patientTableData.splice(this.current_index, 1)
+
+
+                }
+
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+
+        }else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form
@@ -620,14 +711,88 @@
         this.$refs.charge.hide()
       },
       confirm(forms) {
+        console.log(forms)
+
         forms['record_time'] = this.record_date
         forms['admin_user_id'] = this.$store.getters.xt_user.user.id
         forms['org_id'] = this.$store.getters.xt_user.org_id
 
         this.loadingone = true
 
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
-          var that = this
+        var that = this
+
+
+        if(this.$store.getters.xt_user.org_id == 9538 ||this.$store.getters.xt_user.org_id == 4 ){
+
+          axios.get('http://127.0.0.1:9532/sz/api/register/get', {
+            params: forms
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                that.$refs.register.hide()
+                return false
+              } else {
+                if (response.data.data.failed_code == -10){
+                  that.$message.error(response.data.data.msg)
+                  return
+                }else {
+                  that.$refs.register.hide()
+                  let params = {
+                    'record_date': that.record_date
+                  }
+                  getChargeHisPatientList(params).then(response => {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      return false
+                    } else {
+                      that.loadingone = false
+
+                      that.patientTableData = []
+                      that.all_table_data = []
+                      that.hisPatientDatas = []
+
+                      let one_count = 0
+                      let two_count = 0
+                      let three_count = 0
+                      for (let i = 0; i < response.data.data.list.length; i++) {
+                        that.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
+                          that.patientTableData.push(response.data.data.list[i])
+                        }
+                        if (response.data.data.list[i].order.order_status == 2) {
+                          two_count = two_count + 1
+                          that.patientTableData.push(response.data.data.list[i])
+                        }
+                      }
+                      that.hisPatientDatas = response.data.data.list_two
+                      that.cal_one = one_count
+                      that.cal_two = two_count
+                      that.cal_three = three_count
+                      that.current_index = 0
+
+                      for (let i = 0; i < that.patientTableData.length; i++) {
+                        if (this.patientTableData[i].id == this.patientInfo.id) {
+                          that.$refs.tab.setCurrentRow(that.patientTableData[i])
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                        }
+                      }
+                      that.$message({ message: '挂号成功', type: 'success' })
+                      that.loadingone = false
+                      var his_info = response.data.data.his_info
+                      that.hisPatientInfo = his_info
+                    }
+                  })
+                }
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877 ) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms
@@ -1344,10 +1509,11 @@
               .then(function(response) {
                 if (response.data.state == 0) {
                   that.$message.error(response.data.msg)
-                  that.loadingtwo = false
+                  // that.loadingtwo = false
                   return false
                 } else {
 
+
                 }
               })
               .catch(function(error) {
@@ -1391,7 +1557,7 @@
 
             'patient_id': this.patientInfo.id,
             'record_time': this.record_date,
-            "org_id": this.$store.getters.xt_user.org_id
+            'org_id': this.$store.getters.xt_user.org_id
           }
           axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
             params: params
@@ -1414,7 +1580,7 @@
             'number': this.order.number,
             'patient_id': this.patientInfo.id,
             'record_time': this.record_date,
-            "org_id": this.$store.getters.xt_user.org_id
+            'org_id': this.$store.getters.xt_user.org_id
           }
           axios.get('http://127.0.0.1:9532/api/refunddetail/post', {
             params: params
@@ -2256,6 +2422,170 @@
 
           }
         })
+      },
+      sz_open(index) {
+        switch (index) {
+          case 1:
+            this.$refs.register.show()
+            break
+          case 2:
+            var that = this
+            if (this.activeName == 'first') {
+              this.settle_accounts_type = 1
+
+            } else {
+              this.settle_accounts_type = 2
+              this.start_time = this.other_start_time
+              this.end_time = this.other_end_time
+              this.settle_accounts_type = 2
+
+            }
+            let params = {
+              'patient_id': this.patientInfo.id,
+              'record_time': this.record_date,
+              'settle_accounts_type':this.settle_accounts_type,
+              'admin_user_id': this.$store.getters.xt_user.user.id,
+            }
+            axios.get('http://127.0.0.1:9532/sz/api/upload/get', {
+              params: params
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+
+                  if (response.data.data.failed_code == -10){
+                    that.$message.error(response.data.data.msg)
+
+                  }else {
+                    that.changeRadio(1)
+                    that.$message({ message: '预结算成功', type: 'success' })
+                  }
+
+                }
+              })
+              .catch(function(error) {
+              })
+            break
+          case 3:
+            if (this.activeName == 'first') {
+              this.$refs.charge.show(this.getTotal())
+            } else {
+              this.$refs.charge.show(this.getTotalTwo())
+            }
+            break
+          case 4:
+            break
+          case 5:
+            var that = this
+            this.$confirm('是否退费', '退费', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
+                params: {
+                  order_id:this.order.id,
+                  record_time: this.record_date,
+                  admin_user_id:this.$store.getters.xt_user.user.id,
+                  patient_id:this.patientInfo.id
+                }
+              })
+                .then(function(response) {
+                  if (response.data.state == 0) {
+                    that.$message.error(response.data.msg)
+                    return false
+                  } else {
+                    if (response.data.data.failed_code == -10){
+                      that.$message.error(response.data.data.msg)
+
+                    }else {
+                      that.changeRadio(1)
+                      that.$message({ message: '退费成功', type: 'success' })
+                    }
+                  }
+                })
+                .catch(function(error) {
+                })
+            }).catch(() => {
+            })
+            break
+          case 6:
+            var that = this
+            axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
+              params: {
+                order_id:this.order.id,
+                record_time: this.record_date,
+                admin_user_id:this.$store.getters.xt_user.user.id,
+                patient_id:this.patientInfo.id
+
+              }
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10){
+
+                    that.$message.error(response.data.data.msg)
+
+                  }else{
+                    if (response.data.data.failed_code == -10){
+                      that.$message.error(response.data.data.msg)
+
+                    }else {
+                      that.$message({ message: '查询成功', type: 'success' })
+
+                    }
+
+
+                  }
+                }
+              })
+              .catch(function(error) {
+              })
+            break
+          case 7:
+            var that = this
+            axios.get('http://127.0.0.1:9532/sz/api/detail/cancel', {
+              params: {
+                order_id:this.order.id,
+                record_time: this.record_date,
+                admin_user_id:this.$store.getters.xt_user.user.id,
+                patient_id:this.patientInfo.id
+
+              }
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10){
+
+                    that.$message.error(response.data.data.msg)
+
+                  }else{
+                    if (response.data.data.failed_code == -10){
+                      that.$message.error(response.data.data.msg)
+
+                    }else {
+                      that.$message({ message: '明细撤销成功', type: 'success' })
+
+                    }
+
+
+                  }
+                }
+              })
+              .catch(function(error) {
+              })
+            break
+
+        }
+
       }
     },
     mounted() {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -723,36 +723,43 @@ export default {
         r2 = Number(total.toString().replace('.', ''))
         return r1 * r2 / Math.pow(10, m)
       },
-    
-    exportList(){
-       var obj = {index:"合计",total:0}
-       obj.total = this.calTotalPrice()
-      for(let i=0;i<this.tableList.length;i++){
-        this.tableList[i].index = i+1
-        this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-        this.tableList[i].count = this.calCount(this.tableList[i])
-        this.tableList[i].total = this.calTotal(this.tableList[i])
-        this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
-        this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
+      unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.specification_name) && res.set(arr.specification_name, 1));
+      },
+      exportList(){
+        var obj = {index:"合计",total:0}
+        obj.total = this.calTotalPrice()
+     
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+          this.tableList[i].count = this.calCount(this.tableList[i])
+          this.tableList[i].total = this.calTotal(this.tableList[i])
+          this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
+          this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
 
-       }
-       this.tableList.push(obj)
-       console.log("数据222222",this.tableList)
-    
-       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
-       
-       const data = this.formatJson(filterVal, this.tableList)
-       
-        excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '耗材入库明细'
-         })
-          this.downloadLoading = false
-        })
-       },
+        }
+        var arr = this.unique(this.tableList)
+        console.log("arrrr",arr)
+        this.tableList = arr
+        this.tableList.push(obj)
+        console.log("数据222222",this.tableList)
+      
+        import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+        const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+        
+        const data = this.formatJson(filterVal, this.tableList)
+        
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材入库明细'
+          })
+            this.downloadLoading = false
+          })
+        },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -709,7 +709,10 @@ export default {
         r2 = Number(total.toString().replace('.', ''))
         return r1 * r2 / Math.pow(10, m)
       },
-
+      unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.specification_name) && res.set(arr.specification_name, 1));
+      },
 
      exportList(){
 
@@ -723,6 +726,9 @@ export default {
         this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].query_warehouseout_info[0].price).toFixed(2)
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
        }
+       var arr = this.unique(this.tableList)
+       console.log("22222222222222222气",arr)
+       this.tableList = arr
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -180,7 +180,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,1000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"