fix bug

dsk-operate-ui/src/assets/styles/index.scss

@@ -317,16 +317,21 @@ li {
     font-size: 14px;
     color: #232323;
     th {
-      font-size: 13px !important;
-      font-weight: 400 !important;
+      height: 40px;
+      padding: 9px 0px;
     }
     td {
-      font-size: 14px;
+      padding: 9px 0px;
+      .cell {
+        color: #232323;
+      }
     }
     .cell {
       padding-right: 12px;
       padding-left: 12px;
-      line-height: 18px;
+      line-height: 21px;
+      font-size: 12px;
+      font-weight: 400;
     }
     thead {
       color: rgba(35, 35, 35, 0.7);

dsk-operate-ui/src/assets/styles/sidebar.scss

@@ -106,6 +106,14 @@
       color: #d8d8d8;
     }
 
+    .el-submenu.is-opened {
+      & > .el-submenu__title {
+        .el-submenu__icon-arrow {
+          transform: translateY(-50%) rotateZ(180deg);
+        }
+      }
+    }
+
     .el-menu {
       border: none;
       height: 100%;
@@ -133,10 +141,10 @@
     .el-submenu__title {
       display: flex;
       align-items: center;
-      height: 40px;
-      line-height: 40px;
+      height: 38px;
+      line-height: 38px;
       border: 1px solid #141b2f;
-      border-radius: 10px;
+      border-radius: 4px;
       color: #fff;
       margin-bottom: 8px;
       padding: 0 8px !important;
@@ -173,7 +181,7 @@
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
-      border-radius: 10px;
+      border-radius: 4px;
       color: #fff !important;
       &:hover {
         background-color: #1e2c4c !important;
@@ -186,7 +194,7 @@
   .sidebar-container .nest-menu .el-submenu > .el-submenu__title:hover {
     background-color: #1e2c4c !important;
     color: #fff !important;
-    border-radius: 10px;
+    border-radius: 4px;
     border: 1px solid #2b3f69;
   }
 
@@ -426,8 +434,8 @@
   }
 }
 .side-retract {
-  height: 40px;
-  line-height: 48px;
+  height: 38px;
+  line-height: 38px;
   border: 1px solid #141b2f;
   margin-bottom: 6px;
   padding: 0 6px !important;
@@ -435,7 +443,7 @@
   cursor: pointer;
   &:hover {
     background-color: #1e2c4c !important;
-    border-radius: 10px;
+    border-radius: 4px;
     border: 1px solid #2b3f69;
   }
   .svg-icon {

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -178,11 +178,10 @@ export default {
       .avatar-wrapper {
         font-size: 12px;
         color: #232323;
-        line-height: 20px;
         cursor: pointer;
         .pic-avatar{
-          width: 20px;
-          height: 20px;
+          width: 32px;
+          height: 32px;
           border-radius: 50%;
           margin-right: 4px;
           overflow: hidden;
@@ -190,9 +189,9 @@ export default {
         .user-avatar {
           display: inline-block;
           cursor: pointer;
-          width: 24px;
-          height: 24px;
-          line-height: 24px;
+          width: 32px;
+          height: 32px;
+          line-height: 32px;
           text-align: center;
           background: #E3EEF9;
           color: #0081FF;

dsk-operate-ui/src/utils/index.js

@@ -677,7 +677,7 @@ export function createAreaSelect(node, tree, idkey) {
 
   // 没有children 已经是最底层 看parent
   const parentNode = findParentNode(tree, node, idkey);
-  console.log(parentNode,"没有children");
+  console.log(parentNode, "没有children");
 
   // const _temp = nodeList.map(item => {
   //   // 找节点parent
@@ -911,6 +911,18 @@ export const detailSideBar = new Map([
   // 风险信息 法院公告
   ["courtAnnouncement", "courtNotice"],
   // 风险信息 开庭公告
-  ["openAnnouncement", "openacourtsessionNotice"]
+  ["openAnnouncement", "openacourtsessionNotice"],
+  // 咨询业务往来 常合作业主单位
+  ["owner", "cooperativeOwnerUnits"],
+  // 咨询业务往来 常合作施工单位
+  ["construction", "cooperativeConstructionUnit"],
+  // 咨询业务往来 常合作集团
+  ["combine", "cooperativeGroup"],
+  // 内部合作 咨询机构合作
+  ["advisoryList", "consultingAgencyCooperation"],
+  // 内部合作 咨询机构合作
+  ["cooperationList", "cooperationRecord"],
+  // 内部合作 准入情况
+  ["approveInfo", "accessCondition"],
 ])
 

dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/CustomFormDesign.vue

@@ -56,6 +56,12 @@
       </div>
     </div>
 
+    <!-- 底部 -->
+    <div class="custom-form-design-footer">
+      <el-button type="primary" @click="saveOptions">保存设置</el-button>
+      <el-button @click="cancelCreate">取消</el-button>
+    </div>
+
     <!-- 删除分栏提示弹窗 -->
     <el-dialog title="提示" :visible.sync="removeSubFiledModuleDialog" width="480px" :close-on-click-modal="false" class="subfield-module-dialog-outer"
       :custom-class="'subfield-module-dialog-inner'" @close="removeDialogClose">
@@ -130,6 +136,12 @@ export default {
   },
   //方法集
   methods: {
+    saveOptions() {
+
+    },
+    cancelCreate() {
+
+    },
     generateRandomLowerCaseLetter() {
       const alphabet = 'abcdefghijklmnopqrstuvwxyz';
       const randomIndex = Math.floor(Math.random() * alphabet.length);
@@ -315,7 +327,7 @@ export default {
 
   .custom-form-design-inner {
     width: 100%;
-    height: 100%;
+    height: calc(100% - 48px);
     display: flex;
     min-width: 1140px;
 
@@ -489,6 +501,24 @@ export default {
     }
   }
 
+  .custom-form-design-footer {
+    height: 32px;
+    margin-top: 16px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    button {
+      height: 32px;
+      padding: 0px 16px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 4px;
+    }
+  }
+
   ::v-deep .subfield-module-dialog-outer {
     .subfield-module-dialog-inner {
       border-radius: 4px;

dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/index.vue

@@ -102,12 +102,12 @@ export default {
     .custom-form-design-container {
       height: calc(100% - 108px);
       width: 100%;
+      padding: 16px;
       box-sizing: border-box;
 
       .custom-form-design-outer {
         width: 100%;
-        height: calc(100% - 32px);
-        padding: 16px;
+        height: 100%;
         box-sizing: border-box;
       }
     }

dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue

@@ -182,7 +182,7 @@ export default {
     async getPlaceholder() {
       try {
         await this.$nextTick();
-        const doms = document.querySelectorAll("[class*='select-adaptive-']");
+        const doms = this.$el.querySelectorAll("[class*='select-adaptive-']");
         if (doms?.length) {
           doms.forEach(dom => {
             const realStyles = window.getComputedStyle(dom);
@@ -229,7 +229,7 @@ export default {
     async multipleAdaptiveHandle(uid) {
       try {
         await this.$nextTick();
-        const dom = document.querySelector(`.select-adaptive-${uid}`);
+        const dom = this.$el.querySelector(`.select-adaptive-${uid}`);
         const iptChild = dom.querySelector(".el-input__inner");
         if (dom) {
           const textContainer = document.createElement("span");
@@ -276,7 +276,7 @@ export default {
     async iptAdaptiveHandle(uid) {
       try {
         await this.$nextTick();
-        const dom = document.querySelector(`.select-adaptive-${uid}`);
+        const dom = this.$el.querySelector(`.select-adaptive-${uid}`);
         const realStyles = window.getComputedStyle(dom);
         if (dom) {
           const iptChild = dom.querySelector(".el-input__inner");

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -333,8 +333,9 @@ export default {
     getFinancial(id) {
       financial({ cid: String(id) }).then(res => {
         if ((res.code == 200 && !res.data) || !res.data?.totalAssets) {
-          // 禁用商务信息
+          // 禁用财务信息
           this.$set(this.findNodeIndex(this.sideRoute, "business"), "disabled", true);
+          this.$set(this.findNodeIndex(this.sideRoute, "financial"), "disabled", true);
           this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute));
         }
       });

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -226,11 +226,13 @@ export default {
       .cell {
         font-size: 12px;
       }
+      .el-table__header-wrapper {
+        min-height: 40px;
+      }
     }
     .el-table--border th.gutter:last-of-type {
       display: block !important;
       padding-right: 16px;
-      height: 55px;
     }
   }
   ::v-deep .el-table th.el-table__cell.is-leaf,

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeConstructionUnit.vue

@@ -120,6 +120,7 @@ export default {
       dialogtableDataTotal: 0,
       dialogTableData: [],
       statisticsData: {},
+      selectDialogOptions: {}
     };
   },
   //可访问data属性
@@ -134,13 +135,13 @@ export default {
   methods: {
     async initDetail() {
       try {
-        await this.setOptions(true);
+        await this.setOptions();
         await this.handleQuery();
       } catch (error) {
 
       }
     },
-    async setOptions(flag) {
+    async setOptions() {
       try {
         const options = await getCooperativeOwnerUnitsOptionsApi({ companyId: this.queryParams.companyId });
         if (options.code == 200 && options.data) {
@@ -151,8 +152,25 @@ export default {
           const optionsKey = [["businessType", "businessTypes"], ["counterpartCompanyRole", "counterpartCompanyRoles"], ["projectType", "projectTypes"]];
 
           optionsKey.forEach(([key, value]) => {
-            flag ? this.$set(this.formData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]) : null;
-            this.$set(this.dialogFormData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]);
+            this.$set(this.formData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]);
+          });
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    async setDialogOptions() {
+      try {
+        const options = await getCooperativeOwnerUnitsOptionsApi({ companyId: this.queryParams.companyId });
+        if (options.code == 200 && options.data) {
+          for (const key in options.data) {
+            options.data[key] = options.data[key].map(item => ({ name: item, value: item }));
+          }
+          this.selectDialogOptions = options.data;
+          const optionsKey = [["businessType", "businessTypes"], ["counterpartCompanyRole", "counterpartCompanyRoles"], ["projectType", "projectTypes"]];
+
+          optionsKey.forEach(([key, value]) => {
+            this.$set(this.dialogFormData.find(formItem => value == formItem.fieldName), "options", this.selectDialogOptions[key]);
           });
         }
       } catch (error) {
@@ -221,6 +239,9 @@ export default {
     async sortChange({ column, order, prop }) {
       let sort = null;
       switch (prop) {
+        case "count":
+          order == "ascending" ? sort = 6 : sort = 5;
+          break;
         case "time":
           order == "ascending" ? sort = 4 : sort = 3;
           break;
@@ -233,8 +254,9 @@ export default {
       if (!order) sort = "";
       this.queryParams.sort = sort;
       try {
-        let data = this.queryParams;
-        const res = await getCooperativeOwnerUnitsListApi(data);
+        const params = this.createQueryCondition(this.formData);
+        const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
+        const res = await getCooperativeOwnerUnitsListApi(searchParams);
         this.tableData = res.rows ? res.rows : [];
         this.tableDataTotal = res.total ? res.total : 0;
       } catch (error) {
@@ -287,11 +309,12 @@ export default {
       if (!order) sort = "";
       this.dialogQueryParams.sort = sort;
       try {
-        let data = this.dialogQueryParams;
-        const res = await getCooperativeOwnerUnitsDetailApi(data);
+        const params = this.createQueryCondition(this.dialogFormData);
+        const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.dialogQueryParams }));
+        const res = await getCooperativeOwnerUnitsDetailApi(searchParams);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
-        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        const count = await getCooperativeOwnerUnitsCountAmountApi(JSON.parse(JSON.stringify(this.dialogQueryParams)));
         if (count.code == 200 && count.data) {
           this.statisticsData = count.data;
         }
@@ -306,7 +329,7 @@ export default {
       this.dialogHandleQurey(searchParams);
     },
     async dialogOPen() {
-      await this.setOptions();
+      await this.setDialogOptions();
       await this.dialogHandleQurey();
     },
     dialogClose() {

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeGroup.vue

@@ -43,6 +43,11 @@
                 v-html="scope.row.companyName">{{scope.row.companyName}}</span>
               <span v-else>-</span>
             </template>
+            <!-- 合作项目数量 -->
+            <template slot="count" slot-scope="scope">
+              <span v-if="scope.row.count" style="color: #0081FF;cursor: pointer;">{{scope.row.count}}</span>
+              <span v-else>-</span>
+            </template>
           </dialog-tables>
         </template>
 
@@ -125,7 +130,7 @@ export default {
         { label: '集团名称', prop: 'combineName', width: '295', slot: true, showOverflowTooltip: true },
         { label: '合作项目数量', prop: 'count', minWidth: '190', align: "right", slot: true, sortable: "custom" },
         { label: '最近一次合作时间', prop: 'time', minWidth: '214', sortable: "custom" },
-        { label: '合作总金额（万元）', prop: 'amount', minWidth: '226', align: "right", sortable: "custom" },
+        // { label: '合作总金额（万元）', prop: 'amount', minWidth: '226', align: "right", sortable: "custom" },
       ],
       formData: [
         { type: 4, fieldName: 'businessTypes', value: '', placeholder: '咨询机构业务', options: [], uid: this.getUid() },
@@ -143,8 +148,9 @@ export default {
       // 合作项目详情弹窗
       cooperationRecordDialog: false,
       dialogQueryParams: {
-        companyId: "",
-        memberId : "",
+        companyId: this.companyId,
+        memberId: "",
+        combineId: "",
         pageNum: 1,
         pageSize: 10,
         companyType: 3,
@@ -152,9 +158,9 @@ export default {
       },
       memberForData: [
         { label: '合作成员', prop: 'companyName', width: '351', slot: true, showOverflowTooltip: true },
-        { label: '合作次数', prop: 'count	', minWidth: '223', align: "right", slot: true, sortable: "custom" },
+        { label: '合作次数', prop: 'count', minWidth: '223', align: "right", slot: true, sortable: "custom" },
         { label: '最近一次合作时间', prop: 'time', minWidth: '214', sortable: "custom" },
-        { label: '合作总金额（万元）', prop: 'amount', minWidth: '226', align: "right", sortable: "custom" },
+        // { label: '合作总金额（万元）', prop: 'amount', minWidth: '226', align: "right", sortable: "custom" },
       ],
       dialogForData: [
         { label: '合作项目/工程名称', prop: 'projectName', width: '182', slot: true, showOverflowTooltip: true },
@@ -177,6 +183,7 @@ export default {
       dialogIsSkeleton: true,
       dialogtableDataTotal: 0,
       dialogTableData: [],
+      selectDialogOptions: {},
       statisticsData: {},
     };
   },
@@ -192,13 +199,14 @@ export default {
   methods: {
     async initDetail() {
       try {
-        await this.setOptions(true);
+        await this.setOptions();
+        await this.setDialogOptions();
         await this.handleQuery();
       } catch (error) {
 
       }
     },
-    async setOptions(flag) {
+    async setOptions() {
       try {
         const options = await getCooperativeOwnerUnitsOptionsApi({ companyId: this.queryParams.companyId });
         if (options.code == 200 && options.data) {
@@ -209,8 +217,25 @@ export default {
           const optionsKey = [["businessType", "businessTypes"], ["counterpartCompanyRole", "counterpartCompanyRoles"], ["projectType", "projectTypes"]];
 
           optionsKey.forEach(([key, value]) => {
-            flag ? this.$set(this.formData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]) : null;
-            this.$set(this.dialogFormData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]);
+            this.$set(this.formData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]);
+          });
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    async setDialogOptions() {
+      try {
+        const options = await getCooperativeOwnerUnitsOptionsApi({ companyId: this.queryParams.companyId });
+        if (options.code == 200 && options.data) {
+          for (const key in options.data) {
+            options.data[key] = options.data[key].map(item => ({ name: item, value: item }));
+          }
+          this.selectDialogOptions = options.data;
+          const optionsKey = [["businessType", "businessTypes"], ["counterpartCompanyRole", "counterpartCompanyRoles"], ["projectType", "projectTypes"]];
+
+          optionsKey.forEach(([key, value]) => {
+            this.$set(this.dialogFormData.find(formItem => value == formItem.fieldName), "options", this.selectDialogOptions[key]);
           });
         }
       } catch (error) {
@@ -279,6 +304,9 @@ export default {
     async sortChange({ column, order, prop }) {
       let sort = null;
       switch (prop) {
+        case "count":
+          order == "ascending" ? sort = 6 : sort = 5;
+          break;
         case "time":
           order == "ascending" ? sort = 4 : sort = 3;
           break;
@@ -291,8 +319,9 @@ export default {
       if (!order) sort = "";
       this.queryParams.sort = sort;
       try {
-        let data = this.queryParams;
-        const res = await getCooperativeOwnerUnitsListApi(data);
+        const params = this.createQueryCondition(this.formData);
+        const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
+        const res = await getCooperativeOwnerUnitsListApi(searchParams);
         this.tableData = res.rows ? res.rows : [];
         this.tableDataTotal = res.total ? res.total : 0;
       } catch (error) {
@@ -300,18 +329,22 @@ export default {
       }
     },
     viewProject(row) {
-      this.dialogQueryParams.companyId = row.companyId;
       this.dialogQueryParams.memberId = row.combineId;
+      this.dialogQueryParams.combineId = row.combineId;
       this.cooperationRecordDialog = true;
     },
     async dialogHandleQurey(params) {
       try {
         let data = params ? params : this.dialogQueryParams;
+        const _tempData = JSON.parse(JSON.stringify(data));
+        this.currentList == "cooperativeMember" ? delete _tempData.memberId : delete _tempData.memberId;
         this.dialogIsSkeleton = true;
-        const res = this.currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(data) : await getCooperativeOwnerUnitsDetailApi(data);
+        const res = this.currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(_tempData) : await getCooperativeOwnerUnitsDetailApi(_tempData);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
-        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        const dialogData = JSON.parse(JSON.stringify(data));
+        delete dialogData.memberId;
+        const count = await getCooperativeOwnerUnitsCountAmountApi(dialogData);
         if (count.code == 200 && count.data) {
           this.statisticsData = count.data;
         }
@@ -345,11 +378,15 @@ export default {
       if (!order) sort = "";
       this.dialogQueryParams.sort = sort;
       try {
-        let data = this.dialogQueryParams;
-        const res = this.currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(data) : await getCooperativeOwnerUnitsDetailApi(data);
+        const params = this.createQueryCondition(this.dialogFormData);
+        const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.dialogQueryParams }));
+        this.currentList == "cooperativeMember" ? delete searchParams.memberId : delete searchParams.memberId;
+        const res = this.currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(searchParams) : await getCooperativeOwnerUnitsDetailApi(searchParams);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
-        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        const dialogData = JSON.parse(JSON.stringify(this.dialogQueryParams));
+        delete dialogData.memberId;
+        const count = await getCooperativeOwnerUnitsCountAmountApi(dialogData);
         if (count.code == 200 && count.data) {
           this.statisticsData = count.data;
         }
@@ -364,7 +401,7 @@ export default {
       this.dialogHandleQurey(searchParams);
     },
     async dialogOPen() {
-      await this.setOptions();
+      await this.setDialogOptions();
       await this.dialogHandleQurey();
     },
     dialogClose() {
@@ -374,9 +411,24 @@ export default {
       this.dialogtableDataTotal = data.dialogtableDataTotal;
       this.dialogTableData = data.dialogTableData;
     },
+    async resetDialogQuery() {
+      try {
+        const data = this.$options.data.call(this);
+        this.dialogTableData = data.dialogTableData;
+        this.statisticsData = data.statisticsData;
+        this.dialogtableDataTotal = data.dialogtableDataTotal;
+        this.dialogFormData = data.dialogFormData;
+        this.dialogQueryParams.pageNum = 1;
+        this.dialogQueryParams.pageSize = 10;
+        await this.setDialogOptions();
+      } catch (error) {
+        console.log(error);
+      }
+    },
     // 切换tab
-    tabToggle() {
-
+    async tabToggle() {
+      await this.resetDialogQuery();
+      await this.dialogHandleQurey();
     }
   },
 }

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue

@@ -119,7 +119,8 @@ export default {
       dialogIsSkeleton: true,
       dialogtableDataTotal: 0,
       dialogTableData: [],
-      statisticsData: {}
+      statisticsData: {},
+      selectDialogOptions: {}
     };
   },
   //可访问data属性
@@ -134,13 +135,13 @@ export default {
   methods: {
     async initDetail() {
       try {
-        await this.setOptions(true);
+        await this.setOptions();
         await this.handleQuery();
       } catch (error) {
 
       }
     },
-    async setOptions(flag) {
+    async setOptions() {
       try {
         const options = await getCooperativeOwnerUnitsOptionsApi({ companyId: this.queryParams.companyId });
         if (options.code == 200 && options.data) {
@@ -151,8 +152,25 @@ export default {
           const optionsKey = [["businessType", "businessTypes"], ["counterpartCompanyRole", "counterpartCompanyRoles"], ["projectType", "projectTypes"]];
 
           optionsKey.forEach(([key, value]) => {
-            flag ? this.$set(this.formData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]) : null;
-            this.$set(this.dialogFormData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]);
+            this.$set(this.formData.find(formItem => value == formItem.fieldName), "options", this.selectOptions[key]);
+          });
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    async setDialogOptions() {
+      try {
+        const options = await getCooperativeOwnerUnitsOptionsApi({ companyId: this.queryParams.companyId });
+        if (options.code == 200 && options.data) {
+          for (const key in options.data) {
+            options.data[key] = options.data[key].map(item => ({ name: item, value: item }));
+          }
+          this.selectDialogOptions = options.data;
+          const optionsKey = [["businessType", "businessTypes"], ["counterpartCompanyRole", "counterpartCompanyRoles"], ["projectType", "projectTypes"]];
+
+          optionsKey.forEach(([key, value]) => {
+            this.$set(this.dialogFormData.find(formItem => value == formItem.fieldName), "options", this.selectDialogOptions[key]);
           });
         }
       } catch (error) {
@@ -221,6 +239,9 @@ export default {
     async sortChange({ column, order, prop }) {
       let sort = null;
       switch (prop) {
+        case "count":
+          order == "ascending" ? sort = 6 : sort = 5;
+          break;
         case "time":
           order == "ascending" ? sort = 4 : sort = 3;
           break;
@@ -233,8 +254,9 @@ export default {
       if (!order) sort = "";
       this.queryParams.sort = sort;
       try {
-        let data = this.queryParams;
-        const res = await getCooperativeOwnerUnitsListApi(data);
+        const params = this.createQueryCondition(this.formData);
+        const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
+        const res = await getCooperativeOwnerUnitsListApi(searchParams);
         this.tableData = res.rows ? res.rows : [];
         this.tableDataTotal = res.total ? res.total : 0;
       } catch (error) {
@@ -287,11 +309,12 @@ export default {
       if (!order) sort = "";
       this.dialogQueryParams.sort = sort;
       try {
-        let data = this.dialogQueryParams;
-        const res = await getCooperativeOwnerUnitsDetailApi(data);
+        const params = this.createQueryCondition(this.dialogFormData);
+        const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.dialogQueryParams }));
+        const res = await getCooperativeOwnerUnitsDetailApi(searchParams);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
-        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        const count = await getCooperativeOwnerUnitsCountAmountApi(JSON.parse(JSON.stringify(this.dialogQueryParams)));
         if (count.code == 200 && count.data) {
           this.statisticsData = count.data;
         }
@@ -306,7 +329,7 @@ export default {
       this.dialogHandleQurey(searchParams);
     },
     async dialogOPen() {
-      await this.setOptions();
+      await this.setDialogOptions();
       await this.dialogHandleQurey();
     },
     dialogClose() {

dsk-operate-ui/src/views/detail/party-a/riskInformation/equityFreezing.vue

 <template>
   <div class="equity-freezing-container">
 
-    <el-tabs v-model="queryParams.type" @tab-click="handleClick" class="detail-tab">
+    <el-tabs :value="queryParams.type" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="股权冻结" name="0"></el-tab-pane>
-      <el-tab-pane label="历史股权冻结" :disabled="tableDataTotal==0" name="1"></el-tab-pane>
+      <el-tab-pane label="历史股权冻结" :disabled="historyTableDataTotal == 0" name="1"></el-tab-pane>
     </el-tabs>
 
     <head-form-new ref="headFormNew" title="" :form-data="formData" :query-params="queryParams" :total="tableDataTotal" :isExcel="true"
@@ -22,7 +22,7 @@
       </template>
       <!-- 操作 -->
       <template slot="operation-table" slot-scope="scope">
-        <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">操作</span>
+        <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
       </template>
     </tables>
 
@@ -97,14 +97,14 @@ export default {
         type: "0"
       },
       forData: [
-        { label: '执行通知书文号', prop: 'number', width: '164' },
-        { label: '被执行人', prop: 'beExecutedPerson', minWidth: '146' },
-        { label: '股权数额', prop: 'amount', width: '113' },
+        { label: '执行通知书文号', prop: 'number', width: '220', showOverflowTooltip: true },
+        { label: '被执行人', prop: 'beExecutedPerson', width: '220', showOverflowTooltip: true },
+        { label: '股权数额', prop: 'amount', width: '160' },
         { label: '执行法院', prop: 'executiveCourt', minWidth: '146' },
-        { label: '状态', prop: 'status', width: '50' },
+        { label: '状态', prop: 'status', width: '120' },
         { label: '冻结起止日期', prop: 'freezeStartDate', width: '171', slot: true },
-        { label: '公式时间', prop: 'source', width: '93' },
-        { label: '操作', prop: 'operation-table', width: '50', slot: true },
+        { label: '公示时间', prop: 'publicDate', width: '93' },
+        { label: '操作', prop: 'operation-table', width: '120', slot: true },
       ],
       formData: [
         { type: 5, fieldName: 'time', value: '', placeholder: '选择日期', startTime: 'dateFrom', endTime: 'dateTo', uid: this.getUid() },
@@ -113,9 +113,8 @@ export default {
       tableLoading: false,
       tableData: [],
       tableDataTotal: 0,
-      showList: [],
+      historyTableDataTotal: 0,
       isSkeleton: false,
-      resetStatus: false,
       // 股权冻结详情
       equityFreezingDetailDialog: false,
       // 详情缓存
@@ -135,15 +134,27 @@ export default {
     async initDetail() {
       try {
         await this.handleQuery();
+        await this.getHistoryList();
       } catch (error) {
 
       }
     },
     resetQueryParams() {
       const data = this.$options.data.call(this);
+      this.tableData = data.tableData;
+      this.tableDataTotal = data.tableDataTotal;
       this.queryParams = { ...data.queryParams, type: this.queryParams.type };
       this.formData[0].value = "";
     },
+    async getHistoryList(params) {
+      try {
+        let data = params ? { ...params, type: 1 } : { ...this.queryParams, type: 1 };
+        const res = await getEquityFreezingApi(data);
+        this.historyTableDataTotal = res.total ? res.total : 0;
+      } catch (error) {
+        console.log(error);
+      }
+    },
     async handleQuery(params) {
       try {
         let data = params ? { ...params, type: parseInt(params.type) } : { ...this.queryParams, type: parseInt(this.queryParams.type) };
@@ -159,6 +170,7 @@ export default {
     },
     handleClick(v) {
       if (v.name == this.queryParams.type) return;
+      this.queryParams.type = v.name;
       this.resetQueryParams();
       this.handleQuery();
     },

dsk-operate-ui/src/views/detail/party-a/riskInformation/limitHighConsumption.vue

@@ -80,6 +80,9 @@ export default {
     },
     // 查看原文
     viewOriginalArticle(row) {
+      if (row.source) {
+        window.open(row.source);
+      }
     }
   },
 }