Merge remote-tracking branch 'origin/master'

src/views/task/create.vue

@@ -20,11 +20,11 @@
         <el-form-item label="类型" prop="taskType">
           <el-tree-select
             v-model="formData.taskType"
-            :data="typeList"
+            :data="tagList"
             :props="defaultProps"
             check-strictly
             node-key="id"
-            placeholder="请选择归属部门"
+            placeholder="请选择任务类型"
           />
         </el-form-item>
 
@@ -316,18 +316,23 @@ const resetQuery = () => {
   handleQuery()
 }
 
-  // 
-  typeList.value = handleTree(await DeptApi.getSimpleDeptList())
 
 /**
  * 获取标签列表
  */
 function getTagList() {
-  TagLibraryApi.getTagLibraryPage({}).then((res) => {
+  TagLibraryApi.getTagLibraryPage({tagType:2}).then((res) => {
     tagList.value = res
   })
 }
 
+
+const defaultProps = {
+  label: 'tagName', // 使用 'name' 字段作为选项的标签
+  children: 'children', // 如果存在子节点，则使用 'children' 字段
+};
+
+
 /**
  * 获取企业列表
  */
@@ -408,6 +413,7 @@ async function submitForm() {
   const validate = await unref(formRef).validate()
   if (validate) {
     const data = JSON.parse(JSON.stringify(formData.value))
+    data.status=1;
     data.enterpriseIds = formData.value.enterprises.map((i) => i.id)
     if(data.enterpriseIds.length==0){
       message.success("温馨提示：请您选择执法对象")