Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
4677fa81 by lihua
Options

去掉身份认证代码

1 parent 85f91ac2
Inline Side-by-side
Showing 8 changed files with 247 additions and 205 deletions
src/views/data_facilitator/authenticationManagement.vue
...@@ -882,7 +882,7 @@ const getTenant = () => { ...@@ -882,7 +882,7 @@ const getTenant = () => {
882 flowDetail.value = data; 882 flowDetail.value = data;
883 detailGuid.value = data.guid || ''; 883 detailGuid.value = data.guid || '';
884 bizApproveState.value = data.bizApproveState || ''; 884 bizApproveState.value = data.bizApproveState || '';
885 crossPlatformApproveState.value = data.crossPlatformApproveState || ''; 885 // crossPlatformApproveState.value = data.tdsApproveState || '';
886 isEdit.value = (bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' || bizApproveState.value == 'A' || crossPlatformApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true; 886 isEdit.value = (bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' || bizApproveState.value == 'A' || crossPlatformApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true;
887 contentFormItems.value[1].disabled = bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' ? true : false; 887 contentFormItems.value[1].disabled = bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' ? true : false;
888 tableData.value = data.changeList || []; 888 tableData.value = data.changeList || [];
...@@ -1279,7 +1279,7 @@ const btnClick = async (btn, bType = null) => { ...@@ -1279,7 +1279,7 @@ const btnClick = async (btn, bType = null) => {
1279 } 1279 }
1280 params.attachmentRQVOS = attachmentRQVOS; 1280 params.attachmentRQVOS = attachmentRQVOS;
1281 1281
1282 if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') { 1282 if (bizApproveState.value == 'Y') {
1283 let flowParams: any = {}; 1283 let flowParams: any = {};
1284 flowParams.flowType = '10014'; 1284 flowParams.flowType = '10014';
1285 flowParams.bizGuid = detailGuid.value; 1285 flowParams.bizGuid = detailGuid.value;
...@@ -1337,7 +1337,7 @@ const btnClick = async (btn, bType = null) => { ...@@ -1337,7 +1337,7 @@ const btnClick = async (btn, bType = null) => {
1337 }); 1337 });
1338 } else if (type == 'cancel') { 1338 } else if (type == 'cancel') {
1339 setFormItems(); 1339 setFormItems();
1340 if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') { 1340 if (bizApproveState.value == 'Y') {
1341 setFormDisable(); 1341 setFormDisable();
1342 } 1342 }
1343 } else if (type == 'change') { 1343 } else if (type == 'change') {
...@@ -1380,7 +1380,7 @@ onBeforeMount(() => { ...@@ -1380,7 +1380,7 @@ onBeforeMount(() => {
1380 res?.msg && proxy.$ElMessage.error(res?.msg); 1380 res?.msg && proxy.$ElMessage.error(res?.msg);
1381 } 1381 }
1382 }) 1382 })
1383 getParamsList({ dictType: '行业分类', level: 1 }).then((res: any) => { 1383 getParamsList({ dictType: '行业分类' }).then((res: any) => {
1384 if (res?.code == proxy.$passCode) { 1384 if (res?.code == proxy.$passCode) {
1385 industryList.value = res.data || []; 1385 industryList.value = res.data || [];
1386 let index = contentFormItems.value.findIndex(item => item.field == 'industry'); 1386 let index = contentFormItems.value.findIndex(item => item.field == 'industry');
...@@ -1613,7 +1613,7 @@ const viewVoucherFile = () => { ...@@ -1613,7 +1613,7 @@ const viewVoucherFile = () => {
1613 <div class="empty_tips" v-else>暂无变更信息</div> 1613 <div class="empty_tips" v-else>暂无变更信息</div>
1614 </div> 1614 </div>
1615 </ContentWrap> 1615 </ContentWrap>
1616 <ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px" :isExpand="expandResult" 1616 <ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px" :isExpand="expandResult"
1617 @expand="(v) => expandResult = v"> 1617 @expand="(v) => expandResult = v">
1618 <div class="list_panel"> 1618 <div class="list_panel">
1619 <div class="list_item"> 1619 <div class="list_item">
...@@ -1641,7 +1641,7 @@ const viewVoucherFile = () => { ...@@ -1641,7 +1641,7 @@ const viewVoucherFile = () => {
1641 @click="btnClick({ value: 'save' })">保存</el-button> --> 1641 @click="btnClick({ value: 'save' })">保存</el-button> -->
1642 <el-button type="primary" @click="btnClick({ value: 'submit' })">提交</el-button> 1642 <el-button type="primary" @click="btnClick({ value: 'submit' })">提交</el-button>
1643 </div> 1643 </div>
1644 <div class="btns" v-else-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit"> 1644 <div class="btns" v-else-if="bizApproveState == 'Y' && !isEdit">
1645 <el-button type="primary" @click="btnClick({ value: 'change' })">变更认证</el-button> 1645 <el-button type="primary" @click="btnClick({ value: 'change' })">变更认证</el-button>
1646 </div> 1646 </div>
1647 </div> 1647 </div>
......
src/views/data_facilitator/certificationAudit.vue
...@@ -88,48 +88,49 @@ const tableFields: any = ref([ ...@@ -88,48 +88,49 @@ const tableFields: any = ref([
88 } 88 }
89 }, 89 },
90 { 90 {
91 label: "审批状态", field: "bizApproveState", type: "tag", width: TableColumnWidth.STATE, align: 'center', getName: (scope) => { 91 label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center',
92 const approveState = scope.row.bizApproveState 92 // getName: (scope) => {
93 switch (approveState) { 93 // const approveState = scope.row.bizApproveState
94 case 'N': 94 // switch (approveState) {
95 return '草稿中'; 95 // case 'N':
96 case 'A': 96 // return '草稿中';
97 return '审批中'; 97 // case 'A':
98 case 'Y': 98 // return '审批中';
99 return '已通过'; 99 // case 'Y':
100 case 'R': 100 // return '已通过';
101 return '已驳回'; 101 // case 'R':
102 case 'C': 102 // return '已驳回';
103 return '已撤销'; 103 // case 'C':
104 case 'D': 104 // return '已撤销';
105 return '已废弃'; 105 // case 'D':
106 default: 106 // return '已废弃';
107 return '--'; 107 // default:
108 } 108 // return '--';
109 }, tagType: (scope) => { 109 // }
110 const approveState = scope.row.bizApproveState 110 // }, tagType: (scope) => {
111 switch (approveState) { 111 // const approveState = scope.row.bizApproveState
112 case 'A': 112 // switch (approveState) {
113 return 'warning'; 113 // case 'A':
114 case 'Y': 114 // return 'warning';
115 return 'success'; 115 // case 'Y':
116 case 'R': 116 // return 'success';
117 return 'danger'; 117 // case 'R':
118 default: 118 // return 'danger';
119 return 'info'; 119 // default:
120 } 120 // return 'info';
121 } 121 // }
122 }, 122 // }
123 {
124 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
125 label: '查看', visible: (scope) => {
126 return scope.row.crossPlatformApproveState != null;
127 }, click: (scope) => {
128 systemApproveCurrentRowInfo.value = scope.row;
129 approvalDialogVisible.value = true;
130 }
131 }
132 }, 123 },
124 // {
125 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
126 // label: '查看', visible: (scope) => {
127 // return scope.row.crossPlatformApproveState != null;
128 // }, click: (scope) => {
129 // systemApproveCurrentRowInfo.value = scope.row;
130 // approvalDialogVisible.value = true;
131 // }
132 // }
133 // },
133 { 134 {
134 label: "提交时间", field: "createTime", width: TableColumnWidth.DATETIME, getName: (scope) => { 135 label: "提交时间", field: "createTime", width: TableColumnWidth.DATETIME, getName: (scope) => {
135 return scope.row.createTime ? Moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '--'; 136 return scope.row.createTime ? Moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '--';
...@@ -166,7 +167,7 @@ const tableInfo = ref({ ...@@ -166,7 +167,7 @@ const tableInfo = ref({
166 actionInfo: { 167 actionInfo: {
167 label: "操作", 168 label: "操作",
168 type: "btn", 169 type: "btn",
169 width: 180, 170 width: 170,
170 btns: (scope) => { 171 btns: (scope) => {
171 let row = scope.row; 172 let row = scope.row;
172 return getTableBtns(row); 173 return getTableBtns(row);
...@@ -176,34 +177,36 @@ const tableInfo = ref({ ...@@ -176,34 +177,36 @@ const tableInfo = ref({
176 177
177 const getTableBtns = (row, includeDetail = true) => { 178 const getTableBtns = (row, includeDetail = true) => {
178 let btnsArr: any[] = []; 179 let btnsArr: any[] = [];
179 const currentStaffGuid = userData.staffGuid; 180 const currentStaffGuid = userData.userGuid
180 const approveState = row.bizApproveState || 'N'; 181 const approveState = row.approveState;
181 const approveStaffGuids = row.approveStaffGuids || []; 182 const staffGuid = row.createUserId || '';
182 const staffGuid = row.staffGuid || '';
183 let flowState; 183 let flowState;
184 if (approveState == 'N' && staffGuid == currentStaffGuid) { 184 if (approveState == 'N' && staffGuid == currentStaffGuid) {
185 flowState = 1; 185 flowState = 1;
186 } 186 }
187 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 187 // if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
188 flowState = 2; 188 // flowState = 2;
189 } 189 // }
190 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) { 190 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
191 flowState = 3; 191 flowState = 3;
192 } 192 }
193 if (row.flowType == '10013' && approveState == 'Y') { 193 // if (row.flowType == '10013' && approveState == 'Y') {
194 flowState = 4; 194 // flowState = 4;
195 } 195 // }
196 196
197 btnsArr.push({ label: "详情", value: "detail" }) 197 btnsArr.push({ label: "详情", value: "detail" })
198 if (flowState === 1) { 198 if (flowState === 1) {
199 btnsArr.push({ label: "删除", value: "delete" }) 199 btnsArr.push({ label: "删除", value: "delete" })
200 } else if (flowState === 2) { 200 }
201 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 201 // else if (flowState === 2) {
202 } else if (flowState === 3) { 202 // btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
203 // }
204 else if (flowState === 3) {
203 btnsArr.push({ label: "删除", value: "delete" }) 205 btnsArr.push({ label: "删除", value: "delete" })
204 } else if (flowState === 4) {
205 btnsArr.push({ label: "查看进度", value: "progress" })
206 } 206 }
207 // else if (flowState === 4) {
208 // btnsArr.push({ label: "查看进度", value: "progress" })
209 // }
207 return btnsArr 210 return btnsArr
208 } 211 }
209 212
......
src/views/data_facilitator/certificationAuditDetail.vue
...@@ -1147,7 +1147,7 @@ onBeforeMount(() => { ...@@ -1147,7 +1147,7 @@ onBeforeMount(() => {
1147 () => getDetail(), 1147 () => getDetail(),
1148 ) 1148 )
1149 } 1149 }
1150 getParamsList({ dictType: '行业分类', level: 1 }).then((res: any) => { 1150 getParamsList({ dictType: '行业分类' }).then((res: any) => {
1151 if (res?.code == proxy.$passCode) { 1151 if (res?.code == proxy.$passCode) {
1152 industryList.value = res.data || []; 1152 industryList.value = res.data || [];
1153 let index = contentFormItems.value.findIndex(item => item.field == 'industry'); 1153 let index = contentFormItems.value.findIndex(item => item.field == 'industry');
...@@ -1214,21 +1214,40 @@ const viewVoucherFile = () => { ...@@ -1214,21 +1214,40 @@ const viewVoucherFile = () => {
1214 <template> 1214 <template>
1215 <div class="container_wrap full" v-loading="loading"> 1215 <div class="container_wrap full" v-loading="loading">
1216 <div class="content_main panel"> 1216 <div class="content_main panel">
1217 <div 1217 <div v-if="detailType == 'detail' && flowDetail.approveState"
1218 v-if="detailType == 'detail' && (flowDetail.crossPlatformApproveState == 'R' || flowDetail.crossPlatformApproveState == 'E')" 1218 :class="['panel_wrap', 'results_panel', flowDetail.approveState == 'Y' ? 'success' : (flowDetail.approveState == 'R' ? 'reject' : (flowDetail.approveState == 'C' ? 'revoke' : 'audit'))]">
1219 :class="['panel_wrap', 'results_panel', 'reject']">
1220 <div class="panel_header"> 1219 <div class="panel_header">
1221 <div class="header_title" v-if="flowDetail.crossPlatformApproveState == 'R'"> 1220 <div class="header_title" v-if="flowDetail.approveState == 'Y'">
1222 <el-icon class="title-icon"> 1221 <el-icon class="title-icon">
1223 <CircleCloseFilled /> 1222 <svg-icon name="icon-success" />
1224 </el-icon> 1223 </el-icon>
1225 <span class="title_text">主平台审批已驳回，请在列表页面查看具体驳回原因</span> 1224 <span class="title_text">平台审批通过</span>
1226 </div> 1225 </div>
1227 <div class="header_title" v-else-if="flowDetail.crossPlatformApproveState == 'E'"> 1226 <div class="header_title" v-else-if="flowDetail.approveState == 'R'">
1228 <el-icon class="title-icon"> 1227 <el-icon class="title-icon">
1229 <CircleCloseFilled /> 1228 <CircleCloseFilled />
1230 </el-icon> 1229 </el-icon>
1231 <span class="title_text">主平台审批发起失败，请在列表页面查看具体发起失败原因</span> 1230 <span class="title_text">平台被驳回</span>
1231 </div>
1232 <div class="header_title" v-else-if="flowDetail.approveState == 'A'">
1233 <el-icon class="title-icon">
1234 <svg-icon name="icon-audit" />
1235 </el-icon>
1236 <span class="title_text">平台审批中</span>
1237 </div>
1238 <!-- <div class="header_title" v-else-if="flowDetail.approveState == 'C'">
1239 <el-icon class="title-icon">
1240 <svg-icon name="icon-revoke" />
1241 </el-icon>
1242 <span class="title_text">已撤销</span>
1243 </div> -->
1244 </div>
1245 <div class="panel_body" v-if="flowDetail.approveState == 'R'">
1246 <div class="results_list">
1247 <div class="list_item">
1248 <span class="item_label">平台审批意见:</span>
1249 <span class="item_value">{{ flowDetail?.approveSuggest || '--' }}</span>
1250 </div>
1232 </div> 1251 </div>
1233 </div> 1252 </div>
1234 </div> 1253 </div>
...@@ -1284,9 +1303,9 @@ const viewVoucherFile = () => { ...@@ -1284,9 +1303,9 @@ const viewVoucherFile = () => {
1284 <div class="empty_tips" v-else>暂无变更信息</div> 1303 <div class="empty_tips" v-else>暂无变更信息</div>
1285 </div> 1304 </div>
1286 </ContentWrap> 1305 </ContentWrap>
1287 <ContentWrap title="认证结果信息" v-if="approveState == 'Y'" expandSwicth style="margin-top: 15px" :isExpand="expandResult" 1306 <ContentWrap title="认证结果信息" v-if="approveState == 'Y'" expandSwicth style="margin-top: 15px"
1288 @expand="(v) => expandResult = v"> 1307 :isExpand="expandResult" @expand="(v) => expandResult = v">
1289 <div class="list_panel"> 1308 <div class="list_panel">
1290 <div class="list_item"> 1309 <div class="list_item">
1291 <span class="item_label">认证时间：</span> 1310 <span class="item_label">认证时间：</span>
1292 <span class="item_value">{{ flowDetail.credentialTime || '--' }}</span> 1311 <span class="item_value">{{ flowDetail.credentialTime || '--' }}</span>
...@@ -1298,21 +1317,21 @@ const viewVoucherFile = () => { ...@@ -1298,21 +1317,21 @@ const viewVoucherFile = () => {
1298 </div> 1317 </div>
1299 </div> 1318 </div>
1300 </ContentWrap> 1319 </ContentWrap>
1301 <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expand6" 1320 <!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expand6"
1302 @expand="(v) => expand6 = v"> 1321 @expand="(v) => expand6 = v">
1303 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" 1322 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
1304 :processInstanceId="processInstanceId"> 1323 :processInstanceId="processInstanceId">
1305 </ApprovalProcess> 1324 </ApprovalProcess>
1306 </ContentWrap> 1325 </ContentWrap> -->
1307 </div> 1326 </div>
1308 <div class="tool_btns"> 1327 <div class="tool_btns">
1309 <div class="btns"> 1328 <div class="btns">
1310 <el-button @click="btnClick({ value: 'cancel' })" v-if="detailType == 'detail'">关闭</el-button> 1329 <el-button @click="btnClick({ value: 'cancel' })" v-if="detailType == 'detail'">关闭</el-button>
1311 <el-button @click="btnClick({ value: 'cancel' })" v-else>取消</el-button> 1330 <!-- <el-button @click="btnClick({ value: 'cancel' })" v-else>取消</el-button>
1312 <el-button type="primary" @click="btnClick({ value: 'pass' })" 1331 <el-button type="primary" @click="btnClick({ value: 'pass' })"
1313 v-if="approveState == 'A' && flowState == 2">通过</el-button> 1332 v-if="approveState == 'A' && flowState == 2">通过</el-button>
1314 <el-button type="danger" plain @click="btnClick({ value: 'reject' })" 1333 <el-button type="danger" plain @click="btnClick({ value: 'reject' })"
1315 v-if="approveState == 'A' && flowState == 2">驳回</el-button> 1334 v-if="approveState == 'A' && flowState == 2">驳回</el-button> -->
1316 </div> 1335 </div>
1317 </div> 1336 </div>
1318 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" /> 1337 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
......
src/views/data_facilitator/settleDetail.vue
...@@ -37,14 +37,13 @@ const toolBtns: any = computed(() => { ...@@ -37,14 +37,13 @@ const toolBtns: any = computed(() => {
37 let btnsArr: any = [{ 37 let btnsArr: any = [{
38 label: "关闭", value: "cancel", plain: true 38 label: "关闭", value: "cancel", plain: true
39 }]; 39 }];
40 let approveVO = flowDetail.value.approveVO; 40 let staffGuid = userData.userGuid;
41 let staffGuid = userData.staffGuid; 41 // if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
42 if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) { 42 // btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
43 btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]); 43 // }
44 } 44 // if (flowDetail.value.approveState == 'A' && flowDetail.value.createUserId == staffGuid) {
45 if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid) { 45 // btnsArr.push({ label: "撤销", value: "revoke" });
46 btnsArr.push({ label: "撤销", value: "revoke" }); 46 // }
47 }
48 return btnsArr; 47 return btnsArr;
49 }); 48 });
50 49
...@@ -257,8 +256,8 @@ const getDetail = () => { ...@@ -257,8 +256,8 @@ const getDetail = () => {
257 if (res?.code == proxy.$passCode) { 256 if (res?.code == proxy.$passCode) {
258 flowDetail.value = res.data || {}; 257 flowDetail.value = res.data || {};
259 flowDetail.value.accessMethodName = assessMethodList.find(a => a.value == flowDetail.value.accessMethod)?.label; 258 flowDetail.value.accessMethodName = assessMethodList.find(a => a.value == flowDetail.value.accessMethod)?.label;
260 deploymentId.value = res.data.approveVO.camundaDeploymentId 259 // deploymentId.value = res.data.approveVO.camundaDeploymentId
261 processInstanceId.value = res.data.approveVO.camundaInstanceId 260 // processInstanceId.value = res.data.approveVO.camundaInstanceId
262 flowDetail.value.tdsConnectorVerifiable.thirdPartyCertification = []; 261 flowDetail.value.tdsConnectorVerifiable.thirdPartyCertification = [];
263 } else { 262 } else {
264 proxy.$ElMessage.error(res.msg); 263 proxy.$ElMessage.error(res.msg);
...@@ -447,12 +446,12 @@ const fileKeyNames = ref({ ...@@ -447,12 +446,12 @@ const fileKeyNames = ref({
447 </template> 446 </template>
448 </div> 447 </div>
449 </ContentWrap> 448 </ContentWrap>
450 <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove" 449 <!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
451 @expand="(v) => expandApprove = v"> 450 @expand="(v) => expandApprove = v">
452 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" 451 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
453 :processInstanceId="processInstanceId"> 452 :processInstanceId="processInstanceId">
454 </ApprovalProcess> 453 </ApprovalProcess>
455 </ContentWrap> 454 </ContentWrap> -->
456 <ContentWrap v-if="flowDetail.connectorIdentity" title="连接器凭证信息" expandSwicth style="margin-top: 15px" :isExpand="expandCert" 455 <ContentWrap v-if="flowDetail.connectorIdentity" title="连接器凭证信息" expandSwicth style="margin-top: 15px" :isExpand="expandCert"
457 @expand="(v) => expandCert = v"> 456 @expand="(v) => expandCert = v">
458 <div class="list_panel"> 457 <div class="list_panel">
...@@ -471,12 +470,12 @@ const fileKeyNames = ref({ ...@@ -471,12 +470,12 @@ const fileKeyNames = ref({
471 </div> 470 </div>
472 </div> 471 </div>
473 </ContentWrap> 472 </ContentWrap>
474 <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove" 473 <!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
475 @expand="(v) => expandApprove = v"> 474 @expand="(v) => expandApprove = v">
476 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" 475 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
477 :processInstanceId="processInstanceId"> 476 :processInstanceId="processInstanceId">
478 </ApprovalProcess> 477 </ApprovalProcess>
479 </ContentWrap> 478 </ContentWrap> -->
480 </div> 479 </div>
481 <div class="tool_btns"> 480 <div class="tool_btns">
482 <div class="btns"> 481 <div class="btns">
......
src/views/data_facilitator/settleManagement.vue
...@@ -69,50 +69,51 @@ const tableFields = ref([ ...@@ -69,50 +69,51 @@ const tableFields = ref([
69 } 69 }
70 }, 70 },
71 { 71 {
72 label: "审批状态", field: "approveVO", type: "tag", width: 96, align: 'center', getName: (scope) => { 72 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center',
73 const approveVO = scope.row.approveVO || {} 73 // getName: (scope) => {
74 switch (approveVO.approveState) { 74 // const approveVO = scope.row.approveVO || {}
75 case 'N': 75 // switch (approveVO.approveState) {
76 return '草稿中'; 76 // case 'N':
77 case 'A': 77 // return '草稿中';
78 return '审批中'; 78 // case 'A':
79 case 'Y': 79 // return '审批中';
80 return '已通过'; 80 // case 'Y':
81 case 'R': 81 // return '已通过';
82 return '已驳回'; 82 // case 'R':
83 case 'C': 83 // return '已驳回';
84 return '已撤销'; 84 // case 'C':
85 case 'I': 85 // return '已撤销';
86 return '--'; 86 // case 'I':
87 default: 87 // return '--';
88 return '草稿中'; 88 // default:
89 } 89 // return '草稿中';
90 }, tagType: (scope) => { 90 // }
91 const approveVO = scope.row.approveVO || {} 91 // }, tagType: (scope) => {
92 switch (approveVO.approveState) { 92 // const approveVO = scope.row.approveVO || {}
93 case 'A': 93 // switch (approveVO.approveState) {
94 return 'warning'; 94 // case 'A':
95 case 'Y': 95 // return 'warning';
96 return 'success'; 96 // case 'Y':
97 case 'R': 97 // return 'success';
98 return 'danger'; 98 // case 'R':
99 default: 99 // return 'danger';
100 return 'info'; 100 // default:
101 } 101 // return 'info';
102 } 102 // }
103 // }
103 }, 104 },
104 // { label: "同步状态", field: "approveVO", type: "tag", }, 105 // { label: "同步状态", field: "approveVO", type: "tag", },
105 // 专区才需要显示的 106 // 专区才需要显示的
106 { 107 // {
107 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: { 108 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: {
108 label: '查看', visible: (scope) => { 109 // label: '查看', visible: (scope) => {
109 return scope.row.crossPlatformApproveState != null; 110 // return scope.row.crossPlatformApproveState != null;
110 }, click: (scope) => { 111 // }, click: (scope) => {
111 systemApproveCurrentRowInfo.value = scope.row; 112 // systemApproveCurrentRowInfo.value = scope.row;
112 approvalDialogVisible.value = true; 113 // approvalDialogVisible.value = true;
113 } 114 // }
114 } 115 // }
115 }, 116 // },
116 { label: "法人或其他组织", field: "legalEntity", width: 200 }, 117 { label: "法人或其他组织", field: "legalEntity", width: 200 },
117 { label: "修改人", field: "updateUserName", width: 130 }, 118 { label: "修改人", field: "updateUserName", width: 130 },
118 { label: "修改时间", field: "updateTime", width: 170 }, 119 { label: "修改时间", field: "updateTime", width: 170 },
...@@ -157,19 +158,18 @@ const tableInfo = ref({ ...@@ -157,19 +158,18 @@ const tableInfo = ref({
157 const getTableBtns = (row, includeDetail = true) => { 158 const getTableBtns = (row, includeDetail = true) => {
158 let btnsArr: any[] = []; 159 let btnsArr: any[] = [];
159 const approveVO = row.approveVO; 160 const approveVO = row.approveVO;
160 const currentStaffGuid = userData.staffGuid 161 const currentStaffGuid = userData.userGuid;
162 const approveState = row.approveState || 'N';
161 const bizApproveState = row.bizApproveState; 163 const bizApproveState = row.bizApproveState;
162 const approveState = approveVO?.approveState || 'N'; 164 const staffGuid = row?.createUserId || '';
163 const approveStaffGuids = approveVO?.approveStaffGuids || [];
164 const staffGuid = approveVO?.staffGuid || '';
165 let isShowCancel = false; 165 let isShowCancel = false;
166 let flowState; 166 let flowState;
167 if (approveState == 'N') { 167 if (approveState == 'N') {
168 flowState = 1; 168 flowState = 1;
169 } 169 }
170 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 170 // if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
171 flowState = 2; 171 // flowState = 2;
172 } 172 // }
173 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) { 173 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
174 flowState = 3; 174 flowState = 3;
175 } 175 }
...@@ -181,9 +181,10 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -181,9 +181,10 @@ const getTableBtns = (row, includeDetail = true) => {
181 btnsArr = [{ label: "编辑", value: "edit" }, { label: "删除", value: "delete" }] 181 btnsArr = [{ label: "编辑", value: "edit" }, { label: "删除", value: "delete" }]
182 } else { 182 } else {
183 btnsArr.push({ label: "详情", value: "detail" }) 183 btnsArr.push({ label: "详情", value: "detail" })
184 if (flowState === 2) { 184 // if (flowState === 2) {
185 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 185 // btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
186 } else if (flowState === 3) { 186 // } else
187 if (flowState === 3) {
187 if (bizApproveState != 'D') { 188 if (bizApproveState != 'D') {
188 btnsArr.push({ label: "重新提交", value: "edit" }) 189 btnsArr.push({ label: "重新提交", value: "edit" })
189 } 190 }
...@@ -312,10 +313,11 @@ const tablePageChange = (info) => { ...@@ -312,10 +313,11 @@ const tablePageChange = (info) => {
312 }; 313 };
313 314
314 const newCreate = () => { 315 const newCreate = () => {
315 if (tenantData.isCertification != 'Y') { 316 // TODO，要不要加企业认证。
316 proxy.$ElMessage.error('请先进行企业认证，再新增连接器'); 317 // if (tenantData.isCertification != 'Y') {
317 return; 318 // proxy.$ElMessage.error('请先进行企业认证，再新增连接器');
318 } 319 // return;
320 // }
319 router.push({ 321 router.push({
320 name: 'settleStart' 322 name: 'settleStart'
321 }); 323 });
......
src/views/data_facilitator/settleStart.vue
...@@ -6,7 +6,6 @@ name: settleStart ...@@ -6,7 +6,6 @@ name: settleStart
6 import useUserStore from "@/store/modules/user"; 6 import useUserStore from "@/store/modules/user";
7 import { useValidator } from "@/hooks/useValidator"; 7 import { useValidator } from "@/hooks/useValidator";
8 import useDataConnectorStore from "@/store/modules/dataConnector"; 8 import useDataConnectorStore from "@/store/modules/dataConnector";
9 import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
10 import { 9 import {
11 saveConnector, 10 saveConnector,
12 updateConnector, 11 updateConnector,
...@@ -42,7 +41,7 @@ const expandImpact = ref(false); ...@@ -42,7 +41,7 @@ const expandImpact = ref(false);
42 const expandValid = ref(false); 41 const expandValid = ref(false);
43 const approveInfoExpand = ref(false); 42 const approveInfoExpand = ref(false);
44 43
45 const deploymentId = ref(""); 44 // const deploymentId = ref("");
46 const processInstanceId = ref(""); 45 const processInstanceId = ref("");
47 46
48 /** 连接器身份信息表单配置 */ 47 /** 连接器身份信息表单配置 */
...@@ -591,15 +590,15 @@ const connectorDetailInfo: any = ref({}); ...@@ -591,15 +590,15 @@ const connectorDetailInfo: any = ref({});
591 590
592 onBeforeMount(() => { 591 onBeforeMount(() => {
593 if (!guid) { 592 if (!guid) {
594 getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then( 593 // getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
595 (res: any) => { 594 // (res: any) => {
596 if (res.code == proxy.$passCode) { 595 // if (res.code == proxy.$passCode) {
597 deploymentId.value = res.data; 596 // deploymentId.value = res.data;
598 } else { 597 // } else {
599 proxy.$ElMessage.error(res.msg); 598 // proxy.$ElMessage.error(res.msg);
600 } 599 // }
601 } 600 // }
602 ); 601 // );
603 fullscreenLoading.value = true; 602 fullscreenLoading.value = true;
604 getEnterpriseData({ 603 getEnterpriseData({
605 logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser 604 logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser
...@@ -642,19 +641,19 @@ onBeforeMount(() => { ...@@ -642,19 +641,19 @@ onBeforeMount(() => {
642 } 641 }
643 if (res1?.code == proxy.$passCode) { 642 if (res1?.code == proxy.$passCode) {
644 let connectorDetail = connectorDetailInfo.value = res1?.data || {}; 643 let connectorDetail = connectorDetailInfo.value = res1?.data || {};
645 deploymentId.value = connectorDetail.approveVO?.camundaDeploymentId || ''; 644 // deploymentId.value = connectorDetail.approveVO?.camundaDeploymentId || '';
646 processInstanceId.value = connectorDetail.approveVO?.camundaInstanceId || ''; 645 // processInstanceId.value = connectorDetail.approveVO?.camundaInstanceId || '';
647 if (!deploymentId.value) { 646 // if (!deploymentId.value) {
648 getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then( 647 // getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
649 (res: any) => { 648 // (res: any) => {
650 if (res.code == proxy.$passCode) { 649 // if (res.code == proxy.$passCode) {
651 deploymentId.value = res.data; 650 // deploymentId.value = res.data;
652 } else { 651 // } else {
653 proxy.$ElMessage.error(res.msg); 652 // proxy.$ElMessage.error(res.msg);
654 } 653 // }
655 } 654 // }
656 ); 655 // );
657 } 656 // }
658 let approveVO = connectorDetail.approveVO || {}; 657 let approveVO = connectorDetail.approveVO || {};
659 if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && connectorDetail.bizApproveState != 'D') { 658 if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && connectorDetail.bizApproveState != 'D') {
660 restart.value = true; 659 restart.value = true;
...@@ -714,11 +713,11 @@ onBeforeMount(() => { ...@@ -714,11 +713,11 @@ onBeforeMount(() => {
714 <Form ref="validInfoFormRef" formId="valid-info-form" :itemList="validInfoFormItems" :rules="validInfoFormRules" 713 <Form ref="validInfoFormRef" formId="valid-info-form" :itemList="validInfoFormItems" :rules="validInfoFormRules"
715 col="col3" /> 714 col="col3" />
716 </ContentWrap> 715 </ContentWrap>
717 <ContentWrap id="id-approveInfo" title="审批信息" :isExpand="approveInfoExpand" expandSwicth style="margin-top: 15px" 716 <!-- <ContentWrap id="id-approveInfo" title="审批信息" :isExpand="approveInfoExpand" expandSwicth style="margin-top: 15px"
718 @expand="(v) => (approveInfoExpand = v)"> 717 @expand="(v) => (approveInfoExpand = v)">
719 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''"> 718 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
720 </ApprovalProcess> 719 </ApprovalProcess>
721 </ContentWrap> 720 </ContentWrap> -->
722 </div> 721 </div>
723 <div class="tool_btns"> 722 <div class="tool_btns">
724 <div class="btns"> 723 <div class="btns">
......
src/views/data_product/productListing.vue
...@@ -105,7 +105,7 @@ const tableInfo = ref({ ...@@ -105,7 +105,7 @@ const tableInfo = ref({
105 }, 105 },
106 // { label: "上架分类", field: "exchangeName", width: 140 }, 106 // { label: "上架分类", field: "exchangeName", width: 140 },
107 { 107 {
108 label: "审批状态", field: "approveVO", type: "approveTag", width: TableColumnWidth.STATE, align: 'center' 108 label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center'
109 }, 109 },
110 { 110 {
111 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => { 111 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
...@@ -143,7 +143,7 @@ const tableInfo = ref({ ...@@ -143,7 +143,7 @@ const tableInfo = ref({
143 flowState = 1; 143 flowState = 1;
144 } 144 }
145 145
146 const currentStaffGuid = userData.staffGuid 146 const currentStaffGuid = userData.userGuid
147 // const bizApproveState = row.approveState; 147 // const bizApproveState = row.approveState;
148 // const approveState = approveVO.approveState || null; 148 // const approveState = approveVO.approveState || null;
149 // const approveStaffGuids = approveVO.approveStaffGuids || []; 149 // const approveStaffGuids = approveVO.approveStaffGuids || [];
...@@ -383,25 +383,26 @@ const tableBtnClick = (scope, btn) => { ...@@ -383,25 +383,26 @@ const tableBtnClick = (scope, btn) => {
383 } 383 }
384 //撤销 384 //撤销
385 if (type == 'revoke') { 385 if (type == 'revoke') {
386 ElMessageBox.confirm(`撤销后，该流程将不再进行审核，确定这样操作吗？`, "提示", { 386 //TODO。撤销调用什么接口。
387 confirmButtonText: "确定", 387 // ElMessageBox.confirm(`撤销后，该流程将不再进行审核，确定这样操作吗？`, "提示", {
388 cancelButtonText: "取消", 388 // confirmButtonText: "确定",
389 type: 'warning', 389 // cancelButtonText: "取消",
390 }).then(() => { 390 // type: 'warning',
391 revokeFlowData({ 391 // }).then(() => {
392 guid: row.approveVO.approveGuid, 392 // revokeFlowData({
393 flowType: row.approveVO.flowType, 393 // guid: row.approveVO.approveGuid,
394 approveStaffGuid: userData.staffGuid 394 // flowType: row.approveVO.flowType,
395 }, row.tenantGuid).then((res: any) => { 395 // approveStaffGuid: userData.staffGuid
396 if (res.code == '00000') { 396 // }, row.tenantGuid).then((res: any) => {
397 ElMessage.success('撤销成功！') 397 // if (res.code == '00000') {
398 getTableData(); 398 // ElMessage.success('撤销成功！')
399 getListingCountData(); 399 // getTableData();
400 } else { 400 // getListingCountData();
401 ElMessage.error(res.msg) 401 // } else {
402 } 402 // ElMessage.error(res.msg)
403 }) 403 // }
404 }); 404 // })
405 // });
405 406
406 } 407 }
407 if (type == 'pass') { 408 if (type == 'pass') {
......
src/views/data_product/productListingDetail.vue
...@@ -683,8 +683,8 @@ const getProductDetail = async () => { ...@@ -683,8 +683,8 @@ const getProductDetail = async () => {
683 if (res.code == proxy.$passCode) { 683 if (res.code == proxy.$passCode) {
684 const data = res.data || {} 684 const data = res.data || {}
685 flowDetail.value = data; 685 flowDetail.value = data;
686 deploymentId.value = data.approveVO.camundaDeploymentId 686 // deploymentId.value = data.approveVO.camundaDeploymentId
687 processInstanceId.value = data.approveVO.camundaInstanceId 687 // processInstanceId.value = data.approveVO.camundaInstanceId
688 // if (res.data.qualityEvaluationFile && res.data.qualityEvaluationFile.length) { 688 // if (res.data.qualityEvaluationFile && res.data.qualityEvaluationFile.length) {
689 // flowDetail.value.qualityEvaluationFile = { name: res.data.qualityEvaluationFile[0].name, url: res.data.qualityEvaluationFile[0].url } 689 // flowDetail.value.qualityEvaluationFile = { name: res.data.qualityEvaluationFile[0].name, url: res.data.qualityEvaluationFile[0].url }
690 // } 690 // }
...@@ -1766,21 +1766,40 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1766,21 +1766,40 @@ const rejectDialogBtnClick = (btn, info) => {
1766 <template> 1766 <template>
1767 <div class="container_wrap" v-loading="flowDetailLoading"> 1767 <div class="container_wrap" v-loading="flowDetailLoading">
1768 <div class="content_main"> 1768 <div class="content_main">
1769 <div v-if="detailType == 'detail' && (flowDetail.approveState == 'R' || flowDetail.approveState == 'E')" 1769 <div v-if="detailType == 'detail' && flowDetail.approveState"
1770 :class="['panel_wrap', 'results_panel', 'reject']"> 1770 :class="['panel_wrap', 'results_panel', flowDetail.approveState == 'Y' ? 'success' : (flowDetail.approveState == 'R' ? 'reject' : (flowDetail.approveState == 'C' ? 'revoke' : 'audit'))]">
1771 <div class="panel_header"> 1771 <div class="panel_header">
1772 <div class="header_title" v-if="flowDetail.approveState == 'R'"> 1772 <div class="header_title" v-if="flowDetail.approveState == 'Y'">
1773 <el-icon class="title-icon"> 1773 <el-icon class="title-icon">
1774 <CircleCloseFilled /> 1774 <svg-icon name="icon-success" />
1775 </el-icon> 1775 </el-icon>
1776 <span class="title_text">平台审批已驳回，请在列表页面查看具体驳回原因</span> 1776 <span class="title_text">平台审批通过</span>
1777 <!-- 需要展示驳回原因 -->
1778 </div> 1777 </div>
1779 <div class="header_title" v-else-if="flowDetail.approveState == 'E'"> 1778 <div class="header_title" v-else-if="flowDetail.approveState == 'R'">
1780 <el-icon class="title-icon"> 1779 <el-icon class="title-icon">
1781 <CircleCloseFilled /> 1780 <CircleCloseFilled />
1782 </el-icon> 1781 </el-icon>
1783 <span class="title_text">平台审批发起失败，请在列表页面重新提交</span> 1782 <span class="title_text">平台被驳回</span>
1783 </div>
1784 <div class="header_title" v-else-if="flowDetail.approveState == 'A'">
1785 <el-icon class="title-icon">
1786 <svg-icon name="icon-audit" />
1787 </el-icon>
1788 <span class="title_text">平台审批中</span>
1789 </div>
1790 <div class="header_title" v-else-if="flowDetail.approveState == 'C'">
1791 <el-icon class="title-icon">
1792 <svg-icon name="icon-revoke" />
1793 </el-icon>
1794 <span class="title_text">已撤销</span>
1795 </div>
1796 </div>
1797 <div class="panel_body" v-if="flowDetail.approveState == 'R'">
1798 <div class="results_list">
1799 <div class="list_item">
1800 <span class="item_label">平台审批意见:</span>
1801 <span class="item_value">{{ flowDetail?.approveSuggest || '--' }}</span>
1802 </div>
1784 </div> 1803 </div>
1785 </div> 1804 </div>
1786 </div> 1805 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!