518合并代码

src/xt_pages/data/components/addDrugs.vue

@@ -606,6 +606,8 @@
           total:"",
           specification_name:"",
           is_user:"2",
+          sum_count:"",
+          sum_in_count:"",
         },
 
         rules: {
@@ -721,6 +723,7 @@
         this.form.intro = ''
       },
       show(id, obj) {
+        console.log("obj3223323232332",obj)
         this.unitList = []
         this.packingUnit = []
         var arr =  getDataConfig('hemodialysis','units')
@@ -889,9 +892,6 @@
         form['drug_dose_unit'] = this.form.drug_dose_unit
         form['medical_insurance_number'] = this.form.medical_insurance_number
         form['provinces_code'] = this.form.provinces_code
-
-
-
         form['manufacturer'] = this.form.manufacturer
         form['pharmacology_category'] = this.form.pharmacology_category
         form['statistics_category'] = this.form.statistics_category
@@ -930,6 +930,8 @@
         form['prescribing_number_unit'] = this.form.prescribing_number_unit
         form['specification_name'] = this.form.specification_name
         form['is_user'] = this.form.is_user
+        form['sum_count'] = this.form.sum_count
+        form['sum_in_count'] = this.form.sum_in_count
         return form
       },
       getlist() {

src/xt_pages/data/components/drugs.vue

@@ -529,7 +529,8 @@
           val['id'] = this.current_id;
 
           val.min_number =  parseInt(val.min_number)
-
+          console.log("Val323323232",val)
+          
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -720,7 +721,7 @@
               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-
+             
 
 
               this.$refs.addDrugs.show(id, this.formValue)

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -707,7 +707,7 @@
                                 <td width="80">钠浓度(ml/h)/<br />温度(°C)</td>
                                 <td width="50">脉搏<br />(次/分)</td>
                                 <td width="60">血压<br />(mmHg)</td>
-                                <td width="50">血容量</td>
+                                <td width="50">血容量<br />(L)</td>
                                 <td width="50">签名</td>
                                 <td width="200">病情变化及处理</td>
                                 </tr>

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

@@ -791,8 +791,12 @@
         this.lastPredialysisEvaluation = last_predialysis_evaluation
        
        
-        console.log("获取上次数据",this.lastPredialysisEvaluation)
+        console.log("获取上次数据",this.lastPredialysisEvaluation, this.$store.getters.xt_user.org.id )
         if(this.lastPredialysisEvaluation != null) {
+        // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
+        //     console.log("2o2o3232o23o2o3o23")
+        //     this.assessmentBeforeDislysis.remark = "患者已确认无发热,无流行病学接触史"
+        // } 
          if(this.lastPredialysisEvaluation.thromubus_type == 1){
           this.assessmentBeforeDislysis.thromubus_type = this.lastPredialysisEvaluation.thromubus_type.toString()
            this.thrombuShow = true
@@ -822,6 +826,7 @@
           if(this.lastPredialysisEvaluation.period == 2){
              this.lastPredialysisEvaluation.period = "2"
           }
+         
         }
 
 
@@ -1298,6 +1303,7 @@
       }
     },
     created() {
+  
       this.last_dialysis_after = getDataConfig('hemodialysis', 'last_dialysis_after')
       this.dialysis_interphase = getDataConfig('hemodialysis', 'dialysis_duration')
       this.symptom_before_dialysis = getDataConfig('hemodialysis', 'dialysis_before')

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -641,7 +641,7 @@
                         <td width="80">钠浓度(ml/h)/<br />温度(°C)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="60">血压<br />(mmHg)</td>
-                        <td width="50">血容量</td>
+                        <td width="50">血容量<br />L</td>
                         <td width="50">签名</td>
                         <td width="200">病情变化及处理</td>
                       </tr>

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -177,7 +177,8 @@ export default {
         { value: 0, label: '全部', source: 0, lapseto: 0 },
         { value: 1, label: '转出', source: 0, lapseto: 2 },
         { value: 2, label: '留治', source: 0, lapseto: 1 }
-      ],originType:0,
+      ],
+      originType:0,
       originState: [
         { value: 0, label: '全部', source: 0},
         { value: 2, label: '住院', source: 2},
@@ -693,10 +694,10 @@ export default {
           var countwo = response.data.data.countwo
 
           var systolicTotal = response.data.data.systolicTotal
-          console.log('systolictotal', systolicTotal)
+          
           var sysstandTotal = 0
           var systolic = response.data.data.systolic
-          console.log('systolic', systolic)
+
           var sysarr = []
           for (let i = 0; i < systolic.length; i++) {
             if (systolic[i].systolic_blood_pressure >= this.sysmin && systolic[i].systolic_blood_pressure <= this.syslarge) {
@@ -704,20 +705,20 @@ export default {
             }
           }
           sysstandTotal = sysarr.length
-          console.log('sysarr', sysarr)
+       
 
           var diastotal = response.data.data.diastotal
           var diasstandtotal = 0
 
           var diastolic = response.data.data.diastolic
-          // console.log("diastolic",diastolic)
+          
           var diaArr = []
           for (let i = 0; i < diastolic.length; i++) {
             if (diastolic[i].diastolic_blood_pressure >= this.diamin && diastolic[i].diastolic_blood_pressure <= this.dialarge) {
               diaArr.push(diastolic[i])
             }
           }
-          // console.log("diaArr",diaArr)
+         
           diasstandtotal = diaArr.length
           var normData = response.data.data.normData
 
@@ -761,9 +762,10 @@ export default {
               }
             }
           }
-
+          console.log("count23322322332",count)
+          console.log("normdate23233323",normData)
           var arrtwo = this.arrayDate(count, normData)
-
+          console.log("23323332323232323223",arrtwo)
           for (let i = 0; i < arrtwo.length; i++) {
             this.$set(arrtwo[i], 'Count', 0)
           }
@@ -778,6 +780,8 @@ export default {
             arr.push(item)
           })
           arr.sort(this.compare('sort'))
+           console.log("wwowwoowwowo",this.normData)
+           console.log("arr23323323332",arr)
 
           for (const key in this.normData) {
             this.modesData.xAxis.push(this.normData[key].item_name)
@@ -787,6 +791,7 @@ export default {
               this.modesData.series.push(0)
             }
           }
+          
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
           this.getArrLength(this.chart.xAxis.data)
@@ -810,15 +815,20 @@ export default {
         var obj = array2[i]
         var num = obj.inspection_minor   //staff_id   就是要对比的key
         var isExist = false
+
         for (var j = 0; j < array1.length; j++) {
           var aj = array1[j]
+          
           var n = aj.item_id
+         
           if (n == num) {
             isExist = true
             break
           }
         }
+       
         if (!isExist) {
+          
           result.push(obj)
         }
       }

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -27,7 +27,7 @@
                 >
             </div>
             <div>
-               <el-button size="small" type="primary" @click="print_1">打印</el-button>
+               <!-- <el-button size="small" type="primary" @click="print_1">打印</el-button> -->
                <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
             </div>
             <!-- <div>

src/xt_pages/stock/drugs/print.vue

@@ -37,7 +37,7 @@
                         <td>{{item.warehousing_unit}}</td>
                         <td>{{getNumber(item.id)}}</td>
                         <td>{{item.manufacturer}}</td>
-                        <td>{{item.storehouse_id}}</td>
+                        <td>{{getHouseName(item.storehouse_id)}}</td>
                         <td> 
                             <span v-if="item.stock_max_number>0">{{item.stock_max_number}}{{item.warehousing_unit}} </span>  
                             <span v-if="item.stock_min_number>0">{{item.stock_min_number}}{{item.min_unit}}</span>
@@ -52,7 +52,9 @@
                           <span v-if="item.inventory_type == 11">盘亏</span>  
                         </td>
                         <td>{{getPrice(item.id)}}</td>
-                        <td>{{getTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id,item.stock_max_number,item.stock_min_number)}}</td>
+                        <td v-if="item.inventory_type == 11">{{getTotalPrice(item.stock_max_number,item.stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit) - getReduceTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit)}}</td>
+                        <td v-if="item.inventory_type == 10">{{getTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit) - getReduceTotalPrice(item.stock_max_number,item.stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit)}}</td>
+                        <td v-if="item.inventory_type != 10 && item.inventory_type!=11">0</td>
                     </tr>
                     </tbody>
                 </table>
@@ -144,16 +146,64 @@ export default {
           }
           return number
          },
-         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,stock_max_number,stock_min_number){
+         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,last_max_unit,last_min_unit){
            var retail_price = 0
            var totail_price =0
+           var max_unit = ""
+           var min_unit = ""
+           var max_number = 0
            for(let i=0;i<this.inventoryList.length;i++){
             if(id == this.inventoryList[i].id){
               retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+              max_unit = this.inventoryList[i].drug.max_unit
+              min_unit = this.inventoryList[i].drug.min_unit
             }
           }
-          var totail_price = (stock_max_number*min_number +stock_min_number - last_stock_max_number * min_number + last_stock_min_number) * retail_price
-        //  var totail_price = last_stock_max_number * min_number * retail_price + last_stock_min_number * retail_price 
+          console.log("max_unit",max_unit)
+          console.log("min_unit",min_unit)
+          if(last_max_unit == max_unit){
+            if(last_stock_max_number%min_number == 0){
+              totail_price = (last_stock_max_number/min_number) * retail_price + last_stock_min_number * retail_price
+            }
+            if(last_stock_max_number%min_number != 0){
+                totail_price = (last_stock_max_number/min_number)* retail_price + (last_stock_min_number%min_number) * retail_price + last_stock_min_number * retail_price
+            }
+          }
+          if(last_min_unit == min_unit){
+            totail_price = last_stock_max_number * retail_price + last_stock_min_number * retail_price
+          }
+          if(totail_price > 0){
+             return totail_price.toFixed(4)
+          }else{
+            return ""
+          }
+         },
+         getReduceTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,last_max_unit,last_min_unit){
+           var retail_price = 0
+           var totail_price =0
+           var max_unit = ""
+           var min_unit = ""
+           var max_number = 0
+           for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+              retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+              max_unit = this.inventoryList[i].drug.max_unit
+              min_unit = this.inventoryList[i].drug.min_unit
+            }
+          }
+          console.log("max_unit",max_unit)
+          console.log("min_unit",min_unit)
+          if(last_max_unit == max_unit){
+            if(last_stock_max_number%min_number == 0){
+              totail_price = (last_stock_max_number/min_number) * retail_price + last_stock_min_number * retail_price
+            }
+            if(last_stock_max_number%min_number != 0){
+                totail_price = (last_stock_max_number/min_number)* retail_price + (last_stock_min_number%min_number) * retail_price + last_stock_min_number * retail_price
+            }
+          }
+          if(last_min_unit == min_unit){
+            totail_price = last_stock_max_number * retail_price + last_stock_min_number * retail_price
+          }
           if(totail_price > 0){
              return totail_price.toFixed(4)
           }else{
@@ -171,7 +221,20 @@ export default {
           return retail_price
           }
           
+         },
+         getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
          }
+       }
     },
     created(){
 

src/xt_pages/stock/print_all.vue

@@ -31,7 +31,7 @@
                         <td width="60">总额</td>
                         
                     </tr>
-                    <tr v-for="(item,index) in tableData" :key="index">
+                    <tr v-for="(item,index) in tableList" :key="index">
                         <td>{{item.good_name}}</td>
                         <td>{{item.specification_name}}</td>
                         <td>{{item.packing_unit}}</td>
@@ -40,14 +40,21 @@
                         <td>{{getHouseName(item.storehouse_id)}}</td>
                         <td>{{item.stock_count}}</td>
                         <td>{{item.last_stock_count}}</td>
-                        <td>  
+                        <td>
                           <span v-if="item.stock_count > item.last_stock_count">盘亏</span>
-                          <span v-if="item.stock_count < item.last_stock_count">盘盈</span>
+                           <span v-if="item.stock_count < item.last_stock_count">盘盈</span></td>
+                        <td></td>
+                         <td></td>
+                        <!-- <td>  
+                          <span v-if="parseInt(item.stock_count) > parseInt(item.last_stock_count)">盘亏</span>
+                          <span v-if="parseInt(item.stock_count) < parseInt(item.last_stock_count)">盘盈</span>
                         </td>
                         <td>{{item.buy_price}}</td>
                         <td>
                           <span v-if="item.stock_count > item.last_stock_count">{{((item.stock_count - item.last_stock_count)  * item.buy_price).toFixed(2)}}</span> 
-                        </td>
+                          <span v-if="item.stock_count < item.last_stock_count">{{((item.last_stock_count - item.stock_count)  * item.buy_price).toFixed(2)}}</span> 
+                          <span v-if="item.stock_count = item.last_stock_count">0</span> 
+                        </td> -->
                     </tr>
                     </tbody>
                 </table>
@@ -75,7 +82,7 @@ export default {
           ],
           org_name: this.$store.getters.xt_user.org.org_name,
           ids:"",
-          tableData:[],
+          tableList:[],
           manufacturerList:[],
           houseList:[],
         }
@@ -110,9 +117,10 @@ export default {
           }
          getPrintList(params).then(response=>{
            if(response.data.state == 1){
-             var list =  response.data.data.list
-             console.log("list233233232323",list)
-             this.tableData = list
+             var list = response.data.data.list
+             console.log("list232332232323",response.data.data.list)
+             this.tableList = list
+             console.log("list233233232323",this.tableList)
              this.houseList = response.data.data.houseList
            }
          })