Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/component/shiftHandover/enrolled.vue

@@ -202,7 +202,7 @@ export default {
     }
   },
   data() {
-    const { userId } = this.$store.getters
+    const { userId, setting } = this.$store.getters || {}
     return {
       filter: [
         {
@@ -318,7 +318,8 @@ export default {
       jianCeGangWeiList: [],
       filterData: [],
       masterReport: ['已早交班', '已午交班', '已晚交班', '已完成'],
-      subReport: ['早班', '午班', '晚班']
+      subReport: ['早班', '午班', '晚班'],
+      config: setting?.postJob?.allocation || false
     }
   },
   computed: {
@@ -372,7 +373,7 @@ export default {
       // const sql = `select * from t_sbwhgwpzb where di_dian_='${second || first}'`
       this.$common
         .request('query', {
-          key: 'getPositionList',
+          key: this.config ? 'gwzzzha' : 'getPositionList',
           params: [second || first]
         })
         .then((res) => {