1、修改系统字典读取缓存

src/components/modal/dk-modal/dk-modal.vue

@@ -53,6 +53,7 @@
 
 <script>
 import {button as buttonList} from "@/locale/lang/zh-CN";
+import {localRead, localSave} from "@/libs/base/util";
 
 export default {
   name: "dk-modal",
@@ -216,7 +217,6 @@ export default {
       this.$emit('input', n)
       if(n){
         this.displayFlag = true;
-        console.log('ft',this.openFlag,n)
         this.onVisibleChange(true);
         if(this.shortcutFlag){
           this.addKeyBoardEvent();
@@ -323,6 +323,15 @@ export default {
       }
 
       if (e) {
+        // console.log('ttttt',this.$route,localRead(this.$route.name + '_temp'))
+        // // if(data && !this.isEmpty(data)){
+        // //   // 记录缓存
+        // //   localSave(this.$route.name + '_temp', JSON.stringify(data));
+        // // }
+        // let tempData = localRead(this.$route.name + '_temp');
+        // if(tempData){
+        //   this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].model = tempData
+        // }
         this.$nextTick(() => {
           this.focus();   // 聚焦到第一个组件上
         })
@@ -333,6 +342,18 @@ export default {
       }
     },
     /**
+     * @desc   : 记录缓存数据
+     * @author : 周兴
+     * @date   : 2024/4/9 9:44
+     */
+    handleTempData(data){
+      // console.log('dd1d',data,this.$route)
+      // if(data && !this.isEmpty(data)){
+      //   // 记录缓存
+      //   localSave(this.$route.name + '_temp', JSON.stringify(data));
+      // }
+    },
+    /**
      * @desc   : 点击ok
      * @author : 周兴
      * @date   : 2022/7/23 17:35
@@ -352,9 +373,11 @@ export default {
         && this.$refs.modal.$slots.default[0].componentInstance) {
         if(this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName]
           && this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].resetFields){
+          this.handleTempData(this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].model);
           this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].resetFields();
         }
         if(this.$refs.modal.$slots.default[0].componentInstance.resetFields){
+          this.handleTempData(this.$refs.modal.$slots.default[0].componentInstance.model);
           this.$refs.modal.$slots.default[0].componentInstance.resetFields();
         }
       }
@@ -432,9 +455,11 @@ export default {
         && this.$refs.modal.$slots.default[0].componentInstance) {
         if(this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName]
           && this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].resetFields){
+          this.handleTempData(this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].model);
           this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].resetFields();
         }
         if(this.$refs.modal.$slots.default[0].componentInstance.resetFields){
+          this.handleTempData(this.$refs.modal.$slots.default[0].componentInstance.model);
           this.$refs.modal.$slots.default[0].componentInstance.resetFields();
         }
       }

src/store/module/user.js

@@ -172,6 +172,9 @@ export default {
     setDefaultWhName(state, defaultWhName){
       state.defaultWhName = defaultWhName
     },
+    setDataKindList(state, dataKindList){
+      state.dataKindList = dataKindList
+    },
   },
   getters: {
     messageUnreadCount: state => state.messageUnreadList.length,
@@ -275,6 +278,8 @@ export default {
       // 默认仓库
       commit('setDefaultWhId', data.staff.defaultWhId)
       commit('setDefaultWhName', data.staff.defaultWhName)
+      // 记录系统字典
+      commit('setDataKindList', data.dataKindList)
       // 角色
       commit('setRoleIds',data.staff.roleIds)
       if(data.settingValue && data.settingValue.setting){

src/view/ivt/ivt-check/index.vue

@@ -138,7 +138,7 @@ export default {
             valueFormat: {
               code: 'checkStatusList',
               data: [],
-              valueKey: 'id',
+              valueKey: 'kindCode',
               labelKey: 'kindName',
             },
             valueKind: 'M-CHOICE'
@@ -199,17 +199,13 @@ export default {
      * @date   : 2024/3/14 16:33
      */
     getCheckStatus() {
-      let params = {
-        kindType: this.$config.kindType.checkStatus,
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.checkStatus)
+      let list = this.searchContent.filter(it =>  it.valueFormat && it.valueFormat.code == 'checkStatusList')
+      if (list.length > 0) {
+        list[0].valueFormat.data = data
       }
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          let list = this.searchContent.filter(it => it.valueFormat.code == 'checkStatusList')
-          if (list.length > 0) {
-            list[0].valueFormat.data = res.data
-          }
-        }
-      })
     },
 
     /**

src/view/ivt/ivt-freeze/index.vue

@@ -197,17 +197,13 @@ export default {
      * @date   : 2024/3/14 16:33
      */
     getFreezeStatus() {
-      let params = {
-        kindType: this.$config.kindType.freezeStatus,
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.freezeStatus)
+      let list = this.searchContent.filter(it =>  it.valueFormat && it.valueFormat.code == 'freezeStatusList')
+      if (list.length > 0) {
+        list[0].valueFormat.data = data
       }
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          let list = this.searchContent.filter(it => it.valueFormat.code == 'freezeStatusList')
-          if (list.length > 0) {
-            list[0].valueFormat.data = res.data
-          }
-        }
-      })
     },
     /**
      * @desc   : 部门条件

src/view/ivt/ivt-transfer/index.vue

@@ -191,17 +191,13 @@ export default {
      * @date   : 2024/3/30 15:45
      */
     getTransferStatus() {
-      let params = {
-        kindType: this.$config.kindType.transferStatus,
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.transferStatus)
+      let list = this.searchContent.filter(it =>  it.valueFormat && it.valueFormat.code == 'transferStatusList')
+      if (list.length > 0) {
+        list[0].valueFormat.data = data
       }
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          let list = this.searchContent.filter(it => it.valueFormat.code == 'transferStatusList')
-          if (list.length > 0) {
-            list[0].valueFormat.data = res.data
-          }
-        }
-      })
     },
 
     /**

src/view/mst/basic-data/index.vue

@@ -369,19 +369,13 @@ export default {
      * @date   : 2024/3/9 13:03
      */
     getBasicData() {
-      // 查询数据
-      let params = {
-        kindType: this.$config.kindType.basicData
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.basicData)
+      this.leftData = data
+      if (this.leftData.size() > 0) {
+        this.kindCode = this.leftData[0].kindCode
       }
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          console.log('1111111',res.data,res.data.list)
-          this.leftData = res.data
-          if (this.leftData.size() > 0) {
-            this.kindCode = this.leftData[0].kindCode
-          }
-        }
-      })
     },
   },
   created() {

src/view/mst/goods-attr/index.vue

@@ -452,18 +452,13 @@ export default {
      * @date   : 2024/3/9 13:03
      */
     getGoodsAttrData() {
-      // 查询数据
-      let params = {
-        kindType: this.$config.kindType.goodsAttr
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.goodsAttr)
+      this.leftData = data
+      if (this.leftData.size() > 0) {
+        this.kindCode = this.leftData[0].kindCode
       }
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          this.leftData = res.data
-          if (this.leftData.size() > 0) {
-            this.kindCode = this.leftData[0].kindCode
-          }
-        }
-      })
     },
   },
   created() {

src/view/mst/supplier/index.vue

@@ -196,21 +196,14 @@ export default {
      * @date   : 2024/3/4 16:33
      */
     getSupType() {
-      // 定义系统字典查询条件
-      let params = {
-        kindType: this.$config.kindType.supType,
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.supType)
+      let list = this.searchContent.filter(it =>  it.valueFormat && it.valueFormat.code == 'kindType')
+      if (list.length > 0) {
+        list[0].valueFormat.data = data
       }
-      // 根据条件查询系统字典信息
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          // searchContent页面上的查询内容
-          let list = this.searchContent.filter(it => it.valueFormat.code == 'kindType')
-          if (list.length > 0) {
-            list[0].valueFormat.data = res.data
-          }
-          this.supTypeList = res.data;
-        }
-      })
+      this.supTypeList = data;
     },
 
     /**
@@ -219,14 +212,10 @@ export default {
      * @date   : 2024/3/4 16:33
      */
     getserviceCategories() {
-      let params = {
-        kindType: this.$config.kindType.serviceCategories,
-      }
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          this.serviceCategoriesList = res.data;
-        }
-      })
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.serviceCategories)
+      this.serviceCategoriesList = data;
     },
 
     /**

src/view/report/detail-report/index.vue

@@ -119,27 +119,28 @@ export default {
     getSelectDataSource() {
       let filters = this.searchContent.filter(it => it.valueKind == 'M-CHOICE' || it.valueKind == 'S-CHOICE');
       if (filters && filters.length > 0) {
-        let params = {}
         filters.forEach(it => {
-          params = {}
           if (it.valueFormat && it.valueFormat.service && it.valueFormat.method) {
-            // TODO
-            // if(it.valueFormat.searchp){
-            //   params[]
-            // }
-            this.excute(this.$service[it.valueFormat.service],
-              this.$service[it.valueFormat.service][it.valueFormat.method], params).then(res => {
-              if (res.code === this.$config.SUCCESS_CODE) {
-                let data = []
-                if (res.data && res.data.list) {
-                  data = [...res.data.list]
+            // 系统字典直接读取缓存
+            if(it.valueFormat.method == 'getDataKind'){
+              let dataKindList =this.$store.state.user.dataKindList
+              let data = dataKindList.filter(it=>it.kindType == it.valueFormat.kindType);
+              it.valueFormat.data = data
+            }else{
+              this.excute(this.$service[it.valueFormat.service],
+                this.$service[it.valueFormat.service][it.valueFormat.method], {}).then(res => {
+                if (res.code === this.$config.SUCCESS_CODE) {
+                  let data = []
+                  if (res.data && res.data.list) {
+                    data = [...res.data.list]
+                  }
+                  if (data.length === 0 && res.data && Array.isArray(res.data)) {
+                    data = [...res.data]
+                  }
+                  it.valueFormat.data = data
                 }
-                if (data.length === 0 && res.data && Array.isArray(res.data)) {
-                  data = [...res.data]
-                }
-                it.valueFormat.data = data
-              }
-            })
+              })
+            }
           }
         })
       }

src/view/single-page/home/home.vue

@@ -673,14 +673,10 @@ export default {
      * @date   : 2023/9/6 17:04
      */
     getQualityTypeData() {
-      let params = {
-        kindType: this.$config.kindType.qualityType
-      }
-      this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          this.qualityTypeData = res.data;
-        }
-      })
+      // 读取系统字典
+      let dataKindList =this.$store.state.user.dataKindList
+      let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.qualityType)
+      this.qualityTypeData = data;
     },
     /**
      * @desc   : 行切换

src/view/wx-print/index.vue

@@ -61,7 +61,10 @@ export default {
             template: layout,
           })
 
-          hiprintTemplate.toPdf(printData,'单据打印')
+          hiprintTemplate.toPdf(printData,'单据打印',{isDownload:false,type:'dataurlstring'}).then(res=>{
+            console.log('res',res)
+            return res
+          })
 
 
         }else {