修复专区问题

lihua
Showing 3 changed files with 43 additions and 41 deletions
src/views/data_asset/registerJSZQDetail.vue
src/views/data_asset/registerManagemant.vue
src/views/data_product/productListing.vue
--- a/src/views/data_asset/registerJSZQDetail.vue
View file @1294b85
+++ b/src/views/data_asset/registerJSZQDetail.vue
View file @1294b85
@@ -1668,7 +1668,7 @@ const passCommonDialogBtnClick = (btn, info) => {
            </el-tab-pane>
          </el-tabs>
        </ContentWrap>
-        <ContentWrap id="id-assetContent" title="附件信息" description="" style="margin-top: 15px"
+        <ContentWrap v-show="detailType != 'asset' || uploadFileDetailInfo?.length" id="id-assetContent" title="附件信息" description="" style="margin-top: 15px"
          :isExpand="assetContentExpand" expandSwicth @expand="(v) => assetContentExpand = v">
          <div class="list_panel mt4">
            <div class="list_item isFile" v-for="(fileItem, index) in uploadFileDetailInfo">
--- a/src/views/data_asset/registerManagemant.vue
View file @1294b85
+++ b/src/views/data_asset/registerManagemant.vue
View file @1294b85
@@ -155,6 +155,9 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
    }
  }
 },
+{
+  label: "数交所审批状态", field: "exchangeApproveState", type: "approveTagBtn", width: 140, align: 'center'
+},
 { label: "修改人", field: "updateUserName", width: 140 },
 { label: "修改时间", field: "updateTime", width: 180 }]);
--- a/src/views/data_product/productListing.vue
View file @1294b85
+++ b/src/views/data_product/productListing.vue
View file @1294b85
@@ -32,7 +32,7 @@ const sjsLogo = new URL('@/assets/images/sjs-logo.png', import.meta.url).href
 const carouselInfo: any = ref({
  list: [],
-  height: '172px',
+  height: '128px',
  loop: false,
  autoplay: false,
  arrow: 'hover',
@@ -103,24 +103,24 @@ const tableInfo = ref({
      }
    },
    { label: "上架分类", field: "exchangeName", width: 140 },
-    {
+    // {
-      label: "审批状态", field: "approveVO", type: "approveTag", width: TableColumnWidth.STATE, align: 'center'
+    //   label: "审批状态", field: "approveVO", type: "approveTag", width: TableColumnWidth.STATE, align: 'center'
-    },
+    // },
    {
      label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
        return scope.row.listingStatus == 'Y' ? '已上架' : '未上架';
      }
    },
-    {
+    // {
-      label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
+    //   label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
-        label: '查看', visible: (scope) => {
+    //     label: '查看', visible: (scope) => {
-          return scope.row.crossPlatformApproveState != null;
+    //       return scope.row.crossPlatformApproveState != null;
-        }, click: (scope) => {
+    //     }, click: (scope) => {
-          systemApproveCurrentRowInfo.value = scope.row;
+    //       systemApproveCurrentRowInfo.value = scope.row;
-          approvalDialogVisible.value = true;
+    //       approvalDialogVisible.value = true;
-        }
+    //     }
-      }
+    //   }
-    },
+    // },
    { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
  ],
  loading: false,
@@ -133,7 +133,7 @@ const tableInfo = ref({
  actionInfo: {
    label: "操作",
    type: "btn",
-    width: 170,
+    width: 130,
    btns: (scope) => {
      const { row } = scope;
      const approveVO = row.approveVO || {};
@@ -157,31 +157,31 @@ const tableInfo = ref({
      if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
        isShowCancel = true;
      }
-      if ((bizApproveState === 'Y' || row.crossPlatformApproveState == 'Y') && staffGuid == currentStaffGuid) {
+      // if ((bizApproveState === 'Y' || row.crossPlatformApproveState == 'Y') && staffGuid == currentStaffGuid) {
-        if (row.listingStatus == 'Y') {
+      //   if (row.listingStatus == 'Y') {
-          list.push({ label: "下架", value: "down" });
+      //     list.push({ label: "下架", value: "down" });
-        } else {
+      //   } else {
-          list.push({ label: "上架", value: "up" });
+      //     list.push({ label: "上架", value: "up" });
-        }
+      //   }
-      }
+      // }
-      if (flowState === 1) {
+      // if (flowState === 1) {
-        list = [{ label: "编辑", value: "edit" }, { label: "删除", value: "del" }]
+      //   list = [{ label: "编辑", value: "edit" }, { label: "删除", value: "del" }]
-      }
+      // }
-      if (flowState === 2) {
+      // if (flowState === 2) {
-        list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]
+      //   list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]
+      // }
+      // if (flowState === 3 && bizApproveState != 'D') { //重新提交过的不能再重新提交
+      //   list.push({ label: "重新提交", value: "redit" }) //已驳回
+      // }
+      // if (isShowCancel) {
+      //   list.push({ label: "撤销", value: "revoke" })
+      // }
+      if (flowState !== 1) {
+        list.push({ label: "详情", value: "detail" })
      }
      if (flowState === 3) {
        list.push({ label: "删除", value: "del" })
      }
-      if (flowState === 3 && bizApproveState != 'D') { //重新提交过的不能再重新提交
-        list.push({ label: "重新提交", value: "redit" }) //已驳回
-      }
-      if (isShowCancel) {
-        list.push({ label: "撤销", value: "revoke" })
-      }
-      if (flowState !== 1) {
-        list.push({ label: "详情", value: "detail" })
-      }
      return list
    },
  }
@@ -952,10 +952,9 @@ const rejectDialogBtnClick = (btn, info) => {
                </div>
              </div>
            </div>
-            <div class="operator-btn" @click.stop="btnClick(item)">
+             <!--  <div class="operator-btn" @click.stop="btnClick(item)">
-              <!-- <div class="left-btn">更新模板</div> -->
              <div class="right-btn">产品上架</div>
-            </div>
+            </div> -->
          </div>
        </template>
      </CarouselPanel>
@@ -970,7 +969,7 @@ const rejectDialogBtnClick = (btn, info) => {
      </div>
    </div>
    <div class="table_panel_wrap" :style="{
-      height: demandListData.length > 0 ? 'calc(100% - 291px)' : 'calc(100% - 54px)'
+      height: demandListData.length > 0 ? 'calc(100% - 247px)' : 'calc(100% - 54px)'
    }">
      <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange"
        @tableSwitchBeforeChange="tableSwitchBeforeChange" />