diff --git a/src/views/manage/Portraitedit/index.vue b/src/views/manage/Portraitedit/index.vue
index 7f3b9b5..5eb9d0f 100644
--- a/src/views/manage/Portraitedit/index.vue
+++ b/src/views/manage/Portraitedit/index.vue
@@ -32,7 +32,7 @@
                 taskid == ulitem.taskPartitionDictId ? 'allactive' : 'all'
               "
             >
-              {{ ulitem.taskPartitionDictName }}
+              {{ulitem.taskTypeName}}<span class="spanitme" v-if="ulitem.taskTypeName">|</span>{{ ulitem.taskPartitionDictName }}
             </div>
             <!-- <span class="count">{{ ulitem.countNum }}</span> -->
           </div>
@@ -384,6 +384,11 @@ export default {
         width: 100%;
         height: 50px;
         border-bottom: 1px solid #dcdfe6;
+        .spanitme{
+          padding: 10px;
+          color: #A8A8A8;
+
+        }
 
         .count {
           display: inline-block;
diff --git a/src/views/manage/labelfieldinfo/index.vue b/src/views/manage/labelfieldinfo/index.vue
index 0ae0e59..a7b1046 100644
--- a/src/views/manage/labelfieldinfo/index.vue
+++ b/src/views/manage/labelfieldinfo/index.vue
@@ -237,6 +237,34 @@
             <!-- <el-input v-model="aitem.fieldSort" placeholder="请输入字段排序" oninput="value=value.replace(/[^\d]/g,'')"
               maxlength="5"/> -->
           </el-form-item>
+          <el-form-item label="任务类型" prop="taskTypeId">
+            <el-button
+              type=""
+              v-if="aitem.taskTypeName == '请选择任务类型'"
+              @click="clicktype(aitem, index)"
+              style="
+                width: 210px;
+                text-align: left;
+                height: 36px;
+                color: #c0c4cc;
+                overflow: hidden;
+              "
+              >{{ aitem.taskTypeName }}</el-button
+            >
+            <el-button
+              @click="clicktype(aitem, index)"
+              type=""
+              v-else
+              style="
+                width: 210px;
+                text-align: left;
+                height: 36px;
+                padding-left: -10px;
+                overflow: hidden;
+              "
+              >{{ aitem.taskTypeName }}</el-button
+            >
+          </el-form-item>
           <el-form-item label="任务细分" prop="taskPartitionDictId">
             <el-button
               type=""
@@ -271,8 +299,8 @@
             :prop="`labelFieldInfoList.${index}.fieldCode`"
           >
             <el-input
-             onkeyup="this.value=this.value.replace(/[^A-Z]/g,'')"
-            maxlength="50"
+              onkeyup="this.value=this.value.replace(/[^A-Z]/g,'')"
+              maxlength="50"
               v-model="aitem.fieldCode"
               placeholder="请输入字段编码"
               style="width: 210px"
@@ -386,8 +414,8 @@
         </el-form-item>
         <el-form-item label="字段编码" prop="fieldCode">
           <el-input
-          maxlength="50"
-          onkeyup="this.value=this.value.replace(/[^A-Z]/g,'')"
+            maxlength="50"
+            onkeyup="this.value=this.value.replace(/[^A-Z]/g,'')"
             v-model="form.fieldCode"
             placeholder="请输入字段编码"
             style="width: 210px"
@@ -524,6 +552,96 @@
         @updateCPage="updateCPagetwo"
       ></myPagination>
     </el-dialog>
+    <!-- 任务类型 -->
+    <el-dialog
+      title="选择任务类型"
+      :visible.sync="innertype"
+      width="1000px"
+      append-to-body
+      :before-close="typeecancel"
+    >
+      <el-form
+        :model="queryParamstask"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
+        <el-form-item label="任务类型名称" prop="taskTypeName">
+          <el-input
+            v-model="queryParams.taskTypeName"
+            placeholder="请输入任务类型名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuerytask"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerytask"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :max-height="maxTableHeight"
+        v-loading="loading"
+        :data="taskTypeList"
+        @selection-change="handleSelectionChange"
+      >
+      <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="taskTypeId == scope.row.id"
+              circle
+              @click="nurseclicktype(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclicktype(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="任务类型名称"
+          align="center"
+          prop="taskTypeName"
+        />
+        <el-table-column
+          label="任务类型编码"
+          align="center"
+          prop="taskTypeCode"
+        />
+        <el-table-column
+          label="任务类型排序"
+          align="center"
+          prop="taskTypeSort"
+        />
+        <el-table-column
+          label="任务类型备注"
+          align="center"
+          prop="taskTypeRemark"
+          :show-overflow-tooltip="true"
+        />
+      </el-table>
+      <myPagination
+        v-show="totaltype > 0"
+        :total="totaltype"
+        :pageSize="queryType.pageSize"
+        :indexFromWrap="queryType.pageNum"
+        @updateCPage="updateCPagetwo"
+      ></myPagination>
+    </el-dialog>
   </div>
 </template>
 
@@ -531,6 +649,8 @@
 import { listLabelfieldinfo, getLabelfieldinfo, delLabelfieldinfo, addLabelfieldinfo, updateLabelfieldinfo } from "@/api/manage/labelfieldinfo";
 import { listPartition } from "@/api/system/partition";
 import { getAgencytype } from "@/api/system/agency";
+import { listTaskType } from "@/api/system/taskType";
+
 
 export default {
   name: "Labelfieldinfo",
@@ -543,6 +663,7 @@ export default {
       queryParamstask: {
         pageNum: 1,
         pageSize: 10,
+        
         taskTypeId: null,
         taskTypeName: null,
         taskPartitionName: null,
@@ -554,8 +675,22 @@ export default {
       },
       nnerVisibleindex: '',
       taskPartitionDictId: '',
+      taskTypeId:'',
       maxTableHeight: undefined,
       totaltask: 0,
+      // 任务类型
+      innertype: false,
+      totaltype:0,
+      taskTypeList:[],
+
+      queryType: {
+        pageNum: 1,
+        pageSize: 10,
+        taskTypeName: null,
+        taskTypeCode: null,
+        taskTypeSort: null,
+        taskTypeRemark: null,
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -646,12 +781,12 @@ export default {
           },
         ],
         fieldCode: [
-            {
-              required: true,
-              message: "请输入字段编码",
-              trigger: "blur",
-            },
-          ],
+          {
+            required: true,
+            message: "请输入字段编码",
+            trigger: "blur",
+          },
+        ],
         fieldSort: [
           {
             required: true,
@@ -695,6 +830,15 @@ export default {
         this.options = res.data;
       });
     },
+    /** 查询任务类型字典列表 */
+    getListType() {
+      this.loading = true;
+      listTaskType(this.queryType).then(response => {
+        this.taskTypeList = response.rows;
+        this.totaltype = response.total;
+        this.loading = false;
+      });
+    },
     // 任务细分列表
     getListpartit() {
       this.loading = true;
@@ -704,10 +848,21 @@ export default {
         this.loading = false;
       });
     },
+    // 任务类型弹框
+    clicktype(aitem, index){
+      console.log(aitem,'0000000')
+      this.getListType();
+      this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
+      this.nnerVisibleindex = index;
+      this.innertype = true;
+      this.form.taskPartitionDictName= '请选择任务细分';
+      this.form.taskPartitionDictId='';
+  
+    },
     // 任务细分弹框
     clickinnerVisible(aitem, index) {
-      this.getListpartit();
-      this.taskPartitionDictId = aitem.taskPartitionDictId ? aitem.taskPartitionDictId : '';
+      // this.getListpartit();
+      this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
       this.nnerVisibleindex = index;
       this.innerVisible = true;
     },
@@ -716,6 +871,10 @@ export default {
       if (this.form.taskPartitionDictId) {
         this.taskPartitionDictId = this.form.taskPartitionDictId
       }
+      if (this.form.taskTypeId) {
+        this.taskTypeId = this.form.taskTypeId
+      }
+
       this.getListpartit();
       this.innerVisible = true;
     },
@@ -724,22 +883,41 @@ export default {
     innerVisiblecancel() {
       this.innerVisible = false;
     },
+    typeecancel(){
+      this.innertype = false;
+    },
     nurseclickzx(row) {
-      console.log(row)
+
       if (this.title == '添加标签字段信息') {
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName =
           row.taskPartitionName;
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictId =
           row.id;
       } else if (this.titleup == '修改标签字段信息') {
-        this.form.taskPartitionDictName =row.taskPartitionName;
+        this.form.taskPartitionDictName = row.taskPartitionName;
         this.form.taskPartitionDictId =
           row.id;
 
       }
-
       this.innerVisible = false;
     },
+    // 任务类型
+    nurseclicktype(row) {
+      console.log(row,'row')
+      this.queryParamstask.taskTypeId=row.id
+      this.getListpartit()
+      if (this.title == '添加标签字段信息') {
+        this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeName =
+          row.taskTypeName;
+        this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeId =
+          row.id;
+      } else if (this.titleup == '修改标签字段信息') {
+        this.form.taskTypeName = row.taskTypeName;
+        this.form.taskTypeId =
+          row.id;
+      }
+      this.innertype = false;
+    },
 
     /** 查询标签字段信息列表 */
     getList() {
@@ -759,8 +937,10 @@ export default {
         fieldSort: undefined,
         taskPartitionDictName: '请选择任务细分',
         taskPartitionDictId: '',
-        fieldCode:null,
-        
+        taskTypeName:'请选择任务类型',
+        taskTypeId:'',
+        fieldCode: null,
+
       };
       if (this.form.labelFieldInfoList.length == 5) {
         this.$message.error("最多批量添加5条");
@@ -799,6 +979,8 @@ export default {
         updateTime: null,
         taskPartitionDictName: null,
         taskPartitionDictId: null,
+        taskTypeId:null,
+        taskTypeName:null,
 
 
       };
@@ -842,6 +1024,9 @@ export default {
             fieldSort: undefined,
             taskPartitionDictName: '请选择任务细分',
             taskPartitionDictId: '',
+            taskTypeName:'请选择任务类型',
+            taskTypeId:'',
+
 
           },
         ],