Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/setting/app/index.vue

src/views/setting/app/index.vue

@@ -142,7 +142,23 @@ const forms = ref([
 		label: '名称：',
 		itemType: 'input',
 		placeholder: '请输入名称'
-	}
+	},
+  {
+    prop: 'status',
+    label: '状态：',
+    itemType: 'select',
+    placeholder: '请选择状态',
+    options: [
+      {
+        label: '禁用',
+        value: 0
+      },
+      {
+        label: '正常',
+        value: 1
+      }
+    ]
+  }
 ])
 
 // table列表数据请求

src/views/setting/department/index.vue

@@ -187,7 +187,23 @@ const forms = ref([
 		label: '角色名称：',
 		itemType: 'input',
 		placeholder: '请输入角色名称'
-	}
+	},
+  {
+    prop: 'status',
+    label: '状态：',
+    itemType: 'select',
+    placeholder: '请选择状态',
+    options: [
+      {
+        label: '禁用',
+        value: 0
+      },
+      {
+        label: '正常',
+        value: 1
+      }
+    ]
+  }
 ])
 
 // table 参数

src/views/setting/post/index.vue

@@ -126,6 +126,28 @@ const forms = ref([
 		label: '岗位名称：',
 		itemType: 'input',
 		placeholder: '请输入岗位名称'
+	},
+	{
+		prop: 'code',
+		label: '编码：',
+		itemType: 'input',
+		placeholder: '请输入编码'
+	},
+	{
+		prop: 'status',
+		label: '状态：',
+		itemType: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{
+				label: '禁用',
+				value: 0
+			},
+			{
+				label: '正常',
+				value: 1
+			}
+		]
 	}
 ])
 

src/views/setting/user/index.vue

@@ -274,6 +274,22 @@ const forms = ref([
 		label: '账号/姓名：',
 		itemType: 'input',
 		placeholder: '请输入登录账号 / 姓名'
+	},
+	{
+		prop: 'status',
+		label: '状态：',
+		itemType: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{
+				label: '禁用',
+				value: 0
+			},
+			{
+				label: '正常',
+				value: 1
+			}
+		]
 	}
 ])