显示全部的工作单元

pages/index/TabHeader.vue

@@ -58,7 +58,7 @@ export default {
   },
   computed: {
     tabList () {
-      if (this.vuex_workunit && this.vuex_workunit.workunitId === 1) {
+      if (this.isWaiXie) {
         return [{
           path: 'PRO',
           title: i18n.t('外协'),
@@ -71,6 +71,11 @@ export default {
           icon: require('@/static/icons/png/pro.png')
         }]
       }
+    },
+    isWaiXie() {
+      if ((!this.vuex_workunit && this.vuex_workunitList && this.vuex_workunitList[0] && this.vuex_workunitList[0].workunitId === 1) || (this.vuex_workunit && this.vuex_workunit.workunitId === 1))
+        return true
+      return false
     }
   },
   created() {

pages/index/index.vue

@@ -147,12 +147,11 @@ export default {
     uni.$on('BLEstatus', (status) => {
       this.BLEBindbyStatus(status);
     });
-    // this.checkWorkstation();
     await this.getWorkUnitList();
     
     this.$u.api.getTaskConfig().then(res => {
       if (res.code === 200) {
-        if (res.data) {
+        if (res.msg === 'true') {
           this.setWorkUnit(null)
         } else {
           this.setWorkUnit(this.workUnitList[0])
@@ -179,14 +178,6 @@ export default {
       // this.$refs.menu_dialog.open();
       this.showLogoutMenu = true;
     },
-
-    //检查工作中心设置情况
-    checkWorkstation() {
-      if (this.vuex_workunit == null) {
-        this.showWorkstationFlag = true;
-        this.$u.toast(i18n.t('请设置当前触控屏的工作单元！'));
-      }
-    },
     //获取工序清单
     getProcessList() {
       this.$u.api.getProcessList({}).then((res) => {
@@ -216,9 +207,11 @@ export default {
         });
     },
     async getWorkUnitList(item) {
+      this.$u.vuex('vuex_workunitList', null);
       await this.$u.api.getWorkUnitList({}).then((res) => {
         if (res.code === 200) {
           this.workUnitList = res.rows;
+          this.$u.vuex('vuex_workunitList', res.rows);
         } else {
           this.$u.toast(i18n.t('获取工作单元清单异常') + res.msg);
         }

pages/mes/prodReport/index.vue

@@ -1422,10 +1422,7 @@ export default {
   },
   computed: {
     isWaiXie() {
-      if (
-        this.vuex_workunit &&
-        this.vuex_workunit.workunitId === 1
-      )
+      if ((!this.vuex_workunit && this.vuex_workunitList && this.vuex_workunitList[0] && this.vuex_workunitList[0].workunitId === 1) || (this.vuex_workunit && this.vuex_workunit.workunitId === 1))
         return true
       return false
     },
@@ -1822,7 +1819,6 @@ export default {
         this.$u.toast(i18n.t('不允许同时操作多条任务'))
         return
       }
-      // console.log('vuex_workstation', this.$store.state.vuex_workunit)
       const datas = Object.assign({}, this.tableSelectData[0])
       this.$refs['editFeeding']
         .getList()
@@ -2436,9 +2432,9 @@ export default {
         processId: item.processId,
         processCode: item.processCode,
         processName: item.processName,
-        workstationId: this.vuex_workunit.workunitId,
-        workstationCode: this.vuex_workunit.workunitCode,
-        workstationName: this.vuex_workunit.workunitName,
+        workstationId: item.workunitId,
+        workstationCode: item.workunitCode,
+        workstationName: item.workunitName,
         abnormalType: '',
         abnormalReason: '',
         abnormalTime: '',
@@ -2901,13 +2897,11 @@ export default {
         return
       }
       this.materialReturn = true
-      // this.viewSopPicture = this.tableSelectData[0];
-      const taskInfo = this.tableSelectData[0]
       this.curTaskInfo = this.tableSelectData[0]
       this.$u.api.viewpicture
         .listLinkFile({
           taskId: this.curTaskInfo.taskId,
-          workunitId: this.vuex_workunit.workunitId,
+          workunitId: this.curTaskInfo.workunitId,
         })
         .then((res) => {
           if (res.code === 200) {

store/index.js

@@ -61,6 +61,7 @@ const store = new Vuex.Store({
     //当前设备绑定的工作中心
     vuex_workstation: null,
     vuex_workunit: null,
+    vuex_workunitList: null,
     //当前工作中心正在进行的生产任务
     vuex_task: null,
     // 打印机服务器信息