1150f554 by lxs

分级分类任务更新

1 parent 8407c03e
...@@ -31,7 +31,7 @@ service.interceptors.request.use( ...@@ -31,7 +31,7 @@ service.interceptors.request.use(
31 * 为每一次请求生成一个cancleToken 31 * 为每一次请求生成一个cancleToken
32 */ 32 */
33 const source = axios.CancelToken.source(); 33 const source = axios.CancelToken.source();
34 config.headers.tenant = '6646dcad76c411eea911fa163e419da9'; //会员guid先写死 34 config.headers.tenant = '9e5b9d7bfd8c4f4f8079e05de19bf7e0'; //会员guid先写死
35 config.cancelToken = source.token; 35 config.cancelToken = source.token;
36 if (config.method === "postfile") { 36 if (config.method === "postfile") {
37 config.method = "post"; 37 config.method = "post";
......
...@@ -349,25 +349,20 @@ const tableInfo = ref({ ...@@ -349,25 +349,20 @@ const tableInfo = ref({
349 id: "mapping-table", 349 id: "mapping-table",
350 fields: [ 350 fields: [
351 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" }, 351 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" },
352 { label: "任务名称", field: "chName", width: 96 }, 352 { label: "任务名称", field: "taskName", width: 96 },
353 { 353 {
354 label: "目录名称", field: "dataTypeValue", width: 120, type: "text_btn", columClass: 'text_btn', click: (scope) => { 354 label: "目录名称", field: "cgDirName", width: 120, type: "text_btn", columClass: 'text_btn', click: (scope) => {
355 router.push({ 355 router.push({
356 name: "templateConfig", 356 name: "templateConfig",
357 query: { guid: scope.row.damGuid }, 357 query: { guid: scope.row.damGuid },
358 }); 358 });
359 } 359 }
360 }, 360 },
361 { label: "分类分级模板", field: "dataTypeValue", width: 200 }, 361 { label: "分类分级模板", field: "cgTemplateName", width: 200 },
362 { label: "元数据", field: "fieldStandardCode", width: 200 }, 362 { label: "元数据", field: "metaNames", width: 200 },
363 // {
364 // label: "是否公共数据", field: "isPublicData", width: 120, getName: (scope) => {
365 // return scope.row.isPublicData == 'Y' ? '是' : '否';
366 // }
367 // },
368 { 363 {
369 label: "执行状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { 364 label: "执行状态", field: "status", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
370 return filterVal(scope.row.approveState, 'approveState'); 365 return filterVal(scope.row.status, 'status');
371 } 366 }
372 }, 367 },
373 { label: "任务修改人", field: "dataCategory", width: 120 }, 368 { label: "任务修改人", field: "dataCategory", width: 120 },
......
...@@ -339,7 +339,7 @@ const currpermissionList: any = ref([ ...@@ -339,7 +339,7 @@ const currpermissionList: any = ref([
339 } 339 }
340 ]) 340 ])
341 const templateInfo = ref({ 341 const templateInfo = ref({
342 title: '医疗数据分类分级模板', 342 title: '医疗数据分类',
343 descGroup: [ 343 descGroup: [
344 { label: '模型确认人', value: '管理员 ' }, 344 { label: '模型确认人', value: '管理员 ' },
345 { label: '模型确认时间', value: '2021-12-12 09:12:13' }, 345 { label: '模型确认时间', value: '2021-12-12 09:12:13' },
...@@ -611,7 +611,7 @@ onBeforeMount(() => { ...@@ -611,7 +611,7 @@ onBeforeMount(() => {
611 <template> 611 <template>
612 <div class="container_wrap full flex"> 612 <div class="container_wrap full flex">
613 <div class="aside_wrap" v-show="step == 0"> 613 <div class="aside_wrap" v-show="step == 0">
614 <div class="aside_title">选择分类分级模板</div> 614 <div class="aside_title">选择分类</div>
615 <div class="aside_search"> 615 <div class="aside_search">
616 <el-input v-model.trim="asideSearchInput" placeholder="请输入关键字" :prefix-icon="Search" clearable 616 <el-input v-model.trim="asideSearchInput" placeholder="请输入关键字" :prefix-icon="Search" clearable
617 @change="querySearch" /> 617 @change="querySearch" />
......
...@@ -360,16 +360,6 @@ const tableInfo = ref({ ...@@ -360,16 +360,6 @@ const tableInfo = ref({
360 }, 360 },
361 { label: "分类分级模板", field: "dataTypeValue", width: 200 }, 361 { label: "分类分级模板", field: "dataTypeValue", width: 200 },
362 { label: "元数据", field: "fieldStandardCode", width: 200 }, 362 { label: "元数据", field: "fieldStandardCode", width: 200 },
363 // {
364 // label: "是否公共数据", field: "isPublicData", width: 120, getName: (scope) => {
365 // return scope.row.isPublicData == 'Y' ? '是' : '否';
366 // }
367 // },
368 {
369 label: "执行状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
370 return filterVal(scope.row.approveState, 'approveState');
371 }
372 },
373 { label: "任务修改人", field: "dataCategory", width: 120 }, 363 { label: "任务修改人", field: "dataCategory", width: 120 },
374 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME }, 364 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
375 { label: "确认次数", field: "fieldLength", width: 96, align: 'right' }, 365 { label: "确认次数", field: "fieldLength", width: 96, align: 'right' },
...@@ -391,14 +381,10 @@ const tableInfo = ref({ ...@@ -391,14 +381,10 @@ const tableInfo = ref({
391 actionInfo: { 381 actionInfo: {
392 label: "操作", 382 label: "操作",
393 type: "btn", 383 type: "btn",
394 width: 280, 384 width: 100,
395 btns: (scope) => { 385 btns: (scope) => {
396 let row = scope.row, btnArr: any = [ 386 let row = scope.row, btnArr: any = [
397 { label: "结果确认", value: "confirm" }, 387 { label: "查看结果", value: "path" },
398 { label: "结果修改", value: "modify" },
399 { label: "编辑", value: "edit" },
400 { label: "日志", value: "log" },
401 { label: "删除", value: "delete" }
402 ]; 388 ];
403 // if (row.approveState == 'Y') { 389 // if (row.approveState == 'Y') {
404 // if (row.listingStatus == 'Y') { 390 // if (row.listingStatus == 'Y') {
...@@ -441,7 +427,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -441,7 +427,7 @@ const tableBtnClick = (scope, btn) => {
441 const type = btn.value; 427 const type = btn.value;
442 const row = scope.row; 428 const row = scope.row;
443 currTableData.value = row; 429 currTableData.value = row;
444 if (type == "detail" || type === "edit") { 430 if (type == "path") {
445 toPath(type); 431 toPath(type);
446 } else if (type === "delete") { 432 } else if (type === "delete") {
447 open("此操作将永久删除,是否继续?", "warning"); 433 open("此操作将永久删除,是否继续?", "warning");
...@@ -449,23 +435,14 @@ const tableBtnClick = (scope, btn) => { ...@@ -449,23 +435,14 @@ const tableBtnClick = (scope, btn) => {
449 }; 435 };
450 436
451 const toPath = (type) => { 437 const toPath = (type) => {
452 if (type == 'add') { 438 router.push({
453 router.push({ 439 name: "taskDetail",
454 name: "taskEdit", 440 query: {
455 query: { 441 guid: currTableData.value.guid,
456 type 442 name: currTableData.value.damName,
457 }, 443 type
458 }); 444 },
459 } else { 445 });
460 router.push({
461 name: "taskEdit",
462 query: {
463 guid: currTableData.value.guid,
464 name: currTableData.value.damName,
465 type
466 },
467 });
468 }
469 } 446 }
470 447
471 const tablePageChange = (info) => { 448 const tablePageChange = (info) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!