Merge branch 'test' into 'master'

会议申报

See merge request spfm-group/spfm-market-front!38

src/pages/main/meetingDeclaration/marketDecisionMeeting.vue

@@ -47,12 +47,12 @@
                     style="width: 100%"
                     v-loading="loading"
                 >
-                    <el-table-column label="会议时间"  align="center"  width="300px">
-                        <template slot-scope="scope">
+                    <el-table-column label="会议时间"  align="center"  width="300px" :formatter="dateFormat">
+                        <!-- <template slot-scope="scope">
                             <span>{{
                                 $formatDate(scope.row.meetingTime, "YYYY-MM-DD")
                             }}</span>
-                        </template>
+                        </template> -->
                     </el-table-column>
                     <el-table-column prop="meetingName" label="会议名称"  align="center">
                     </el-table-column>
@@ -129,7 +129,6 @@
                         label="操作"
                         width="150px"
                         align="center"
-                        fixed="right"
                     >
                         <template slot-scope="scope">
                             <el-button
@@ -555,6 +554,10 @@ export default {
         };
     },
     methods: {
+        dateFormat(row,column){
+            const daterc = row[column.property]
+            return daterc.split(' ')[0];
+        },
         jump(v, n) {
             //1 查看 2上传 3编辑修改 4删除一条
             if (v === 1) {

src/pages/main/meetingDeclaration/specialReport.vue

@@ -48,12 +48,7 @@
                     v-loading="loading"
 
                 >
-                    <el-table-column label="会议时间" align="center" width="300px">
-                        <template slot-scope="scope">
-                            <span>{{
-                                $formatDate(scope.row.meetingTime, "YYYY-MM-DD")
-                            }}</span>
-                        </template>
+                    <el-table-column label="会议时间" align="center" width="300px" prop="meetingTime" :formatter="dateFormat">
                     </el-table-column>
                     <el-table-column prop="meetingName" label="会议名称" align="center">
                     </el-table-column>
@@ -96,13 +91,14 @@
             :fullscreen="false"
             
         >
-            <div v-loading="loadinged">
+            <div>
                 <el-table
                     :data="infoTableData"
                     border
                     size="mini"
                     style="margin: 20px 0;"
                     height="50vh"
+                    v-loading="loading"
                 >
                     <el-table-column prop="serialNumber" label="序号">
                     </el-table-column>
@@ -131,7 +127,6 @@
                         label="操作"
                         width="150px"
                         align="center"
-                        fixed="right"
                     >
                         <template slot-scope="scope">
                             <el-button
@@ -551,10 +546,14 @@ export default {
                 "12"
             ],
             menus: JSON.parse(window.sessionStorage.childrenMenus),
-            isAllExport: false
+            isAllExport: false,
         };
     },
     methods: {
+        dateFormat(row,column){
+            const daterc = row[column.property]
+            return daterc.split(' ')[0];
+        },
         jump(v, n) {
             //1 查看 2上传 3编辑修改 4删除一条
             if (v === 1) {