3055b892 by lxs

数据资产登记更新

1 parent e4e0cb29
......@@ -208,7 +208,7 @@ const btnClick = (btn) => {
if (type == 'create') {
router.push({
name: 'registerStart',
query: { exchangeGuid: btn.exchangeGuid, isRestart: '', type }
query: { exchangeGuid: btn.exchangeGuid, type }
});
} else if (type == 'search') {
exchangGuid.value = btn.exchangeGuid;
......@@ -225,7 +225,7 @@ const tableBtnClick = (scope, btn) => {
if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态,才可以编辑。
router.push({
name: 'registerStart',
query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, isRestart: btn.label == '重新提交' ? 'true' : '', tenantGuid: row.tenantGuid, type }
query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, tenantGuid: row.tenantGuid, type }
});
} else if (type == "delete") {
delTableOpen("此操作将永久删除该资产登记,是否继续?", "warning");
......
......@@ -336,7 +336,7 @@ const setPropertyFormItemsValue = (info) => {
item.default = info.propertyTermSdate ? [info.propertyTermSdate, info.propertyTermEdate] : (info.field || []);
} else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
item.default = tenantDetail.value[item.field];
item.field == 'businessLicenseEndDate' && (item.col = info['propertyTerm'] == 'Y'?'no-margin-r':'');
item.field == 'businessLicenseEndDate' && (item.col = info['propertyTerm'] == 'Y' ? 'no-margin-r' : '');
} else if (item.field == 'businessLicenseJson') {
item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : [];
if (!item.default.length) {
......@@ -345,8 +345,8 @@ const setPropertyFormItemsValue = (info) => {
item.visible = true;
}
} else {
if(item.field == 'officeLocation' || item.field == 'unitNature'){
item.col = info['propertyTerm'] == 'Y'?'no-margin-r':''
if (item.field == 'officeLocation' || item.field == 'unitNature') {
item.col = info['propertyTerm'] == 'Y' ? 'no-margin-r' : ''
}
item.default = info[item.field];
}
......@@ -1875,7 +1875,6 @@ const save = () => {
fullscreenLoading.value = true;
if (draftDetailInfo.value.guid) {
params.guid = draftDetailInfo.value.guid;
params.isRestart = restart.value;
registerUpdate(params).then((res: any) => {
fullscreenLoading.value = false;
if (res.code == proxy.$passCode) {
......@@ -1932,7 +1931,6 @@ onActivated(() => {
})
onBeforeMount(() => {
restart.value = localStorage.getItem('isRestart') ? true : false;
if (guid) {
fullscreenLoading.value = true;
getRegiaterDetail({ guid: guid }).then((res: any) => {
......@@ -1944,6 +1942,9 @@ onBeforeMount(() => {
if (approveVO) {
deploymentId.value = approveVO.camundaDeploymentId;
processInstanceId.value = approveVO.camundaInstanceId;
if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && data.bizApproveState != 'D') {
restart.value = true;
}
} else {
getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => {
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!