Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
a335bd10 by lihua
Options

新增策略接口联调

1 parent 77c169ab
Inline Side-by-side
Showing 7 changed files with 145 additions and 85 deletions
src/api/modules/dataDelivery.ts
...@@ -31,4 +31,11 @@ export const verifyStatusChange = (params) => request({ ...@@ -31,4 +31,11 @@ export const verifyStatusChange = (params) => request({
31 export const deliveryContract = (guid) => request({ 31 export const deliveryContract = (guid) => request({
32 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/delivery?deliveryGuid=${guid}`, 32 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/delivery?deliveryGuid=${guid}`,
33 method: 'post' 33 method: 'post'
34 })
35
36 /** 数据使用 */
37 export const getDataUsePageList = (params) => request({
38 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/page-list`,
39 method: 'post',
40 data: params
34 }) 41 })
...\ No newline at end of file ...\ No newline at end of file
......
src/views/data_asset/dataDelivery.vue
...@@ -87,7 +87,11 @@ const tableFields = ref([ ...@@ -87,7 +87,11 @@ const tableFields = ref([
87 }); 87 });
88 } 88 }
89 }, 89 },
90 { label: "交付方式", field: "deliveryMethod", width: 120 }, 90 {
91 label: "交付方式", field: "deliveryMethod", width: 120, getName: (scope) => {
92 return scope.row.deliveryMethod == 1 ? '文件' : 'API';
93 }
94 },
91 { 95 {
92 label: "交付状态", field: "deliveryStatus", type: "tag", width: 96, align: 'center', 96 label: "交付状态", field: "deliveryStatus", type: "tag", width: 96, align: 'center',
93 getName: (scope) => { 97 getName: (scope) => {
......
src/views/data_asset/dataUsage.vue
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 import TableTools from "@/components/Tools/table_tools.vue"; 2 import TableTools from "@/components/Tools/table_tools.vue";
3 import { commonPageConfig, TableColumnWidth } from '@/utils/enum'; 3 import { commonPageConfig, TableColumnWidth } from '@/utils/enum';
4 import { 4 import {
5 getDataUsePageList,
5 6
6 } from "@/api/modules/dataDelivery"; 7 } from "@/api/modules/dataDelivery";
7 8
...@@ -64,35 +65,12 @@ const tableFields = ref([ ...@@ -64,35 +65,12 @@ const tableFields = ref([
64 }); 65 });
65 } 66 }
66 }, 67 },
67 { label: "交付方式", field: "deliveryMethod", width: 120 },
68 { 68 {
69 label: "交付状态", field: "deliveryStatus", type: "tag", width: 96, align: 'center', 69 label: "交付方式", field: "deliveryMethod", width: 120, getName: (scope) => {
70 getName: (scope) => { 70 return scope.row.deliveryMethod == 1 ? '文件' : 'API';
71 const deliveryStatus = scope.row.deliveryStatus
72 switch (deliveryStatus) {
73 case 1:
74 return '未交付';
75 case 2:
76 return '已交付';
77 case 3:
78 return '交付中';
79 default:
80 return '--';
81 }
82 }, tagType: (scope) => {
83 const deliveryStatus = scope.row.deliveryStatus
84 switch (deliveryStatus) {
85 case 3:
86 return 'warning';
87 case 2:
88 return 'success';
89 case 1:
90 return 'info';
91 default:
92 return 'info';
93 }
94 } 71 }
95 }, 72 },
73 { label: "交付方", field: "deliveryPartyName", width: 240 },
96 { label: "交付时间", field: "deliveryTime", width: 170 }, 74 { label: "交付时间", field: "deliveryTime", width: 170 },
97 ]); 75 ]);
98 76
...@@ -113,6 +91,10 @@ const tableInfo = ref({ ...@@ -113,6 +91,10 @@ const tableInfo = ref({
113 type: "btn", 91 type: "btn",
114 width: 160, 92 width: 160,
115 btns: (scope) => { 93 btns: (scope) => {
94 let btns: any = [];
95 //TODO。根据返回值显示按钮
96 btns.push({ label: '日志', value: 'log' });
97 return btns;
116 } 98 }
117 } 99 }
118 }); 100 });
...@@ -129,6 +111,41 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -129,6 +111,41 @@ const toSearch = (val: any, clear: boolean = false) => {
129 getTableData(); 111 getTableData();
130 }; 112 };
131 113
114 const getTableData = () => {
115 tableInfo.value.loading = true
116 getDataUsePageList({
117 pageIndex: page.value.curr,
118 pageSize: page.value.limit,
119 dataProductName: page.value.dataProductName,
120 contractName: page.value.contractName
121 }).then((res: any) => {
122 tableInfo.value.loading = false
123 if (res?.code == proxy.$passCode) {
124 const data = res.data || {};
125 tableInfo.value.data = data.records || []
126 tableInfo.value.page.limit = data.pageSize
127 tableInfo.value.page.curr = data.pageIndex
128 tableInfo.value.page.rows = data.totalRows
129 } else {
130 res?.msg && proxy.$ElMessage.error(res?.msg)
131 }
132 }).catch(() => {
133 tableInfo.value.loading = false
134 })
135 };
136
137 const tablePageChange = (info) => {
138 page.value.curr = Number(info.curr);
139 page.value.limit = Number(info.limit);
140 tableInfo.value.page.curr = page.value.curr;
141 tableInfo.value.page.limit = page.value.limit;
142 getTableData();
143 };
144
145 onBeforeMount(() => {
146 toSearch({});
147 });
148
132 </script> 149 </script>
133 150
134 <template> 151 <template>
...@@ -142,6 +159,4 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -142,6 +159,4 @@ const toSearch = (val: any, clear: boolean = false) => {
142 </div> 159 </div>
143 </template> 160 </template>
144 161
145 <style lang="scss" scoped>
146
147 </style>
...\ No newline at end of file ...\ No newline at end of file
162 <style lang="scss" scoped></style>
...\ No newline at end of file ...\ No newline at end of file
......
src/views/data_smart_contract/components/strategyTable.vue
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
84 v-else-if="!isLook && productFieldList != null && (scope.row.constraintEnName == 'limitedDeliveryConnector' || scope.row.constraintEnName == 'limitedUseConnector')" 84 v-else-if="!isLook && productFieldList != null && (scope.row.constraintEnName == 'limitedDeliveryConnector' || scope.row.constraintEnName == 'limitedUseConnector')"
85 v-model="scope.row['constraintConnectorValue']" :loading="loading" :remote="true" 85 v-model="scope.row['constraintConnectorValue']" :loading="loading" :remote="true"
86 :remote-method="remoteMethod" :max-collapse-tags="1" :collapse-tags="true" :collapse-tags-tooltip="true" 86 :remote-method="remoteMethod" :max-collapse-tags="1" :collapse-tags="true" :collapse-tags-tooltip="true"
87 multiple filterable clearable :placeholder="scope.row.constraintPlaceholderValue || '请输入关键字搜索'" value-key="guid"> 87 multiple filterable clearable :placeholder="scope.row.constraintPlaceholderValue || '请输入关键字搜索'" value-key="guid" @change="(val) => handleOperatorSelectChange(val, scope, 'constraintConnectorValue')">
88 <el-option v-for="opt in connectorList" :key="opt['guid']" :label="opt['tenantName']" 88 <el-option v-for="opt in connectorList" :key="opt['guid']" :label="opt['tenantName']"
89 :value="opt" /> 89 :value="opt['guid']" />
90 </el-select> 90 </el-select>
91 <!-- 加密字段 --> 91 <!-- 加密字段 -->
92 <el-select v-else-if="!isLook && productFieldList != null && scope.row.constraintEnName == 'dataField'" 92 <el-select v-else-if="!isLook && productFieldList != null && scope.row.constraintEnName == 'dataField'"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
96 <el-option v-for="opt in productFieldList" :key="opt['enName']" :label="opt['chName']" 96 <el-option v-for="opt in productFieldList" :key="opt['enName']" :label="opt['chName']"
97 :value="opt['enName']" /> 97 :value="opt['enName']" />
98 </el-select> 98 </el-select>
99 <span v-else>{{ scope.row['constraintFieldValue'] || '--' }}</span> 99 <span v-else>{{ (scope.row.constraintEnName == 'dataField' ? scope.row.additionValue?.map(a => a.chName)?.join(',') : ((scope.row.constraintEnName == 'limitedDeliveryConnector' || scope.row.constraintEnName == 'limitedUseConnector') ? scope.row.additionValue?.map(a => a.tenantName)?.join(',') : scope.row['constraintFieldValue'])) || '--' }}</span>
100 </template> 100 </template>
101 </el-table-column> 101 </el-table-column>
102 <el-table-column v-if="!isLook" label="操作" width="140px" align="left" fixed="right" show-overflow-tooltip> 102 <el-table-column v-if="!isLook" label="操作" width="140px" align="left" fixed="right" show-overflow-tooltip>
...@@ -192,6 +192,7 @@ const strategyValueInfo: any = ref([{ ...@@ -192,6 +192,7 @@ const strategyValueInfo: any = ref([{
192 /** 将数据库存储的值转化为该组件接收的树形结构 */ 192 /** 将数据库存储的值转化为该组件接收的树形结构 */
193 const transferValueToNew = (val, isTemplate = false) => { 193 const transferValueToNew = (val, isTemplate = false) => {
194 let detailPolicyListValue: any[] = [] 194 let detailPolicyListValue: any[] = []
195 connectorList.value = [];
195 val?.forEach((p, index) => { 196 val?.forEach((p, index) => {
196 let lastItem = detailPolicyListValue?.[detailPolicyListValue.length - 1]; 197 let lastItem = detailPolicyListValue?.[detailPolicyListValue.length - 1];
197 let childInfo = Object.assign({}, p); 198 let childInfo = Object.assign({}, p);
...@@ -199,7 +200,8 @@ const transferValueToNew = (val, isTemplate = false) => { ...@@ -199,7 +200,8 @@ const transferValueToNew = (val, isTemplate = false) => {
199 childInfo.constraintFieldValue = childInfo.additionValue.map(a => a.enName); 200 childInfo.constraintFieldValue = childInfo.additionValue.map(a => a.enName);
200 } 201 }
201 if ((childInfo.constraintEnName == 'limitedDeliveryConnector' || childInfo.constraintEnName == 'limitedUseConnector') && childInfo.additionValue?.length) { 202 if ((childInfo.constraintEnName == 'limitedDeliveryConnector' || childInfo.constraintEnName == 'limitedUseConnector') && childInfo.additionValue?.length) {
202 childInfo.constraintConnectorValue = childInfo.additionValue; 203 childInfo.constraintConnectorValue = childInfo.additionValue.map(a => a.guid);
204 connectorList.value.push(...childInfo.additionValue);
203 } 205 }
204 if (isTemplate && (childInfo.constraintEnName == 'dataField' || childInfo.constraintEnName == 'limitedDeliveryConnector' || childInfo.constraintEnName == 'limitedUseConnector')) { 206 if (isTemplate && (childInfo.constraintEnName == 'dataField' || childInfo.constraintEnName == 'limitedDeliveryConnector' || childInfo.constraintEnName == 'limitedUseConnector')) {
205 childInfo.constraintPlaceholderValue = childInfo.constraintValue; 207 childInfo.constraintPlaceholderValue = childInfo.constraintValue;
...@@ -251,6 +253,9 @@ const strategyData = computed(() => { ...@@ -251,6 +253,9 @@ const strategyData = computed(() => {
251 index: s.index, 253 index: s.index,
252 orderNum: s.orderNum 254 orderNum: s.orderNum
253 }, sc)); 255 }, sc));
256 // if (sc.constraintConnectorValue?.length) {
257 // // connectorList.value.push(...sc.constraintConnectorValue);
258 // }
254 }) 259 })
255 }) 260 })
256 return v; 261 return v;
...@@ -271,6 +276,12 @@ const selectConditionChange = (val, scope) => { ...@@ -271,6 +276,12 @@ const selectConditionChange = (val, scope) => {
271 let svChild = sv.children?.find(c => c.childIndex == scope.row.childIndex); 276 let svChild = sv.children?.find(c => c.childIndex == scope.row.childIndex);
272 svChild && (svChild.constraintEnName = props.constraintOptionsList.find(o => o.policyName == val)?.policyEnName); 277 svChild && (svChild.constraintEnName = props.constraintOptionsList.find(o => o.policyName == val)?.policyEnName);
273 svChild && (svChild.constraintName = val); 278 svChild && (svChild.constraintName = val);
279 if (svChild && svChild.constraintOperatorCode) {
280 let opList = getActualOperationList(scope);
281 if (!opList.some(o => o.value == svChild.constraintOperatorCode)) {
282 svChild.constraintOperatorCode = '';
283 }
284 }
274 } 285 }
275 286
276 const handleOperatorSelectChange = (val, scope, field) => { 287 const handleOperatorSelectChange = (val, scope, field) => {
...@@ -278,6 +289,11 @@ const handleOperatorSelectChange = (val, scope, field) => { ...@@ -278,6 +289,11 @@ const handleOperatorSelectChange = (val, scope, field) => {
278 let sv = strategyValueInfo.value.find(s => s.index == index); 289 let sv = strategyValueInfo.value.find(s => s.index == index);
279 let svChild = sv.children?.find(c => c.childIndex == scope.row.childIndex); 290 let svChild = sv.children?.find(c => c.childIndex == scope.row.childIndex);
280 svChild && (svChild[field] = val); 291 svChild && (svChild[field] = val);
292 if (field == 'constraintConnectorValue') {
293 svChild.additionValue = val?.map(vv => {
294 return connectorList.value.find(c => c.guid == vv);
295 })
296 }
281 } 297 }
282 298
283 /** 添加策略信息的操作行为行 */ 299 /** 添加策略信息的操作行为行 */
......
src/views/data_smart_contract/smartContractCreate.vue
...@@ -23,7 +23,6 @@ import { ...@@ -23,7 +23,6 @@ import {
23 getParamsList, 23 getParamsList,
24 } from "@/api/modules/queryService"; 24 } from "@/api/modules/queryService";
25 import useDataSmartContract from "@/store/modules/dataSmartContract"; 25 import useDataSmartContract from "@/store/modules/dataSmartContract";
26 import { getEnterpriseData } from "@/api/modules/dataIdentify";
27 26
28 const { required } = useValidator(); 27 const { required } = useValidator();
29 const userStore = useUserStore(); 28 const userStore = useUserStore();
...@@ -461,7 +460,7 @@ const getSubmitInfo = () => { ...@@ -461,7 +460,7 @@ const getSubmitInfo = () => {
461 }]; 460 }];
462 params.policys = strategyTableRef.value.strategyData?.map((d, index) => { 461 params.policys = strategyTableRef.value.strategyData?.map((d, index) => {
463 let v = Object.assign({}, d, { orderNum: index + 1, }); 462 let v = Object.assign({}, d, { orderNum: index + 1, });
464 if (d.constraintName.includes('字段') && d.constraintFieldValue?.length) { 463 if (d.constraintName == 'dataField' && d.constraintFieldValue?.length) {
465 v.constraintValue = d.constraintFieldValue.join(','); 464 v.constraintValue = d.constraintFieldValue.join(',');
466 v.additionValue = d.constraintFieldValue?.map(dv => { 465 v.additionValue = d.constraintFieldValue?.map(dv => {
467 return { 466 return {
...@@ -469,6 +468,9 @@ const getSubmitInfo = () => { ...@@ -469,6 +468,9 @@ const getSubmitInfo = () => {
469 chName: productFieldList?.value.find(p => p.enName == dv)?.chName || dv 468 chName: productFieldList?.value.find(p => p.enName == dv)?.chName || dv
470 } 469 }
471 }) 470 })
471 } else if ((d.constraintEnName == 'limitedDeliveryConnector' || d.constraintEnName == 'limitedUseConnector') && d.constraintConnectorValue?.length) {
472 v.constraintValue = d.constraintConnectorValue?.join(',');
473 v.additionValue = d.additionValue;
472 } 474 }
473 return v; 475 return v;
474 }) || []; 476 }) || [];
...@@ -652,9 +654,6 @@ const cancel = () => { ...@@ -652,9 +654,6 @@ const cancel = () => {
652 654
653 const detailInfo: any = ref({}); 655 const detailInfo: any = ref({});
654 656
655 /** 当前会员是否认证信息 */
656 const currTenantDetailInfo: any = ref({});
657
658 const psLogon = ref(); 657 const psLogon = ref();
659 658
660 onBeforeMount(() => { 659 onBeforeMount(() => {
...@@ -742,23 +741,25 @@ onBeforeMount(() => { ...@@ -742,23 +741,25 @@ onBeforeMount(() => {
742 }) 741 })
743 } 742 }
744 fullscreenLoading.value = true; 743 fullscreenLoading.value = true;
745 psLogon.value = getEnterpriseData({ 744 // 连接器不需要用到会员认证信息。未认证的没有菜单。
746 logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser 745 // psLogon.value = getEnterpriseData({
747 }).then((res: any) => { 746 // logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser
748 psLogon.value = null; 747 // }).then((res: any) => {
749 fullscreenLoading.value = false; 748 // psLogon.value = null;
750 if (res?.code == proxy.$passCode) { 749 // fullscreenLoading.value = false;
751 currTenantDetailInfo.value = res.data || {}; 750 // if (res?.code == proxy.$passCode) {
752 exec(); 751 // currTenantDetailInfo.value = res.data || {};
753 } else { 752 // exec();
754 res?.msg && proxy.$ElMessage.error(res?.msg); 753 // } else {
755 exec(); 754 // res?.msg && proxy.$ElMessage.error(res?.msg);
756 } 755 // exec();
757 }).catch(() => { 756 // }
758 psLogon.value = null; 757 // }).catch(() => {
759 fullscreenLoading.value = false; 758 // psLogon.value = null;
760 exec(); 759 // fullscreenLoading.value = false;
761 }); 760 // exec();
761 // });
762 exec();
762 getParamsList({ dictType: '合约签署模式' }).then((res: any) => { 763 getParamsList({ dictType: '合约签署模式' }).then((res: any) => {
763 if (res?.code == proxy.$passCode) { 764 if (res?.code == proxy.$passCode) {
764 const data = res.data || []; 765 const data = res.data || [];
......
src/views/data_smart_contract/smartContractDetail.vue
...@@ -17,7 +17,8 @@ import { ...@@ -17,7 +17,8 @@ import {
17 getContractExecList, 17 getContractExecList,
18 terminateContract, 18 terminateContract,
19 getTerminateDetailInfo, 19 getTerminateDetailInfo,
20 getSignatureFile 20 getSignatureFile,
21 getDamFieldsByProductGuid
21 } from "@/api/modules/dataSmartContract"; 22 } from "@/api/modules/dataSmartContract";
22 import { 23 import {
23 tagMethod, 24 tagMethod,
...@@ -127,7 +128,20 @@ const btnHandles = ref({ ...@@ -127,7 +128,20 @@ const btnHandles = ref({
127 continueContractNegotiate({ 128 continueContractNegotiate({
128 contractGuid: route.query.guid, 129 contractGuid: route.query.guid,
129 policys: strategyTableEditRef.value.strategyData?.map((d, index) => { 130 policys: strategyTableEditRef.value.strategyData?.map((d, index) => {
130 return Object.assign({}, d, { orderNum: index + 1 }) 131 let v = Object.assign({}, d, { orderNum: index + 1, });
132 if (d.constraintName == 'dataField' && d.constraintFieldValue?.length) {
133 v.constraintValue = d.constraintFieldValue.join(',');
134 v.additionValue = d.constraintFieldValue?.map(dv => {
135 return {
136 enName: dv,
137 chName: productFieldList?.value.find(p => p.enName == dv)?.chName || dv
138 }
139 })
140 } else if ((d.constraintEnName == 'limitedDeliveryConnector' || d.constraintEnName == 'limitedUseConnector') && d.constraintConnectorValue?.length) {
141 v.constraintValue = d.constraintConnectorValue?.join(',');
142 v.additionValue = d.additionValue;
143 }
144 return v;
131 }) 145 })
132 }).then((res: any) => { 146 }).then((res: any) => {
133 fullscreenLoading.value = false; 147 fullscreenLoading.value = false;
...@@ -244,7 +258,7 @@ const extendTableInfo = ref({ ...@@ -244,7 +258,7 @@ const extendTableInfo = ref({
244 { label: "字段类型", field: "fieldTypeName", width: 140 }, 258 { label: "字段类型", field: "fieldTypeName", width: 140 },
245 { label: "输入内容", field: "content", width: 300 }, 259 { label: "输入内容", field: "content", width: 300 },
246 ], 260 ],
247 data: [], 261 data: <any>[],
248 showPage: false, 262 showPage: false,
249 actionInfo: { 263 actionInfo: {
250 show: false 264 show: false
...@@ -283,7 +297,7 @@ const productTableInfo = ref({ ...@@ -283,7 +297,7 @@ const productTableInfo = ref({
283 { label: "所属主体名称", field: "dataProductEntityName", width: 240 }, 297 { label: "所属主体名称", field: "dataProductEntityName", width: 240 },
284 { label: "产品简介", field: "dataProductAbstract", width: 240 }, 298 { label: "产品简介", field: "dataProductAbstract", width: 240 },
285 ], 299 ],
286 data: [], 300 data: <any>[],
287 showPage: false, 301 showPage: false,
288 actionInfo: { 302 actionInfo: {
289 show: false 303 show: false
...@@ -921,6 +935,13 @@ const constraintOptionsList: any = ref([]); ...@@ -921,6 +935,13 @@ const constraintOptionsList: any = ref([]);
921 /** 策略操作行为下拉列表 */ 935 /** 策略操作行为下拉列表 */
922 const actionOptionsList: any = ref([]); 936 const actionOptionsList: any = ref([]);
923 937
938 /** 根据选择的数据产品显示限定字段下拉列表 */
939 const initProductFieldValue: any = ref([]);
940 const productFieldList: any = ref([]);
941
942 /** 初始化的策略值为空数组 */
943 const initStrategyData = ref([]);
944
924 /** 获取第二步合约协商信息 */ 945 /** 获取第二步合约协商信息 */
925 const getStepTwoNegotiateInfo = (loading = true) => { 946 const getStepTwoNegotiateInfo = (loading = true) => {
926 fullscreenLoading.value = true; 947 fullscreenLoading.value = true;
...@@ -1036,6 +1057,19 @@ onBeforeMount(() => { ...@@ -1036,6 +1057,19 @@ onBeforeMount(() => {
1036 nodeInfoFormItems.value[5].default = user.executionerId; 1057 nodeInfoFormItems.value[5].default = user.executionerId;
1037 extendTableInfo.value.data = detailInfo.value.contractExpansions || []; 1058 extendTableInfo.value.data = detailInfo.value.contractExpansions || [];
1038 productTableInfo.value.data = detailInfo.value.contractSubjects || []; 1059 productTableInfo.value.data = detailInfo.value.contractSubjects || [];
1060 let productGuid = productTableInfo.value.data?.[0]?.dataProductGuid;
1061 if (productGuid) {
1062 getDamFieldsByProductGuid(productGuid).then((res: any) => {
1063 if (res?.code == proxy.$passCode) {
1064 productFieldList.value = res.data || initProductFieldValue.value;
1065 } else {
1066 productFieldList.value = initProductFieldValue.value;
1067 res?.msg && proxy.$ElMessage.error(res?.msg)
1068 }
1069 })
1070 } else {
1071 productFieldList.value = initProductFieldValue.value;
1072 }
1039 } else { 1073 } else {
1040 res?.msg && proxy.$ElMessage.error(res?.msg) 1074 res?.msg && proxy.$ElMessage.error(res?.msg)
1041 } 1075 }
...@@ -1272,7 +1306,7 @@ onActivated(() => { ...@@ -1272,7 +1306,7 @@ onActivated(() => {
1272 expandSwicth style="margin-top: 15px" :isExpand="expandPolicyConsult" @expand="(v) => (expandPolicyConsult = v)" 1306 expandSwicth style="margin-top: 15px" :isExpand="expandPolicyConsult" @expand="(v) => (expandPolicyConsult = v)"
1273 description=""> 1307 description="">
1274 <StrategyTable ref="strategyTableEditRef" :show-title="true" :value="consultDetailInfo?.policys" 1308 <StrategyTable ref="strategyTableEditRef" :show-title="true" :value="consultDetailInfo?.policys"
1275 :operatorOptionList="operatorOptionList" :actionOptionsList="actionOptionsList" 1309 :operatorOptionList="operatorOptionList" :actionOptionsList="actionOptionsList" :productFieldList="productFieldList"
1276 :constraintOptionsList="constraintOptionsList"></StrategyTable> 1310 :constraintOptionsList="constraintOptionsList"></StrategyTable>
1277 </ContentWrap> 1311 </ContentWrap>
1278 <ContentWrap v-show="detailType == 'consult' || currentStep == 2" id="history-info-consult" title="协商记录" 1312 <ContentWrap v-show="detailType == 'consult' || currentStep == 2" id="history-info-consult" title="协商记录"
......
src/views/data_smart_contract/smartContractManagement.vue
...@@ -13,7 +13,6 @@ import { ...@@ -13,7 +13,6 @@ import {
13 } from "@/api/modules/dataSmartContract" 13 } from "@/api/modules/dataSmartContract"
14 import useDataSmartContract from "@/store/modules/dataSmartContract"; 14 import useDataSmartContract from "@/store/modules/dataSmartContract";
15 import { commonPageConfig, USERROLE } from '@/utils/enum'; 15 import { commonPageConfig, USERROLE } from '@/utils/enum';
16 import { getEnterpriseData } from "@/api/modules/dataIdentify";
17 16
18 const userData = JSON.parse(localStorage.userData); 17 const userData = JSON.parse(localStorage.userData);
19 const tenantData = JSON.parse(localStorage.tenantInfo); 18 const tenantData = JSON.parse(localStorage.tenantInfo);
...@@ -300,12 +299,13 @@ const newCreate = () => { ...@@ -300,12 +299,13 @@ const newCreate = () => {
300 return; 299 return;
301 } 300 }
302 let exec = () => { 301 let exec = () => {
303 if (tenantData.isCertification != 'Y' && !currTenantDetailInfo.value.trustedIdentityCredential) { //认证过的 302 // 连接器不需要单独控制，没有认证的都不可以进入此菜单权限
304 if (userData.superTubeFlag != 'Y') {//平台用户 303 // if (tenantData.isCertification != 'Y' && !currTenantDetailInfo.value.trustedIdentityCredential) { //认证过的
305 proxy.$ElMessage.error('请先完成企业认证后再进行创建'); 304 // if (userData.superTubeFlag != 'Y') {//平台用户
306 return; 305 // proxy.$ElMessage.error('请先完成企业认证后再进行创建');
307 } 306 // return;
308 } 307 // }
308 // }
309 router.push({ 309 router.push({
310 name: 'smartContractCreate' 310 name: 'smartContractCreate'
311 }); 311 });
...@@ -327,27 +327,10 @@ onActivated(() => { ...@@ -327,27 +327,10 @@ onActivated(() => {
327 } 327 }
328 }) 328 })
329 329
330 /** 当前会员是否认证信息 */
331 const currTenantDetailInfo: any = ref({});
332
333 const psLogon = ref(); 330 const psLogon = ref();
334 331
335 onBeforeMount(() => { 332 onBeforeMount(() => {
336 !dataSmartContractStore.isRefresh && toSearch({}) 333 !dataSmartContractStore.isRefresh && toSearch({})
337 if (tenantData.isCertification != 'Y') {
338 psLogon.value = getEnterpriseData({
339 logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser
340 }).then((res: any) => {
341 psLogon.value = null;
342 if (res?.code == proxy.$passCode) {
343 currTenantDetailInfo.value = res.data || {};
344 } else {
345 res?.msg && proxy.$ElMessage.error(res?.msg);
346 }
347 }).catch(() => {
348 psLogon.value = null;
349 });
350 }
351 }) 334 })
352 335
353 </script> 336 </script>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!