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

src/api/stock.js

@@ -786,3 +786,11 @@ export function getReportStockList(params) {
     params: params
   })
 }
+
+export function SaveCheckedDamage(params) {
+  return request({
+    url: '/api/stock/savecheckdamage',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/stock/detail/print.vue

@@ -52,7 +52,7 @@
              
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
-                <span v-if="type == 2"> {{ item.count }}</span>
+                <span v-if="type == 2"> {{getStockCount(item.good_id) }}</span>
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
@@ -425,6 +425,9 @@
            var list = response.data.data.list
            console.log("新的",list)
            this.stockDatas = list
+           var stockTotal = response.data.data.stockTotal
+          this.stockTotal = stockTotal
+           
            
          }
       })

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -761,10 +761,11 @@ export default {
         this.tableData[i].specification_name = this.tableData[i].specification_name
         this.tableData[i].packing_unit = this.tableData[i].packing_unit
         this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].packing_price).toFixed(2)
+        this.tableData[i].out_count = this.getStockCount(this.tableData[i].good_id)
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','packing_price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
 
        const data = this.formatJson(filterVal, this.tableData)
        console.log("data",data)
@@ -808,6 +809,8 @@ export default {
           var list = response.data.data.list
           console.log("出库单详单",list)
           this.tableData = list
+          var stockTotal = response.data.data.stockTotal
+          this.stockTotal = stockTotal
         }
       })
      } 

src/xt_pages/stock/stockDamaged.vue

@@ -38,7 +38,7 @@
             </div>
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary">核对</el-button>
+                <el-button size="small" type="primary" @click="toCheck">核对</el-button>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary">导出</el-button>
             </div>
@@ -271,7 +271,7 @@
         </span>
         <span slot="footer" class="dialog-footer">
             <el-button @click="checkDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="SaveCheckedPrice">保 存</el-button>
+            <el-button type="primary" @click="SaveCheckedDamage">保 存</el-button>
         </span>
     </el-dialog>
   </div>
@@ -280,7 +280,7 @@
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveReportStock,getReportStockList} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage} from "@/api/stock"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -331,6 +331,8 @@ export default {
             page:1,
             total:0,
             doctorList:[],
+            checker:this.$store.getters.xt_user.user.id,
+            check_time:new Date(),
         }
     },
     methods:{
@@ -470,7 +472,6 @@ export default {
        }else{
          this.checkDialogVisible = true
        }
-    
      },
     changePrice(val){
        console.log("val23232322323",val)
@@ -486,6 +487,22 @@ export default {
       this.ids = str
      
      },
+     SaveCheckedDamage(){
+         var params = {
+            ids:this.ids,
+            check_time:this.getTime(this.check_time),
+            checker:this.checker,
+         }
+       console.log("params",params)
+       SaveCheckedDamage(params).then(response=>{
+         if(response.data.state == 1){
+           this.$message.success("保存成功")
+           var reportprice = response.data.data.reportprice 
+           this.checkDialogVisible = false
+           this.getlist()
+         }
+       })
+     }
     },
     created(){
         // var nowDate = new Date();

src/xt_pages/user/dialysisSolution.vue

@@ -1568,7 +1568,10 @@ export default {
       this.addPlan.dialysis_duration_minute = '' + row.dialysis_duration_minute
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
-      this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
+      if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
+        this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
+      }
+     
       if (row.anticoagulant == 3) {
         this.addPlan.anticoagulant = '低分子肝素'
       }
@@ -1581,42 +1584,88 @@ export default {
 
       }
       this.addPlan.replacement_total = row.replacement_total
-
-      this.addPlan.target_ktv = row.target_ktv.toString()
-      this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
+      if(row.target_ktv!="" ||row.target_ktv!=undefined){
+         this.addPlan.target_ktv = row.target_ktv.toString()
+      }
+      if(row.target_ultrafiltration!="" || row.target_ultrafiltration!=undefined){
+        this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
+      }
+   
 
       this.addPlan.dialysis_duration = parseFloat(row.dialysis_duration_hour) + parseFloat((row.dialysis_duration_minute / 60).toFixed(2))
       this.addPlan.dialysis_duration_hour = row.dialysis_duration_hour
       this.addPlan.dialysis_duration_minute = row.dialysis_duration_minute
-      this.addPlan.anticoagulant_shouji = row.anticoagulant_shouji.toString()
-      this.addPlan.anticoagulant_weichi = row.anticoagulant_weichi.toString()
-      this.addPlan.anticoagulant_zongliang = row.anticoagulant_zongliang.toString()
-      this.addPlan.anticoagulant_gaimingcheng = row.anticoagulant_gaimingcheng.toString()
-      this.addPlan.anticoagulant_gaijiliang = row.anticoagulant_gaijiliang.toString()
-      this.addPlan.kalium = row.kalium.toString()
-      this.addPlan.sodium = row.sodium.toString()
-      this.addPlan.calcium = row.calcium.toString()
-
-
+      if(row.anticoagulant_shouji!=""|| row.anticoagulant_shouji!=undefined){
+        this.addPlan.anticoagulant_shouji = row.anticoagulant_shouji.toString()
+      }
+      if(row.anticoagulant_weichi!="" || row.anticoagulant_weichi!=undefined){
+          this.addPlan.anticoagulant_weichi = row.anticoagulant_weichi.toString()
+      }
+      if(row.anticoagulant_zongliang!="" || row.anticoagulant_zongliang!=undefined){
+        this.addPlan.anticoagulant_zongliang = row.anticoagulant_zongliang.toString()
+      }
+      if(row.anticoagulant_gaimingcheng!=""||row.anticoagulant_gaimingcheng!=undefined){
+         this.addPlan.anticoagulant_gaimingcheng = row.anticoagulant_gaimingcheng.toString()
+      }
+      if(row.anticoagulant_gaijiliang!=""||row.anticoagulant_gaijiliang!=undefined){
+         this.addPlan.anticoagulant_gaijiliang = row.anticoagulant_gaijiliang.toString()
+      }
+      if(row.kalium!=""||row.kalium!=undefined){
+        this.addPlan.kalium = row.kalium.toString()
+      }
+      if(row.sodium!=""||row.sodium!=undefined){
+        this.addPlan.sodium = row.sodium.toString()
+      }
+      if(row.calcium!=""||row.calcium!=undefined){
+         this.addPlan.calcium = row.calcium.toString()
+      }
+     
+     if(row.bicarbonate!=""||  row.bicarbonate!=undefined){
+       this.addPlan.bicarbonate = row.bicarbonate.toString()
+     }
 
-      this.addPlan.bicarbonate = row.bicarbonate.toString()
-      this.addPlan.glucose = row.glucose.toString()
+     if(row.glucose!=""||row.glucose!=undefined){
+       this.addPlan.glucose = row.glucose.toString()
+     }
+     if(row.dialysate_flow!="" || row.dialysate_flow!=undefined){
       this.addPlan.dialysate_flow = row.dialysate_flow.toString()
-      this.addPlan.dialysate_temperature = row.dialysate_temperature.toString()
-      this.addPlan.conductivity = row.conductivity.toString()
+     }
+    if( row.dialysate_temperature!=""||  row.dialysate_temperature!=undefined){
+       this.addPlan.dialysate_temperature = row.dialysate_temperature.toString()
+    }
+    if(row.conductivity!="" ||row.conductivity!=undefined ){
+       this.addPlan.conductivity = row.conductivity.toString()
+    }
+     
+    
       this.addPlan.remark = row.remark
 
       this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
-      this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
+      if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
+        this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
+      }
+     
       this.addPlan.puncture_needle  = row.puncture_needle
-      this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
+      if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
+        this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
+      }
+     
       this.addPlan.epo  = row.epo
-      this.addPlan.epo_count  = row.epo_count.toString()
-
-
-      this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
-      this.addPlan.plasma_separator = row.plasma_separator.toString()
-      this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
+      if(row.epo_count!="" || row.epo_count!=undefined){
+        this.addPlan.epo_count  = row.epo_count.toString()
+      }
+    
+      if(row.dialyzer_perfusion_apparatus!="" ||  row.dialyzer_perfusion_apparatus!=undefined){
+         this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
+      }
+      if(row.plasma_separator!="" || row.plasma_separator!=undefined){
+        this.addPlan.plasma_separator = row.plasma_separator.toString()
+      }
+     
+      if(row.bilirubin_adsorption_column!="" || row.bilirubin_adsorption_column!=undefined){
+         this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
+      }
+    
       this.addPlan.dialysis_irrigation = row.dialysis_irrigation
       this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialysis_irrigation = row.dialysis_irrigation
@@ -1635,12 +1684,23 @@ export default {
       }else{
         this.addPlan.body_fluid = row.body_fluid
       }
-      this.addPlan.body_fluid_other = row.body_fluid_other.toString()
+      if(row.body_fluid_other!=''|| row.body_fluid_other!=undefined){
+        this.addPlan.body_fluid_other = row.body_fluid_other.toString()
+      }
+     
       this.addPlan.special_medicine = row.special_medicine
-      this.addPlan.special_medicine_other = row.special_medicine_other.toString()
+      if(row.special_medicine_other!=""||row.special_medicine_other!=undefined){
+        this.addPlan.special_medicine_other = row.special_medicine_other.toString()
+      }
+   
       this.addPlan.displace_liqui_part = row.displace_liqui_part
-      this.addPlan.displace_liqui_value = row.displace_liqui_value.toString()
-      this.addPlan.ultrafiltration = row.ultrafiltration.toString()
+      if(row.displace_liqui_value!=''||row.displace_liqui_value!=undefined){
+        this.addPlan.displace_liqui_value = row.displace_liqui_value.toString()
+      }
+      if(row.ultrafiltration!='' ||  row.ultrafiltration!=undefined){
+        this.addPlan.ultrafiltration = row.ultrafiltration.toString()
+      }
+     
       this.addPlan.blood_access = row.blood_access
 
       this.addPlan.registrars_id = row.registrars_id

src/xt_pages/user/templateSummary.vue

@@ -60,7 +60,7 @@
             <el-col :span="14">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">阶段小结内容</div>
-                <div style="padding:10px;border-bottom:1px solid #DCDFE6;">阶段小结时间:{{getTime(editObj.record_time)}}</div>  
+                <div style="padding:10px;border-bottom:1px solid #DCDFE6;"><span v-if="editObj.record_time!=''">阶段小结时间:{{getTime(editObj.record_time)}}</span></div>  
                 <div style="padding: 10px 10px 0;">阶段小结概要:</div>  
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;">
                   <span style="margin-right:10px;line-height:30px;">干体重(kg):{{editObj.dry_weight}}</span>
@@ -79,7 +79,7 @@
                   <span style="margin-right:10px;line-height:30px;">透析液:(钾:{{editObj.kalium}} 钙:{{editObj.autunite}} Na:{{editObj.natrium}})</span>
                   <br>
                   <span style="margin-right:10px;line-height:30px;">每次透析:<span v-if="editObj.hour!=''"> {{editObj.hour}}小时</span>
-                   <span v-if="editObj.minute!=''">{{editObj.minute}}</span>分</span>
+                   <span v-if="editObj.minute!=0">{{editObj.minute}}分</span></span>
                   <span style="margin-right:10px;line-height:30px;">透前体重（kg）:{{editObj.befor_weight}}</span>
                   <span style="margin-right:10px;line-height:30px;">透后体重（kg）:{{editObj.after_weight}}</span>
                   <br>
@@ -365,7 +365,7 @@
                          <el-date-picker
                             v-model="form.record_time"
                              type="datetime"
-                            value-format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd HH:mm:ss"
                             placeholder="选择日期时间">
                         </el-date-picker>
                       </el-form-item>
@@ -419,6 +419,7 @@
                   <el-col :span="8" v-if="form.radio == 1">
                     <el-form-item>
                       <el-date-picker
+                        @change="changeStartMonth"
                         value-format="MM"
                         v-model="form.start_month"
                         type="month"
@@ -428,7 +429,7 @@
                   </el-col>
                   <el-col :span="8" v-if="form.radio == 2">
                     <el-form-item>
-                       <el-select v-model="form.quarter" placeholder="请选择">
+                       <el-select v-model="form.quarter" placeholder="请选择" @change="changeQuarter">
                         <el-option
                           v-for="item in timeType"
                           :key="item.id"
@@ -623,7 +624,7 @@
                          <el-date-picker
                             v-model="form.record_time"
                              type="datetime"
-                            value-format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd HH:mm:ss"
                             placeholder="选择日期时间">
                         </el-date-picker>
                       </el-form-item>
@@ -862,7 +863,7 @@
           template_inspection_id:0,
           template_inspection_content:"",
           admin_user_id:this.$store.getters.xt_user.user.id,
-          record_time: moment().locale('zh-cn').format('YYYY-MM-DD'),
+          record_time: moment().locale('zh-cn').format('YYYY-MM-DD HH:mm:ss'),
           patient_id:"",
           start_time:"",
           end_time:"",
@@ -918,6 +919,7 @@
         start_date: moment(new Date()).startOf("month").format("YYYY-MM-DD"),
         end_date: moment(new Date()).endOf('month').format("YYYY-MM-DD"),
         ids:"",
+        lastYear:new moment().subtract(1,'months').date(1).format("YYYY-MM-DD"),
       }
     },
     created() {
@@ -966,15 +968,20 @@
      
     },
     methods: {
-    getTime(value, temp) {
-      if (value == 0) {
-        return ''
-      }
-      if (value != undefined) {
-        return uParseTime(value, temp)
-      }
-      return ''
-    },
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      getTimeTwo(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d} {h}:{i}:{s}')
+         }
+      },
       getTimeOne(val) {
          if(val < 0){
            return ""
@@ -1028,6 +1035,7 @@
 
       },
       changeCurrentRecordTwo(val){
+        console.log("val232232",val.id)
         this.form.id = val.id
         this.getCurrentRecordDetail(val.id)
       },
@@ -1141,6 +1149,7 @@
           var params = {
             other_start_time:this.startYear,
             patient_id:this.patient_id,
+            last_time:this.lastYear,
           }
          console.log("开始数据",params)
         getInspectionMajorItem(params).then(response=>{
@@ -1280,7 +1289,7 @@
             template_plan_content:this.form.template_plan_content,
             // template_inspection_content:JSON.stringify(this.form.template_inspection_content),
             admin_user_id:this.form.admin_user_id,
-            record_time:this.getTime(this.form.record_time),
+            record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
             template_summary_id:this.form.template_summary_id,
             template_summary_content:this.form.template_summary_content,
@@ -1294,7 +1303,7 @@
             radio:this.form.radio,
          }
           console.log("parawm232323223",params)
-        
+    
         saveCreation(params).then(response=>{
            if(response.data.state ==1){
              var summary =  response.data.data.summary
@@ -1323,8 +1332,6 @@
              this.form.template_summary_content = ""
              this.form.template_plan_content = ""
              this.form.template_inspection_content = ""
-             this.form.admin_user_id = ""
-             this.form.record_time = ""
              this.from.after_pressure = ""
              this.form.template_summary_id = ""
              this.form.template_plan_id = ""
@@ -1435,8 +1442,17 @@
               this.form.anticoagulant = list.anticoagulant
               this.form.autunite = list.autunite
               this.form.befor_pressure = list.befor_pressure
-              this.form.befor_weight = list.befor_weight
-              this.form.dialysis_count = list.dialysis_count
+              if( list.befor_weight == 0){
+                 this.form.befor_weight = ""
+              }else{
+                this.form.befor_weight = list.befor_weight
+              }
+              if(list.dialysis_count == 0){
+                 this.form.dialysis_count = ""
+              }else{
+                this.form.dialysis_count = list.dialysis_count
+              }
+             
               this.form.dialzer_apparatus = list.dialzer_apparatus
               this.form.dry_weight = list.dry_weight
                this.form.hd_count= list.hd_count
@@ -1447,12 +1463,17 @@
                this.form.minute = list.minute
                this.form.natrium =list.natrium
                this.form.perfusion_apparatus= list.perfusion_apparatus
-               this.form.record_time = this.getTime(list.record_time)
-               console.log("时间232233232",this.form.record_time)
+               this.form.record_time = this.getTimeTwo(list.record_time)
+               console.log("时间232233232",list.record_time)
                this.form.template_inspection_id = list.template_inspection_id
                this.form.template_plan_content = list.template_plan_content
                this.form.template_summary_content =list.template_summary_content
-               this.form.template_summary_id = list.template_summary_id
+               if(list.template_summary_id == 0){
+                 this.form.template_summary_id = ""
+               }else{
+                 this.form.template_summary_id = list.template_summary_id
+               }
+              
                this.projectIndate = list.inspect_date
                this.projectStr = list.project_id
            }
@@ -1519,6 +1540,7 @@
             var list = response.data.data.list
             this.$message.success("保存成功")
             this.edit_show_dialog = false
+            this.getTemplateSummaryList()
           }
         })
       },
@@ -1575,8 +1597,6 @@
         this.form.template_summary_content = ""
         this.form.template_plan_content = ""
         this.form.template_inspection_content = ""
-        this.form.admin_user_id = ""
-        this.form.record_time = ""
         this.from.after_pressure = ""
         this.form.template_summary_id = ""
         this.form.template_plan_id = ""
@@ -1612,8 +1632,6 @@
         this.form.template_summary_content = ""
         this.form.template_plan_content = ""
         this.form.template_inspection_content = ""
-        this.form.admin_user_id = ""
-        this.form.record_time = ""
         this.form.after_pressure = ""
         this.form.template_summary_id = ""
         this.form.template_plan_id = ""
@@ -1656,8 +1674,7 @@
         this.form.template_summary_content = ""
         this.form.template_plan_content = ""
         this.form.template_inspection_content = ""
-        this.form.admin_user_id = ""
-        this.form.record_time = ""
+       
         this.form.after_pressure = ""
         this.form.template_summary_id = ""
         this.form.template_plan_id = ""
@@ -1693,6 +1710,7 @@
       changeYear(val){
         console.log("val2323323223",val)
         this.startYear = val+"-" + "30"
+        this.lastYear = val+"-"+"01"
         this.getInspectionMajor()
       },
       selectSummary(val){
@@ -1821,4 +1839,7 @@
 .el-table::before {
   background-color: #d0d3da;
 }
+.el-select-dropdown {
+  max-width: 1000px !important;
+}
 </style>

src/xt_pages/user/templateSummaryPrint.vue

@@ -36,7 +36,7 @@
             <span>灌流器:{{patientList.perfusion_apparatus}}</span> 
             <span>抗凝剂:{{getAnticoagulant(patientList.anticoagulant)}}</span>  
             <span>透析液(钾:{{patientList.kalium}} 钙:{{patientList.autunite}} Na:{{patientList.natrium}} ):</span> 
-            <span>每次透析(小时):{{patientList.hour}}时{{patientList.minute}}分</span>
+            <span>每次透析(小时):{{patientList.hour}}时{{patientList.minute}} <span v-if="patientList.minute!=''">分</span></span>
           </div>
           <div style="display:flex;justify-content: space-between;margin-top:10px;">
             <span>透前体重(kg):{{patientList.befor_weight}}</span>