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

src/xt_pages/user/templateSummary.vue

@@ -900,6 +900,7 @@
           start_time:"",
           end_time:"",
           template_plan_content:"",
+          inspect_date:"",
         },
         timeType:[
           {id:1,name:"第一季度"},
@@ -1451,9 +1452,10 @@
            if(response.data.state == 1){
               var list = response.data.data.list
               var inspectlist = response.data.data.inspectlist
-              console.log("inspectlist2322332",list)
+
+              console.log("列表数据",list)
               let arr = this.unique(inspectlist,'project_name')
-              console.log("hhh23h2323223223232323",arr)
+              console.log("内容233323232323223",arr)
               list.template_inspection_content = arr
               this.editObj = list
 
@@ -1530,6 +1532,7 @@
               this.form.anticoagulant = list.anticoagulant
               this.form.autunite = list.autunite
               this.form.befor_pressure = list.befor_pressure
+              this.projectIndate = list.inspect_date
               if( list.befor_weight == 0){
                  this.form.befor_weight = ""
               }else{
@@ -1552,7 +1555,6 @@
                this.form.natrium =list.natrium
                this.form.perfusion_apparatus= list.perfusion_apparatus
                this.form.other_count = list.other_count
-              //  this.form.record_time = this.getTimeTwo(list.record_time)
                console.log("时间232233232",list.record_time)
                if(list.template_inspection_id == 0){
                   list.template_inspection_id = ""
@@ -1573,8 +1575,6 @@
                }else{
                  this.form.template_summary_id = list.template_summary_id
                }
-
-              //  this.projectIndate = list.inspect_date
                this.projectStr = list.project_id
            }
         })
@@ -1633,8 +1633,6 @@
             befor_weight:this.form.befor_weight.toString(),
             after_weight:this.form.after_weight.toString(),
             befor_pressure:this.form.befor_pressure,
-            // template_summary_content:this.form.template_summary_content,
-            // template_plan_content:this.form.template_plan_content,
             template_plan_content:"",
             template_summary_content:this.$refs.edit_neditor.content,
             admin_user_id:this.form.admin_user_id,
@@ -1648,7 +1646,8 @@
             inspect_date:this.projectIndate,
          }
          console.log("parawm232323223",params)
-
+        
+       
         UpdateTemplateSummary(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list