01bfea00 by lxs

数据资产登记更新

1 parent 7d9019de
...@@ -229,7 +229,7 @@ const btnClick = (btn) => { ...@@ -229,7 +229,7 @@ const btnClick = (btn) => {
229 if (type == 'create') { 229 if (type == 'create') {
230 router.push({ 230 router.push({
231 name: 'registerStart', 231 name: 'registerStart',
232 query: { exchangeGuid: btn.exchangeGuid, isRestart: '', type } 232 query: { exchangeGuid: btn.exchangeGuid, type }
233 }); 233 });
234 } else if (type == 'search') { 234 } else if (type == 'search') {
235 exchangGuid.value = btn.exchangeGuid; 235 exchangGuid.value = btn.exchangeGuid;
...@@ -246,7 +246,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -246,7 +246,7 @@ const tableBtnClick = (scope, btn) => {
246 if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态,才可以编辑。 246 if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态,才可以编辑。
247 router.push({ 247 router.push({
248 name: 'registerStart', 248 name: 'registerStart',
249 query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, isRestart: btn.label == '重新提交' ? 'true' : '', tenantGuid: row.tenantGuid, type } 249 query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, tenantGuid: row.tenantGuid, type }
250 }); 250 });
251 } else if (type == "delete") { 251 } else if (type == "delete") {
252 delTableOpen("此操作将永久删除该资产登记,是否继续?", "warning"); 252 delTableOpen("此操作将永久删除该资产登记,是否继续?", "warning");
......
...@@ -1891,7 +1891,6 @@ const save = () => { ...@@ -1891,7 +1891,6 @@ const save = () => {
1891 fullscreenLoading.value = true; 1891 fullscreenLoading.value = true;
1892 if (draftDetailInfo.value.guid) { 1892 if (draftDetailInfo.value.guid) {
1893 params.guid = draftDetailInfo.value.guid; 1893 params.guid = draftDetailInfo.value.guid;
1894 params.isRestart = restart.value;
1895 registerUpdate(params).then((res: any) => { 1894 registerUpdate(params).then((res: any) => {
1896 fullscreenLoading.value = false; 1895 fullscreenLoading.value = false;
1897 if (res.code == proxy.$passCode) { 1896 if (res.code == proxy.$passCode) {
...@@ -1948,7 +1947,6 @@ onActivated(() => { ...@@ -1948,7 +1947,6 @@ onActivated(() => {
1948 }) 1947 })
1949 1948
1950 onBeforeMount(() => { 1949 onBeforeMount(() => {
1951 restart.value = localStorage.getItem('isRestart') ? true : false;
1952 if (guid) { 1950 if (guid) {
1953 fullscreenLoading.value = true; 1951 fullscreenLoading.value = true;
1954 getRegiaterDetail({ guid: guid }).then((res: any) => { 1952 getRegiaterDetail({ guid: guid }).then((res: any) => {
...@@ -1960,6 +1958,9 @@ onBeforeMount(() => { ...@@ -1960,6 +1958,9 @@ onBeforeMount(() => {
1960 if (approveVO) { 1958 if (approveVO) {
1961 deploymentId.value = approveVO.camundaDeploymentId; 1959 deploymentId.value = approveVO.camundaDeploymentId;
1962 processInstanceId.value = approveVO.camundaInstanceId; 1960 processInstanceId.value = approveVO.camundaInstanceId;
1961 if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && data.bizApproveState != 'D') {
1962 restart.value = true;
1963 }
1963 } else { 1964 } else {
1964 getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => { 1965 getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => {
1965 if (res.code == proxy.$passCode) { 1966 if (res.code == proxy.$passCode) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!