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

src/store/modules/globalConfig.js

       },
       {
         id: 31,
-        name: '对'
+        name: '米'
       },
       {
         id: 32,
-        name: '米'
+        name: '对'
       },
       {
         id: 33,
         name: '万份'
       },
+      {
+        id: 34,
+        name: '副'
+      },
     ],
     body_fluid: [{
       id: 1,

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

              <el-input v-model="assessmentBeforeDislysis.dehydration"></el-input>
             </el-form-item>
           </el-col>
-          
 
+
+          <el-col :span="8">
+            <el-form-item label="透析前药物:" v-if="isShow('透析前药物')">
+             <el-input v-model="assessmentBeforeDislysis.pre_dialysis_drugs"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="围手术期:" v-if="isShow('围手术期')">
+              <el-select v-model="assessmentBeforeDislysis.period">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option label="无" value="1"></el-option>
+                <el-option label="有" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="8">
+            <el-form-item label="预计进食量:" v-if="isShow('预计进食量')">
+             <el-input v-model="assessmentBeforeDislysis.estimated_food_intake"></el-input>
+            </el-form-item>
+          </el-col>
          
           <el-col :span="24">
             <el-form-item label="备注： ">
           thrombus_av:"",
           thromubus_a:"",
           thromubus_v:"",
-          dehydration:""
+          dehydration:"",
+          pre_dialysis_drugs:"",
+          period:"",
+          estimated_food_intake:"",
         },
 
         InnerDialogProps: {

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

 
             </el-form-item>
           </el-col>
+               
+          
+          <el-col :span="8" v-if="isShows('病情')">
+             <el-form-item label="病情：">
+                <el-select v-model="dialysisPrescription.illness" placeholder="请选择">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option
+                  v-for="(item, index) in  illnessList "
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+             </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('葡萄糖')">
+             <el-form-item label="葡萄糖：">
+                <el-input v-model="dialysisPrescription.amylaceum"></el-input>
+             </el-form-item>
+          </el-col>
+
         </el-row>
 
         <el-row :gutter="20">
           irrigation:"",
           antioxidant_commodity_name:"",
           displace_speed:"",
+          illness:"",
+          amylaceum:"",
         },
 
         anticoagulant: {
         bloods:[],
         irrigations:[],
         dialyzers:[],
+        illnessList:[]
       }
     },
     methods: {
         console.log("透析器",this.dialyzers)
         console.log("灌流器",this.irrigations)
       }
+    },
+    created(){
+      this.illnessList = getDataConfig('hemodialysis','illness')
+      console.log("列表22222222222",this.illnessList)
     }
   }
 </script>

src/xt_pages/qcd/basicInformationAnalysis.vue

       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-        console.log("本月最后一天",timeEnd)
+        // console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量