1、增加表格设置

src/api/pages/mst/tableSet.js

@@ -0,0 +1,22 @@
+/**
+ * @desc   : 用户表格设置服务
+ * @author : 周兴
+ * @date   : 2024-07-31 14:37
+ */
+export default {
+  tableSetService: {
+    prefix: '/mdm-server/mst/tableSet/',
+    // 保存表格设置
+    saveTableSet:'save_table_set',
+  }
+}
+
+/**
+ * @desc   : 用户表格设置路由
+ * @author : 周兴
+ * @date   : 2024-02-01 16:03
+ */
+export const routeUrl = {
+  tableSet: {
+  }
+}

src/components/business/modal_table_filter/modal_table_filter.vue

@@ -226,7 +226,7 @@ export default {
      * @date   : 2023/4/4 17:01
      */
     refreshClient(tableRef, code, tableType, columns) {
-      let userTableSetting = vm.$store.state.user.userTableSetting;
+      let userTableSetting = vm.$store.state.user.userTableSetting || [];
       let filters = userTableSetting.filter(it => it.tableRef === tableRef && it.code === code && it.tableType === tableType)
       if (filters && filters.length > 0) {
         filters[0].columns.value = JSON.stringify(columns);
@@ -261,7 +261,7 @@ export default {
       })
       params.columns = columns;
       // 保存到数据库
-      this.excute(this.$service.userTableSetService, this.$service.userTableSetService.saveUserTableSet, params).then(res => {
+      this.excute(this.$service.tableSetService, this.$service.tableSetService.saveTableSet, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           // 保存成功
           this.$Message.success(vm.$t('I_001', {'param': vm.$t('save')}))

src/components/table/dk-table/dk-table.vue

@@ -491,9 +491,9 @@ export default {
               ]
             },
             // 透视
-            {
-              code: 'perspective', name: vm.$t('perspective'), disabled: false, visible: self.perspectiveFlag
-            },
+            // {
+            //   code: 'perspective', name: vm.$t('perspective'), disabled: false, visible: self.perspectiveFlag
+            // },
             // <!--自适应列宽-->
             {
               code: 'adaption', name: vm.$t('adaption'), disabled: false, visible: true, children: [

src/locale/lang/zh-CN.js

@@ -326,8 +326,8 @@ export const columns = {
   outAmt: '已出库金额',
   returnQty: '已出库退货数量',
   returnAmt: '已出库退货金额',
-  nonStdCode: '非标号',
-  oNonStdCode: '原非标号',
+  nonStdCode: '色号',
+  oNonStdCode: '原色号',
   whId: '仓库',
   addressArea: '客户区域',
   addressNo: '门牌号',
@@ -368,7 +368,7 @@ export const columns = {
   amteMeet:'剩余应付',
   pricePur:'采购价',
   itemPurAmt:'采购金额',
-  nonStandardCode:'非标号',
+  nonStandardCode:'色号',
   returnNo:'退货单号',
   returnQty1:'退货数量',
   priceReturn:'退货价',

src/mixins/index.js

@@ -354,6 +354,16 @@ export const indexMixin = {
       }
     },
     /**
+     * @desc   : 打开搜索重新计算表格高度
+     * @author : 周兴
+     * @date   : 2023/4/18 11:22
+     */
+    changeCollapse() {
+      setTimeout(() => {
+        this.resizeTable() // 重新计算表格高度
+      }, 300)
+    },
+    /**
      * @desc   : 设置查询条件
      * @author : 周兴
      * @date   : 2023/1/4 10:55
@@ -1033,9 +1043,8 @@ export const indexMixin = {
     showSetting(it, refName) {
       if (it) {
         it.userTableSetInfo = {
-          // ftyId: this.$store.state.user.ftyId,
           cpId: this.$store.state.user.cpId,
-          userId: this.$store.state.user.id,
+          staffId: this.$store.state.user.staffId,
           tableType: this.$config.userTableType.page,
           code: this.$route.name,
           tableRef: refName

src/view/pur/pur-track-report/index.vue

@@ -1,6 +1,6 @@
 <!-- @desc:采购跟踪  @auth:常皓宁  @time:2024/04/22 09:15 -->
 <template>
-  <div slot="top">
+  <div class="main-div">
     <DkTabs v-model="tabsModel" :options="tabsOptions" @on-click="tabsClick"></DkTabs>
     <!--    采购订单-->
     <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='purchase' ">
@@ -50,7 +50,7 @@
                      majorField="purItemId"
                      :data="purChaseItemList"
                      :columns="goodsColumns"
-                     :height="400"
+                     :height="tableHeight + 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -107,7 +107,7 @@
                      majorField="intoItemId"
                      :data="purEntryItemList"
                      :columns="purEntryColumns"
-                     :height="400"
+                     :height="tableHeight+ 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -164,7 +164,7 @@
                      majorField="retuenItemId"
                      :data="purReturnItemList"
                      :columns="purReturnColumns"
-                     :height="400"
+                     :height="tableHeight+ 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -183,7 +183,7 @@
                      majorField="retuenItemId"
                      :data="purPayData"
                      :columns="purPayColumns"
-                     :height="400"
+                     :height="tableHeight+ 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -197,8 +197,7 @@
 </template>
 
 <script>
-import {indexMixin} from '@/mixins'
-import {formMixin} from "@/mixins/form";
+import {formMixin} from '@/mixins/form'
 
 export default {
   name: "pur-track-report",