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

src/api/common/common.js

@@ -47,7 +47,7 @@ export function getConfigurationList(limit, page) {
 }
 
 export function getConfigurationDetail(id, params) {
-  console.log('id=====', id)
+ 
   return request({
     url: 'com/api/getconfigurationdetail?id=' + id,
     method: 'get',

src/api/consumable.js

@@ -14,7 +14,7 @@ export function GetAllZone(params){
 //获取透析参数
 
 export function getDialysisParameters(params){
- 
+   console.log("params============heyuan",params)
   return request({
      url:"/api/dialysis/getdialysisparameters",
      method:"Get",

src/xt_pages/dialysis/components/allSummary.vue

@@ -182,12 +182,12 @@ export default {
                 { value: 2, label: "下午" },
                 { value: 3, label: "晚上" }
             ],
-            selected_date:"",
+            selected_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             partitionArr:[],
             partitionType: 0,
             tableData: [],
             search_input:"",
-            start_time:"",
+            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             tableName:[],
             limit:10,
             page:1,
@@ -240,12 +240,12 @@ export default {
           this.getAllMaterial()
         },
            search(){
-           if(this.selected_date==""){
-              this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
-            }
-            if(this.selected_date!=''){
-              this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-            } 
+          //  if(this.selected_date==""){
+          //     this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+          //   }
+          //   if(this.selected_date!=''){
+          //     this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
+          //   } 
            const params ={
               start_time:this.start_time,
               scheduleType: this.scheduleType,
@@ -329,12 +329,12 @@ export default {
         },
 
         getAllMaterial(){
-          if(this.selected_date==""){
-              this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
-            }
-            if(this.selected_date!=''){
-              this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-            } 
+          // if(this.selected_date==""){
+          //     this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+          //   }
+          //   if(this.selected_date!=''){
+          //     this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
+          //   } 
            const params = {
               startime:this.start_time
            }
@@ -355,12 +355,12 @@ export default {
          this.getlist()
         },
         getlist(){
-           if(this.selected_date==""){
-              this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
-            }
-            if(this.selected_date!=''){
-              this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-            } 
+          //  if(this.selected_date==""){
+          //     this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+          //   }
+          //   if(this.selected_date!=''){
+          //     this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
+          //   } 
            const params ={
               start_time:this.start_time,
               scheduleType: this.scheduleType,

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -195,7 +195,7 @@ export default {
                 { value: 3, label: "晚上" }
             ],
             // selected_date:new Date(),
-            selected_date:"",
+            selected_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             partitionArr:[],
             partitionType: 0,
             tableData: [],
@@ -203,9 +203,8 @@ export default {
             limit:10,
             page:1,
             total:0,
-            start_time:0,
+            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             selecting_schs: [],
-            start_time:0,
             prescriptionList:[],
             dialysisBefor:[]
         }
@@ -240,12 +239,12 @@ export default {
             this.$refs.dialysisParameters.show();
         },
         search(){
-            if(this.selected_date==""){
-              this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
-            }
-            if(this.selected_date!=''){
-              this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-            }
+            // if(this.selected_date==""){
+            //   this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+            // }
+            // if(this.selected_date!=''){
+            //   this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
+            // }
             const params ={
               start_time:this.start_time,
               keyword:this.search_input,
@@ -275,12 +274,13 @@ export default {
           return new Date(time).getTime() / 1000;
          },
         getlist(){
-            if(this.selected_date==""){
-              this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
-            }
-            if(this.selected_date!=''){
-              this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-            }
+            // if(this.selected_date==""){
+            //   this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+            // }
+            // if(this.selected_date!=''){
+            //   this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
+            // }
+            
             const params ={
               start_time:this.start_time,
               keyword:this.search_input,