分类分级任务联调

@@ -472,6 +472,13 @@ export const getTaskFieldCount = (data) => request({
   params: data
   params: data
 })
 })
 
 
+// 分类分级任务执行数据库信息查询
+export const getDbFieldList = (data) => request({
+  url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/cg-task-exec-result/confirm-query-db-list`,
+  method: 'get',
+  params: data
+})
+
 // 分类分级任务执行字段查询
 // 分类分级任务执行字段查询
 export const execTaskFieldList = (data) => request({
 export const execTaskFieldList = (data) => request({
   url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/cg-task-exec-result/confirm-field-list-query`,
   url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/cg-task-exec-result/confirm-field-list-query`,
@@ -489,7 +496,7 @@ export const execTaskSheetList = (data) => request({
 export const execTaskConfirm = (data) => request({
 export const execTaskConfirm = (data) => request({
   url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/cg-task-exec-result/confirm-task`,
   url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/cg-task-exec-result/confirm-task`,
   method: 'post',
   method: 'post',
-  data
+  params: data
 })
 })
 
 
 // 分类分级任务执行字段确认
 // 分类分级任务执行字段确认
@@ -536,7 +543,7 @@ export const filterVal = (val, type) => {
   } else if(type == 'confirmStatus'){
   } else if(type == 'confirmStatus'){
     switch (val) {
     switch (val) {
       case 'N':
       case 'N':
-        status = '草稿中';
+        status = '待确认';
         break;
         break;
       case 'Y':
       case 'Y':
         status = '已确认';
         status = '已确认';
@@ -557,6 +564,18 @@ export const filterVal = (val, type) => {
         status = '待确认';
         status = '待确认';
         break;
         break;
     }
     }
+  } else if(type == 'changeStatus'){
+    switch (val) {
+      case 'N':
+        status = '待确认';
+        break;
+      case 'Y':
+        status = '已确认';
+        break;
+      default:
+        status = '--';
+        break;
+    }
   }
   }
   return status;
   return status;
 }
 }

@@ -498,6 +498,11 @@ const scheduleChange = (val, rowValue) => {
 const treeSelectNodeChange = (node, item, nodeObj) => {
 const treeSelectNodeChange = (node, item, nodeObj) => {
   emits("treeSelectNodeChange", node, item, nodeObj);
   emits("treeSelectNodeChange", node, item, nodeObj);
 }
 }
+
+const getCascaderCheckedData = () => {
+  const dialogForm = dialogFormRef.value[0] || dialogFormRef.value;
+  return dialogForm.getCascaderCheckedData();
+}
 const setTreeChecked = (checkedKeys, leafOnly: boolean = false) => {
 const setTreeChecked = (checkedKeys, leafOnly: boolean = false) => {
   nextTick(() => {
   nextTick(() => {
     const formTree = formTreeRef.value[0] || formTreeRef.value;
     const formTree = formTreeRef.value[0] || formTreeRef.value;
@@ -533,7 +538,8 @@ defineExpose({
   formTreeRef,
   formTreeRef,
   setTableRowSelected,
   setTableRowSelected,
   setTreeChecked,
   setTreeChecked,
-  getDialogConRef
+  getDialogConRef,
+  getCascaderCheckedData
 });
 });
 </script>
 </script>
 
 

@@ -101,7 +101,7 @@ onMounted(() => {
         <template v-if="item.type == 'select'">
         <template v-if="item.type == 'select'">
           <el-select :class="{ 'is-multiple': item.multiple }" v-model="formInline[item.field]"
           <el-select :class="{ 'is-multiple': item.multiple }" v-model="formInline[item.field]"
             :placeholder="item.placeholder" :clearable="item.clearable" :filterable="item.filterable"
             :placeholder="item.placeholder" :clearable="item.clearable" :filterable="item.filterable"
-            @change="(val) => selectChange(val, item)">
+            :disabled="item.disabled ?? false" @change="(val) => selectChange(val, item)">
             <el-option v-for="opt in item.options" :label="item.props?.label ? opt[item.props.label] : opt.label"
             <el-option v-for="opt in item.options" :label="item.props?.label ? opt[item.props.label] : opt.label"
               :value="item.props?.value ? opt[item.props.value] : opt.value" />
               :value="item.props?.value ? opt[item.props.value] : opt.value" />
           </el-select>
           </el-select>

@@ -64,7 +64,9 @@ const tableInfo = ref({
     {
     {
       label: "结果状态", field: "confirmStatus", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
       label: "结果状态", field: "confirmStatus", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
         return filterVal(scope.row.confirmStatus, 'confirmStatus');
         return filterVal(scope.row.confirmStatus, 'confirmStatus');
-      }
+      }, tagType: (scope) => {
+        return scope.row.confirmStatus=='Y'?'success':'warning';
+      },
     },
     },
   ],
   ],
   data: [],
   data: [],
@@ -157,6 +159,7 @@ const toPath = (type) => {
       query: {
       query: {
         guid: currTableData.value.guid,
         guid: currTableData.value.guid,
         name: currTableData.value.taskName,
         name: currTableData.value.taskName,
+        detail: JSON.stringify(currTableData.value),
         type
         type
       },
       },
     });
     });