Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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

       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
       <el-form ref="form" :model="form" label-width="160px">
         <el-row :gutter="20">
+         
+          <el-col :span="8" >
+            <el-form-item
+              label="透后时间 :"
+              style="width: 350px"
+              :prop="isName('透后时间')"
+              v-if="org_id == 0 || org_id ==10599"
+            >
+              <el-date-picker
+                type="datetime"
+                format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm"
+                placeholder="选择时间"
+                v-model="form.start_time"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('实际治疗时长')">
             <el-form-item label="实际治疗时长(时):" prop="actualTreatmentHourShow" :rules="isCheckmust('实际治疗时长')">
 
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透后症状')">
+        <el-col :span="8" v-if="isShow('透后症状') && org_id !=0 && org_id != 10721">
           <el-form-item label="透后症状: " :prop="isName('透后症状')" :rules="isCheckmust('透后症状')">
             <el-input
               v-model="form.symptom_after_dialysis"
           </el-form-item>
         </el-col>
 
+        <el-col :span="8" v-if="(org_id == 0 || org_id == 10721)">
+          <el-form-item label="透后症状: ">
+            <el-input v-model="form.symptom_after_dialysis_remark"></el-input>
+          </el-form-item>
+         
+        </el-col>
+
         <el-col :span="8" v-if="isShow('透析中入量') && org_id!=10485 && org_id!=10460  && org_id!=10551">
           <el-form-item label="透析中入量: " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
 import { uParseTime } from '@/utils/tools'
 import store from '@/store'
 import { parseTime } from '@/utils'
-
+const moment = require('moment');
 import request from '@/utils/request'
 
 export default {
         last_after_weight:"",
         displace_liqui_value:"",
         after_weight:"",
+        symptom_after_dialysis_remark:"",
+        start_time:""
       },
       lapseList:[],
       leaveOfficeMethod:[],
     }
   },
   methods: {
+    getTimeOne (time) {
+      return uParseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
+    },
     isName(name) {
       let filedList = store.getters.xt_user.fileds;
       for (let i = 0; i < filedList.length; i++) {
 
           ParamsQuery['patient'] = this.patient.id
           ParamsQuery['record_date'] = this.record_date
+          if(this.form.start_time == ""){
+            ParamsQuery["record_time"] =  moment().format('YYYY-MM-DD HH:mm:ss')
+          }else{
+            ParamsQuery["record_time"] = this.form.start_time
+          }
+        
           ParamsQuery['mode'] = '1'
           if (this.assessment_after_dislysis.creater > 0) {
             ParamsQuery['mode'] = '2'
           data["transfusion_volume"] = this.form.transfusion_volume
           data["condenser"] = this.form.condenser
           data['displace_liqui_value'] = this.form.displace_liqui_value
+        
+          data["symptom_after_dialysis_remark"] = this.form.symptom_after_dialysis_remark
+        
+        
           if(this.form.last_after_weight >0){
             data["last_after_weight"] = this.form.last_after_weight.toString()
           }else{
     // 数据开始
     show(predialysis,last_after) {
       console.log("头号好地方阿道夫地方阿道夫阿道夫",this.last_monitor)
-
+      
+      if(this.assessment_after_dislysis!=null && this.assessment_after_dislysis.id>0){
+         this.form.start_time = this.getTimeOne(this.assessment_after_dislysis.record_time) 
+      }
+     
+      
       if(this.$store.getters.xt_user.template_info.org_id == 10679){
         if(this.form.systolic_blood_pressure == 0){
            this.form.systolic_blood_pressure = this.last_monitor.systolic_blood_pressure
         if(this.form.pulse_frequency == 0){
           this.form.pulse_frequency = this.last_monitor.pulse_frequency
         }
+       
 
       }
       this.isVisibility = true
   },
   created() {
     // console.log("this.form", this.form.consciousness);
-
+     
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')

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

                     </el-col>
 
                     <el-col :span="8" v-if="isShows('是否单超脱水')">
-                        <el-form-item label="是否单超脱水:" prop="is_water" :rules="isCheckmust('是否单超脱水')">
+                        <el-form-item label="是否单超脱水:" prop="is_water">
                            <el-select v-model="dialysisPrescription.is_water">
                                 <el-option
                                         v-for="(item, index) in waterList"
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8" >
+                        <el-form-item label="是否先超脱水:" prop="first_super" v-if="isShows('是否先超脱水')">
+                           <el-select v-model="dialysisPrescription.first_super">
+                                <el-option
+                                        v-for="(item, index) in waterListThree"
+                                        :label="item.name"
+                                        :value="item.id"
+                                        :key="index + 's'"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    
+                    <el-col :span="8">
+                        <el-form-item label="是否序惯脱水:" prop="is_sequential"  v-if="isShows('是否序惯脱水')">
+                           <el-select v-model="dialysisPrescription.is_sequential">
+                                <el-option
+                                        v-for="(item, index) in waterListTwo"
+                                        :label="item.name"
+                                        :value="item.id"
+                                        :key="index + 't'"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="电导度(mS/cm)：" prop="conduct">
+                            <el-input v-model="dialysisPrescription.conduct"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    
+
 
                     <el-col :span="8" v-if="isShows('透析液')">
                         <el-form-item label="透析液:" prop="dialyzate" :rules="isCheckmust('透析液')">
           washing_time:"",
           blood_access_part_id:"",
           anticoagulant_weichi_hour:"",
-          dialyzate:""
+          dialyzate:"",
+          first_super:0,
+          is_sequential:0,
+          conduct:""
         },
 
         anticoagulant: {
           {id:1,name:"是"},
           {id:2,name:"否"}
         ],
+        waterListOne:[
+          {id:0,name:"请选择"},
+          {id:1,name:"是"},
+          {id:2,name:"否"}
+        ],
+        waterListTwo:[
+          {id:0,name:"请选择"},
+          {id:1,name:"是"},
+          {id:2,name:"否"}
+        ],
+        waterListThree:[
+          {id:0,name:"请选择"},
+          {id:1,name:"是"},
+          {id:2,name:"否"}
+        ],
         dialyzateList:[
           {id:0,name:"请选择"},
           {id:1,name:"碳酸"},

src/xt_pages/stock/detail/print.vue

               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0 || org_id ==10402">
+                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0 || org_id ==10402 || org_id == 10721 || org_id == 10726 || org_id == 10697">
                     <!-- {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}} -->
                      {{(getMySelfCount(item.good_id) * item.buy_price).toFixed(2)}}
                      
                   </span>
-                  <span v-if="org_id == 10265 || org_id == 10215  ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id == 10265 || org_id == 10215 || org_id == 10721 || org_id ==10726 || org_id == 10697 ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=9675 && org_id!=9679 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191 && org_id!=10402&& org_id!=0">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=9675 && org_id!=9679 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191 && org_id!=10402&& org_id!=0 && org_id!=10721 && org_id!=10726 && org_id!=10697">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>