f13946e2 by lxs

数据资产登记更新

1 parent d24705fc
...@@ -23,6 +23,7 @@ import { ...@@ -23,6 +23,7 @@ import {
23 getRegisterTenant, 23 getRegisterTenant,
24 getExchangeList 24 getExchangeList
25 } from "@/api/modules/dataAsset"; 25 } from "@/api/modules/dataAsset";
26 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
26 import useDataAssetStore from "@/store/modules/dataAsset"; 27 import useDataAssetStore from "@/store/modules/dataAsset";
27 import useUserStore from "@/store/modules/user"; 28 import useUserStore from "@/store/modules/user";
28 29
...@@ -145,7 +146,6 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -145,7 +146,6 @@ const getTableBtns = (row, includeDetail = true) => {
145 console.log(userData) 146 console.log(userData)
146 let btnsArr: any[] = []; 147 let btnsArr: any[] = [];
147 if (row.approveState == 'N') {//只有草稿中的详情是可以编辑的 148 if (row.approveState == 'N') {//只有草稿中的详情是可以编辑的
148 includeDetail && btnsArr.push({ label: "详情", value: "path_detail" })
149 includeDetail && btnsArr.push({ label: "编辑", value: "edit" }) 149 includeDetail && btnsArr.push({ label: "编辑", value: "edit" })
150 if (row.tenantGuid == userData.tenantGuid) { 150 if (row.tenantGuid == userData.tenantGuid) {
151 btnsArr.push({ label: "删除", value: "delete" }); 151 btnsArr.push({ label: "删除", value: "delete" });
...@@ -209,10 +209,11 @@ const tableBtnClick = (scope, btn) => { ...@@ -209,10 +209,11 @@ const tableBtnClick = (scope, btn) => {
209 }).then(() => { 209 }).then(() => {
210 listDataLoading.value = true; 210 listDataLoading.value = true;
211 let params = { 211 let params = {
212 bizGuid: row.guid, 212 guid: row.approveVO.approveGuid,
213 funcCode: row.funcCode 213 flowType: row.approveVO.flowType,
214 approveStaffGuid: userData.staffGuid,
214 } 215 }
215 registerApproveCancel(params).then((res: any) => { 216 revokeFlowData(params).then((res: any) => {
216 listDataLoading.value = false; 217 listDataLoading.value = false;
217 if (res?.code == proxy.$passCode) { 218 if (res?.code == proxy.$passCode) {
218 if (res.data) { 219 if (res.data) {
...@@ -424,11 +425,12 @@ const passDialogBtnClick = (btn, info) => { ...@@ -424,11 +425,12 @@ const passDialogBtnClick = (btn, info) => {
424 if (btn.value == 'submit') { 425 if (btn.value == 'submit') {
425 listDataLoading.value = true; 426 listDataLoading.value = true;
426 let params = { 427 let params = {
427 bizGuid: currTableData.value.guid, 428 guid: currTableData.value.approveVO.approveGuid,
428 funcCode: currTableData.value.funcCode, 429 flowType: currTableData.value.approveVO.flowType,
429 approveSuggest: info.approveSuggest 430 approveSuggest: info.approveSuggest,
431 approveStaffGuid: userData.staffGuid,
430 } 432 }
431 registerApproveAllow(params).then((res: any) => { 433 passFlowData(params).then((res: any) => {
432 listDataLoading.value = false; 434 listDataLoading.value = false;
433 if (res?.code == proxy.$passCode) { 435 if (res?.code == proxy.$passCode) {
434 if (res.data) { 436 if (res.data) {
...@@ -491,11 +493,12 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -491,11 +493,12 @@ const rejectDialogBtnClick = (btn, info) => {
491 } 493 }
492 listDataLoading.value = true; 494 listDataLoading.value = true;
493 let params = { 495 let params = {
494 bizGuid: currTableData.value.guid, 496 guid: currTableData.value.approveVO.approveGuid,
495 funcCode: currTableData.value.funcCode, 497 flowType: currTableData.value.approveVO.flowType,
496 approveSuggest: info.approveSuggest 498 approveSuggest: info.approveSuggest,
499 approveStaffGuid: userData.staffGuid,
497 } 500 }
498 registerApproveBackup(params).then((res: any) => { 501 rejectFlowData(params).then((res: any) => {
499 listDataLoading.value = false; 502 listDataLoading.value = false;
500 if (res?.code == proxy.$passCode) { 503 if (res?.code == proxy.$passCode) {
501 if (res.data) { 504 if (res.data) {
......
...@@ -405,9 +405,10 @@ onBeforeMount(() => { ...@@ -405,9 +405,10 @@ onBeforeMount(() => {
405 fullscreenLoading.value = false; 405 fullscreenLoading.value = false;
406 if (res.code == proxy.$passCode) { 406 if (res.code == proxy.$passCode) {
407 const data = res.data || {} 407 const data = res.data || {}
408 let { approveVO } = data;
408 draftDetailInfo.value = data; 409 draftDetailInfo.value = data;
409 deploymentId.value = data.camundaDeploymentId; 410 deploymentId.value = approveVO.camundaDeploymentId;
410 processInstanceId.value = data.camundaInstanceId 411 processInstanceId.value = approveVO.camundaInstanceId
411 let coverageArea = ''; 412 let coverageArea = '';
412 let coverageAreas = []; 413 let coverageAreas = [];
413 let damTypeItem = baseFormItems.value.find(item => item.field == 'damType'); 414 let damTypeItem = baseFormItems.value.find(item => item.field == 'damType');
...@@ -743,14 +744,6 @@ const baseFormItems: any = ref([ ...@@ -743,14 +744,6 @@ const baseFormItems: any = ref([
743 clearable: true, 744 clearable: true,
744 required: true, 745 required: true,
745 }, { 746 }, {
746 label: "数据时间范围",
747 type: "date-picker",
748 field: "dateRange",
749 default: null,
750 placeholder: "开始时间~结束时间",
751 clearable: true,
752 required: true,
753 }, {
754 label: '病例总数(例)', 747 label: '病例总数(例)',
755 type: 'input', 748 type: 'input',
756 placeholder: '请输入', 749 placeholder: '请输入',
...@@ -760,7 +753,6 @@ const baseFormItems: any = ref([ ...@@ -760,7 +753,6 @@ const baseFormItems: any = ref([
760 default: '', 753 default: '',
761 required: false 754 required: false
762 }, { 755 }, {
763 }, {
764 label: '数据覆盖地域', 756 label: '数据覆盖地域',
765 type: 'checkbox-select', 757 type: 'checkbox-select',
766 placeholder: '全国', 758 placeholder: '全国',
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!