d83c37d5 by lihua

修改江苏资产登记传参

1 parent d290190e
...@@ -20,6 +20,10 @@ const props = defineProps({ ...@@ -20,6 +20,10 @@ const props = defineProps({
20 type: Object, 20 type: Object,
21 default: { 21 default: {
22 } 22 }
23 },
24 isBizGuid: {
25 type: Boolean,
26 default: false
23 } 27 }
24 }) 28 })
25 29
...@@ -53,7 +57,7 @@ const gettableList = () => { ...@@ -53,7 +57,7 @@ const gettableList = () => {
53 getCrossDetailList({ 57 getCrossDetailList({
54 pageIndex: 1, 58 pageIndex: 1,
55 pageSize: -1, 59 pageSize: -1,
56 bizGuid: props.currentRowInfo.guid 60 bizGuid: props.isBizGuid ? props.currentRowInfo.bizGuid : props.currentRowInfo.guid
57 }).then((res: any) => { 61 }).then((res: any) => {
58 tableInfo.value.loading = false; 62 tableInfo.value.loading = false;
59 if (res.code == proxy.$passCode) { 63 if (res.code == proxy.$passCode) {
......
...@@ -605,7 +605,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -605,7 +605,7 @@ const rejectDialogBtnClick = (btn, info) => {
605 </div> 605 </div>
606 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" /> 606 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
607 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 607 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
608 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo" 608 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo" :isBizGuid="true"
609 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval> 609 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
610 </div> 610 </div>
611 </template> 611 </template>
......
...@@ -118,12 +118,19 @@ const tableInfo = ref({ ...@@ -118,12 +118,19 @@ const tableInfo = ref({
118 loading: false, 118 loading: false,
119 fields: [{ label: "序号", type: "index", width: 56, align: "center" }, 119 fields: [{ label: "序号", type: "index", width: 56, align: "center" },
120 { 120 {
121 label: "数据资产名称", field: "daName", width: 180, align: "left", type: 'text_btn', value: 'assetDetail', columClass: 'text_btn', click: (scope) => { 121 label: "数据资产名称", field: "damName", width: 180, align: "left", type: 'text_btn', value: 'assetDetail', columClass: 'text_btn', click: (scope) => {
122 let row = scope.row; 122 let row = scope.row;
123 router.push({ 123 if (row.dataSource == '1') {
124 name: 'registerInfoDetail', 124 router.push({
125 query: { guid: row.guid, name: row.daName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' } 125 name: 'registerInfoJSZQDetail',
126 }); 126 query: { guid: row.bizGuid, name: row.damName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
127 });
128 } else {
129 router.push({
130 name: 'registerInfoDetail',
131 query: { guid: row.bizGuid, name: row.damName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
132 });
133 }
127 } 134 }
128 }, 135 },
129 { label: "所属公司", field: "tenantName", width: 240 }, 136 { label: "所属公司", field: "tenantName", width: 240 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!