员工bug

api/pages/mst/staff.js

@@ -27,7 +27,7 @@ module.exports = {
             // 范围权限
             staffPurview: { key: 'staffPurview', url: '/package-base-select/pages/select-staff-purview/select-staff-purview', image: 'btn-data-qua.png' },
             // 离职
-            leaveOffice: { key: 'leaveOffice', method: 'leaveOffice', image: 'btn-resignation.png' },
+            leaveOffice: { key: 'leaveOffice', method: 'leaveOffice', image: 'btn-resignation.png',question:true },
 
         }
     }

package-base-select/pages/select-data/select-data.js

@@ -77,12 +77,12 @@ Page({
           }
         },
         success: function (res) {
-          console.log('_this.data.chooseType',_this.data.chooseRoute);
+          console.log('_this.data.chooseType', _this.data.chooseRoute);
           // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-          res.eventChannel.emit('params', {formType:_this.data.chooseRoute.type,backFlag:true})
+          res.eventChannel.emit('params', { formType: _this.data.chooseRoute.type, backFlag: true })
         }
       })
-    }else if(this.data.popContent && this.data.popContent.length > 0){
+    } else if (this.data.popContent && this.data.popContent.length > 0) {
       this.setData({
         showPop: true
       })
@@ -556,7 +556,7 @@ Page({
       case Constants.chooseType.org:
         title = "部门"
         this.setData({
-          addUrl: '/package-basic-data/pages/org/org',
+          addUrl: app.globalData.company.gradeCode == Constants.gradeCode.STD ? null : '/package-basic-data/pages/org/org',
           routeObjName: 'common',
           method: 'getOrg',
           title: 'orgName',
@@ -866,7 +866,7 @@ Page({
             name: 'addressFull',
             title: '地址'
           },
-         
+
           {
             name: 'phone',
             title: '电话'

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

@@ -92,7 +92,7 @@ Page({
     // 专业版
     if (this.data.gradeCode == Constants.gradeCode.PRO) {
       params.flgCanLogin = (formData.flgCanPcLogin || formData.flgCanWxLogin)
-       // 1：PC端，2：移动端，3：PC+移动端
+      // 1：PC端，2：移动端，3：PC+移动端
       if (formData.flgCanPcLogin && formData.flgCanWxLogin) {
         params.loginType = Constants.loginType.loginTypeWxPc
       } else if (formData.flgCanPcLogin) {
@@ -165,13 +165,15 @@ Page({
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
         title: mixins.$t('staffEdit'),
-      })     
+      })
 
     } else {
       wx.setNavigationBarTitle({
         title: mixins.$t('staffAdd'),
       })
-
+      let formData = {}
+      formData.orgId = app.globalData.user.orgId
+      formData.orgName = app.globalData.user.orgName
     }
     // 专业版
     if (this.data.gradeCode == Constants.gradeCode.PRO) {
@@ -185,9 +187,19 @@ Page({
         [
           { code: 'flgCanLogin', type: 'switch', title: mixins.$t('flgCanLogin') },
         ]
+        //标准版-新建选择部门页面隐藏新建
+      if (this.data.formMode == Constants.formMode.edit) { } else {
+        let formData = {}
+        formData.orgId = app.globalData.user.orgId
+        formData.orgName = app.globalData.user.orgName
+        this.setData({
+          formData: JSON.stringify(formData)
+        })
+      }
+
     }
     this.setData({
-      contentObj: contentObj_
+      contentObj: contentObj_,
     })
   },
 })

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

@@ -138,10 +138,8 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
    */
-  leaveOffice(e) {
-    console.log(e);
-    let item = e
-    let id = item.staffId
+  leaveOffice(e) { 
+    let item = e 
     let params = {
       staffId: item.staffId,
       flgValid: false,

package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -33,7 +33,7 @@ Page({
     }],
 
     // 查询条件-筛选
-    pullMenuList: (app.globalData.company.gradeCode == Constants.gradeCode.PRO)?[
+    pullMenuList: (app.globalData.company.gradeCode == Constants.gradeCode.PRO) ? [
       {
         code: 'intoType',
         pullType: 'mSelect',
@@ -66,37 +66,37 @@ Page({
         title: mixins.$t('flgValid'),
         dataType: 'checkbox'
       },
-    ]:[
-      {
-        code: 'intoType',
-        pullType: 'mSelect',
-        typeName: 'intoTypeSt'
-      },
-      {
-        code: 'cusName',
-      },
-      {
-        code: 'cusPhone',
-      },
-      {
-        code: 'addressFull',
-      },
-      {
-        code: 'whName',
-        title: mixins.$t('reservoirArea')
-      },
-      {
-        code: 'staffName',
-      },
-      {
-        code: 'orgName',
-      },
-      {
-        code: 'flgValid',
-        title: mixins.$t('flgValid'),
-        dataType: 'checkbox'
-      },
-    ],
+    ] : [
+        {
+          code: 'intoType',
+          pullType: 'mSelect',
+          typeName: 'intoTypeSt'
+        },
+        {
+          code: 'cusName',
+        },
+        {
+          code: 'cusPhone',
+        },
+        {
+          code: 'addressFull',
+        },
+        {
+          code: 'whName',
+          title: mixins.$t('reservoirArea')
+        },
+        {
+          code: 'staffName',
+        },
+        {
+          code: 'orgName',
+        },
+        {
+          code: 'flgValid',
+          title: mixins.$t('flgValid'),
+          dataType: 'checkbox'
+        },
+      ],
 
     // 列表区（脚部金额）
     footerAmount: {
@@ -172,10 +172,8 @@ Page({
       [mixins.$t('firstInWh')]: [{
         name: 'intoNo',
         title: mixins.$t('inOrderNo')
-      }, {
-        name: 'intoReasonName',
-        title: mixins.$t('intoReason')
-      }, {
+      },
+      {
         name: [{
           name: 'orgName',
           title: ''
@@ -317,8 +315,11 @@ Page({
       params.intoStatus = Constants.intoStatus.inBounded
       params.outStatus = Constants.outStatus.outBounded
     }
-    params.intoTypes = params.intoTypeList
-
+    if (app.globalData.company.gradeCode == Constants.gradeCode.PRO) {
+      params.intoTypes = params.intoTypeList
+    } else {
+      params.intoTypes = params.intoTypeStList
+    }
     return params;
   },
   /**