数据资产登记更新
Showing
2 changed files
with
8 additions
and
7 deletions
| ... | @@ -208,7 +208,7 @@ const btnClick = (btn) => { | ... | @@ -208,7 +208,7 @@ const btnClick = (btn) => { |
| 208 | if (type == 'create') { | 208 | if (type == 'create') { |
| 209 | router.push({ | 209 | router.push({ |
| 210 | name: 'registerStart', | 210 | name: 'registerStart', |
| 211 | query: { exchangeGuid: btn.exchangeGuid, isRestart: '', type } | 211 | query: { exchangeGuid: btn.exchangeGuid, type } |
| 212 | }); | 212 | }); |
| 213 | } else if (type == 'search') { | 213 | } else if (type == 'search') { |
| 214 | exchangGuid.value = btn.exchangeGuid; | 214 | exchangGuid.value = btn.exchangeGuid; |
| ... | @@ -225,7 +225,7 @@ const tableBtnClick = (scope, btn) => { | ... | @@ -225,7 +225,7 @@ const tableBtnClick = (scope, btn) => { |
| 225 | if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态,才可以编辑。 | 225 | if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态,才可以编辑。 |
| 226 | router.push({ | 226 | router.push({ |
| 227 | name: 'registerStart', | 227 | name: 'registerStart', |
| 228 | query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, isRestart: btn.label == '重新提交' ? 'true' : '', tenantGuid: row.tenantGuid, type } | 228 | query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, tenantGuid: row.tenantGuid, type } |
| 229 | }); | 229 | }); |
| 230 | } else if (type == "delete") { | 230 | } else if (type == "delete") { |
| 231 | delTableOpen("此操作将永久删除该资产登记,是否继续?", "warning"); | 231 | delTableOpen("此操作将永久删除该资产登记,是否继续?", "warning"); | ... | ... |
| ... | @@ -336,7 +336,7 @@ const setPropertyFormItemsValue = (info) => { | ... | @@ -336,7 +336,7 @@ const setPropertyFormItemsValue = (info) => { |
| 336 | item.default = info.propertyTermSdate ? [info.propertyTermSdate, info.propertyTermEdate] : (info.field || []); | 336 | item.default = info.propertyTermSdate ? [info.propertyTermSdate, info.propertyTermEdate] : (info.field || []); |
| 337 | } else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。 | 337 | } else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。 |
| 338 | item.default = tenantDetail.value[item.field]; | 338 | item.default = tenantDetail.value[item.field]; |
| 339 | item.field == 'businessLicenseEndDate' && (item.col = info['propertyTerm'] == 'Y'?'no-margin-r':''); | 339 | item.field == 'businessLicenseEndDate' && (item.col = info['propertyTerm'] == 'Y' ? 'no-margin-r' : ''); |
| 340 | } else if (item.field == 'businessLicenseJson') { | 340 | } else if (item.field == 'businessLicenseJson') { |
| 341 | item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : []; | 341 | item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : []; |
| 342 | if (!item.default.length) { | 342 | if (!item.default.length) { |
| ... | @@ -345,8 +345,8 @@ const setPropertyFormItemsValue = (info) => { | ... | @@ -345,8 +345,8 @@ const setPropertyFormItemsValue = (info) => { |
| 345 | item.visible = true; | 345 | item.visible = true; |
| 346 | } | 346 | } |
| 347 | } else { | 347 | } else { |
| 348 | if(item.field == 'officeLocation' || item.field == 'unitNature'){ | 348 | if (item.field == 'officeLocation' || item.field == 'unitNature') { |
| 349 | item.col = info['propertyTerm'] == 'Y'?'no-margin-r':'' | 349 | item.col = info['propertyTerm'] == 'Y' ? 'no-margin-r' : '' |
| 350 | } | 350 | } |
| 351 | item.default = info[item.field]; | 351 | item.default = info[item.field]; |
| 352 | } | 352 | } |
| ... | @@ -1875,7 +1875,6 @@ const save = () => { | ... | @@ -1875,7 +1875,6 @@ const save = () => { |
| 1875 | fullscreenLoading.value = true; | 1875 | fullscreenLoading.value = true; |
| 1876 | if (draftDetailInfo.value.guid) { | 1876 | if (draftDetailInfo.value.guid) { |
| 1877 | params.guid = draftDetailInfo.value.guid; | 1877 | params.guid = draftDetailInfo.value.guid; |
| 1878 | params.isRestart = restart.value; | ||
| 1879 | registerUpdate(params).then((res: any) => { | 1878 | registerUpdate(params).then((res: any) => { |
| 1880 | fullscreenLoading.value = false; | 1879 | fullscreenLoading.value = false; |
| 1881 | if (res.code == proxy.$passCode) { | 1880 | if (res.code == proxy.$passCode) { |
| ... | @@ -1932,7 +1931,6 @@ onActivated(() => { | ... | @@ -1932,7 +1931,6 @@ onActivated(() => { |
| 1932 | }) | 1931 | }) |
| 1933 | 1932 | ||
| 1934 | onBeforeMount(() => { | 1933 | onBeforeMount(() => { |
| 1935 | restart.value = localStorage.getItem('isRestart') ? true : false; | ||
| 1936 | if (guid) { | 1934 | if (guid) { |
| 1937 | fullscreenLoading.value = true; | 1935 | fullscreenLoading.value = true; |
| 1938 | getRegiaterDetail({ guid: guid }).then((res: any) => { | 1936 | getRegiaterDetail({ guid: guid }).then((res: any) => { |
| ... | @@ -1944,6 +1942,9 @@ onBeforeMount(() => { | ... | @@ -1944,6 +1942,9 @@ onBeforeMount(() => { |
| 1944 | if (approveVO) { | 1942 | if (approveVO) { |
| 1945 | deploymentId.value = approveVO.camundaDeploymentId; | 1943 | deploymentId.value = approveVO.camundaDeploymentId; |
| 1946 | processInstanceId.value = approveVO.camundaInstanceId; | 1944 | processInstanceId.value = approveVO.camundaInstanceId; |
| 1945 | if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && data.bizApproveState != 'D') { | ||
| 1946 | restart.value = true; | ||
| 1947 | } | ||
| 1947 | } else { | 1948 | } else { |
| 1948 | getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => { | 1949 | getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => { |
| 1949 | if (res.code == proxy.$passCode) { | 1950 | if (res.code == proxy.$passCode) { | ... | ... |
-
Please register or sign in to post a comment