518合并代码

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

@@ -1422,7 +1422,7 @@
               this.irrigations[i].name = this.irrigations[i].specification_name
             }
             this.InnerDialogProps.values = this.irrigations
-            this.InnerDialogProps.titles = '透析器'
+            this.InnerDialogProps.titles = '灌流器'
             this.InnerDialogProps.type = 'irrigations'
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_irrigation
             this.InnerDialogProps.isShowTextArea = false

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

@@ -694,18 +694,31 @@
             </template>
           </el-table-column>
 
-          <el-table-column
-            prop="heparin"
+         <el-table-column
+            prop="displacement_flow_quantity"
             align="center"
             label="累计血容量(ml)"
-            width="140"
-            v-if="isShow('累计血容量')"
+            width="100"
+            v-if="isShow('累计血容量') && template_id != 41"
+          >
+             <template slot-scope="scope">
+              {{ scope.row.accumulated_blood_volume }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="displacement_flow_quantity"
+            align="center"
+            label="累计血容量(L)"
+            width="100"
+            v-if="isShow('累计血容量') && template_id == 41"
           >
             <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
             </template>
           </el-table-column>
 
+
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -1355,7 +1368,13 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('累计血容量')">
+          <el-col :span="8" v-if="isShow('累计血容量') && template_id == 41">
+            <el-form-item label="累计血容量(L)：">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+          </el-col>
+         
+          <el-col :span="8" v-if="isShow('累计血容量') && template_id  != 41">
             <el-form-item label="累计血容量(ml)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -32,7 +32,10 @@
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
-          <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
+          <th v-if="isShow('累计血容量')" width="92px">累计血容量 
+            <span v-if="template_id !=41">(ml)</span>
+            <span v-if="template_id == 41">(L)</span>
+          </th>
           <th v-if="isShow('血容量')" width="92px">血容量(L)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>

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

@@ -52,7 +52,7 @@
                           <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)}}</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>
                     </tr>
                     </tbody>
                 </table>
@@ -144,7 +144,7 @@ export default {
           }
           return number
          },
-         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id){
+         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,stock_max_number,stock_min_number){
            var retail_price = 0
            var totail_price =0
            for(let i=0;i<this.inventoryList.length;i++){
@@ -152,9 +152,10 @@ export default {
               retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
             }
           }
-         var totail_price = last_stock_max_number * min_number * retail_price + last_stock_min_number * retail_price 
+          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 
           if(totail_price > 0){
-             return totail_price
+             return totail_price.toFixed(4)
           }else{
             return ""
           }
@@ -163,10 +164,13 @@ export default {
            var retail_price = 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
+               retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
             }
           }
+          if(retail_price > 0){
           return retail_price
+          }
+          
          }
     },
     created(){

src/xt_pages/stock/print_all.vue

@@ -45,7 +45,9 @@
                           <span v-if="item.stock_count < item.last_stock_count">盘盈</span>
                         </td>
                         <td>{{item.buy_price}}</td>
-                        <td>{{(item.last_stock_count * item.buy_price).toFixed(2)}}</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>
                     </tr>
                     </tbody>
                 </table>

src/xt_pages/user/dialysisSolution.vue

@@ -537,7 +537,7 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item
+            <!-- <el-form-item
               label="置换方式："
               v-if="
                 isShows('置换液')   && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)
@@ -555,7 +555,7 @@
                   :value="option.id"
                 ></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
 
           <el-col :span="8" v-if="isShows('置换液总量')  && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)">
@@ -1401,7 +1401,7 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.$refs[formName].resetFields()
+              
               this.dialogFormVisible = false
               this.tableData[this.current_index].doctor =
                 response.data.data.solution.doctor
@@ -1410,6 +1410,7 @@ export default {
               this.tableData[this.current_index].initiate_mode =
                 response.data.data.solution.initiate_mode
               this.current_index = -1
+              this.$refs[formName].resetFields()
               return false
             }
           })
@@ -1484,7 +1485,7 @@ export default {
           }
           this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
           this.addPlan.dialysis_irrigation = this.dialysis_irrigation
-
+          this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
           editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1496,10 +1497,8 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.$refs[formName].resetFields()
-
               this.dialogVisible = false
-
+              // this.$refs[formName].resetFields()
               for (var dindex in response.data.data.solution) {
                 if (dindex == 'id') {
                   continue
@@ -1512,6 +1511,7 @@ export default {
               // this.tableData[this.current_index].updated_time = response.data.data.solution.updated_time;
 
               this.current_index = -1
+              this.fetchPatientDialysisSolutions()
               return false
             }
           })
@@ -1526,6 +1526,7 @@ export default {
           const mode = '1'
           this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
           this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+          this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
           console.log("add",this.addPlan)
           createPatientDialysisSolution(
             this.patientID,
@@ -1542,13 +1543,14 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.$refs[formName].resetFields()
               this.dialogVisible = false
-              this.tableData.unshift(response.data.data.solution)
+              // this.tableData.unshift(response.data.data.solution)
               if (this.tableData.length > 10) {
                 this.tableData.pop()
               }
               this.total += 1
+              // this.$refs[formName].resetFields()
+              this.fetchPatientDialysisSolutions()
               return false
             }
           })
@@ -1944,7 +1946,6 @@ export default {
 
     addPlanModeChange() {
       var thismode = parseInt(this.addPlan.mode)
-      console.log("addplan22323",this.addPlan.mode)
       if(thismode == 2 || thismode == 5 || thismode ==12){
           this.zhiShow = true
           this.huShow= true
@@ -2195,7 +2196,7 @@ export default {
     this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
     this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
     this.queryParams.id = this.patientID
-    // this.fetchAllDoctorAndNurse();
+  
 
   }
 }