suochencheng vor 7 Jahren
Ursprung
Commit
de7ca0ccc3
2 geänderte Dateien mit 24 neuen und 14 gelöschten Zeilen
  1. 14 6
      src/main/resources/templates/FormTemplate.vm
  2. 10 8
      src/main/vue/src/pages/TestAaa.vue

+ 14 - 6
src/main/resources/templates/FormTemplate.vm

@@ -196,15 +196,23 @@ export default {
 
                     #end
                     #if(${field.formType}=="currentTime")
-                        if(res.data.${field.modelName}){
-                            res.data.${field.modelName} = format(new Date(res.data.${field.modelName}), 'YYYY/MM/DD HH:mm', { locale: zh });
-                        }
+                            res.data.${field.modelName} = format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh });
 
                     #end
                     #if(${field.formType}=="currentDate")
-                        if(res.data.${field.modelName}){
-                            res.data.${field.modelName} = format(new Date(res.data.${field.modelName}), 'YYYY/MM/DD', { locale: zh });
-                        }
+                            res.data.${field.modelName} = format(new Date(), 'YYYY/MM/DD', { locale: zh });
+
+                    #end
+                    #if(${field.formType}=="loginName")
+                            res.data.${field.modelName} = this.userInfo.username;
+
+                    #end
+                    #if(${field.formType}=="workNumber")
+                            res.data.${field.modelName} = this.userInfo.workNumber;
+
+                    #end
+                    #if(${field.formType}=="departId")
+                            res.data.${field.modelName} = this.userInfo.departId;
 
                     #end
                 #end

+ 10 - 8
src/main/vue/src/pages/TestAaa.vue

@@ -100,22 +100,24 @@ export default {
             }).then(res => {
                 if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                         if(res.data.multiSelect){
                             res.data.multiSelect = res.data.multiSelect.split(',');
                         }else{
                             res.data.multiSelect = [];
                         }
 
-                                                                                                                                                                                                                                                                                                    if(res.data.testcTime){
-                            res.data.testcTime = format(new Date(res.data.testcTime), 'YYYY/MM/DD HH:mm', { locale: zh });
-                        }
+                                                                                                                                                                                                                                                                                                                                                                                            res.data.loginUser = this.userInfo.username;
 
-                                                                                                                                            if(res.data.testcDate){
-                            res.data.testcDate = format(new Date(res.data.testcDate), 'YYYY/MM/DD', { locale: zh });
-                        }
+                                                                                                                                                res.data.testcTime = format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh });
+
+                                                                                                                                                                                                            res.data.testcDate = format(new Date(), 'YYYY/MM/DD', { locale: zh });
+
+                                                                                                                                                                                                                                res.data.workNumber = this.userInfo.workNumber;
+
+                                                                                                                                                                                                            res.data.departId = this.userInfo.departId;
 
-                                                                                                                                                                                            
+                                    
                 this.formData = res.data;
 
                 if (this.$route.query.column) {