518合并代码

src/api/stock.js

 }
 
 export function postGoodInformation(params) {
-  console.log('PARMAS22', params)
   return request({
     url: '/api/good/postgoodinformation',
     method: 'Post',

src/xt_pages/data/basicConfig.vue

             <p style="margin-top:20px;">耗材先出库再执行：
                 <el-switch v-model="is_open_is_type" @change="changeFuncType"></el-switch>
             </p>
-            <!-- <p style="margin-top:20px;">药品在保存处方时出库：
+            <p style="margin-top:20px;">药品在保存处方时出库：
                 <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
-            </p> -->
+            </p>
         </div>
 
 

src/xt_pages/data/components/consumables.vue

        let params = {
           'goods':tableData
         };
-
-
-
+        console.log("param2332323223",params)
         postGoodInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;

src/xt_pages/data/components/drugs.vue

 
 
           if (results[i]['*拆零零售价'] === undefined) {
-                obj['retail_price'] = ''
+                obj['min_price'] = ''
               } else {
            if (key == '*拆零零售价') {
+               obj['min_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*包装零售价'] === undefined) {
+                obj['retail_price'] = ''
+              } else {
+           if (key == '*包装零售价') {
                obj['retail_price'] = results[i][key].replace(/\s/g,"")
               }
            }
         }
        }
        for(let i=0;i<tableData.length;i++){
-          tableData[i].dose = parseInt(tableData[i].dose)
+          tableData[i].dose = tableData[i].dose.toString()
        }
        let params = {
           'drugs':tableData

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

                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
 
                     <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.org_id != 54">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987  ">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54  ">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
 
                     <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54'
                                     :label="'总量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>

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

                 template_id == 48 ||
                 template_id == 51 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
               template_id != 48 &&
               template_id != 51 &&
               template_id != 53 &&
+              template_id != 54 &&
               org_id!= 10210 &&
               org_id != 9555
             "
                 template_id == 46 ||
                 template_id == 48 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 47)
             "
           >
               template_id != 44 &&
               template_id != 46 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 48 &&
               template_id != 47
             "
                 template_id == 29 ||
                 template_id == 48 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 47)
             "
           >
               template_id != 29 &&
               template_id != 48 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 47
             "
           >
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 48)
             "
           >
               template_id != 29 &&
               template_id != 43 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 48
             "
           >
                 template_id == 46 ||
                 template_id == 48 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 47)
             "
           >
               template_id != 46 &&
               template_id != 48 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 47
             "
           >
                 template_id == 48 ||
                 template_id == 51 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
               template_id != 51 &&
               template_id == 48 &&
               template_id == 53 &&
+              template_id == 54 &&
               org_id !=  10210 &&
               org_id != 9555
             "
               template_id != 46 &&
               template_id != 47 &&
               template_id != 48 &&
+              template_id != 54 &&
               template_id != 53
             "
           >
                 template_id == 46 ||
                 template_id == 47 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 48)
             "
           >
               template_id != 43 &&
               template_id != 46 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 48
             "
           >
                 template_id == 29 ||
                 template_id == 46 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 48)
             "
           >

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53  || template_id == 54) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53 && template_id != 54" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/hospitalStation/components/deskPrescription.vue

 
                 teamList.push(obj)
               } else if (project[i].type == 3 && project[i].status == 1) {
-                if (project[i].good_info.total <= 0) {
+                if (project[i].good_info.sum_count <= 0) {
                   num++
                   this.$refs.tabProjectTeam.toggleRowSelection(row)
                   this.$message.error(project[i].good_info.good_name + '库存不足')

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

 
                   teamList.push(obj)
                 } else if (project[i].type == 3 && project[i].status == 1) {
-                  if (project[i].good_info.total <= 0) {
+                  if (project[i].good_info.sum_count <= 0) {
                     num++
                     this.$refs.tabProjectTeam.toggleRowSelection(row)
                     this.$message.error(project[i].good_info.good_name + '库存不足')

src/xt_pages/user/dialysisSolution.vue

               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
-            <el-form-item label="置换量(L) : " prop="replacement_total">
-              <el-input
-                v-model="addPlan.replacement_total"
-                type="number"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+         
 
           <el-col :span="8" v-if="isShows('钾')">
             <el-form-item label="钾（mmol/L）: " prop="kalium">
               <el-input v-model="addPlan.special_medicine_other"></el-input>
             </el-form-item>
           </el-col>
-
+           <el-col :span="8" v-if="isShows('置换量') && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)">
+            <el-form-item label="置换量(L) : " prop="replacement_total">
+              <el-input
+                v-model="addPlan.replacement_total"
+                type="number"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item
-              label="置换液："
-              v-if="
-                isShows('置换液') &&
-                  this.$store.getters.xt_user.template_info.template_id != 6
+              label="置换液：" v-if="isShows('置换液') &&   (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)
               "
-              v-show="huShow"
             >
               <el-select
                 v-model="addPlan.displace_liqui_part"
             <el-form-item
               label="置换方式："
               v-if="
-                isShows('置换液') &&
-                  this.$store.getters.xt_user.template_info.template_id == 6
+                isShows('置换液')   && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)
               "
             >
               <el-select
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
+          <el-col :span="8" v-if="isShows('置换液总量')  && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)">
             <el-form-item label="置换液总量(L)">
               <el-input v-model="addPlan.displace_liqui_value"></el-input>
             </el-form-item>
         epo:"",
         epo_count:"",
         max_ultrafiltration_rate:"",
-   
+        
       },
       childPlan: {
         mode: '',
     openEdit(index, row) {
       console.log("ro2333333",row)
       this.current_index = index
-
       this.addPlan.id = row.id
       this.addPlan.mode = row.mode_id
       this.addPlan.mode_name = row.mode_name