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

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

@@ -2849,7 +2849,7 @@
           single_dose = ' 单次用量 ' + val.single_dose + val.single_dose_unit
         }
 
-        if (val.advice_desc > 0) {
+        if (val.advice_desc > 0 || val.advice_desc.length > 0) {
           advice_desc = val.advice_desc + val.drug_spec_unit
         }
 

src/xt_pages/dialysis/schedualPatient.vue

@@ -264,9 +264,18 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       if(selected_date.selected_date){
         this.selected_date = selected_date.selected_date
       }
-      
+
       this.getInitData()
-      
+
+    }, mounted() {
+      const timer = setInterval(() => {
+        // this.getInitData();
+        this.requestDialysisSchedules()
+      }, 1000 * 30)
+      // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+      this.$once('hook:beforeDestroy', () => {
+        clearInterval(timer)
+      })
     },
     methods: {
       // handletimeType: function(index) {
@@ -316,7 +325,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         }else{
           this.getData()
         }
-        
+
       },
       getInitData: function() {
         getDialysisRecordInitData().then(rs => {
@@ -332,7 +341,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             this.zone_options = zone_options
             // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
             this.requestDialysisSchedules()
-            
+
             console.log(1111111111111,this.zone_schedules)
           } else {
             this.$message.error(resp.msg)
@@ -406,15 +415,15 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.getData()
       },
       getData(){
-    
+
         let patientArr = []
         patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
         // for (let i = 0; i < patientArr.length; i++) {
-          
+
         //   for (let j = 0; j < patientArr[i].schedules.length; j++) {
         //     if (patientArr[i].schedules.length > 0 && patientArr[i].schedules[j].dialysis_order != null) {
         //       // 删除元素后改变i的值
-              
+
         //       console.log("候诊区",patientArr[i].schedules[j])
         //       patientArr[i].schedules.splice(j--, 1);
         //     }
@@ -506,7 +515,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           }
           arr2 = arr
         }
-        
+
 
         let arr3 = []
         if(this.schedule_type_selected == 0){
@@ -524,7 +533,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           }
           arr3 = arr
         }
-        
+
 
         let arr4 = []
         if(this.zone_selected == 0){
@@ -540,8 +549,8 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           }
           arr4 = arr
         }
-        
-        
+
+
         if(this.patientStateVal == 1){
           arr4.map((item,index) => {
             if(index != 0){

src/xt_pages/user/components/PatientForm.vue

@@ -932,7 +932,7 @@ const defaultForm = {
   homeTelephone: "",
   relative_phone: "",
   relative_relations: "",
-  lapseto: 1,
+  lapseto: "",
   homeAddress: "",
   work: "",
   unit_address: "",
@@ -1115,7 +1115,7 @@ const defaultForm = {
 };
 
 export default {
-  name: "patientForm",
+   name: "patientForm",
   props: {
     isEdit: {
       type: Boolean,
@@ -1301,6 +1301,7 @@ export default {
     this.orgname = xtuser.org.org_name;
     this.adminusername = xtuser.user.user_name;
 
+
     if (this.isEdit) {
       this.submitMsg = "修改患者信息成功";
       const id = this.$route.params && this.$route.params.id;
@@ -1317,6 +1318,7 @@ export default {
     } else {
       this.submitMsg = "新增患者成功";
       this.form = Object.assign({}, defaultForm);
+      this.form.lapseto  = 1
     }
   },
   watch: {
@@ -1387,6 +1389,7 @@ export default {
       }
 
       this.form.user_sys_before_count =  this.form.user_sys_before_count.toString()
+      this.form.avatar =this.form.avatar.
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formSubmit = false;
@@ -1477,14 +1480,14 @@ export default {
       // const isJPG = file.type === "image/jpeg";
       var fileType = file.type;
       const isJPG = fileType.indexOf("image") > -1;
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 < 6;
 
       if (!isJPG) {
         this.$message.error("只能上传图片");
         return false;
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error("上传头像图片大小不能超过 6MB!");
         return false;
       }
 

src/xt_pages/user/registration.vue

@@ -4,7 +4,7 @@
     <el-form ref="form" :rules="rules" :model="form" label-width="134px" class="clearfix" >
       <div class="dataTitle">一般资料</div>
      <el-row >
-       
+
       <el-col :span="4" align="center">
         <el-upload  style="width:100%;"
           :data="uploadData"
@@ -22,7 +22,7 @@
         <el-dialog :visible.sync="dialogVisible">
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
-        <el-upload 
+        <el-upload
           :data="uploadData"
           :multiple="false"
           action="https://upload.qiniup.com"
@@ -47,7 +47,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
-                <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:47%;float:left;margin-right: 1%;" ></el-input> 
+                <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:47%;float:left;margin-right: 1%;" ></el-input>
                 <el-button type="primary" @click="generatedialysisno">自动生成</el-button>
             </el-form-item>
           </el-col>
@@ -112,7 +112,7 @@
           <el-form-item label="出生日期 : "  class="is-required" prop="birth" >
               <el-date-picker v-model="form.birth" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'" @change="hadSelectBirth" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
           </el-form-item>
-        </el-col> 
+        </el-col>
         <el-col :span="8">
           <el-form-item label="年龄 : " >
               <el-input v-model="form.age" ></el-input>
@@ -130,7 +130,7 @@
         </el-col>
         <el-col :span="8">
             <el-form-item label="医保号 : " >
-              <el-input v-model="form.healthCareNo" ></el-input>              
+              <el-input v-model="form.healthCareNo" ></el-input>
             </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -143,7 +143,7 @@
        <el-row :gutter="10">
          <el-col :span="8">
             <el-form-item label="身高(cm) : " >
-              <el-input maxlength="5" v-model="form.height" @change="checkHeight"></el-input>              
+              <el-input maxlength="5" v-model="form.height" @change="checkHeight"></el-input>
             </el-form-item>
         </el-col>
         <el-col :span="8" style="clearfix">
@@ -164,7 +164,7 @@
             </el-form-item>
         </el-col>
        </el-row>
-       
+
        <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="文化程度 : " >
@@ -181,10 +181,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-            
+
         </el-col>
        </el-row>
-      
+
       <div class="dataTitle">联系方式</div>
       <el-row :gutter="10">
         <el-col :span="6">
@@ -235,7 +235,7 @@
         </el-col>
       </el-row>
 
-      
+
        <el-row :gutter="10">
         <el-col :span="6">
           <el-form-item label="初始透析次数 : " >
@@ -253,7 +253,7 @@
               <el-checkbox v-for="item in contagionList" :label="item.id" :key="item.id" :value="item.id">{{item.name}}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-        </el-col> 
+        </el-col>
       </el-row>
 
       <el-row :gutter="10">
@@ -272,13 +272,13 @@
            </el-form-item>
         </el-col>
         <el-col :span="6">
-           <el-form-item label="跌倒评估 : "> 
+           <el-form-item label="跌倒评估 : ">
                <el-input v-model="form.assessment"></el-input>
            </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="慢性病 : ">
-            <el-checkbox-group 
+            <el-checkbox-group
               v-model="form.diseases"
              >
               <el-checkbox v-for="item in checkDisease" :label="item.id" :key="item.id" :value="item.id" >{{item.name}}</el-checkbox>
@@ -310,9 +310,9 @@
             </el-form-item>
          </el-col>
       </el-row>
-      
+
     </el-form>
-  </div>  
+  </div>
 </template>
 
 <script>
@@ -427,7 +427,7 @@ export default {
         ],
         birth:[
           { required: true, message: '请填写生日', trigger: 'blur' },
-        ] 
+        ]
       }
     };
   },
@@ -443,7 +443,7 @@ export default {
     this.inductionOptions = this.$store.getters.induction_options;
     this.contagionList = this.$store.getters.contagions;
     this.checkDisease = this.$store.getters.disease;
-    
+
   },
   methods: {
     onSubmit(formName) {
@@ -467,7 +467,7 @@ export default {
                   type: 'success',
                   duration: 2000
                 })
-                
+
                 this.$refs[formName].resetFields();
                 this.$router.push({path:"/patients/patient"});
                 return false;
@@ -505,27 +505,27 @@ export default {
       // const isJPG = file.type === "image/jpeg";
       var fileType = file.type
       const isJPG = fileType.indexOf("image")>-1;
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 < 6;
 
       if (!isJPG) {
         this.$message.error("只能上传图片");
         return false;
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error("上传头像图片大小不能超过 6MB!");
         return false;
       }
 
       var date = new Date();
       var ext = getFileExtension(file.name);
-      var key = date.getFullYear() + "/" + (date.getMonth() + 1) + "/" + date.getDate() + "/"  + date.getHours() + "/"  + date.getMinutes() + "/"  + date.getSeconds() + "/" + "_s_" + file.uid + "." + ext;
+      var key = date.getFullYear() + "/" + (date.getMonth() + 1) + "/" + date.getDate() + "/"  + date.getHours() + "/"  + date.getMinutes() + "/"  + date.getSeconds() + "/" + "_s_" + file.uid+"?imageView2/2/w/500/h/500/q/90" + "." + ext;
       this.loading = this.$loading({
           lock: true,
           text: '上传中...',
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
       });
-      
+
       const _self = this
       return new Promise((resolve, reject) => {
         getToken().then(response => {

src/xt_pages/workforce/components/tableData.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="table_data">
-    <div class="cell clearfix" v-if="weekTime == 'thisWeek'">
+    <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
       <el-input
         size="small"
         style="width: 400px;"
@@ -1793,8 +1793,19 @@ export default {
       return [w, n];
     },
     search: function() {
+      let week_type = 0
+      if (this.weekTime == 'thisWeek'){
+        week_type = 1
+      }else if(this.weekTime == 'nextWeek'){
+        week_type = 2
+      }else if(this.weekTime == 'nextTwoWeek'){
+        week_type = 3
+      }
+
+
       const params = {
-        keywords: this.keywords
+        keywords: this.keywords,
+        week_type: week_type,
       };
       getSearchResult(params).then(response => {
         if (response.data.state == 1) {