Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

config/dev.env.js

 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://112.74.16.180:9527"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://localhost:9529"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/xt_pages/data/druguse.vue

                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"

src/xt_pages/data/druguseTemplate.vue

               </el-form>
               <div class="txsj" style="text-align: center;margin-bottom: 30px">
                 <el-button round @click="newRecordAction">新增医嘱内容</el-button>
-                <el-button round @click="deleteRecordAction">删除医嘱内容</el-button>
                 <el-button round @click="modifyRecordAction">修改医嘱内容</el-button>
+                <el-button round @click="deleteRecordAction">删除医嘱内容</el-button>
               </div>
               <el-table
                 ref="table" :data="adviceTableData"
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="规格 :" required prop="advice_desc">
+                  <el-form-item label="规格 :" >
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
 
 
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="规格" prop="advice_desc">
+                  <el-form-item label="规格" >
                     <el-input v-model="templateFormEdit.advice_desc"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label="药品规格 :" prop="drug_spec">
                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="规格 :" required prop="advice_desc">
+                  <el-form-item label="规格 :" >
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label="药品规格 :" prop="drug_spec">
         },
         templateRules: {
           advice_name: [{ required: true, message: '请填写医嘱内容' }],
-          advice_desc: [{ required: true, message: '请填写规格' }]
 
         },
         templateEditRules: {

src/xt_pages/dialysis/Dialog/StatOrderDialog/index.vue

                     <span>瓶</span>
                 </el-form-item> 
                 <el-form-item label="给药途径 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.way" >
+                  <el-select v-model="form.way" style="width:100%;" >
                       <el-option v-for="(item, index) in wayList" :label="item.label" :value="item.value" :key="index"></el-option>                      
                   </el-select>  
                 </el-form-item>
                 <el-form-item label="执行频率 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.frequency" >
+                  <el-select v-model="form.frequency" style="width:100%;">
                       <el-option v-for="(item, index) in frequencyList" :label="item.label" :value="item.value" :key="index"></el-option>                                           
                   </el-select>  
                 </el-form-item>

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

 
 
         <el-button  v-if="groupSelectRow != null"   round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
-        <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">修改医嘱</el-button>
+        <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
 
         <!--<el-button round @click="openNewChild" :loading="deleLoading">新增子药</el-button>-->
       </div>

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

             </el-form-item>
           </el-col>
           <el-col :span="12">
-
             <el-form-item label="开始时间 :" required prop="start_time">
               <el-date-picker
                 type="datetime"

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

 
 
         <el-col :span="8">
-          <el-form-item label="透析器/灌流器">
+          <el-form-item label="透析器/灌流器：">
             <el-input  v-model="dialysisPrescription.dialyzer_perfusion_apparatus"></el-input>
           </el-form-item>
 

src/xt_pages/dialysis/dialysisPage.vue

                 <el-col :span="15">
                   <el-form-item label="给药途径 :" prop="delivery_way">
                     <el-select v-model="adviceForm.delivery_way" :disabled="adviceForm.parent_id==0?false:true"
-                               filterable placeholder="请选择(输入可搜索)" style="width:90%">
+                               filterable placeholder="请选择(输入可搜索)" style="width:100%">
                       <el-option
                         v-for="item in deliveryWayOptions"
                         :key="item.id"
                 <el-col :span="15">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select v-model="adviceForm.execution_frequency" :disabled="adviceForm.parent_id==0?false:true"
-                               filterable placeholder="请选择(输入可搜索)" style="width:90%">
+                               filterable placeholder="请选择(输入可搜索)" style="width:100%">
                       <el-option
                         v-for="item in executionFrequencyOptions"
                         :key="item.id"

src/xt_pages/qcd/outcomeIndicators/control.vue

           <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
         </el-table-column>
         
-        <el-table-column :label="reference.item_name+'//'+reference.unit" min-width="210" align="center" v-for="(reference, index) in activeReferences" :key="index"  :render-header="renderheader">
+        <el-table-column :label="reference.item_name+'//'+reference.unit" :min-width="itemWight(reference, index)" align="center" v-for="(reference, index) in activeReferences" :key="index"  :render-header="renderheader">
           <template slot-scope="scope"><span>{{getItemVulue(reference.project_id, reference.id, scope.row)}}</span></template>
         </el-table-column>
       </el-table>
     this.getList();
   },
   methods: {
+    itemWight(reference, index) {
+      var width = 70;
+      switch (index) {
+        case 0:
+          width = 110
+          break;
+        case 1:
+        case 3:
+          width = 100
+          break;
+        case 2:
+          width = 160
+          break;
+      
+        default:
+          break;
+      }
+      return width;
+      // if(typeof(reference.item_name) !='undefined') {
+      //   console.log("reference.item_name.length * 20", reference.item_name.length * 20);
+      //   return reference.item_name.length * 20;
+
+      // } else {
+      //   return 80;
+      // }
+      
+    },
     getList() {
       GetOICData(this.listQuery).then(response => {
         if (response.data.state == 0) {

src/xt_pages/user/doctorAdvice.vue

         <div class="patient-app-container advice-container app-container">
             <div class="cellButton" style="float:right;">
               <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small"   @click="openNew" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
-                <el-button size="small"  @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>            
+                <el-button size="small"  @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>
             </div>
             <div class="cell clearfix">
                 <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" size="small" />
                 <span class="cellLine"> - </span>
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
             </div>
-            <el-table @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" :cell-class-name="adviceNameShow" >
+            <el-table id="oictable" @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" :cell-class-name="adviceNameShow" >
 
                 <el-table-column align="center" label="全选" width="60px" type="selection" fixed></el-table-column>
                 <!--<el-table-column type="index" :index="indexMethod"  label="序号" width="60px" align="center"></el-table-column>-->
                             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(0)">新增医嘱内容</el-button>
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(1)">修改医嘱内容</el-button>
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(1)">修改医嘱内容</el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
                         </el-col>
-                        
+
                     </el-row>
                     <el-row>
                       <el-col :span="24">
                             >{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="给药途径" min-width="80" property="delivery_way" align="center">
+                        <el-table-column label="
+                        
+                        " min-width="80" property="delivery_way" align="center">
                             <template slot-scope="scope">
                             <span v-if="scope.row.parent_row==0">{{scope.row.delivery_way}}</span>
                             </template>
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="给药途径 :" prop="delivery_way">
+                            <el-form-item label="给药途径 :" prop="delivery_way" >
                                 <el-select v-model="nameForm.delivery_way"  filterable clearable allow-create  :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:100%" >
                                     <el-option
                                     v-for="item in deliveryWayOptions"
                                 <el-date-picker type="date" readonly format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期" v-model="adviceForm.advice_date"  style="width: 100%;"></el-date-picker>
                             </el-form-item>
                         </el-col>
-                    </el-row>
-                    <el-form-item label="开始时间 :" required prop="start_time">
-                        <el-date-picker type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  placeholder="选择时间" v-model="adviceForm.start_time" style="width:50%" :disabled="adviceForm.parent_id==0?false:true" ></el-date-picker>
-                    </el-form-item>
-                    <el-row>
+                    <el-col :span="12">
+                      <el-form-item label="开始时间 :" required prop="start_time" style="width:280px;">
+                          <el-date-picker type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  placeholder="选择时间" v-model="adviceForm.start_time"  :disabled="adviceForm.parent_id==0?false:true" ></el-date-picker>
+                      </el-form-item>
+                    </el-col>
                         <el-col :span="12">
                           <el-form-item label="医嘱内容 :" required prop="advice_name">
                             <el-input v-model="adviceForm.advice_name" ></el-input>
 
                         <el-col :span="12">
                             <el-form-item label="药品规格 :" prop="drug_spec" >
-                                <el-col :span="8">
+                                <el-col :span="9">
                                     <el-input v-model="adviceForm.drug_spec"></el-input>
                                 </el-col>
-                                 <el-col class="line" :span="2">&nbsp;</el-col>
+                                 <el-col class="line" :span="1">&nbsp;</el-col>
                                 <el-col :span="14">
                                     <el-select v-model="adviceForm.drug_spec_unit"  filterable clearable allow-create  placeholder="选择" >
                                         <el-option v-for="item in unitsOption" :key="item.id" :label="item.name " :value="item.name">
                                 </el-col>
                             </el-form-item>
                         </el-col>
-                    </el-row>
-
-                    <el-row>
+                  
                         <el-col :span="12">
                             <el-form-item label="单次用量 :" prop="single_dose" >
-                                <el-col :span="8">
+                                <el-col :span="9">
                                     <el-input v-model="adviceForm.single_dose"></el-input>
                                 </el-col>
-                                 <el-col class="line" :span="2">&nbsp;</el-col>
+                                 <el-col class="line" :span="1">&nbsp;</el-col>
                                 <el-col :span="14">
                                     <!-- <el-input v-model="adviceForm.single_dose_unit" ></el-input> -->
 
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="开药数量 :" prop="prescribing_number">
-                                <el-col :span="8">
+                                <el-col :span="9">
                                     <el-input v-model="adviceForm.prescribing_number"></el-input>
                                 </el-col>
-                                 <el-col class="line" :span="2">&nbsp;</el-col>
+                                 <el-col class="line" :span="1">&nbsp;</el-col>
                                 <el-col :span="14">
-                                    <el-select v-model="adviceForm.prescribing_number_unit"  filterable clearable allow-create  placeholder="选择" >
+                                    <el-select v-model="adviceForm.prescribing_number_unit"   filterable clearable allow-create  placeholder="选择" >
                                         <el-option v-for="item in unitsOption" :key="item.id" :label="item.name " :value="item.name">
                                         </el-option>
                                     </el-select>
                                 </el-col>
                             </el-form-item>
                         </el-col>
-                    </el-row>
-                    <el-row>
+                    
                         <el-col :span="12">
-                            <el-form-item label="给药途径 :" prop="delivery_way">
-                                <el-select v-model="adviceForm.delivery_way" :disabled="adviceForm.parent_id==0?false:true" filterable clearable allow-create  placeholder="请选择(输入可搜索)" style="width:90%" >
+                            <el-form-item label="给药途径 :" prop="delivery_way" >
+                                <el-select v-model="adviceForm.delivery_way" :disabled="adviceForm.parent_id==0?false:true" filterable clearable allow-create  placeholder="请选择(输入可搜索)" style="width:100%" >
                                     <el-option
                                     v-for="item in deliveryWayOptions"
                                     :key="item.id"
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="执行频率 :" prop="execution_frequency">
-                                 <el-select v-model="adviceForm.execution_frequency" :disabled="adviceForm.parent_id==0?false:true" filterable clearable allow-create  placeholder="请选择(输入可搜索)" style="width:90%" >
+                            <el-form-item label="执行频率 :" prop="execution_frequency" style="width:100%;">
+                                 <el-select v-model="adviceForm.execution_frequency" :disabled="adviceForm.parent_id==0?false:true" filterable clearable allow-create  placeholder="请选择(输入可搜索)" style="width:100%" >
                                     <el-option
                                     v-for="item in executionFrequencyOptions"
                                     :key="item.id"
                     <el-form-item label="开嘱医生 :" >
                         <span>{{adminusername}} </span>
                     </el-form-item>
+                    
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <template v-if="isEdit">
 
                 </el-form>
                 <div slot="footer" class="dialog-footer">
+                    <el-button  @click="dialogStopFormVisible = false">取消</el-button>                    
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="submitStopAdvice('stopForm')">保 存</el-button>
-                    <el-button type="primary" @click="dialogStopFormVisible = false">取消</el-button>
                 </div>
             </el-dialog>
 
 };
 </script>
 
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 

src/xt_pages/user/inspection.vue

       <el-row :gutter="20">
         <el-col :span="7">
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="projects" border style="width: 100%" highlight-current-row @current-change="handleCurrentChange" ref="singleTable" >
-            <el-table-column label="检验检查项目">
+            <el-table-column label="检验检查项目" align="center">
               <el-table-column
                 prop="project_name"
                 label="检验项目"
           </div>
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
             :data="items" border style="width: 100%" id="user-inspection-order"  >
-         
+
             <el-table-column
               prop="item_name"
               label="检验项目"
+              align="center"
               min-width="180">
               <template slot-scope="scope">
                 {{scope.row.item_name}} {{scope.row.item_name_addition}}
             <el-table-column
               prop="name"
               label="结果"
+              align="center"
               min-width="80">
               <template slot-scope="scope">
                 <span>{{scope.row.value}}</span>
             <el-table-column
               prop="address"
               label="参考值"
+              align="center"
               min-width="120">
               <template slot-scope="scope">
                 <span v-if="scope.row.range_type==1">{{scope.row.range_min}}~{{scope.row.range_max}}</span>
             <el-table-column
               prop="unit"
               label="单位"
+              align="center"
               min-width="80">
             </el-table-column>
           </el-table>
 
           <template v-for="(item, index) in form.formItem" >
             <el-col :span="7" :key="index">
-              <el-form-item :label="item.item_name" v-if="item.range_type==1"  :key="item.item_id" :prop="'formItem.' + index + '.value'" 
+              <el-form-item :label="item.item_name" v-if="item.range_type==1"  :key="item.item_id" :prop="'formItem.' + index + '.value'"
              >
                 <el-input placeholder="请填入" v-model="item.value" style="width:95%" type="number">
                   <template slot="append">{{item.unit}}</template>
                 </el-input>
-              </el-form-item> 
-              <el-form-item :label="item.item_name" v-else :key="item.item_id" :prop="'formItem.' + index + '.value'"  
+              </el-form-item>
+              <el-form-item :label="item.item_name" v-else :key="item.item_id" :prop="'formItem.' + index + '.value'"
               >
                 <el-select  v-model="item.value" placeholder="请选择" style="width:95%">
                   <el-option
                     :value="optionItem">
                   </el-option>
                 </el-select>
-              </el-form-item> 
+              </el-form-item>
             </el-col>
             <el-col :span="1" :key="'form-col'+index">&nbsp;</el-col>
           </template>
-          
+
         </el-row>
-        
-        
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
   },
   methods:{
     deleteInspection(){
-      
+
       if(this.project == null || this.itemDate == "") {
         this.$message.error("请先选择删除删除的记录");
         return false;
       }
-      
+
       this.$confirm('确认删除此记录?', '删除', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
                     type: "success",
                     duration: 2000
                 });
-                
+
                 for( var index in this.projects) {
                   if (this.projects[index].project_id == params.project_id) {
                     this.projects[index].count --;
         this.$message.error("请先选择项目");
         return false;
       }
-      
+
       this.form.method = "edit";
       this.formTitle = "修改" + this.project.project_name;
       this.form.project_id = this.project.project_id;
         // formItem["value"] = '';
         // if (formItem.range_type==2) {
         //   formItem["select_options"] = formItem.range_options.split(",");
-        // } 
+        // }
         this.form.formItem.push({
           id:    0,
           project_id: this.project.inspection_reference[index].project_id,
                   this.items.push(item);
                 }
               }
-              
+
               this.resetForm(formName);
               this.dialogFormVisible = false;
 
                   this.items.push(item);
                 }
               }
-              
+
               this.resetForm(formName);
               this.dialogFormVisible = false;
 
           return false;
         }
       });
-      
+
     },
     fetchInspectionReference(){
       fetchInspectionReference(this.patientID).then(response=>{
         this.fetchPatientInspections(this.queryParams);
       }
     },
-    
+
     handleCurrentChangePage(val) {
         this.itemLoading = true;
       this.queryParams.page = val;
 };
 </script>
 
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
 <style >
 #user-inspection-order td {
     border-bottom:0px !important;

src/xt_permission.js

 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
 
   NProgress.start()