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

src/xt_pages/data/druguseTemplate.vue

         this.templateFormTwoVisible = false
       }, 
       submitTemplateTwo(formName) {
-       
+        
         this.templateForm['template_id'] = this.current_template_id
         this.templateForm['advice_type'] = this.form.advice_type
        
             return s && s.trim()
           }).join(',')
         }
-
+        console.log("编辑模板",this.templateForm)
+        
         // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
           template_id: this.current_template_id
         }
         console.log("params---",params)
-        return 
+       
         updateTemplateName(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)