695593266@qq.com 1 giorno fa
parent
commit
570ee83d5a

+ 13 - 13
src/views/productionPlan/components/newFactoryProductionScheduling.vue

@@ -295,7 +295,7 @@
         planPickerSelectionAll: [],
         planPickerSelectionSyncing: false,
         planTableSelectionSyncing: false,
-        planTableStatusTab: 'published',
+        planTableStatusTab: 'unpublished',
         dialogRenderKey: 0,
         dotLineLoading: false,
         dotLineFullscreen: false,
@@ -404,24 +404,24 @@
       planTableStatusTabs() {
         if (this.isOrderScheduling) {
           return [
-            {
-              name: 'dispatched',
-              label: '已派单'
-            },
             {
               name: 'undispatched',
               label: '未派单'
+            },
+            {
+              name: 'dispatched',
+              label: '已派单'
             }
           ];
         }
         return [
-          {
-            name: 'published',
-            label: '已发布'
-          },
           {
             name: 'unpublished',
             label: '未发布'
+          },
+          {
+            name: 'published',
+            label: '已发布'
           }
         ];
       },
@@ -644,7 +644,7 @@
           : '布点';
       },
       getDefaultPlanTableStatusTab(mode = this.schedulingMode) {
-        return mode === 'order' ? 'dispatched' : 'published';
+        return mode === 'order' ? 'undispatched' : 'unpublished';
       },
       getPlanTableStatusRequestWhere(tabName = this.planTableStatusTab) {
         if (this.isOrderScheduling) {
@@ -2973,14 +2973,14 @@
           const api = this.isReview ? releaseByApproval : release;
           const data = await api([row.id]);
           if (data || data === 0) {
-            this.$message.success('审批成功!');
+            this.$message.success('提交审核成功!');
           } else {
-            this.$message.error('审批失败,请重新审批!');
+            this.$message.error('提交审核失败,请重新提交!');
           }
           await this.refreshSchedulingView();
           await this.reloadPlanSchedulingPlansByStatus();
         } catch (e) {
-          this.$message.error(e.message || '审批失败,请重新审批!');
+          this.$message.error(e.message || '提交审核失败,请重新提交!');
         } finally {
           this.approvalLoading = false;
           loading.close();

+ 2 - 2
vue.config.js

@@ -35,14 +35,14 @@ module.exports = {
         // target: 'http://192.168.1.103:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.158:18086',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.102:18086',
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
 
         // target: 'http://192.168.1.116:18086',