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

src/xt_pages/data/components/editProject.vue

     },
     methods:{
         getTime(val) {
+         if(val < 0){
+           return ""
+         }
          if(val == ""){
           return ""
          }else {
               this.form.cost_classify = projecDetail.cost_classify
               this.form.executive_section = projecDetail.executive_section
               this.form.medical_coverage = projecDetail.medical_coverage
+              if(projecDetail.statistical_classification == 0){
+                 this.form.statistical_classification = ""
+              }
               this.form.statistical_classification =projecDetail.statistical_classification
               this.form.disease_directory = projecDetail.disease_directory?projecDetail.disease_directory:""
               this.form.is_record = projecDetail.is_record?projecDetail.is_record:""
               this.form.execution_frequency = projecDetail.execution_frequency
               this.form.number_days = projecDetail.number_days
               this.form.total = projecDetail.total
+              if(projecDetail.category == 0){
+                this.form.category = ""
+              }
               this.form.category = projecDetail.category
+              if(projecDetail.specail_project == 0){
+                this.form.specail_project = ""
+              }
               this.form.specail_project = projecDetail.specail_project
               this.form.social_security_directory_code = projecDetail.social_security_directory_code
               this.form.record_date = this.getTime(projecDetail.record_date)

src/xt_pages/data/components/project.vue

     },
     created(){
       this.getlist()
-      this.getDartmentList
+      this.getDartmentList()
      
     }
 }

src/xt_pages/role/components/AdminRoleInfoForm.vue

             if (resp.state === 1) {
               this.roles = []
               this.roles.push(...resp.data.roles)
+              console.log("resp2222",resp.data.roles)
               this.qntoken = resp.data.qntoken
               var admin = resp.data.admin
               this.form.name = admin.user_name