Merge remote-tracking branch 'origin/master'

src/views/Home/homepj/pjForm.vue

@@ -106,7 +106,7 @@ const formData = ref({
   pjName: undefined,
   pjDone: undefined,
   pjDescribe: undefined,
-  pjContent: undefined,
+  pjContent: "<p><br></p>",
   pjType: undefined,
   pjEtime: undefined,
   pjVtime: undefined,
@@ -174,7 +174,7 @@ const resetForm = () => {
     pjName: undefined,
     pjDone: undefined,
     pjDescribe: undefined,
-    pjContent: undefined,
+    pjContent: "<p><br></p>",
     pjType: undefined,
     pjEtime: undefined,
     pjVtime: undefined,

src/views/Home/rcgl/rcglInfo/RcglInfoForm.vue

@@ -36,15 +36,15 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="开始日期" prop="date">
+<!--      <el-form-item label="开始日期" prop="date">-->
-        <el-date-picker
+<!--        <el-date-picker-->
-          v-model="formData.date"
+<!--          v-model="formData.date"-->
-          type="date"
+<!--          type="date"-->
-          value-format="x"
+<!--          value-format="x"-->
-          placeholder="选择开始日期"
+<!--          placeholder="选择开始日期"-->
-          disabled
+<!--          disabled-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-row>
         <el-col :span="12">
           <el-form-item label="预计开始时间" prop="startTime">