Merge remote-tracking branch 'origin/project1' into project1

src/views/sample/basicInformation/index.vue

@@ -89,7 +89,7 @@
         </el-table-column>
         <el-table-column label="操作日期" prop="createDate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ parseTime(scope.row.createDate,'{y}/{m}/{d}') || '-' }}
+            {{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作">
@@ -266,6 +266,7 @@ export default {
     },
     // 编辑
     handleUpdate(row) {
+      this.title = '编辑基础信息表单'
       console.log('row', row)
       const id = row.businessId
       getDetailById(id).then(res => {