Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/details/DialysisPrescription.vue

           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 )">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>

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

           this.is_open = 0
         }
         
-        if(this.$store.getters.xt_user.org.id == 10101 || this.$store.getters.xt_user.org.id == 10233){
+        if(this.$store.getters.xt_user.org.id == 10101){
           if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
             var date = new Date(this.predialysis.created_time * 1000)
             var year = date.getFullYear()
           }
           if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
-          } else {
+          }else if(this.$store.getters.xt_user.org.id == 10234 || this.$store.getters.xt_user.org.id == 9671){
+            if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '06:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            }
+           } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
             } else if (schedual.schedule_type == 2) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

           </el-table-column>
          <el-table-column align="center" width="150">
           <template slot="header" slot-scope="scope" >
-                <span>批号</span>
+                <span >批号<span style="color: red">*</span></span>
             </template>
               <template slot-scope="scope">
-                <el-form-item style="padding-top: 20px">
+                <el-form-item style="padding-top: 20px" :rules="tableRules.batch_number"  :prop="'recordData.' + scope.$index + '.batch_number'">
                   <el-input
                     placeholder="请输入批号"
                     v-model="scope.row.batch_number"
               ></el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column label="有效日期" width="180" align="center">
+          <el-table-column  width="180" align="center">
+             <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
             <template slot-scope="scope">
-              <el-date-picker
-                prefix-icon="el-icon-date"
-                style="width: 145px"
-                v-model="scope.row.expiry_date"
-                type="date"
-                placeholder="选择日期时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
+              <el-form-item   :prop="'recordData.' + scope.$index + '.expiry_date'"
+                :rules="tableRules.expiry_date"
+                style="padding-top: 20px">
+                <el-date-picker
+                  prefix-icon="el-icon-date"
+                  style="width: 145px"
+                  v-model="scope.row.expiry_date"
+                  type="date"
+                  placeholder="选择日期时间"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </el-form-item>
             </template>
           </el-table-column>
 
 
           min_unit:[
             {required:true,message:'单位不能为空',trigger:'blur'}
-          ]
-
+          ],
+          batch_number:[
+           {required:true,message:'批号不能为空',trigger:'blur'}
+          ],
+          expiry_date:[
+           {required:true,message:'有效日期不能为空',trigger:'blur'}
+          ],
         },
         type: this.$route.query.type,
         total: '',

src/xt_pages/stock/stockInOrderAdd.vue

         
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
-              <span>批号</span>
+              <span>批号<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 20px" >
+              <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.number'"
+                            :rules='tableRules.number' >
                 <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
               </el-form-item>
             </template>
 
             </template>
           </el-table-column>
-          <el-table-column label="有效日期" align="center" width="180">
+          <el-table-column  align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
             <template slot-scope="scope">
-              <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
-                              type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd">
-              </el-date-picker>
-
+              <el-form-item  :prop="'recordData.' + scope.$index + '.expiry_date'"
+                :rules="tableRules.expiry_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+             </el-form-item>
             </template>
           </el-table-column>
 
           ],
           number:[
             { required: true, message: '批号不能为空', trigge: 'blur' }
-          ]
+          ],
+          expiry_date:[
+            { required: true, message: '有效日期不能为空', trigge: 'blur' }
+          ],
 
         },
         type: this.$route.query.type,
         this.isVisibility = true
       },
        comfirm: function(val) {
-        console.log("val99999999999999",val)
         this.propForm.goodType = []
         this.propForm.goods = []
 

src/xt_pages/workforce/remind_print_setting.vue

                 <div v-if="printObj.anticoagulant == 1">抗凝剂:
                   <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >
-                   <span>{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span> 
+                   <span>{{getAnticoagulant(main_collection.solution,main_collection.mode_id)}}</span>
                   </span>
                 </div>
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
                 <div v-if="printObj.anticoagulant_zongliang == 1">
                   用量:
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                  {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                   </span>
                 </div>
                 <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
       BreadCrumb
     },
     created() {
-      // console.log("type2323233223232",this.$route.query.type)
      this.type = this.$route.query.type
      this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
           return false;
         }
       });
+     },
+      getAnticoagulant(arr,mode_id){
+       var name = ""
+       if(arr.length > 0){
+           for(let i=0;i<arr.length;i++){
+          if(mode_id == arr[i].mode_id){
+            name = arr[i].anticoagulant
+          }
+       } 
+      if(name == 0){
+         name = ""
+       }
+       if(name == 1){
+         name = "无肝素"
+       }
+       if(name == 2){
+         name = "普通肝素"
+       }
+       if(name == 3){
+         name ="低分子肝素"
+       }
+
+       if(name == 4){
+         name = "阿加曲班"
+       }
+        if(name == 5){
+         name = "枸橼酸钠"
+       }
+        if(name == 6){
+         name = "低分子肝素钙"
+       }
+        if(name == 7){
+         name = "低分子肝素钠"
+       }
+
+       return name
+      }
+     },
+     getAnticoagulantZonliang(arr,mode_id){
+       var name = 0
+       if(arr.length > 0){
+         for(let i=0;i<arr.length;i++){
+          if(mode_id == arr[i].mode_id){
+            name = arr[i].anticoagulant_zongliang
+          }
+        } 
+       }
+       return name
      }
     }
   }