代码提交

src/views/productionSchedulingPlan/basic/equipmentCapacity.vue

@@ -17,6 +17,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      :before-open="beforeOpen"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -170,7 +171,7 @@ export default {
               },
               {
                 label: '普通设备',
-                value: 1,
+                value: '1',
               },
             ],
           },
@@ -265,6 +266,14 @@ export default {
     };
   },
   methods: {
+     beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        // this.form.processId = this.form.processId+''
+        // this.form.craftId = this.form.craftId+''
+        this.form.workCenterId = this.form.workCenterId+''
+      }
+      done();
+    },
     onChangeData(val, type) {
       if (val&&type == 'workCenterId') {
         this.form.workCenterName = val.wcCode;

src/views/productionSchedulingPlan/basic/personnelCapacity.vue

@@ -17,6 +17,8 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      :before-open="beforeOpen"
+
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -191,6 +193,7 @@ export default {
             search: false,
             sortable: true,
             span: 12,
+            width:250,
             labelWidth: 220,
             type: 'number',
           },
@@ -210,6 +213,14 @@ export default {
     };
   },
   methods: {
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        this.form.processId = this.form.processId+''
+        this.form.craftId = this.form.craftId+''
+        this.form.workCenterId = this.form.workCenterId+''
+      }
+      done();
+    },
     onChangeData(val, type) {
       if (val && type == 'workCenterId') {
         this.form.workCenterName = val.wcName;

src/views/productionSchedulingPlan/basic/principalProducer.vue

@@ -17,6 +17,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      :before-open="beforeOpen"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -149,6 +150,15 @@ export default {
     };
   },
   methods: {
+    
+     beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        this.form.processId = this.form.processId+''
+        // this.form.craftId = this.form.craftId+''
+        this.form.workCenterId = this.form.workCenterId+''
+      }
+      done();
+    },
     onChangeData(val, type) {
       if (val&&type == 'processId') {
         this.form.processName = val.name;

src/views/productionSchedulingPlan/basic/qualityGrade.vue

@@ -17,6 +17,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      :before-open="beforeOpen"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -106,15 +107,15 @@ export default {
             dicData:[
               {
                 label:'军品',
-                value:1
+                value:'1'
               },
               {
                 label:'商飞',
-                value:2
+                value:'2'
               },
               {
                 label:'宇航',
-                value:3
+                value:'3'
               }
             ]
           },
@@ -126,6 +127,12 @@ export default {
     };
   },
   methods: {
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+       
+      }
+      done();
+    },
     rowSave(row, done, loading) {
       addGualityGrade(row).then(
         () => {

src/views/productionSchedulingPlan/basic/sintTempCurve.vue

@@ -17,6 +17,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      :before-open="beforeOpen"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -115,32 +116,12 @@ export default {
             hide: true,
             display: false,
           },
-          {
-            label: '设备编码',
-            prop: 'equipCode',
-            search: true,
-            sortable: true,
-            span: 12,
-            width: 120,
-            type: 'select',
-            filterable: true,
-            dicUrl: '/blade-scheduling/equipment/findList',
-            props: {
-              label: 'deviceCode',
-              value: 'deviceCode',
-            },
-            change: val => {
-              this.onChangeData(val.item, 'equipName');
-            },
-          },
           {
             label: '设备名称',
             prop: 'equipName',
             search: false,
             sortable: true,
             span: 12,
-            width: 120,
-            disabled: true,
           },
 
           {
@@ -149,7 +130,6 @@ export default {
             search: false,
             sortable: true,
             span: 12,
-            width: 120,
             type: 'select',
             dicData: [
               {
@@ -158,7 +138,7 @@ export default {
               },
               {
                 label: '普通设备',
-                value: 1,
+                value: '1',
               },
             ],
           },
@@ -168,8 +148,6 @@ export default {
             search: false,
             sortable: true,
             span: 12,
-            hide: true,
-            display: false,
           },
 
           {
@@ -195,6 +173,14 @@ export default {
     };
   },
   methods: {
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        this.form.processId = this.form.processId+''
+        // this.form.craftId = this.form.craftId+''
+        // this.form.workCenterId = this.form.workCenterId+''
+      }
+      done();
+    },
     onChangeData(val, type) {
       if (val && type == 'workCenterId') {
         this.form.workCenterName = val.wcCode;

src/views/productionSchedulingPlan/schedulingDashboard/index.vue

@@ -108,6 +108,7 @@
               搜索
             </el-button>
             <el-button icon="el-icon-delete" @click="handleReset" size="medium"> 清空 </el-button>
+             <el-button type="primary" size="medium" @click="exportXls">导出</el-button>
           </div>
         </el-col>
       </el-row>
@@ -117,9 +118,9 @@
       <!-- 头部标题和图例 -->
       <div class="gantt-header">
         <div class="status-legend">
-          <div class="legend-item">
+          <!-- <div class="legend-item">
             <el-button type="primary" size="medium" @click="exportXls">导出</el-button>
-          </div>
+          </div> -->
           <div class="legend-item">
             <el-checkbox
               v-model="legendStatus.pending"
@@ -133,19 +134,20 @@
           <div class="legend-item">
             <el-checkbox
               v-model="legendStatus.processing"
-              :style="{ '--checkbox-color': '#007bff' }"
+              :style="{ '--checkbox-color': '#28a745' }"
               @change="handleLegendChange('processing')"
             >
-              <span class="legend-text" style="color: #007bff">进行中</span>
+              <!-- <span class="legend-text" style="color: #007bff">进行中</span> -->
+              <span class="legend-text" style="color: #28a745">进行中</span>
             </el-checkbox>
           </div>
           <div class="legend-item">
             <el-checkbox
               v-model="legendStatus.completed"
-              :style="{ '--checkbox-color': '#28a745' }"
+              :style="{ '--checkbox-color': '#007bff' }"
               @change="handleLegendChange('completed')"
             >
-              <span class="legend-text" style="color: #28a745">已完成</span>
+              <span class="legend-text" style="color: #007bff">已完成</span>
             </el-checkbox>
           </div>
         </div>
@@ -1116,10 +1118,10 @@ export default {
     getStatusColor(row) {
       switch (row.planStatus) {
         case '5':
-          return '#28a745';
+          return '#007bff';
         case '2':
         case '3':
-          return '#007bff';
+          return '#28a745';
         case '1':
           return '#6c757d';
         case '6':
@@ -1131,10 +1133,10 @@ export default {
     getStatusTagType(row) {
       switch (row.planStatus) {
         case '5':
-          return 'success';
+          return 'primary';
         case '2':
         case '3':
-          return 'primary';
+          return 'success';
         case '1':
           return 'info';
         case '6':