Merge branch 'ming' of uskycloud/usky-web-mobile into master

src/pages/business/common/projectMange/write/components/template1.vue

@@ -25,9 +25,8 @@
             confirmType="return"
             :autoHeight="true"
             :maxlength="-1"
-            :height="'100%'"
             border="none"
-            style="padding: 0px; margin: 10px 0"
+            style="padding: 0px; margin: 10px 0;min-height:100px"
             @change="realTimeSaving()"
           ></u-textarea>
         </u-collapse-item>

src/pages/business/common/projectMange/write/insert.vue

@@ -110,7 +110,7 @@ function handleSubmit(type, id) {
           ccTo: newData.ccTo,
           reportImage: newData.reportImage,
           reportFile: newData.reportFile,
-          timingTime: newData.timingTime,
+          timingTime: proxy.$time.getFormatterDate(new Date().getTime()).slice(0,10)+' '+ newData.timingTime.slice(11,20),
           isRegularlySend: newData.isRegularlySend,
         };