1、修改基础资料左侧按版本控制

package-basic-data/pages/basic-data/basic-data.js

@@ -494,14 +494,12 @@ Page({
     */
   getDataKind() {
     // 读取系统字典
-    let dataKindList = app.globalData.dataKindList
-    let sidebarList = []
+    let sidebarList = app.globalData.dataKindList.filter(it=>it.kindType == Constants.kindType.basicData)
+    console.log('gradeCode',this.data.gradeCode);
     if (this.data.gradeCode == Constants.gradeCode.STD) {
-      sidebarList = dataKindList.filter(it => (it.kindType == Constants.kindType.basicData && it.kindCode != '基础资料-盈亏原因'))
-    } else {
-      sidebarList = dataKindList.filter(it => it.kindType == Constants.kindType.basicData)
-    }
-
+      sidebarList = sidebarList.filter(it => (it.kindCode == '基础资料-仓库' || it.kindCode == '基础资料-账户' ||
+                                      it.kindCode == '基础资料-入库' || it.kindCode == '基础资料-渠道'))
+    } 
     this.setData({
       sidebarList: sidebarList
     })

package-basic-data/pages/register/company-setting/company-setting.js

@@ -8,7 +8,7 @@
 *		姜永辉		  	2022-11-22			1.00		   	新建
 *******************************************************************************/
 const mixins = require('@/mixins/index.js')
-const Constants = require('@/utils/Constants.js'); 
+const Constants = require('@/utils/Constants.js');
 
 const app = getApp()
 Page({
@@ -29,7 +29,7 @@ Page({
                 { code: 'shopSize', type: 'str', readonly: 'true', title: mixins.$t('shopSize') },
                 { code: 'feedback', type: 'textarea', readonly: 'true', title: mixins.$t('feedback') },
             ],
-        }, 
+        },
     },
 
     /**
@@ -48,7 +48,7 @@ Page({
             },
             success: function (res) {
                 // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-                res.eventChannel.emit('params', {   })
+                res.eventChannel.emit('params', {})
             }
         })
     },
@@ -65,12 +65,13 @@ Page({
     },
 
     /**
- * @desc : 给表单赋值
- * @date : 2024/2/1 15:49
- * @author : 姜永辉
- */
+     * @desc : 给表单赋值
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
+     */
     setValuesByEdit(data) {
-        let contentObj = this.data.contentObj 
+        console.log('setValuesByEdit');
+        let contentObj = this.data.contentObj
         this.setData({
             formData: JSON.stringify(data)
         })

pages/mine/mine.js

@@ -369,7 +369,11 @@ Page({
   * @author : 姜永辉
   */
   toSetting() {
+    this.setData({
+      loading:true
+    })
     console.log(app.globalData.user, "toSetting");
+    let _this = this
     wx.navigateTo({
       url: this.data.route.companySetting.url,
       events: {
@@ -380,6 +384,11 @@ Page({
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
         res.eventChannel.emit('params', { id: app.globalData.company.cpId, formMode: Constants.formMode.edit })
+        setTimeout(()=>{
+          _this.setData({
+            loading:false
+          })
+        },2000)
       }
     })
   },