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/dialog/monitor_dialog.vue

             v-if="
               isShow('超滤量') &&
                 (template_id == 6 ||
+                  template_id == 9 ||
                   template_id == 10 ||
                   template_id == 11 ||
                   template_id == 12 ||
             v-if="
               isShow('超滤量') &&
                 template_id != 6 &&
+                template_id !=9 &&
                 template_id != 10 &&
                 template_id != 11 &&
                 template_id != 12 &&
 
           <el-col
             :span="8"
-            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 == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || 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 == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
 
           <el-col
             :span="8"
-            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!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && 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!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

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 == 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 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && 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 && 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 || this.$store.getters.xt_user.template_info.org_id == 9555)" 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 && 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)" 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" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

           <td width="80" style="line-height:20px">TMP<br />{{monitors[0] && monitors[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}}</td>
           <td width="60" style="line-height:20px">血流量<br />ml/min</td>
           <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
+          <td width="60" v-if="org_id  == 10032" style="line-height:20px">超滤量<br />ml</td>
+          <td width="60" v-if="org_id  == 10032" style="line-height:20px">透析液温度<br />℃</td>
           <!-- <td width="60">钠浓度<br/>mmol/L</td>
         <td width="80">透析液温度<br/>℃</td>
         <td width="60">置换率<br/>ml/min</td> -->
           </td>
           <td>
             &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
+          </td>
+           <td v-if="org_id  == 10032">
+            &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
+          </td>
+           <td v-if="org_id  == 10032">
+            &nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
           </td>
           <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
           <td>
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
           </td>
+         
         </tr>
         </tbody>
       </table>
         doctorForm: {
           doctor: '',
           url: ''
-        }
+        },
+        org_id:0,
       }
   },
     methods: {
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
+      this.org_id = xtuser.org.id
       // this.orgname = "遂溪方济医院";
       this.modeOptions = this.$store.getters.treatment_mode
       this.replacementWays = this.$store.getters.replacement_ways

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

           style="width:100%;"
           v-model="start_time"
           type="date"
-          placeholder="选择日期">
+          placeholder="选择日期"
+           :picker-options="pickerOptions0">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="" prop="name" style="width:49%;">
         //   family_history:"",
 
         // },
+          pickerOptions0: {
+          disabledDate(time) {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
         formValue:{
           temperature:"",
           blood_sugar:"",

src/xt_pages/outpatientDoctorStation/template/printOne.vue

           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">科室：{{getDepart(hisPatient.departments)?getDepart(hisPatient.departments):''}}</div>
+              <div style="margin-bottom: 10px;">科室：{{getDepart(item.info.departments)?getDepart(item.info.departments):''}}</div>
               <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
               <div>地址：{{item.patient.home_address}}</div>
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

src/xt_pages/outpatientRegistration/registrationHistory.vue

                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="180">
                     <template slot-scope="scope">
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
                       <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" >已就诊</el-button>  
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
                       <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>
                     </template>
                 </el-table-column>
             ],
             start_time:moment().format("YYYY-MM-DD"),
             end_time:moment().format("YYYY-MM-DD"),
-            limit:20,
+            limit:10,
             page:1,
             total:0,
             departMent:[],
             startUnix:'',
 
             dialogVisible:false,
-            form:{}
+            form:{},
+            is_Name:false
         }
     },
     created(){
         },
        handleSizeChange(val) {
           this.limit = val
-          this.getList()
+          this.getlist()
        },
         handleCurrentChange(val) {
         this.page = val
-        this.getList()
+        this.getlist()
         },
         getlist(){
           var params = {

src/xt_pages/stock/stockOutOrder.vue

 
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
+           
             <el-tooltip
               class="item"
               effect="dark"
             >
               <el-button
                 size="small"
-                type="primary"
-                icon="el-icon-search"
+                type="warning"
+                icon="el-icon-document"
                 @click="handleSearch(scope.row.id)"
               >
               </el-button>
     
     //新增
     handleSearch(id){ 
+      this.warehousingOutInfo.info = []
+      this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetailOne(id)
       this.dialogVisible = true
     },
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
+
             this.warehousingOutInfo.info = response.data.data.info
-            this.handleSpanTempArr()
+            // this.handleSpanTempArr()
           }
         })
      }, 
       }, 
 
     jump(id){
+      this.userList = []
       this.GetOrderDetail(id)
      
     },
         const params = {
           'id': order_id
         }
-        console.log("params 0---------",params)
+      
         getWarehouseOutUser(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             var total = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               var obj = response.data.data.list[i]
-              console.log("obj---------",obj)
               obj['is_total'] = 0
               this.userList.push(obj)
               total = total + response.data.data.list[i].count