数据交付联调

lihua
Showing 2 changed files with 44 additions and 11 deletions
src/views/data_asset/dataDelivery.vue
src/views/data_asset/dataUsage.vue
--- a/src/views/data_asset/dataDelivery.vue
View file @08da74f
+++ b/src/views/data_asset/dataDelivery.vue
View file @08da74f
@@ -62,24 +62,27 @@ const searchItemList = ref([
 const tableFields = ref([
  { label: "序号", type: "index", width: 56, align: "center" },
  {
-    label: "数据产品名称", field: "dataProductName", width: 150, type: "text_btn", columClass: 'text_btn', value: "detail", click: (scope) => {
+    label: "数据产品名称", field: "dataProductName", width: 160, type: "text_btn", columClass: 'text_btn', value: "detail", click: (scope) => {
+      //是不是只有自己查看
      router.push({
-        name: 'productListingDetail',
+        path: '/data-asset/register-catalog/register-catalog-detail',
        query: {
          guid: scope.row.dataProductGuid,
          type: 'detail',
+          dataSources: 2,
+          foundMode: 1,
          name: scope.row.dataProductName,
        }
      });
    }
  },
  {
-    label: "合约名称", field: "contractName", width: 160, type: "text_btn", columClass: 'text_btn', value: "detail1", click: (scope) => {
+    label: "合约名称", field: "contractName", width: 170, type: "text_btn", columClass: 'text_btn', value: "detail1", click: (scope) => {
      //履约中的合约状态
      router.push({
        name: 'smartContractDetail',
        query: {
-          guid: scope.row.guid,
+          guid: scope.row.contractGuid,
          name: scope.row.contractName,
          type: 'keepAgree',
          isDetail: 'Y'
@@ -186,7 +189,7 @@ const tableInfo = ref({
  rowKey: 'guid',
  loading: false,
  fields: tableFields.value,
-  data: [], //{ verifySatus: 2 }, { verifySatus: 4 }, { verifySatus: 3, deliveryStatus: 2, }
+  data: <any>[], //{ verifySatus: 2 }, { verifySatus: 4 }, { verifySatus: 3, deliveryStatus: 2, }
  page: {
    type: "normal",
    rows: 0,
@@ -221,12 +224,36 @@ const tableInfo = ref({
      } else {
      }
+      if (row.isRefresh) {
+        btns.push({ label: "刷新中", value: "execute", disabled: true });
+      }
      // 交付只有核验通过有。
      let verifySatus = row.verifySatus;
-      (verifySatus == 1 || verifySatus == 4) && btns.push({
+      (verifySatus == 1 || verifySatus == 4) && !row.isRefresh && btns.push({
        value: 'refresh', label: '刷新', click: (scope) => {
+          scope.row.isRefresh = true;
+          //只刷新当前这一条数据
+          getPageList({
+            pageIndex: page.value.curr,
+            pageSize: page.value.limit,
+            dataProductName: page.value.dataProductName,
+            contractName: page.value.contractName,
+            verifySatus: page.value.verifySatus,
+            deliveryGuid: scope.row.guid
+          }).then((res: any) => {
+            if (res?.code == proxy.$passCode) {
+              let data: any = res.data?.records?.[0] || [];
+              let index = scope.$index;
+              data.isRefresh = false;
+              tableInfo.value.data[index] = data;
+              proxy.$ElMessage.success('刷新成功');
+            } else {
+              scope.row.isRefresh = false;
+              res?.msg && proxy.$ElMessage.error(res?.msg)
+            }
+          }).catch(() => {
+            tableInfo.value.loading = false
+          })
        }
      });
      if (verifySatus == 2) {
@@ -236,6 +263,7 @@ const tableInfo = ref({
            verifyDialogInfo.value.visible = true;
            verifyDialogInfo.value.contents[0].formInfo.items[0].default = 'TG';
            verifyDialogInfo.value.contents[0].formInfo.items[1].default = '';
+            verifyDialogInfo.value.contents[0].formInfo.items[1].visible = false;
          }
        });
      }
@@ -398,11 +426,12 @@ const verifyDialogInfo = ref({
 const verifyDialogRadioChange = (val, info) => {
  verifyDialogInfo.value.contents[0].formInfo.items[1].visible = val == 'NTG';
+  verifyDialogInfo.value.contents[0].formInfo.items[0].default = val;
 }
 const verifyDialogBtnClick = (btn, info) => {
  if (btn.value == 'submit') {
-    if (!info.verifySuggest) {
+    if (info.verifySatus == 'NTG' && !info.verifySuggest) {
      proxy.$ElMessage.error('请先填写未通过理由');
      return;
    }
@@ -412,6 +441,7 @@ const verifyDialogBtnClick = (btn, info) => {
    })).then((res: any) => {
      verifyDialogInfo.value.footer.btns[1].loading = false;
      if (res?.code == proxy.$passCode) {
+        verifyDialogInfo.value.visible = false;
        proxy.$ElMessage.success('核验状态提交成功');
        getTableData();
      } else {
--- a/src/views/data_asset/dataUsage.vue
View file @08da74f
+++ b/src/views/data_asset/dataUsage.vue
View file @08da74f
@@ -41,11 +41,14 @@ const tableFields = ref([
  { label: "序号", type: "index", width: 56, align: "center" },
  {
    label: "数据产品名称", field: "dataProductName", width: 150, type: "text_btn", columClass: 'text_btn', value: "detail", click: (scope) => {
+      //TODO.是在数据使用方使用的
      router.push({
-        name: 'productListingDetail',
+        path: '/data-asset/register-catalog/register-catalog-detail',
        query: {
          guid: scope.row.dataProductGuid,
          type: 'detail',
+          dataSources: 2,
+          foundMode: 1,
          name: scope.row.dataProductName,
        }
      });
@@ -57,7 +60,7 @@ const tableFields = ref([
      router.push({
        name: 'smartContractDetail',
        query: {
-          guid: scope.row.guid,
+          guid: scope.row.contractGuid,
          name: scope.row.contractName,
          type: 'keepAgree',
          isDetail: 'Y'