Merge branch 'lrh' of yinet2020/YinetOASystemWeb into master

src/views/dashboard/LineChart.vue

@@ -13,9 +13,9 @@
             <el-button type="text" @click="detern(scope.row)" style="color: black">{{scope.row.fwtitle}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="createtime" label="接收时间" width="180" align="center">
+        <el-table-column prop="createTime" label="接收时间" width="180" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.createtime | format('yyyy-MM-dd hh:mm')}}</span>
+            <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -28,9 +28,9 @@
                  <el-button type="text" @click="myAppReturn(scope.row)" style="color: black">{{scope.row.fwtitle}}</el-button>
                </template>
              </el-table-column>
-             <el-table-column prop="createtime" label="创建时间" width="180" align="center">
+             <el-table-column prop="createTime" label="创建时间" width="180" align="center">
                 <template slot-scope="scope">
-                  <span>{{scope.row.createtime | format('yyyy-MM-dd hh:mm')}}</span>
+                  <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
                 </template>
              </el-table-column>
       </el-table>
@@ -53,7 +53,7 @@
         lineParams: {
           pageNum: 1,
           pageSize: 5,
-          // orderByColumn: "createtime",
+          // orderByColumn: "createTime",
           // isAsc:"desc",//排序方式
         },
       }

src/views/dashboard/RaddarChart.vue

@@ -11,7 +11,7 @@
             <el-button type="text" @click="detern(scope.row)" style="color: black">{{scope.row.fwtitle}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="createtime" label="完成时间" width="180" align="center"></el-table-column>
+        <el-table-column prop="createTime" label="完成时间" width="180" align="center"></el-table-column>
  </el-table>
  </el-card>
 </template>
@@ -25,7 +25,7 @@
           raddarParams: {
             pageNum: 1,
             pageSize: 5,
-            orderByColumn: "createtime",
+            orderByColumn: "createTime",
             isAsc:"desc",//排序方式
           },
         }

src/views/system/actform/shouwen/swToDraft.vue

@@ -9,7 +9,7 @@
           <el-input v-model="form.fwdept"></el-input>
         </el-form-item>
         <el-form-item label="来文日期 : ">
-          <el-input v-model="form.createtime"></el-input>
+          <el-input v-model="form.createTime"></el-input>
         </el-form-item>
         <el-form-item label="流水号 : ">
           <el-input ></el-input>

src/views/system/actwork/details/havedetails.vue

@@ -9,7 +9,7 @@
         <el-input v-model="form.fwdept"></el-input>
       </el-form-item>
       <el-form-item label="来文日期 : ">
-        <el-input v-model="form.createtime"></el-input>
+        <el-input v-model="form.createTime"></el-input>
       </el-form-item>
       <el-form-item label="流水号 : ">
         <el-input ></el-input>

src/views/system/actwork/details/tododetails.vue

@@ -9,7 +9,7 @@
       <el-input v-model="form.fwdept"></el-input>
     </el-form-item>
     <el-form-item label="来文日期 : ">
-      <el-input v-model="form.createtime"></el-input>
+      <el-input v-model="form.createTime"></el-input>
     </el-form-item>
     <el-form-item label="流水号 : ">
       <el-input ></el-input>

src/views/system/actwork/havedone.vue

@@ -50,9 +50,9 @@
 
       <el-table-column label="标题" align="center" prop="fwtitle" />
       <el-table-column label="当前处理" width="180" align="center" prop="taskName"/>
-      <el-table-column label="创建时间" width="180" align="center" prop="createtime" >
+      <el-table-column label="创建时间" width="180" align="center" prop="createTime" >
         <template slot-scope="scope">
-          <span>{{scope.row.createtime | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
         </template>
       </el-table-column>
       <el-table-column label="办理时间" width="180" align="center" prop="updateTime" >
@@ -159,7 +159,7 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          orderByColumn: "createtime",
+          orderByColumn: "createTime",
           isAsc:"desc",//排序方式
         },
         // 表单参数

src/views/system/actwork/meapply.vue

@@ -47,7 +47,7 @@
       <el-table-column label="申请人" align="center" prop="applyUser"/>
       <el-table-column label="创建时间" width="180" align="center" prop="createTime">
         <template slot-scope="scope">
-          <span>{{scope.row.createtime | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
         </template>
       </el-table-column>
       <el-table-column label="当前处理" width="180" align="center" prop="createTime">
@@ -163,7 +163,7 @@
             taskid: '',
             fwtitle: '',
             fwdept: '',
-            createtime: '',
+            createTime: '',
             taskName: ''
           }
 

src/views/system/actwork/todo.vue

@@ -49,9 +49,9 @@
       </el-table-column>
       <el-table-column label="标题" align="center" prop="fwtitle" />
       <el-table-column label="当前处理" width="180" align="center" prop="taskName" />
-      <el-table-column label="创建时间" width="180" align="center" prop="createtime" >
+      <el-table-column label="创建时间" width="180" align="center" prop="createTime" >
         <template slot-scope="scope">
-          <span>{{scope.row.createtime | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
         </template>
       </el-table-column>
       <el-table-column label="到达时间" width="180" align="center" prop="updateTime" >
@@ -157,7 +157,7 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          orderByColumn: "createtime",
+          orderByColumn: "createTime",
           isAsc:"desc",//排序方式
         },
         // 表单参数