1008 批量报工

src/views/modules/board/productionBlankingBoard.vue

@@ -14,6 +14,14 @@
         border
         :row-class-name="tableRowClassName"
         style="width: 100%;">
+        <el-table-column
+          prop="erpStatus"
+          header-align="center"
+          align="left"
+          min-width="30"
+          style="font-size: 20px"
+          label="ERP">
+        </el-table-column>
         <el-table-column
           prop="orderNo"
           header-align="center"
@@ -26,14 +34,14 @@
           prop="partDescSpec"
           header-align="center"
           align="left"
-          min-width="120"
+          min-width="105"
           label="硫化产品名称">
         </el-table-column>
         <el-table-column
           prop="compPartDescSpec"
           header-align="center"
           align="left"
-          min-width="120"
+          min-width="105"
           label="混炼胶名称">
         </el-table-column>
         <el-table-column
@@ -119,6 +127,9 @@
         if (row.finishedFlag == '3') {
           return 'false-row'
         }
+        if (row.finishedFlag == '4') {
+          return 'yellow-row'
+        }
         return ''
 
         // if (row.finishedFlag == '2') {
@@ -203,5 +214,7 @@
     /*background: #cbcb14;*/
     background: #db1212;
   }
-
+  .board2 .el-table .yellow-row{
+    background: #ffff00;
+  }
 </style>

src/views/modules/production/dailyPlan.vue

@@ -436,7 +436,7 @@
       },
       // 排产信息界面
       openScheduleModel (row) {
-        if (row.status == '已计划' || row.status == '已取消' || row.status == '已关闭') {
+        if (row.status == '已计划'  || row.status == '已关闭') {
           this.$alert('该订单状态为' + row.status + '无法排产', '错误', {
             confirmButtonText: '确定'
           })
@@ -444,7 +444,7 @@
         }
         let list = {orderNo: row.orderNo}
         getSchedulingSize(list).then(({data}) => {
-          this.scheduledModelData.schedulingSize = data.schedulingSize
+          this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
           this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
         })
         this.scheduledingData.lotSize = row.lotSize
@@ -489,8 +489,8 @@
 
         savePlan(this.scheduledingData).then(({data}) => {
           if (data && data.code === 0) {
-            this.scheduledModelData.schedulingSize = data.schedulingSize
-            this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
+            this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1);
+            this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1))
             this.schedulingModalFlag = false
             let data1 = {orderNo: this.scheduledModelData.orderNo}
             getWorkPlanData(data1).then(({data}) => {
@@ -577,8 +577,8 @@
 
         savePlans(JSON.stringify(scheduledList)).then(({data}) => {
           if (data && data.code === 0) {
-            this.scheduledModelData.schedulingSize = data.schedulingSize
-            this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
+            this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
+            this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1))
             this.schedulingsFlag = false
             let data1 = {orderNo: this.scheduledModelData.orderNo}
             getWorkPlanData(data1).then(({data}) => {
@@ -624,8 +624,8 @@
 
         savePlan(this.scheduledingData).then(({data}) => {
           if (data && data.code === 0) {
-            this.scheduledModelData.schedulingSize = data.schedulingSize;
-            this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize);
+            this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1);
+            this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1));
             let data1 = {orderNo: this.scheduledModelData.orderNo}
             getWorkPlanData(data1).then(({data}) => {
               this.scheduleTableData = data.rows
@@ -675,8 +675,8 @@
         }).then(() => {
           delPlan(delData).then(({data}) => {
             if (data && data.code === 0) {
-              this.scheduledModelData.schedulingSize = data.schedulingSize
-              this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize);
+              this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
+              this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1));
               this.getData()
               let data1 = {orderNo: this.scheduledModelData.orderNo}
               getWorkPlanData(data1).then(({data}) => {

src/views/modules/production/productionBlankingSearch.vue

@@ -25,6 +25,14 @@
         align="center"
         width="30">
       </el-table-column>
+      <el-table-column
+        prop="erpStatus"
+        header-align="center"
+        align="left"
+        min-width="40"
+        style="font-size: 20px"
+        label="erp状态">
+      </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
@@ -151,6 +159,9 @@
         if (row.finishedFlag == '3') {
           return 'false-row'
         }
+        if (row.finishedFlag == '4') {
+          return 'yellow-row'
+        }
         return ''
       },
       search () {
@@ -200,7 +211,9 @@
     /*background: #cbcb14;*/
     background: #db1212;
   }
-
+  .search1 .el-table .yellow-row{
+    background: #ffff00;
+  }
   .search1 .el-table .cell {
     padding: 0px;
   }