质量评估，价值评估支持不走流程配置

lihua
Showing 7 changed files with 29 additions and 12 deletions
src/api/modules/workFlowService.ts
src/components/Form/index.vue
src/components/Table/index.vue
src/views/data_asset/qualityEvaluate.vue
src/views/data_asset/registerCatalogDetail.vue
src/views/data_asset/registerDetail.vue
src/views/data_asset/valueEvaluate.vue
--- a/src/api/modules/workFlowService.ts
View file @379422c
+++ b/src/api/modules/workFlowService.ts
View file @379422c
@@ -78,3 +78,9 @@ export const crossPlatformApprove = (params) => request({
  method: 'post',
  data: {}
 })
+/** 功能流程配置-获取是否需要审批 */
+export const isNeedApprove = (params) => request({
+  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/func-flow-config/is-need-approve?funcCode=${params.funcCode}`,
+  method: 'get',
+})
\ No newline at end of file
--- a/src/components/Form/index.vue
View file @379422c
+++ b/src/components/Form/index.vue
View file @379422c
@@ -1452,8 +1452,8 @@ const panelChange = (scope, row) => {
          :disabled="item.disabled || readonly" @change="(val) => cascaderChange(val, item)" />
        <template v-else-if="item.type && item.type.indexOf('date') > -1">
          <el-date-picker :class="[item.col, { is_block: item.block }]" v-if="item.type == 'date-picker'"
-            v-model="formInline[item.field]" type="daterange" range-separator="至" start-placeholder="开始日期" :format="item.format ?? ''"
+            v-model="formInline[item.field]" type="daterange" range-separator="至" start-placeholder="开始日期" :format="item.format ?? null"
-            :value-format="item.valueFormat ?? ''"
+            :value-format="item.valueFormat ?? null"
            end-placeholder="结束日期" :unlink-panels="item.unlink ?? false" :shortcuts="item.shortcuts ?? []"
            :default-value="item.defaultDate" :disabled="item.disabled ?? false" />
          <el-date-picker :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'date-year'"
--- a/src/components/Table/index.vue
View file @379422c
+++ b/src/components/Table/index.vue
View file @379422c
@@ -292,7 +292,7 @@ onMounted(() => {
          <span v-else>{{ '--' }}</span>
        </template>
        <template #default="scope" v-else-if="item.type == 'approveTagBtn'">
-          <div v-if="scope.row[item.field] !== undefined"  style="position: relative;">
+          <div v-if="item.enableNoApprove == true ? (scope.row.isApprove != 'N' && scope.row[item.field] !== undefined) : (scope.row[item.field] !== undefined)"  style="position: relative;">
            <el-tag :type="tagType(scope.row, item.field)">{{
            tagMethod(scope.row, item.field)
            }}</el-tag>
--- a/src/views/data_asset/qualityEvaluate.vue
View file @379422c
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @379422c
--- a/src/views/data_asset/registerCatalogDetail.vue
View file @379422c
+++ b/src/views/data_asset/registerCatalogDetail.vue
View file @379422c
@@ -114,7 +114,7 @@ const getDetailInfo = () => {
      if (res.code == proxy.$passCode) {
        const data = res.data || {};
        evaDetailInfo.value = data;
-        deploymentId.value = data.approveVO.camundaDeploymentId;
+        deploymentId.value = data.approveVO?.camundaDeploymentId;
        processInstanceId.value = data.approveVO?.camundaInstanceId;
      } else {
        proxy.$ElMessage.error(res.msg);
@@ -127,7 +127,7 @@ const getDetailInfo = () => {
        const data = res.data || {};
        costAssessDetail.value = data;
        evaDetailInfo.value = data;
-        deploymentId.value = data.approveVO.camundaDeploymentId;
+        deploymentId.value = data.approveVO?.camundaDeploymentId;
        processInstanceId.value = data.approveVO?.camundaInstanceId;
      } else {
        proxy.$ElMessage.error(res.msg);
@@ -209,6 +209,9 @@ const toolBtns: any = computed(() => {
    label: "关闭", value: "cancel", plain: true
  }];
  let approveVO = evaDetailInfo.value.approveVO || costAssessDetail.value.approveVO;
+  if (!approveVO) {
+    return btnsArr;
+  }
  let staffGuid = userData.staffGuid;
  if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
    btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
@@ -1171,7 +1174,7 @@ const handleClick = () => {
        </div>
      </ContentWrap>
-      <ContentWrap v-if="route.query.type == 'qualityEvaluate' || route.query.type == 'costAssess'" id="id-approveInfo"
+      <ContentWrap v-if="(route.query.type == 'qualityEvaluate' && evaDetailInfo.approveVO && evaDetailInfo.isApprove !='N') || (route.query.type == 'costAssess' && costAssessDetail.approveVO && costAssessDetail.isApprove !='N')" id="id-approveInfo"
        title="审批信息" description="" style="margin: 16px 16px 16px">
        <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
        </ApprovalProcess>
--- a/src/views/data_asset/registerDetail.vue
View file @379422c
+++ b/src/views/data_asset/registerDetail.vue
View file @379422c
@@ -78,7 +78,7 @@ const getDetailInfo = () => {
        const data = res.data || {};
        evaDetailInfo.value = data;
        detailInfo.value = data;
-        deploymentId.value = data.approveVO.camundaDeploymentId;
+        deploymentId.value = data.approveVO?.camundaDeploymentId;
        processInstanceId.value = data.approveVO?.camundaInstanceId;
        //需要显示质量评价信息
        if (data.qualityScore != null) {
@@ -90,6 +90,9 @@ const getDetailInfo = () => {
            tabsInfo.value.tabs.splice(3, 1);
          }
        }
+        if (evaDetailInfo.value.isApprove == 'N') {
+          tabsInfo.value.tabs.pop();
+        }
        if (fullPath === route.fullPath) {
          document.title = `详情-${data.daName}`;
        }
@@ -124,7 +127,7 @@ const getDetailInfo = () => {
        const data = res.data || {};
        costAssessDetailInfo.value = data;
        detailInfo.value = data;
-        deploymentId.value = data.approveVO.camundaDeploymentId;
+        deploymentId.value = data.approveVO?.camundaDeploymentId;
        processInstanceId.value = data.approveVO?.camundaInstanceId;
        // 需要显示价值评估信息
        if (data.assessmentMoney != null) {
@@ -136,7 +139,9 @@ const getDetailInfo = () => {
            tabsInfo.value.tabs.splice(3, 1);
          }
        }
+        if (costAssessDetailInfo.value.isApprove == 'N') {
+          tabsInfo.value.tabs.pop();
+        }
        if (data.qualityScore) {
          // 确保"质量评价"标签存在于tabs中，并插入到"价值评估"前面
          const qualityTabIndex = tabsInfo.value.tabs.findIndex(tab => tab.name === "qualityEvaluate");
@@ -285,8 +290,8 @@ const getDetailInfo = () => {
        let { approveVO } = data;
        detailInfo.value = data;
        assetDetailInfo.value = data;
-        deploymentId.value = approveVO.camundaDeploymentId;
+        deploymentId.value = approveVO?.camundaDeploymentId;
-        processInstanceId.value = approveVO.camundaInstanceId;
+        processInstanceId.value = approveVO?.camundaInstanceId;
        isTextTruncated();
      } else {
        ElMessage.error(res.msg);
@@ -446,6 +451,9 @@ const toolBtns: any = computed(() => {
    return btnsArr;
  }
  let approveVO = detailInfo.value.approveVO;
+  if (!approveVO) {
+    return btnsArr;
+  }
  let staffGuid = userData.staffGuid;
  if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
    btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
@@ -1748,7 +1756,7 @@ const passCommonDialogBtnClick = (btn, info) => {
          </div>
        </ContentWrap>
        <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
-          :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v" v-if="route.query.type != 'certificate'">
+          :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v" v-if="tabsInfo.tabs.find(t => t.name == 'approveInfo') && route.query.type != 'certificate'">
          <!-- <Table :tableInfo="approveTableInfo" /> -->
          <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
            :processInstanceId="processInstanceId">
--- a/src/views/data_asset/valueEvaluate.vue
View file @379422c
+++ b/src/views/data_asset/valueEvaluate.vue
View file @379422c