fiix

xukangle
Showing 6 changed files with 338 additions and 288 deletions
src/api/modules/dataAsset.ts
src/components/Dialog/index.vue
src/components/Form/index.vue
src/views/data_asset/qualityEvaluate.vue
src/views/data_asset/valueEvaluate.vue
src/views/security_menu/index.vue
--- a/src/api/modules/dataAsset.ts
View file @0e184ae
+++ b/src/api/modules/dataAsset.ts
View file @0e184ae
@@ -164,8 +164,14 @@ export const deleteCostAssess = (params) => request({
 });
 /** 通过价值评估审批 */
+// export const costAssessAllow = (params) => request({
+//   url: `${import.meta.env.VITE_API_NEW_PORTAL}/cost-assessment/allow`,
+//   method: 'post',
+//   data: params
+// });
+/** 质量评价审批通过 */
 export const costAssessAllow = (params) => request({
-  url: `${import.meta.env.VITE_API_NEW_PORTAL}/cost-assessment/allow`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/cost-assessment/submit-flow`,
  method: 'post',
  data: params
 });
--- a/src/components/Dialog/index.vue
View file @0e184ae
+++ b/src/components/Dialog/index.vue
View file @0e184ae
@@ -72,7 +72,7 @@ const textareVal = ref("");
 const headerSearchInputValue = ref("");
 const dialogVisible = computed(() => {
-  return props.dialogInfo.visible;
+  return props.dialogInfo?.visible;
 });
 const showClose = computed(() => {
  return props.dialogInfo.showClose ?? true;
@@ -99,10 +99,10 @@ const dialogHeight = computed(() => {
  return props.dialogInfo.height ?? "auto";
 });
 const dialogTitle = computed(() => {
-  return props.dialogInfo.header.title;
+  return props.dialogInfo.header?.title;
 });
 const headerSearchInputVisible = computed(() => {
-  return props.dialogInfo.header.headerSearchInputVisible ?? false;
+  return props.dialogInfo.header?.headerSearchInputVisible ?? false;
 });
 const headerSearchInputPlaceholder = computed(() => {
  return (
@@ -579,7 +579,7 @@ defineExpose({
                    <span>{{ bar.label }}</span>
                  </span>
                  <template v-else>
-                    <el-popover v-if="bar.popover" :visible="bar.popover.visible" :title="bar.popover.title"
+                    <el-popover v-if="bar.popover" :visible="bar.popover?.visible" :title="bar.popover.title"
                      :content="bar.popover.content" placement="bottom-start" :width="bar.popover.width ?? 200"
                      trigger="click">
                      <template #reference>
@@ -692,7 +692,7 @@ defineExpose({
        </div>
      </div>
    </div>
-    <template #footer v-if="footer.visible ?? true">
+    <template #footer v-if="footer?.visible ?? true">
      <div class="dialog-footer" :class="{ between: footer.textBtns }">
        <div v-if="footer.textBtns">
          <span class="text_btn" v-for="btn in footer.textBtns" :disabled="btn.disabled ?? false"
@@ -700,7 +700,7 @@ defineExpose({
        </div>
        <div>
          <template v-for="btn in footer.btns">
-            <el-button v-if="btn.visible ?? true" :type="btn.type" :disabled="btn.disabled ?? false"
+            <el-button v-if="btn?.visible ?? true" :type="btn.type" :disabled="btn.disabled ?? false"
              :loading="btn.loading ?? btnLoading" @click="btnClick(btn, null)" v-preReClick>{{ btn.label }}</el-button>
          </template>
        </div>
--- a/src/components/Form/index.vue
View file @0e184ae
+++ b/src/components/Form/index.vue
View file @0e184ae
@@ -197,6 +197,19 @@ const inputChange = (val, row) => {
      formInline.value[row.field] = val = parseFloat(val || 0).toFixed(2);
    }
  }
+  if (row.inputType == 'scoreNumber' && parseFloat(val) > 100) {
+    // 先去除非数字和小数点字符
+    val = val.replace(/[^\d.]/g, "");
+    // 限制最多保留两位小数
+    val = val.replace(/\.{2,}/g, ".");
+    val = val.replace(/^(\d+)\.(\d{2}).*$/, "$1.$2");
+    let num = parseFloat(val);
+    if (num > 100) {
+      num = 100;  // 超过100时将其设置为100
+      val = num.toFixed(2);  // 保证显示为两位小数
+    }
+    formInline.value[row.field] = val;
+  }
  // 新增的 inputType 处理逻辑：integerWithComma
  if (row.inputType == "integerWithComma") {
    val = val.replace(/[^\d]/g, ""); // 移除非数字字符
@@ -604,7 +617,7 @@ const panelChange = (scope, row) => {
            required_mark: item.required,
          }">{{
            item.label
-            }}</span>
+          }}</span>
        </span>
        <div class="header_title_tooltip" style="width: auto" v-if="item.tooltip">
@@ -697,7 +710,7 @@ const panelChange = (scope, row) => {
              <div class="item_panel" :class="{ is_block: panel.block }" v-for="panel in item.children">
                <label :class="{ required_mark: panel.required }">{{
                  panel.label
-                  }}</label>
+                }}</label>
                <el-checkbox v-if="panel.type == 'checkbox'" v-model="formInline[panel.field]"
                  :disabled="panel.disabled || readonly" :true-label="panel.trueValue ?? true"
                  :false-label="panel.falseValue ?? false">{{ panel.placeholder }}</el-checkbox>
@@ -780,7 +793,7 @@ const panelChange = (scope, row) => {
                <span class="item-label" slot="label">
                  <span v-if="child.label" :class="{ required_mark: child.required }">{{
                    child.label
-                    }}</span>
+                  }}</span>
                </span>
                <el-select v-if="child.type == 'select'" v-model="formInline[child.field]"
                  :placeholder="child.placeholder" :disabled="child.disabled || readonly" :filterable="child.filterable"
@@ -839,7 +852,7 @@ const panelChange = (scope, row) => {
                <span class="item-label" slot="label">
                  <span :class="{ required_mark: child.required }">{{
                    child.label
-                    }}</span>
+                  }}</span>
                </span>
                <el-cascader v-if="child.type == 'cascader'" v-model="formInline[child.field]" :props="child.props"
                  :options="child.options" :show-all-levels="child.showAllLevels ?? true"
@@ -882,7 +895,7 @@ const panelChange = (scope, row) => {
            <div class="item_panel" v-for="child in item.children">
              <label :class="{ required_mark: child.required }">{{
                child.label
-                }}</label>
+              }}</label>
              <div class="tool_item">
                <el-select v-model="formInline[child.field]" :class="{ is_block: child.block }"
                  :placeholder="child.placeholder" :multiple="child.multiple" :collapse-tags="child.collapse"
@@ -957,7 +970,7 @@ const panelChange = (scope, row) => {
                <span class="item-label" slot="label">
                  <span :class="{ required_mark: child.required }">{{
                    child.label
-                    }}</span>
+                  }}</span>
                </span>
                <el-input :class="[child.col, { is_block: child.block }]" v-model="formInline[child.field]"
                  :rows="child.rows ?? 4" type="textarea" :placeholder="child.placeholder"
@@ -981,8 +994,7 @@ const panelChange = (scope, row) => {
              </div>
            </div>
            <div v-if="item.example" class="panel_header-expample">{{ item.example }}</div>
-            <el-input ref="exampleTextareaRef" :id="item.field"
+            <el-input ref="exampleTextareaRef" :id="item.field" :class="[item.col, { is_block: item.block }]"
-              :class="[item.col, { is_block: item.block }]"
              v-model="formInline[item.field]" :rows="item.rows ?? 4" type="textarea" :placeholder="item.placeholder"
              :disabled="item.disabled || readonly" :readonly="item.readonly" resize="none"
              :maxlength="item.maxlength ?? 500" show-word-limit @focus="(event) => inputFocus(event, item)"
@@ -1014,7 +1026,7 @@ const panelChange = (scope, row) => {
                  <span class="item-label" slot="label">
                    <span :class="{ required_mark: child.required }">{{
                      child.label
-                      }}</span>
+                    }}</span>
                  </span>
                  <div class="input_group" :class="[child.col]" v-if="child.type == 'input-group'">
                    <template v-for="(group, c) in child.children">
@@ -1023,7 +1035,7 @@ const panelChange = (scope, row) => {
                        <span class="item-label" slot="label">
                          <span :class="{ required_mark: group.required }">{{
                            group.label
-                            }}</span>
+                          }}</span>
                        </span>
                        <el-select v-if="group.type == 'select'" v-model="formInline[group.field]"
                          :placeholder="group.placeholder" :clearable="group.clearable"
@@ -1164,7 +1176,7 @@ const panelChange = (scope, row) => {
                <span class="item-label" slot="label">
                  <span :class="{ required_mark: child.required }">{{
                    child.label
-                    }}</span>
+                  }}</span>
                </span>
                <el-select v-if="child.type == 'select'" v-model="formInline[child.field]"
                  :placeholder="child.placeholder" :clearable="child.clearable" :disabled="child.disabled || readonly"
@@ -1215,7 +1227,7 @@ const panelChange = (scope, row) => {
                <span class="item-label" slot="label" :class="[child.col]">
                  <span :class="{ required_mark: child.required }">{{
                    child.label
-                    }}</span>
+                  }}</span>
                </span>
                <div class="input_popover_panel" v-if="child.type == 'input-popover-panel'">
                  <el-popover placement="bottom-start" width="100%" trigger="click" :teleported="false">
@@ -1269,7 +1281,7 @@ const panelChange = (scope, row) => {
                <span class="item-label" slot="label">
                  <span :class="{ required_mark: child.required }">{{
                    child.label
-                    }}</span>
+                  }}</span>
                </span>
                <template v-if="child.type == 'upload-image'">
                  <el-upload :class="[child.col, 'avatar-uploader', { is_block: child.block }]" action="#"
--- a/src/views/data_asset/qualityEvaluate.vue
View file @0e184ae
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @0e184ae
@@ -223,6 +223,7 @@ const tableBtnClick = (scope, btn) => {
  const type = btn.value;
  const row = scope.row;
  currTableData.value = row;
+  console.log(row, '-------');
  if (type == "redit") {
    dialogInfo.value.visible = true;
    dialogInfo.value.type = 'reSubmit';
@@ -618,12 +619,12 @@ const passDialogBtnClick = (btn, info) => {
      evaluationRangeStart: info.evaluationRange[0],
      evaluationRangeEnd: info.evaluationRange[1],
      evaluationNote: info.evaluationNote,
-      evaluationFile:  info.evaluationFile?.map(file => {
+      evaluationFile: info.evaluationFile?.map(file => {
-              return {
+        return {
-                name: file.name,
+          name: file.name,
-                url: file.url
+          url: file.url
-              }
+        }
-            }) || [],
+      }) || [],
    }).then((res: any) => {
      passDialogInfo.value.footer.btns[1].loading = false;
      if (res?.code == proxy.$passCode) {
--- a/src/views/data_asset/valueEvaluate.vue
View file @0e184ae
+++ b/src/views/data_asset/valueEvaluate.vue
View file @0e184ae
@@ -21,7 +21,7 @@ import {
 } from "@/api/modules/queryService";
 import useUserStore from "@/store/modules/user";
 import useDataAssetStore from "@/store/modules/dataAsset";
-import { passFlowData, rejectFlowData, revokeFlowData } from '@/api/modules/workFlowService';
+import { getCamundaDeploymentId, getProcessNodesPromise, passFlowData, rejectFlowData, revokeFlowData } from '@/api/modules/workFlowService';
 const assetStore = useDataAssetStore();
@@ -80,6 +80,7 @@ const tableFields = ref([
  },
 ]);
+const deploymentId = ref('');
 onBeforeMount(() => {
  if (isCompanyPlatform.value) {
    tableInfo.value.fields = tableFields.value;
@@ -87,12 +88,19 @@ onBeforeMount(() => {
    tableFields.value.splice(3, 0, { label: "企业名称", field: "tenantName", width: 250, align: "left" })
    tableInfo.value.fields = tableFields.value;
  }
-  getTenantAttach(userData.tenantGuid).then((res: any) => {
+  // getTenantAttach(userData.tenantGuid).then((res: any) => {
-    if (res?.code == proxy.$passCode) {
+  //   if (res?.code == proxy.$passCode) {
-      attachDataInfo.value = res.data || {};
+  //     attachDataInfo.value = res.data || {};
-      formItems.value[1].templateUrl = attachDataInfo.value.quality_evaluation_file;
+  //     formItems.value[1].templateUrl = attachDataInfo.value.quality_evaluation_file;
+  //   } else {
+  //     ElMessage.error(res.msg);
+  //   }
+  // })
+  getCamundaDeploymentId('10019', userData.tenantGuid, userData.staffGuid).then((res: any) => {
+    if (res.code == proxy.$passCode) {
+      deploymentId.value = res.data;
    } else {
-      ElMessage.error(res.msg);
+      proxy.$ElMessage.error(res.msg);
    }
  })
 });
@@ -252,14 +260,14 @@ const tableInfo = ref({
 //   }
 //   return btnsArr;
 // }
-const getTableBtns = (row, includeDetail = true) => {
+const getTableBtns = (row) => {
  let btnsArr: any[] = [];
-  const approveVO = row.approveVO;
+  const approveVO = row.approveVO || {};
+  const approveState = row.approveState || null;
+  const approveStaffGuids = approveVO.approveStaffGuids || [];
+  const staffGuid = approveVO.staffGuid || '';
+  const bizApproveState = row.bizApproveState;
  const currentStaffGuid = userData.staffGuid
-  const bizApproveState = row.approveState;
-  const approveState = approveVO?.approveState || 'N';
-  const approveStaffGuids = approveVO?.approveStaffGuids || [];
-  const staffGuid = approveVO?.staffGuid || '';
  let isShowCancel = false;
  let flowState;
  if (approveState == 'N') {
@@ -274,24 +282,25 @@ const getTableBtns = (row, includeDetail = true) => {
  if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
    isShowCancel = true;
  }
  if (flowState === 1) {
-    btnsArr = [{ label: "编辑", value: "edit" }, { label: "删除", value: "delete" }]
+    btnsArr = [{ label: "删除", value: "delete" }]
-  } else {
+  }
+  if (flowState === 2) {
+    btnsArr = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]
+  }
+  if (flowState === 3) {
+    btnsArr.push({ label: "删除", value: "delete" })
+  }
+  if (flowState === 3 && bizApproveState != 'D') {
+    btnsArr.push({ label: "重新提交", value: "redit" })
+  }
+  if (isShowCancel) {
+    btnsArr.push({ label: "撤销", value: "revoke" })
+  }
+  if (flowState !== 1) {
    btnsArr.push({ label: "详情", value: "detail" })
-    if (flowState === 2) {
-      btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
-      if (isShowCancel) {
-        btnsArr.push({ label: "撤销", value: "revoke" })
-      }
-    } else if (flowState === 3) {
-      if (bizApproveState != 'D') {
-        btnsArr.push({ label: "重新提交", value: "edit" })
-      }
-      btnsArr.push({ label: "删除", value: "delete" })
-    }
  }
-  return btnsArr
+  return btnsArr;
 }
@@ -300,12 +309,34 @@ const currTableData: any = ref({});
 const tableBtnClick = (scope, btn) => {
  const type = btn.value;
  const row = scope.row;
+  console.log('row', row);
  currTableData.value = row;
-  if (type == "edit") {
+  if (type == "redit") {
-    formItems.value[0].visible = false;
+    if (!row.registerGuid) {
-    formItems.value[1].default = row.costAssessmentFile || [];
+      formItems.value[2].visible = false;
-    dialogInfo.value.type = 'reSubmit';
+      formItems.value[3].visible = false;
-    dialogInfo.value.visible = true;
+      formItems.value[4].visible = false;
+      formItems.value[5].visible = false;
+      formItems.value[0].visible = false;
+      formItems.value[0].default = row.damGuid;
+      formItems.value[1].default = row.costAssessmentFile || [];
+      dialogInfo.value.type = 'reSubmit';
+      dialogInfo.value.visible = true;
+    } else {
+      formItems.value[2].visible = true;
+      formItems.value[3].visible = true;
+      formItems.value[4].visible = true;
+      formItems.value[5].visible = true;
+      formItems.value[0].visible = false;
+      formItems.value[0].default = row.damGuid;
+      formItems.value[1].default = row.costAssessmentFile || [];
+      formItems.value[2].default = row.qualityScore;
+      formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : '';
+      formItems.value[4].default = row.evaluationNote;
+      formItems.value[5].default = row.evaluationFile || [];
+      dialogInfo.value.type = 'reSubmit';
+      dialogInfo.value.visible = true;
+    }
  } else if (type == "delete") {
    delTableOpen("此操作将永久删除该资产价值评估，是否继续?", "warning");
  } else if (type === 'backup') {
@@ -314,29 +345,23 @@ const tableBtnClick = (scope, btn) => {
    passDialogInfo.value.visible = true;
    passFormItems.value[2].placeholder = '按照本次评估目的及价值类型，该笔数据资产在评估基准日的评估值为人民币***元。本次评估结论在评估基准日后一年内有效，即自20*年*月*日至20*年*月*日止。超过一年，需重新举行资产评估。';
  } 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) {
+          getTableData();
-          if (res.data) {
-            ElMessage.success('该资产价值评估流程撤销成功！');
-            getTableData();
-          } else {
-            ElMessage.error('该资产价值评估流程撤销失败！');
-          }
        } else {
-          ElMessage.error(res.msg);
+          ElMessage.error(res.msg)
        }
-      });
+      })
    }).catch(() => {
      ElMessage({
        type: 'info',
@@ -348,6 +373,23 @@ const tableBtnClick = (scope, btn) => {
      name: 'registerValueDetail',
      query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', daTenantGuid: row.tenantGuid }
    });
+  } else if (type === 'detail') { // 详情
+    if (row.registerApproveState == 'Y') {
+      router.push({
+        name: 'registerDetail',
+        query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', daTenantGuid: row.tenantGuid }
+      });
+    } else {
+      router.push({
+        name: 'evaCatalogDetail',
+        query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess' }
+      });
+    }
+  } else if (type == 'productDetail') {
+    router.push({
+      name: 'registerCatalogDetail',
+      query: { guid: row.damGuid }
+    });
  }
  else if (type === 'pass') {
    passDialogInfo.value.visible = true;
@@ -458,7 +500,7 @@ const tablePageChange = (info) => {
  getTableData();
 };
-const formItems = ref([
+const formItems = ref<any>([
  {
    label: '资产名称',
    type: 'select',
@@ -479,6 +521,9 @@ const formItems = ref([
    tip: '支持格式：xls .xlsx .doc .docx .rar .zip',
    type: 'upload-file',
    accept: '.xls, .xlsx, .doc, .docx, .rar, .zip',
+    field: 'costAssessmentFile',
+    default: [],
+    required: true,
    templateUrl: 'auto',
    templateClick: () => {
      const link = document.createElement('a');
@@ -488,11 +533,8 @@ const formItems = ref([
      link.click();
      link.remove();
    },
-    required: true,
    block: true,
    visible: true,
-    default: [],
-    field: 'costAssessmentFile',
  },
  // 质量评分 type： input
  {
@@ -528,7 +570,6 @@ const formItems = ref([
    default: '',
    maxlength: 250,
    block: true,
-    focusValue: true,
    clearable: true,
    required: true,
    visible: false
@@ -614,19 +655,24 @@ const handleSelectChange = (val, row, info) => {
 }
 const passDialogInputChange = (val, item, inlineValue) => {
+  console.log('val', val, item, inlineValue);
  if (item.field == 'assessmentMoney') {
    let M = "";
    let D = "";
    let assessmentDate = inlineValue.assessmentDate;
    if (assessmentDate) {
-      M = (assessmentDate.getMonth() + 1 < 10 ? '0' + (assessmentDate.getMonth() + 1) : assessmentDate.getMonth() + 1);
+      M = (assessmentDate?.getMonth() + 1 < 10 ? '0' + (assessmentDate?.getMonth() + 1) : assessmentDate?.getMonth() + 1);
-      D = (assessmentDate.getDate() + 1 < 10 ? '0' + assessmentDate.getDate() : assessmentDate.getDate());
+      D = (assessmentDate?.getDate() + 1 < 10 ? '0' + assessmentDate?.getDate() : assessmentDate?.getDate());
    }
-    passFormItems.value[2].placeholder = `按照本次评估目的及价值类型，该笔数据资产在评估基准日的评估值为人民币${val}元。本次评估结论在评估基准日后一年内有效，即自${inlineValue.assessmentDate ? `${inlineValue.assessmentDate.getFullYear()}年${M}月${D}日至${inlineValue.assessmentDate.getFullYear() + 1}年${M}月${D}日` : '20*年*月*日至20*年*月*日'}止。超过一年，需重新举行资产评估。`;
+    passFormItems.value[2].placeholder = `按照本次评估目的及价值类型，该笔数据资产在评估基准日的评估值为人民币${val}元。本次评估结论在评估基准日后一年内有效，即自${inlineValue.assessmentDate ? `${inlineValue.assessmentDate?.getFullYear()}年${M}月${D}日至${inlineValue.assessmentDate?.getFullYear() + 1}年${M}月${D}日` : '20*年*月*日至20*年*月*日'}止。超过一年，需重新举行资产评估。`;
  } else if (item.field == 'assessmentDate') {
-    let M = (val.getMonth() + 1 < 10 ? '0' + (val.getMonth() + 1) : val.getMonth() + 1);
+    if (val && !(val instanceof Date)) {
-    let D = (val.getDate() + 1 < 10 ? '0' + val.getDate() : val.getDate());
+      // 如果 val 不是 Date 类型，尝试将其转换为 Date 对象
-    passFormItems.value[2].placeholder = `按照本次评估目的及价值类型，该笔数据资产在评估基准日的评估值为人民币${inlineValue.assessmentMoney ? inlineValue.assessmentMoney : '***'}元。本次评估结论在评估基准日后一年内有效，即自${val ? `${val.getFullYear()}年${M}月${D}日至${val.getFullYear() + 1}年${M}月${D}日` : '20*年*月*日至20*年*月*日'}止。超过一年，需重新举行资产评估。`;
+      val = new Date(val);
+    }
+    let M = (val?.getMonth() + 1 < 10 ? '0' + (val?.getMonth() + 1) : val?.getMonth() + 1);
+    let D = (val?.getDate() + 1 < 10 ? '0' + val?.getDate() : val?.getDate());
+    passFormItems.value[2].placeholder = `按照本次评估目的及价值类型，该笔数据资产在评估基准日的评估值为人民币${inlineValue.assessmentMoney ? inlineValue.assessmentMoney : '***'}元。本次评估结论在评估基准日后一年内有效，即自${val ? `${val?.getFullYear()}年${M}月${D}日至${val?.getFullYear() + 1}年${M}月${D}日` : '20*年*月*日至20*年*月*日'}止。超过一年，需重新举行资产评估。`;
  }
 }
@@ -635,75 +681,112 @@ const reSubmitPromise: any = ref(null);
 /** 编辑质量评估发起资产申请按钮处理。 */
 const dialogBtnClick = (btn, info) => {
+  console.log('btn', btn, info);
  if (btn.value == 'submit') {
-    if (dialogInfo.value.type == 'reSubmit') {
+    getProcessNodesPromise({
-      if (reSubmitPromise.value) {
+      deploymentId: deploymentId.value,
-        return;
+      processInstanceId: null,
-      }
+    }).then((res: any) => {
-      reSubmitPromise.value = updateCostAssess({
+      console.log('res', res);
-        guid: currTableData.value.guid,
+      if (dialogInfo.value.type == 'reSubmit') {
-        tenantGuid: userData.tenantGuid,
+        if (reSubmitPromise.value) {
-        registerGuid: currTableData.value.registerGuid,
+          return;
-        daName: currTableData.value.daName,
-        registerTime: currTableData.value.registerTime,
-        issuingEntityGuid: currTableData.value.issuingEntityGuid,
-        costAssessmentFile: info.costAssessmentFile?.map(f => f.url) || []
-      }).then((res: any) => {
-        reSubmitPromise.value = null;
-        if (res?.code == proxy.$passCode) {
-          ElMessage.success('该资产价值评估重新提交成功');
-          dialogInfo.value.visible = false;
-          page.value.curr = 1;
-          getTableData();
-        } else {
-          ElMessage.error(res.msg);
        }
-      })
+        reSubmitPromise.value = updateCostAssess({
-    } else {
+          guid: currTableData.value.guid,
-      if (savePromise.value) {
-        return;
-      }
-      let daInfo = assetListData.value.find(a => a.guid == info.registerGuid);
-      let params: any = {};
-      if (daInfo.qualityEvaluationGuid) {
-        //通过质量评估
-        params = {
          immediateApprove: true,
          tenantGuid: userData.tenantGuid,
-          registerGuid: info.registerGuid,
+          daName: currTableData.value.daName,
-          daName: daInfo.damName,
+          damGuid: currTableData.value.damGuid,
-          damGuid: daInfo.guid,
+          costAssessmentFile: info.costAssessmentFile?.map(file => {
-          costAssessmentFile: info.costAssessmentFile?.map(f => f.url) || [],
+            return {
-          evaluationFile: info.evaluationFile?.map(f => f.url) || [],
+              name: file.name,
-          qualityScore: info.qualityScore,
+              url: file.url
+            }
+          }) || [],
+          evaluationFile: info.evaluationFile?.map(file => {
+            return {
+              name: file.name,
+              url: file.url
+            }
+          }) || [],
+          qualityScore: info.qualityScore || null,
          evaluationRangeStart: info.evaluationRange ? info.evaluationRange[0] : null,
          evaluationRangeEnd: info.evaluationRange ? info.evaluationRange[1] : null,
-          evaluationNote: info.evaluationNote,
+          evaluationNote: info.evaluationNote || null,
-        }
+          evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
+        }).then((res: any) => {
+          reSubmitPromise.value = null;
+          if (res?.code == proxy.$passCode) {
+            ElMessage.success('该资产价值评估重新提交成功');
+            dialogInfo.value.visible = false;
+            page.value.curr = 1;
+            getTableData();
+          } else {
+            ElMessage.error(res.msg);
+          }
+        })
      } else {
-        //未通过质量评估
+        if (savePromise.value) {
-        params = {
+          return;
-          immediateApprove: true,
-          tenantGuid: userData.tenantGuid,
-          registerGuid: info.registerGuid,
-          daName: daInfo.damName,
-          damGuid: daInfo.guid,
-          costAssessmentFile: info.costAssessmentFile?.map(f => f.url) || [],
        }
-      }
+        let params: any = {};
-      console.log('daInfo', daInfo, info);
+        let daInfo = assetListData.value.find(a => a.guid == info.registerGuid);
-      savePromise.value = saveCostAssess(params).then((res: any) => {
+        if (daInfo.qualityEvaluationGuid) {
-        savePromise.value = null;
+          //通过质量评估发起资产申请
-        if (res?.code == proxy.$passCode) {
+          params = {
-          ElMessage.success('价值评估发起成功');
+            immediateApprove: true,
-          dialogInfo.value.visible = false;
+            tenantGuid: userData.tenantGuid,
-          page.value.curr = 1;
+            daName: daInfo.damName,
-          getTableData();
+            damGuid: daInfo.guid,
+            costAssessmentFile: info.costAssessmentFile?.map(file => {
+              return {
+                name: file.name,
+                url: file.url
+              }
+            }) || [],
+            evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
+          }
        } else {
-          ElMessage.error(res.msg);
+          //未通过质量评估发起资产申请
+          params = {
+            immediateApprove: true,
+            tenantGuid: userData.tenantGuid,
+            daName: daInfo.damName,
+            damGuid: daInfo.guid,
+            costAssessmentFile: info.costAssessmentFile?.map(file => {
+              return {
+                name: file.name,
+                url: file.url
+              }
+            }) || [],
+            evaluationFile: info.evaluationFile?.map(file => {
+              return {
+                name: file.name,
+                url: file.url
+              }
+            }) || [],
+            qualityScore: info.qualityScore,
+            evaluationRangeStart: info.evaluationRange ? info.evaluationRange[0] : null,
+            evaluationRangeEnd: info.evaluationRange ? info.evaluationRange[1] : null,
+            evaluationNote: info.evaluationNote,
+            evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
+          }
        }
-      })
+        console.log('daInfo', daInfo, info);
-    }
+        savePromise.value = saveCostAssess(params).then((res: any) => {
+          savePromise.value = null;
+          if (res?.code == proxy.$passCode) {
+            ElMessage.success('价值评估发起成功');
+            dialogInfo.value.visible = false;
+            page.value.curr = 1;
+            getTableData();
+          } else {
+            ElMessage.error(res.msg);
+          }
+        })
+      }
+    })
  } else if (btn.value == 'cancel') {
    dialogInfo.value.visible = false;
  }
@@ -833,42 +916,26 @@ const passDialogInfo = ref({
  },
 });
-// const passDialogBtnClick = (btn, info) => {
-//   if (btn.value == 'submit') {
-//     costAssessAllow({
-//       guid: currTableData.value.guid,
-//       assessmentMoney: info.assessmentMoney,
-//       assessmentDate: info.assessmentDate,
-//       assessmentNote: info.assessmentNote,
-//       assessmentFile: info.assessmentFile.map(f => f.url),
-//     }).then((res: any) => {
-//       if (res?.code == proxy.$passCode) {
-//         if (res.data) {
-//           ElMessage.success('审批成功');
-//           passDialogInfo.value.visible = false;
-//           getTableData();
-//         } else {
-//           ElMessage.error('审批失败');
-//         }
-//       } else {
-//         ElMessage.error(res.msg);
-//       }
-//     })
-//   } else if (btn.value == 'cancel') {
-//     passDialogInfo.value.visible = false;
-//   }
-// };
 const passDialogBtnClick = (btn, info) => {
+  let params: any = {}
+  console.log('btn', btn, info, currTableData.value);
  if (btn.value == 'submit') {
-    tableInfo.value.loading = true;
-    let params = {
+    costAssessAllow({
      guid: currTableData.value.approveVO.approveGuid,
+      bizGuid: currTableData.value.guid,
      flowType: currTableData.value.approveVO.flowType,
-      approveSuggest: info.approveSuggest,
      approveStaffGuid: userData.staffGuid,
-    }
+      assessmentMoney: info.assessmentMoney,
-    passFlowData(params).then((res: any) => {
+      assessmentDate: info.assessmentDate,
-      tableInfo.value.loading = false;
+      assessmentNote: info.assessmentNote,
+      assessmentFile: info.assessmentFile.map(file => {
+        return {
+          name: file.name,
+          url: file.url
+        }
+      }) || [],
+    }).then((res: any) => {
      if (res?.code == proxy.$passCode) {
        if (res.data) {
          ElMessage.success('审批成功');
@@ -880,9 +947,7 @@ const passDialogBtnClick = (btn, info) => {
      } else {
        ElMessage.error(res.msg);
      }
-    }).catch(() => {
+    })
-      tableInfo.value.loading = false;
-    });
  } else if (btn.value == 'cancel') {
    passDialogInfo.value.visible = false;
  }
--- a/src/views/security_menu/index.vue
View file @0e184ae
+++ b/src/views/security_menu/index.vue
View file @0e184ae
@@ -76,117 +76,90 @@ const tableInfo = ref({
-/**弹窗配置 */
+const formItems = ref([
-const newCreateGradeFormItems = ref<any>([{
+  {
-  label: '标签名',
+    label: '附件上传',
-  type: 'input',
+    tip: '支持格式：pdf,单个文件不能超过10MB ',
-  placeholder: '请选择',
+    type: 'upload-file',
-  field: 'label',
+    accept: '.pdf',
-  default: '',
+    field: 'costAssessmentFile',
-  required: true,
+    templateUrl: '',
-  filterable: true,
+    required: true,
-  clearable: true,
+    block: true,
-  visible: true,
+    visible: true,
-  block: true,
+    default: [],
-},
+  },
-{
+  {
-  label: '分类',
+    label: '附件上传',
-  type: 'tree-select',
+    tip: '支持格式：pdf,单个文件不能超过10MB ',
-  placeholder: '请选择',
+    type: 'upload-file',
-  field: 'classifyDetailGuid',
+    accept: '.pdf',
-  default: '',
+    field: 'costAssessmentFile1',
-  options: [],
+    templateUrl: '',
-  props: {
+    required: true,
-    label: "classifyName",
+    block: true,
-    value: "guid",
+    visible: true,
+    default: [],
  },
-  required: true,
+  {
-  checkStricty: true,
+    label: '附件上传',
-  lazy: false,
+    tip: '支持格式：pdf,单个文件不能超过10MB ',
-  filterable: true,
+    type: 'upload-file',
-  clearable: true,
+    accept: '.pdf',
-  visible: true,
+    field: 'costAssessmentFile2',
-  block: true,
+    templateUrl: '',
-},
+    required: true,
-{
+    block: true,
-  label: '分级',
+    visible: true,
-  type: 'select',
+    default: [],
-  maxlength: 19,
-  placeholder: '请输入',
-  field: 'gradeDetailGuid',
-  default: '',
-  options: [],
-  props: {
-    label: 'name',
-    value: 'guid',
  },
-  clearable: true,
-  required: true,
-  block: true,
-},
-  // {
-  //   label: ' ',
-  //   type: 'label',
-  //   default: '规则配置',
-  //   block: true,
-  //   col: 'title-label'
-  // },
-  // {
-  //   label: '精确匹配',
-  //   type: 'textarea',
-  //   maxlength: 200,
-  //   placeholder: '请输入字段中文，中间用英文“,”分号隔开',
-  //   field: 'matchChValue',
-  //   default: '',
-  //   clearable: true,
-  //   required: false,
-  // },
-  // {
-  //   label: '',
-  //   type: 'textarea',
-  //   maxlength: 200,
-  //   placeholder: '请输入字段中文，中间用英文“,”分号隔开',
-  //   field: 'matchEnValue',
-  //   default: '',
-  //   clearable: true,
-  //   required: false,
-  // }
 ]);
-const newCreateGradeFormRules = ref({
+const formRules = ref({
-  label: [
+  registerGuid: [
-    { required: true, message: '请输入标签名', trigger: 'change' }
+    { required: true, trigger: 'change', message: "请填写资产名称" }
-  ],
-  detailGuid: [
-    { required: true, message: '请选择分类', trigger: 'change' }
-  ],
-  gradeDetailGuid: [
-    { required: true, message: '请选择分级', trigger: 'change' }
  ],
+  costAssessmentFile: [{
+    validator: (rule: any, value: any, callback: any) => {
+      if (!value?.length) {
+        callback(new Error('请上传数据价值评估附件'))
+      } else {
+        callback();
+      }
+    }, trigger: 'change'
+  }]
 });
-const newCreateGradeStandardDialogInfo = ref({
+const dialogInfo = ref({
  visible: false,
-  size: 600,
+  size: 510,
-  title: "添加标签",
+  direction: "column",
-  type: "",
+  header: {
-  formInfo: {
+    title: "价值评估发起",
-    id: "grade-form",
-    items: newCreateGradeFormItems.value,
-    rules: newCreateGradeFormRules.value,
  },
-  submitBtnLoading: false,
+  type: '',//标识是否是重新提交
-  btns: {
+  contents: [
-    cancel: () => {
+    {
-      newCreateGradeStandardDialogInfo.value.visible = false;
+      type: 'form',
-      newCreateGradeStandardDialogInfo.value.submitBtnLoading = false;
+      title: '',
-    },
+      formInfo: {
-    submit: async (btn, info) => {
+        id: 'quality-coss-level',
+        items: formItems.value,
+        rules: formRules.value
+      }
    }
-  }
+  ],
-})
+  footer: {
+    btns: [
+      { type: "default", label: "取消", value: "cancel" },
+      { type: "primary", label: "确定", value: "submit" },
+    ],
+  },
+});
+const dialogBtnClick = () => {
+  console.log('handleSelectChange');
+};
 const classSearchItemList = ref<any>([
@@ -244,13 +217,7 @@ const searchClass = async (val: any, clear: boolean = false) => {
 };
 const addNewLabel = () => {
-  newCreateGradeStandardDialogInfo.value.visible = true;
+  dialogInfo.value.visible = true;
-  newCreateGradeStandardDialogInfo.value.title = '新增标签';
-  newCreateGradeFormItems.value.forEach(item => {
-    item.default = '';
-    item.disabled = false;
-  });
-  newCreateGradeStandardDialogInfo.value.submitBtnLoading = false;
 }
@@ -276,8 +243,7 @@ const addNewLabel = () => {
        </div>
      </div>
    </div>
-    <Dialog_form ref="dialogLabelFormRef" :dialogConfigInfo="newCreateGradeStandardDialogInfo" class="v-dialog-form">
+    <Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" />
-    </Dialog_form>
  </div>
 </template>