Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

lxs
Showing 6 changed files with 73 additions and 67 deletions
pnpm-lock.yaml
public/files/数据价值评估.docx
public/files/数据质量评价.docx
src/api/modules/dataAsset.ts
src/components/Form/index.vue
src/views/data_asset/qualityEvaluate.vue
--- a/pnpm-lock.yaml
View file @70ab560
+++ b/pnpm-lock.yaml
View file @70ab560
--- a/public/files/数据价值评估.docx 0 → 100644
View file @70ab560
+++ b/public/files/数据价值评估.docx 0 → 100644
View file @70ab560
--- a/public/files/数据质量评价.docx 0 → 100644
View file @70ab560
+++ b/public/files/数据质量评价.docx 0 → 100644
View file @70ab560
--- a/src/api/modules/dataAsset.ts
View file @70ab560
+++ b/src/api/modules/dataAsset.ts
View file @70ab560
@@ -108,7 +108,7 @@ export const updatQuality = (params) => request({
 /** 获取可以发起资产质量评价的选项列表。 */
 /** type: 1 质量评价；2 资产评估 */
 export const getRegisteredList = (type) => request({
-  url: `${import.meta.env.VITE_API_NEW_PORTAL}/register-base/get-valid-list?type=${type}`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/get-valid-list?type=${type}`,
  method: 'get'
 })
--- a/src/components/Form/index.vue
View file @70ab560
+++ b/src/components/Form/index.vue
View file @70ab560
@@ -400,7 +400,8 @@ const downloadTemplate = async (url) => {
 }
 const onUploadFileDownload = async (file, item) => {
-  let url = file.url;
+  let f = formInline.value[item.field].find(i => i.name == file.name);
+  let url = f.url;
  const refSignInfo: any = await getDownFileSignByUrl(parseAndDecodeUrl(url).fileName);
  if (!refSignInfo?.data) {
    refSignInfo?.msg && ElMessage.error(refSignInfo?.msg);
@@ -493,6 +494,7 @@ const uploadFile = (file, item) => {
        actualSignedRequestHeaders: res.data.actualSignedRequestHeaders
      }).then(() => {
        if (res.code == '00000') {
+          file.file.url = res.data.signedUrl;
          let fileItem = {
            name: file.file.name,
            url: res.data.signedUrl,
@@ -1279,7 +1281,7 @@ const panelChange = (scope, row) => {
                    <template #trigger>
                      <el-button :disabled="child.disabled" :icon="Upload" class="mr8">上传文件</el-button>
                    </template>
-                    <el-button :icon="Download" v-if="child.templateUrl" @click="downloadTemplate(child.templateUrl)">
+                    <el-button :icon="Download" v-if="child.templateUrl" @click="(child.templateUrl == 'auto' && child.templateClick) ? child.templateClick() : downloadTemplate(child.templateUrl)">
                      下载模板
                    </el-button>
                    <template #tip>
@@ -1360,7 +1362,7 @@ const panelChange = (scope, row) => {
              <template #trigger>
                <el-button :disabled="item.disabled" :icon="Upload" class="mr8">上传文件</el-button>
              </template>
-              <el-button :icon="Download" v-if="item.templateUrl" @click="downloadTemplate(item.templateUrl)">
+              <el-button :icon="Download" v-if="item.templateUrl" @click="(item.templateUrl == 'auto' && item.templateClick) ? item.templateClick() : downloadTemplate(item.templateUrl)">
                下载模板
              </el-button>
              <template #tip>
--- a/src/views/data_asset/qualityEvaluate.vue
View file @70ab560
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @70ab560
@@ -18,10 +18,8 @@ import {
  updatQuality
 } from "@/api/modules/dataAsset";
 import useUserStore from "@/store/modules/user";
-import {
-  getTenantAttach
-} from "@/api/modules/queryService";
 import useDataAssetStore from "@/store/modules/dataAsset";
+import { passFlowData, rejectFlowData, revokeFlowData, getCamundaDeploymentId, getProcessNodesPromise } from "@/api/modules/workFlowService";
 const assetStore = useDataAssetStore();
@@ -31,36 +29,26 @@ const { proxy } = getCurrentInstance() as any;
 const userStore = useUserStore();
 const userData = JSON.parse(userStore.userData)
-/** 是否时企业端。不是企业端，则是服务端，需要显示企业名称。 */
-const isCompanyPlatform = ref(userData.tenantType == 1);
 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据质量评价中已通过、审批中的资产。 */
 const assetListData: any = ref([]);
-/** 会员附件模板 */
-const attachDataInfo: any = ref({});
 const tableFields = ref([
  { label: "序号", type: "index", width: 56, align: "center" },
-  { label: "资产名称", field: "daName", width: 160, align: "left" },
+  { label: "资产名称", field: "daName", width: 160, align: "left", type: 'text_btn', value: 'productDetail', columClass: 'text_btn' },
  { label: "登记时间", field: "registerTime", width: 120 },
  //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
  { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
  { label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' },
 ]);
+const deploymentId = ref('');
 onBeforeMount(() => {
-  if (isCompanyPlatform.value) {
+  getCamundaDeploymentId('10018').then((res: any) => {
-    tableInfo.value.fields = tableFields.value;
+    if (res.code == proxy.$passCode) {
-  } else {
+      deploymentId.value = res.data;
-    tableFields.value.splice(3, 0, { label: "企业名称", field: "tenantName", width: 250, align: "left" })
-    tableInfo.value.fields = tableFields.value;
-  }
-  getTenantAttach(userData.tenantGuid).then((res: any) => {
-    if (res?.code == proxy.$passCode) {
-      attachDataInfo.value = res.data || {};
-      formItems.value[1].templateUrl = attachDataInfo.value.quality_evaluation_file;
    } else {
-      ElMessage.error(res.msg);
+      proxy.$ElMessage.error(res.msg);
    }
  })
 });
@@ -240,29 +228,23 @@ const tableBtnClick = (scope, btn) => {
    }
    passFormItems.value[2].placeholder = `本次评估数据资产总体质量得分为**分\n准确性：\n一致性：\n可访问性：\n规范性：\n完整性：`;
  } else if (type === 'revoke') { // 撤销，状态为审批中时可以撤销。
-    ElMessageBox.confirm('确定撤销该资产质量评价吗？', "提示", {
+    ElMessageBox.confirm(`撤销后，该流程将不再进行审核，确定这样操作吗？`, "提示", {
      confirmButtonText: "确定",
      cancelButtonText: "取消",
      type: 'warning',
    }).then(() => {
-      let params = {
+      revokeFlowData({
-        bizGuid: row.guid,
+        guid: row.approveVO.approveGuid,
-        funcCode: row.funcCode
+        flowType: row.approveVO.flowType,
-      }
+        approveStaffGuid: userData.staffGuid,
-      tableInfo.value.loading = true;
+      }).then((res: any) => {
-      registerApproveCancel(params).then((res: any) => {
+        if (res.code == '00000') {
-        tableInfo.value.loading = false;
+          ElMessage.success('撤销成功！')
-        if (res?.code == proxy.$passCode) {
-          if (res.data) {
-            ElMessage.success('该资产质量评价流程撤销成功！');
          getTableData();
        } else {
-            ElMessage.error('该资产质量评价流程撤销失败！');
+          ElMessage.error(res.msg)
        }
-        } else {
+      })
-          ElMessage.error(res.msg);
-        }
-      });
    }).catch(() => {
      ElMessage({
        type: 'info',
@@ -270,10 +252,22 @@ const tableBtnClick = (scope, btn) => {
      });
    });
  } else if (type === 'path_detail') { // 详情
+    if (row.registerApproveState == 'Y') {
      router.push({
        name: 'registerDetail',
        query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', daTenantGuid: row.tenantGuid }
      });
+    } else {
+      router.push({
+        name: 'registerCatalogDetail',
+        query: { guid: row.damGuid, type: 'asset' }
+      });
+    }
+  } else if (type == 'productDetail') {
+    router.push({
+      name: 'registerCatalogDetail',
+      query: { guid: row.damGuid, type: 'asset' }
+    });
  }
 };
@@ -311,6 +305,8 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => {
 const tablePageChange = (info) => {
  page.value.curr = Number(info.curr);
  page.value.limit = Number(info.limit);
+  tableInfo.value.page.curr = page.value.curr;
+  tableInfo.value.page.limit = page.value.limit;
  getTableData();
 };
@@ -318,13 +314,13 @@ const formItems = ref([{
  label: '资产名称',
  type: 'select',
  placeholder: '请选择',
-  field: 'registerGuid',
+  field: 'damGuid',
  default: '',
  block: true,
  options: assetListData.value,
  props: {
    value: 'guid',
-    label: 'daName'
+    label: 'damName'
  },
  visible: true,
  required: true
@@ -333,7 +329,15 @@ const formItems = ref([{
  tip: '支持格式：xls .xlsx .doc .docx .rar .zip',
  type: 'upload-file',
  accept: '.xls, .xlsx, .doc, .docx, .rar, .zip',
-  templateUrl: null,
+  templateUrl: 'auto',
+  templateClick: () => {
+    const link = document.createElement('a');
+    link.href = "/files/数据质量评价.docx";
+    link.download = '数据质量评价.docx';
+    document.body.appendChild(link);
+    link.click();
+    link.remove();
+  },
  required: true,
  block: true,
  visible: true,
@@ -342,8 +346,8 @@ const formItems = ref([{
 }]);
 const formRules = ref({
-  registerGuid: [
+  damGuid: [
-    { required: true, trigger: 'change', message: "请填写资产名称" }
+    { required: true, trigger: 'change', message: "请选择资产名称" }
  ],
  qualityEvaluationFile: [{
    validator: (rule: any, value: any, callback: any) => {
@@ -378,31 +382,30 @@ const dialogInfo = ref({
  footer: {
    btns: [
      { type: "default", label: "取消", value: "cancel" },
-      { type: "primary", label: "确定", value: "submit" },
+      { type: "primary", label: "确定", value: "submit", loading: false },
    ],
  },
 });
-const savePromise: any = ref(null);
-const reSubmitPromise: any = ref(null);
 /** 编辑质量评价发起资产申请按钮处理。 */
 const dialogBtnClick = (btn, info) => {
  if (btn.value == 'submit') {
+    dialogInfo.value.footer.btns[1].loading = true;
+    getProcessNodesPromise({
+      deploymentId: deploymentId.value,
+      processInstanceId: null,
+    }).then((res: any) => {
+      if (res?.code == proxy.$passCode) {
        if (dialogInfo.value.type == 'reSubmit') {
-      if (reSubmitPromise.value) {
+          updatQuality({
-        return;
-      }
-      reSubmitPromise.value = updatQuality({
            guid: currTableData.value.guid,
            tenantGuid: userData.tenantGuid,
-        registerGuid: currTableData.value.registerGuid,
+            damGuid: currTableData.value.damGuid,
            daName: currTableData.value.daName,
-        registerTime: currTableData.value.registerTime,
+            immediateApprove: true,
-        issuingEntityGuid: currTableData.value.issuingEntityGuid,
+            issuingEntityGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
            qualityEvaluationFile: info.qualityEvaluationFile?.map(f => f.url) || []
          }).then((res: any) => {
-        reSubmitPromise.value = null;
            if (res?.code == proxy.$passCode) {
              ElMessage.success('该资产质量评价重新提交成功');
              dialogInfo.value.visible = false;
@@ -413,19 +416,16 @@ const dialogBtnClick = (btn, info) => {
            }
          })
        } else {
-      if (savePromise.value) {
+          let daInfo = assetListData.value.find(a => a.guid == info.damGuid);
-        return;
+          saveQuality({
-      }
-      let daInfo = assetListData.value.find(a => a.guid == info.registerGuid);
-      savePromise.value = saveQuality({
            tenantGuid: userData.tenantGuid,
-        registerGuid: info.registerGuid,
+            damGuid: info.damGuid,
-        daName: daInfo.daName,
+            daName: daInfo.damName,
-        registerTime: daInfo.registerTime,
+            immediateApprove: true,
-        issuingEntityGuid: daInfo.exchangeGuid,
+            // registerTime: daInfo.registerTime,
+            issuingEntityGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
            qualityEvaluationFile: info.qualityEvaluationFile?.map(f => f.url) || []
          }).then((res: any) => {
-        savePromise.value = null;
            if (res?.code == proxy.$passCode) {
              ElMessage.success('质量评价发起成功');
              dialogInfo.value.visible = false;
@@ -436,6 +436,10 @@ const dialogBtnClick = (btn, info) => {
            }
          })
        }
+      } else {
+        ElMessage.error(res.msg);
+      }
+    })
  } else if (btn.value == 'cancel') {
    dialogInfo.value.visible = false;
  }