diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue
index dc63f59..3c092b5 100644
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@@ -101,6 +101,13 @@
         min-width="50"
         label="已完工数">
       </el-table-column>
+      <el-table-column
+        prop="inputQty"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="输入混炼胶重量">
+      </el-table-column>
       <el-table-column
         prop="userName"
         header-align="center"
@@ -115,6 +122,13 @@
         min-width="100"
         label="录入时间">
       </el-table-column>
+      <el-table-column
+        prop="reportTime"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="报工时间">
+      </el-table-column>
       <el-table-column
         prop=""
         header-align="center"
@@ -132,7 +146,7 @@
         <el-form-item :label="'日计划号：'">
           <el-input v-model="reportData.orderNo" disabled style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'报工数量：'">
+        <el-form-item :label="'混炼胶报工重量：'">
           <el-input v-model="reportData.reportQty" type="number" style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
@@ -144,10 +158,10 @@
 
     <el-dialog title="批量报工" :close-on-click-modal="false" v-drag :visible.sync="reportsModalFlag" width="341px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'总报工数量：'">
+        <el-form-item :label="'混炼胶总报工重量：'">
           <el-input v-model="qtyIn" @change="changeAverage" type="number" style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'平均报工数量：'">
+        <el-form-item :label="'平均报工重量：'">
           <el-input v-model="qtyAverage" disabled style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
@@ -166,6 +180,7 @@
     dailyPlanReportSave,
     dailyPlanReportsSave
   } from "@/api/production.js"
+  import decimalUtil from '../../../utils/decimalUtil'
   export default {
     name: 'dailyPlanReport',
     data () {
@@ -177,7 +192,9 @@
           reportQty:'',
           reportBy:this.$store.state.user.name,
           site:this.$store.state.user.site,
+          orderRef1: '',
         },
+        orderRef1:'',
         needQty:0,
         height:200,
         tableData:[],
@@ -220,17 +237,18 @@
           return false
         }
         this.reportData.orderNo=row.orderNo;
-        this.needQty=row.orderQty-row.qtyfinished;
+        this.needQty=decimalUtil.sub(row.orderQty,row.qtyfinished);
         this.reportData.reportQty=0;
+        this.reportData.orderRef1=row.orderRef1;
         this.reportModalFlag=true;
       },
       reportSave(){
-        if(this.reportData.reportQty<this.needQty){
-          this.$alert('报工数量小于计划数量无法报工！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
+        // if(this.reportData.reportQty<this.needQty){
+        //   this.$alert('报工数量小于计划数量无法报工！', '错误', {
+        //     confirmButtonText: '确定'
+        //   })
+        //   return false;
+        // }
         dailyPlanReportSave(this.reportData).then(({data}) => {
           if (data && data.code === 0) {
             this.search();
@@ -274,6 +292,7 @@
         }
         this.qtyIn='';
         this.qtyAverage='0';
+        this.orderRef1=orderRef;
         this.reportsModalFlag=true;
       },
       changeAverage(){
@@ -283,14 +302,14 @@
         }
       },
       reportsSave(){
-        for (let i = 0; i <this.dataListSelections.length ; i++) {
-          if(this.dataListSelections[i].orderQty>this.qtyAverage){
-            this.$alert('存在计划数量大于平均报工数量的订单！','错误',{
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-        }
+        // for (let i = 0; i <this.dataListSelections.length ; i++) {
+        //   if(this.dataListSelections[i].orderQty>this.qtyAverage){
+        //     this.$alert('存在计划数量大于平均报工数量的订单！','错误',{
+        //       confirmButtonText: '确定'
+        //     })
+        //     return false;
+        //   }
+        // }
         let inList=[];
         for (let i = 0; i <this.dataListSelections.length ; i++) {
           let indata={
@@ -298,6 +317,7 @@
             reportQty:this.qtyAverage,
             reportBy:this.$store.state.user.name,
             site:this.$store.state.user.site,
+            orderRef1:this.orderRef1
           }
           inList.push(indata)
         }
diff --git a/src/views/modules/production/searchDailyPlan.vue b/src/views/modules/production/searchDailyPlan.vue
index f9ebfa8..43a5e5c 100644
--- a/src/views/modules/production/searchDailyPlan.vue
+++ b/src/views/modules/production/searchDailyPlan.vue
@@ -117,6 +117,13 @@
         min-width="100"
         label="录入时间">
       </el-table-column>
+      <el-table-column
+        prop="reportTime"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="报工时间">
+      </el-table-column>
     </el-table>
   </div>
 </template>