新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -894,7 +894,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id !=0">
+                        v-if="org_id!=10440 && org_id!=0 && org_id!=10469">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -918,6 +918,21 @@
                         </div>
                         kg
                       </div>
+
+                      <div class="inline_block" style="flex: 1"
+                        v-if="org_id!=10440 && org_id ==0 || org_id!=10469">
+                        上次透后体重：
+                        <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          <span>{{
+                            record.lastafterweight.weight_after
+                          }}</span>
+                       
+                        </div>
+                        kg
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         透前体重：
                         <div
@@ -938,7 +953,7 @@
                         </div>
                         kg
                       </div>
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10469">
                         计划超滤量：
                         <div
                           class="under_line"
@@ -954,6 +969,22 @@
                          <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471">L</span>
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id==0 || org_id == 10469">
+                        处方脱水量：
+                        <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.prescription_water
+                              ? record.prescription.prescription_water
+                              : "/"
+                          }}
+                        </div>
+                        ml
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
                         <div

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

@@ -1326,12 +1326,12 @@
               }
 
               if(msg == 2){
-                this.$message.error("库存不足,请入库")
+                this.$message.error("执行失败,库存不足,请入库")
                 this.execTimeDialogVisible = false
                 return false
               }
               if(msg == 3){
-                this.$message.error("无库存,请入库")
+                this.$message.error("执行失败,无库存,请入库")
                 this.execTimeDialogVisible = false
                 return false
               }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -915,16 +915,16 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10440">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10440">
                       上次透后体重：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 ">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -961,7 +961,7 @@
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
                       计划超滤量： 
                       <div
                         class="under_line"
@@ -976,6 +976,22 @@
                       <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">L</span>
                     </div>
+
+
+                    <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 0">
+                      处方脱水量： 
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                        {{
+                          prescription.prescription_water
+                            ? prescription.prescription_water
+                            : "/"
+                        }}
+                      </div>
+                       ml
+                    </div>
                     <div class="inline_block" style="flex: 1">
                       干体重：
                       <div

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -239,7 +239,7 @@
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex:4;" v-if="org_id == 10081">
+                    <div class="inline_block" style="flex:4;" v-if="org_id == 9779">
                       穿刺点：
                       <div class="under_line" style="min-width: 120px;text-align: center">
                         {{ predialysis.point_puncture ? predialysis.point_puncture : "/" }}

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2022,7 +2022,7 @@
             this.state2 = last_info.sick_history
           }
 
-          if(this.org_id == 0 || this.org_id == 10138){
+          if(this.org_id == 10138){
              this.diagnose = []
              this.diagnose.push(24)
              this.diagnose.push(85)

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

@@ -216,7 +216,7 @@
     
         },
         created(){
-            this.educationOptions = getDataConfig("patient", "education_types");
+            this.educationOptions = getDataConfig("patient", "profession_options");
             this.getAllDoctorList()
             this.getPatientCaseHistory()
     

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

@@ -59,6 +59,7 @@
               v-model="storehouse_in_id"
               filterable
               placeholder="请选择调入仓库"
+              @change="changeHouseInfoList"
             >
               <el-option
                 v-for="(option, index) in houseList"
@@ -156,6 +157,7 @@
                 <el-input
                   v-model="scope.row.count"
                   style="width: 100px"
+                  oninput="value=value.replace(/\D|^0/g,'')"
                   @input="
                     selectCount(
                       scope.row.project_id,
@@ -315,7 +317,7 @@ export default {
       var array = [];
       array.push(this.id);
       var ids = array.join(",");
-
+      
       checkSecondOrder(ids).then((response) => {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
@@ -459,7 +461,10 @@ export default {
       this.$refs["tableForm"].validate((valid) => {
         if (valid) {
           const array = this.recordInfo.recordData;
-
+          if(len(array)==0){
+             this.$message.error("请新增药品或者耗材")
+             return false
+          }
           for (let i = 0; i < array.length; i++) {
             array[i].count = parseInt(array[i].count);
             array[i].second_total = array[i].second_total.toString();
@@ -562,10 +567,38 @@ export default {
       }
       return total_count;
     },
+    changeHouseInfoList(){
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_in_id = ""
+         return false
+      }
+    },
     changeHouseList() {
+      const tempObj = {};
+      tempObj["id"] = 0;
+      tempObj["name"] = "";
+      tempObj["project_name"] = "";
+      tempObj["project_type"] = "";
+      tempObj["second_specification_name"] = "";
+      tempObj["sencond_unit"] = "";
+      tempObj["count"] = "";
+      tempObj["second_total"] = "";
+      tempObj["is_source"] = 0;
+      tempObj["remake"] = "";
+      tempObj["project_id"] = 0;
+      tempObj["min_price"] = 0;
+      this.recordInfo.recordData = []
+      this.recordInfo.recordData.push(tempObj);
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_out_id = ""
+         return false
+      }
       var params = {
         storehouse_out_id: this.storehouse_out_id,
       };
+
       this.tabList = [];
       getStoreHouseGoodList(params).then((response) => {
         var drugList = response.data.data.drugList;

src/xt_pages/stock/inventoryTransfer/transEdit.vue

@@ -63,6 +63,7 @@
               filterable
               placeholder="请选择调入仓库"
               :disabled="store_disabled"
+              @change="changeHouseInfoList"
             >
               <el-option
                 v-for="(option, index) in houseList"
@@ -154,6 +155,7 @@
               <el-form-item
                 style="padding-top: 20px"
                 :prop="'recordData.' + scope.$index + '.count'"
+                oninput="value=value.replace(/\D|^0/g,'')"
                 :rules="tableRules.count"
               >
                 <el-input
@@ -747,6 +749,10 @@ export default {
           });
           this.loading = true;
           const array = this.recordInfo.recordData;
+          if(len(array)==0){
+             this.$message.error("请新增药品或者耗材")
+             return false
+          }
           if (this.storehouse_in_id <= 0) {
             this.$message.error("调入仓库不能为空!");
             this.loading = false;
@@ -819,8 +825,33 @@ export default {
         }
       });
     },
+    changeHouseInfoList(){
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_in_id = ""
+         return false
+      }
+    },
 
     changeHouseList() {
+      const tempObj = {};
+      tempObj["id"] = 0;
+      tempObj["name"] = "";
+      tempObj["project_name"] = "";
+      tempObj["project_type"] = "";
+      tempObj["second_specification_name"] = "";
+      tempObj["sencond_unit"] = "";
+      tempObj["count"] = "";
+      tempObj["second_total"] = "";
+      tempObj["is_source"] = 0;
+      tempObj["remake"] = "";
+      tempObj["project_id"] = 0;
+      tempObj["min_price"] = 0;
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_out_id = ""
+         return false
+      }
       var params = {
         storehouse_out_id: this.storehouse_out_id,
       };

src/xt_pages/user/components/PatientDetail.vue

@@ -160,7 +160,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="8" v-if="org_id!=0 && org_id!=10138 && org_id!=10278">
               <el-form-item
                 label="首次肾脏治疗时间 : "
                 label-width="150px"
@@ -179,6 +179,21 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="6" :style="isEdit ? 'width:380px' : ''" v-if="org_id==0||org_id == 10138 || org_id == 10278">
+                <el-form-item
+                  label="首次进入本院时间:"
+                  prop="firstDialysisDate"
+                  label-width="150px"
+                >
+                  <el-date-picker
+                    v-model="form.firstDialysisDate"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+
             <el-col :span="8">
               <el-form-item label="本人电话: " class="is-required" prop="phone">
                 <el-input
@@ -790,14 +805,14 @@
         </el-col> -->
       </el-row>
 
-      <el-col :span="24">
+      <!-- <el-col :span="24">
         <el-form-item>
           <el-button type="text" @click="treat_info_fold = !treat_info_fold"
             >{{ treat_info_fold ? "更多治疗信息" : "收起"
             }}<i class="el-icon--right" :class="treat_fold_icon"></i
           ></el-button>
         </el-form-item>
-      </el-col>
+      </el-col> -->
 
       <el-col :span="24">
         <el-form-item label="登记人员 : ">
@@ -1365,9 +1380,9 @@ export default {
             if(this.form.doctor == 0){
               this.form.doctor = ""
             }
-            if (patietInfo.is_infectious == 1) {
-              this.form.remind_cycle = 0;
-            }
+            // if (patietInfo.is_infectious == 1) {
+            //   this.form.remind_cycle = 0;
+            // }
             console.log("222222", this.form.remind_cycle);
             this.form.user_sys_before_count = patietInfo.user_sys_before_count;
 

src/xt_pages/user/components/PatientForm.vue

@@ -1823,9 +1823,9 @@ export default {
            
             this.form.is_infectious = patietInfo.is_infectious;
             console.log("哈哈哈哈",patietInfo.is_infectious)
-            if(this.form.is_infectious == 1){
-              this.form.remind_cycle = 0
-            }
+            // if(this.form.is_infectious == 1){
+            //   this.form.remind_cycle = 0
+            // }
             this.form.tell_phone = patietInfo.tell_phone;
             this.form.dialysis_age = patietInfo.dialysis_age;
             this.form.contact_name = patietInfo.contact_name;