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

src/views/system/fieldDerive.vue

@@ -74,7 +74,7 @@
 
               <el-table-column align="center" label="字段状态" >
                 <template v-slot="{row}">
-                  <span>{{ row.status}}</span>
+                  {{ row.status==1 ? '已启用' : '已禁用' }}
                 </template>
               </el-table-column>
 <!-- 

src/views/system/fieldInfo.vue

@@ -69,9 +69,9 @@
                 </template>
               </el-table-column>
 
-                  <el-table-column prop="state" label="状态" >
+                  <el-table-column prop="status" label="状态" >
                     <template slot-scope="scope">
-                      {{ scope.row.state ? '已启用' : '已禁用' }}
+                      {{ scope.row.status==1 ? '已启用' : '已禁用' }}
                     </template>
                   </el-table-column>