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

lihua
Showing 11 changed files with 221 additions and 21 deletions
src/api/modules/dataAsset.ts
src/api/modules/workFlowService.ts
src/components/Drawer/index.vue
src/components/Form/index.vue
src/components/Tools/table_search.vue
src/router/modules/dataAssetRegistry.ts
src/views/data_asset/contractProgress.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/dataAsset.ts
View file @423e031
+++ b/src/api/modules/dataAsset.ts
View file @423e031
@@ -444,6 +444,41 @@ export const getRegisterExchangeList = () => request({
  method: 'get'
 })
+/** 获取合同列表 */
+export const getContractList = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-contract/page-list`,
+  method: 'post',
+  data: params
+})
+/** 新增合同 */
+export const saveDamContract = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-contract/save`,
+  method: 'post',
+  data: params
+}) 
+/** 更新合同 */
+export const updateDamContract = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-contract/update`,
+  method: 'put',
+  data: params
+}) 
+/** 删除合同 */
+export const delDamContract =  (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-contract/delete`,
+  method: 'delete',
+  data: params
+}) 
+/** 获取会员列表 */
+export const getTenantList = (params) => request({
+  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/singlePage`,
+  method: 'post',
+  data: params
+})
 // API详情
 /** 查询域名和文根 */
 /** api类型,有表单类型,自定义sql. */
--- a/src/api/modules/workFlowService.ts
View file @423e031
+++ b/src/api/modules/workFlowService.ts
View file @423e031
@@ -78,3 +78,8 @@ 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',
+})
--- a/src/components/Drawer/index.vue
View file @423e031
+++ b/src/components/Drawer/index.vue
View file @423e031
@@ -106,7 +106,7 @@ const getDrawerConRef = (refName) => {
  }
  //  const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
  if (refName == 'drawerFormRef') {
-    const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
+    const drawerForm = drawerFormRef.value?.[0] || drawerFormRef.value;
    return drawerForm
  }
 }
@@ -153,11 +153,13 @@ const tableBtnClick = (scope, btn) => {
 const submitForm = async (formEl: FormInstance | undefined, btn) => {
  if (!formEl) return;
  await formEl.validate((valid, fields) => {
-    if (valid) {
    const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
+    if (valid) {
      const formInfo = drawerForm.formInline;
      emits("drawerBtnClick", btn, formInfo);
    } else {
+      var obj = fields && Object.keys(fields);
+      obj?.[0] && formEl?.scrollToField(obj?.[0])
      console.log("error submit!", fields);
    }
  });
--- a/src/components/Form/index.vue
View file @423e031
+++ b/src/components/Form/index.vue
View file @423e031
@@ -1452,7 +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="开始日期"
+            v-model="formInline[item.field]" type="daterange" range-separator="至" start-placeholder="开始日期" :format="item.format ?? null"
+            :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/Tools/table_search.vue
View file @423e031
+++ b/src/components/Tools/table_search.vue
View file @423e031
@@ -182,6 +182,10 @@ onMounted(() => {
          <el-date-picker v-model="formInline[item.field]" type="datetimerange" start-placeholder="开始时间"
            end-placeholder="结束时间" />
        </template>
+        <template v-else-if="item.type == 'date-range'">
+          <el-date-picker v-model="formInline[item.field]" type="daterange" :start-placeholder="item.startPlaceholder ?? '开始日期'" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            :end-placeholder="item.endPlaceholder ?? '结束日期'" />
+        </template>
        <template v-else-if="item.type == 'radio-button'">
          <el-radio-group v-model="formInline[item.field]" @change="radioGroupChange">
            <el-radio-button v-for="opts in item.options" :label="opts.label" />
--- a/src/router/modules/dataAssetRegistry.ts
View file @423e031
+++ b/src/router/modules/dataAssetRegistry.ts
View file @423e031
@@ -217,6 +217,27 @@ const routes: RouteRecordRaw[] = [
        },
      },
    ]
+  },
+  {
+    path: '/data-asset-register/contract-progress',
+    component: Layout,
+    meta: {
+      title: '合同进度一览',
+      icon: 'ep:grid',
+    },
+    children: [
+      {
+        path: '',
+        name: 'contractProgress',
+        component: () => import('@/views/data_asset/contractProgress.vue'),
+        meta: {
+          title: '合同进度一览',
+          sidebar: false,
+          cache: true,
+          breadcrumb: false,
+        },
+      },
+    ]
  }
 ]
 export default routes
--- a/src/views/data_asset/contractProgress.vue 0 → 100644
View file @423e031
+++ b/src/views/data_asset/contractProgress.vue 0 → 100644
View file @423e031
--- a/src/views/data_asset/qualityEvaluate.vue
View file @423e031
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @423e031
@@ -15,13 +15,14 @@ import {
  qualityAllow,
  deleteQuality,
  updatQuality,
+  getTenantList
 } from "@/api/modules/dataAsset";
 import useUserStore from "@/store/modules/user";
 import useDataAssetStore from "@/store/modules/dataAsset";
 import {
  getStaffDetailInfo
 } from "@/api/modules/queryService";
-import { rejectFlowData, revokeFlowData, getCamundaDeploymentId, getProcessNodesPromise, isMyFirstNode, passFlowData } from "@/api/modules/workFlowService";
+import { isNeedApprove, rejectFlowData, revokeFlowData, getCamundaDeploymentId, getProcessNodesPromise, isMyFirstNode, passFlowData } from "@/api/modules/workFlowService";
 const assetStore = useDataAssetStore();
@@ -51,7 +52,7 @@ const tableFields = ref([
  { label: "登记时间", field: "registerTime", width: 120 },
  //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
  { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
-  { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
+  { label: "审批状态", field: "approveVO", type: "approveTag", enableNoApprove: true, width: 96, align: 'center' },
  {
    label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
      label: '查看', visible: (scope) => {
@@ -66,7 +67,21 @@ const tableFields = ref([
 const deploymentId = ref('');
-onMounted(() => {
+const tenantList: any = ref([]);
+onBeforeMount(() => {
+  getTenantList({
+    bizState: 'Y',
+    pageSize: -1
+  }).then((res: any) => {
+    tenantList.value = [];
+    if (res.code == proxy.$passCode) {
+      tenantList.value = res.data?.records || [];
+      formItems.value[1].options = tenantList.value;
+    } else {
+      proxy.$ElMessage.error(res.msg);
+    }
+  })
 });
 onActivated(() => {
@@ -144,17 +159,31 @@ const getTableData = () => {
  })
 }
+let needApprovePromise = ref();
+const needApprove = ref(true);
 const handleCreate = () => {
  if (!assetListData.value.length) {
    ElMessage.warning('当前没有可发起质量评价的资产！');
    return;
  }
+  if (needApprovePromise.value) {
+    return;
+  }
+  needApprovePromise.value = isNeedApprove({ funcCode: 'ZCZLPJ' }).then((res1: any) => {
+    needApprovePromise.value = null;
+    if (res1.code == proxy.$passCode) {
+      needApprove.value = res1.data;
      formItems.value[0].visible = true;
      formItems.value[0].default = '';
-  formItems.value[1].visible = true;
+      formItems.value[1].visible = !needApprove.value;
-  formItems.value[1].default = [];
+      formItems.value[1].default = '';
+      formItems.value[2].visible = true;
+      formItems.value[2].default = [];
      dialogInfo.value.visible = true;
      dialogInfo.value.type = '';
+      if (needApprove.value) {
        getCamundaDeploymentId('10018', userData.tenantGuid, userData.staffGuid).then((res: any) => {
          if (res.code == proxy.$passCode) {
            deploymentId.value = res.data;
@@ -163,6 +192,11 @@ const handleCreate = () => {
            proxy.$ElMessage.error(res.msg);
          }
        })
+      }
+    } else {
+      proxy.$ElMessage.error(res1.msg);
+    }
+  })
 }
 const page = ref({
@@ -203,7 +237,13 @@ const tableInfo = ref({
 const getTableBtns = (row) => {
  let btnsArr: any[] = [];
-  const approveVO = row.approveVO || {};
+  const approveVO = row.approveVO;
+  if (!approveVO && row.isApprove == 'N') {
+    btnsArr.push({ label: "编辑", value: "redit" });
+    btnsArr.push({ label: "删除", value: "del" });
+    btnsArr.push({ label: "详情", value: "detail" });
+    return btnsArr;
+  }
  const approveState = row.approveVO.approveState || null;
  const approveStaffGuids = approveVO.approveStaffGuids || [];
  const staffGuid = approveVO.staffGuid || '';
@@ -254,11 +294,21 @@ const tableBtnClick = (scope, btn) => {
  currTableData.value = row;
  console.log(row, '-------');
  if (type == "redit") {
+    isNeedApprove({ funcCode: 'ZCZLPJ' }).then((res1: any) => {
+      if (res1.code == proxy.$passCode) {
+        needApprove.value = res1.data;
+        formItems.value[0].visible = false;
+        formItems.value[0].default = row.damGuid;
+        formItems.value[1].visible = !needApprove.value;
+        formItems.value[1].default = row.evaluationAgencyGuid;
+        formItems.value[2].default = row.qualityEvaluationFile || [];
+        dialogInfo.value.contents[0].formInfo.items = formItems.value;
        dialogInfo.value.visible = true;
        dialogInfo.value.type = 'reSubmit';
-    formItems.value[0].visible = false;
+      } else {
-    formItems.value[0].default = row.registerGuid;
+        proxy.$ElMessage.error(res1.msg);
-    formItems.value[1].default = row.qualityEvaluationFile || [];
+      }
+    })
  } else if (type == "del") {
    delTableOpen("此操作将永久删除该资产质量评价，是否继续?", "warning");
  } else if (type === 'reject') {
@@ -390,6 +440,20 @@ const formItems = ref([{
  visible: true,
  required: true
 }, {
+  label: '评估机构',
+  type: 'select',
+  placeholder: '请选择',
+  field: 'evaluationAgencyGuid',
+  default: '',
+  block: true,
+  options: tenantList.value,
+  props: {
+    value: 'guid',
+    label: 'tenantName'
+  },
+  visible: false,
+  required: true
+}, {
  label: '附件上传',
  tip: '支持格式：xls .xlsx .doc .docx .rar .zip',
  type: 'upload-file',
@@ -456,6 +520,62 @@ const dialogInfo = ref({
 /** 编辑质量评价发起资产申请按钮处理。 */
 const dialogBtnClick = (btn, info) => {
  if (btn.value == 'submit') {
+    if (!needApprove.value) {
+      // 不需要走流程审批的提交
+      dialogInfo.value.footer.btns[1].loading = true;
+      if (dialogInfo.value.type == 'reSubmit') {
+        updatQuality({
+          guid: currTableData.value.guid,
+          tenantGuid: userData.tenantGuid,
+          damGuid: currTableData.value.damGuid,
+          daName: currTableData.value.daName,
+          immediateApprove: true,
+          evaluationAgencyGuid: info.evaluationAgencyGuid,
+          qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
+            return {
+              name: file.name,
+              url: file.url
+            }
+          }) || []
+        }).then((res: any) => {
+          dialogInfo.value.footer.btns[1].loading = false;
+          if (res?.code == proxy.$passCode) {
+            ElMessage.success('该资产质量评价重新提交成功');
+            dialogInfo.value.visible = false;
+            page.value.curr = 1;
+            getTableData();
+          } else {
+            ElMessage.error(res.msg);
+          }
+        })
+      } else {
+        let daInfo = assetListData.value.find(a => a.guid == info.damGuid);
+        saveQuality({
+          tenantGuid: userData.tenantGuid,
+          damGuid: info.damGuid,
+          daName: daInfo.damName,
+          immediateApprove: true,
+          evaluationAgencyGuid: info.evaluationAgencyGuid,
+          qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
+            return {
+              name: file.name,
+              url: file.url
+            }
+          }) || []
+        }).then((res: any) => {
+          dialogInfo.value.footer.btns[1].loading = false;
+          if (res?.code == proxy.$passCode) {
+            ElMessage.success('质量评价发起成功');
+            dialogInfo.value.visible = false;
+            page.value.curr = 1;
+            getTableData();
+          } else {
+            ElMessage.error(res.msg);
+          }
+        })
+      }
+    } else {
+      // 需要走流程的审批功能。
      dialogInfo.value.footer.btns[1].loading = true;
      let submitFunc = () => {
        getProcessNodesPromise({
@@ -540,6 +660,7 @@ const dialogBtnClick = (btn, info) => {
          }
        })
      }
+    }
  } else if (btn.value == 'cancel') {
    dialogInfo.value.visible = false;
  }
--- a/src/views/data_asset/registerCatalogDetail.vue
View file @423e031
+++ b/src/views/data_asset/registerCatalogDetail.vue
View file @423e031
@@ -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 @423e031
+++ b/src/views/data_asset/registerDetail.vue
View file @423e031
@@ -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 }]);
@@ -1749,7 +1757,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 @423e031
+++ b/src/views/data_asset/valueEvaluate.vue
View file @423e031