diff --git a/src/router/index.js b/src/router/index.js
index 58dd00d..0e1fc02 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,6 +46,8 @@ const globalRoutes = [
 
 // 主入口路由(需嵌套上左右整体布局)
 const mainRoutes = {
+
+
   path: '/',
   component: _import('main'),
   name: 'main',
diff --git a/src/views/modules/pad/padPartAttribute.vue b/src/views/modules/pad/padPartAttribute.vue
index 9b95cfd..68cd6f8 100644
--- a/src/views/modules/pad/padPartAttribute.vue
+++ b/src/views/modules/pad/padPartAttribute.vue
@@ -50,18 +50,25 @@
         label="属性描述">
       </el-table-column>
       <el-table-column
-        prop="valueType"
+        prop="textValue"
         header-align="center"
         align="left"
         min-width="60"
-        label="属性类型">
+        label="文本值">
       </el-table-column>
       <el-table-column
         prop="numValue"
         header-align="center"
+        align="right"
+        min-width="60"
+        label="数字值">
+      </el-table-column>
+      <el-table-column
+        prop="valueType"
+        header-align="center"
         align="left"
         min-width="60"
-        label="属性值">
+        label="属性类型">
       </el-table-column>
     </el-table>
   </div>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index da9a220..359d9b3 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -366,7 +366,7 @@
       </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item label="合格数量">
-          <el-input type="number" style="width: 178px;"  class="input_reight"  v-model="saveHeaderData.qtyApprove" @blur="qtyApproveBlur()"></el-input>
+          <el-input type="number" style="width: 178px;" :disabled="approveFlag"  class="input_reight"  v-model="saveHeaderData.qtyApprove" @blur="qtyApproveBlur()"></el-input>
         </el-form-item>
         <el-form-item label="不合格数量" >
           <el-input type="number"  class="input_left" style="width: 178px;"  v-model="saveHeaderData.qtyUnApprove" @blur="qtyReportedBlur()"></el-input>
@@ -374,12 +374,10 @@
 <!--        <el-form-item label="返工数量" >-->
 <!--          <el-input type="number" style="width: 178px;"  v-model="saveHeaderData.qtyRework"  @blur="qtyReworkBlur()"></el-input>-->
 <!--        </el-form-item>-->
-        <el-form-item label="硫化模数" >
-          <el-input type="number"  class="input_left" style="width: 178px;"  v-model="moQty" @blur="moQtyBlur()"></el-input>
-        </el-form-item>
+
       </el-form>
       <el-form :inline="true" label-position="top">
-        <el-form-item label="合格重量(KG)">
+        <el-form-item label="带框合格重量(KG)">
           <el-input type="number" style="width: 178px;"  class="input_reight" :disabled="factorFlag"  v-model="KGApprove" @blur="KGApproveBlur()"></el-input>
         </el-form-item>
         <el-form-item label="不合格重量(KG)">
@@ -394,7 +392,7 @@
       </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item label="框重(KG)">
-          <el-input  type="number"  class="input_left" style="width: 178px;"   v-model="saveHeaderData.boxWeight" ></el-input>
+          <el-input  type="number"  class="input_left" style="width: 178px;"   v-model="saveHeaderData.boxWeight"  @blur="boxWeightBlur()"></el-input>
         </el-form-item>
         <el-form-item label="停机原因">
           <el-input style="width: 370px;"  v-model="saveHeaderData.shutdownReason"></el-input>
@@ -513,7 +511,6 @@
     },
     data () {
       return {
-        moQty:'',
         cavity:'',
         setUp: {
           reviewFlag: false,
@@ -525,6 +522,7 @@
         KGReported:'',
         KGApprove:'',
         KGRework:'',
+        approveFlag:false,
         saveHeaderData: {
           boxWeight:0,
           qtyRequire:'',
@@ -962,7 +960,7 @@
                 return false;
               }
             })
-
+            this.approveFlag=false;
             this.scanModalFlag=false;
             this.setUp.reviewFlag = true;
             this.setUp.disabled = true;
@@ -984,13 +982,46 @@
       },
       qtyApproveBlur(){
         if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.saveHeaderData.qtyApprove!=''){
-          this.KGApprove=(this.saveHeaderData.qtyApprove*this.qty3).toFixed(1)
-          this.moQty=''
+          if(this.saveHeaderData.boxWeight!=null&&this.saveHeaderData.boxWeight!='') {
+            this.KGApprove = (this.saveHeaderData.qtyApprove * this.qty3+Number(this.saveHeaderData.boxWeight)).toFixed(1)
+          }else {
+            this.KGApprove = (this.saveHeaderData.qtyApprove * this.qty3).toFixed(1)
+          }
+          this.factorFlag=true
         }
         if(this.saveHeaderData.qtyApprove==''){
           this.KGApprove=''
         }
       },
+      boxWeightBlur(){
+          if(this.saveHeaderData.boxWeight==null||this.saveHeaderData.boxWeight==''){
+            this.saveHeaderData.boxWeight=0
+          }
+          if(this.approveFlag){
+            if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGApprove!=''){
+              this.saveHeaderData.qtyApprove=((this.KGApprove-this.saveHeaderData.boxWeight)/this.qty3).toFixed(0)
+            }
+          }else {
+            if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.saveHeaderData.qtyApprove!=''){
+              this.KGApprove = (this.saveHeaderData.qtyApprove * this.qty3+Number(this.saveHeaderData.boxWeight)).toFixed(1)
+            }
+          }
+      },
+      KGApproveBlur(){
+        if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGApprove!=''){
+          if(this.saveHeaderData.boxWeight!=null&&this.saveHeaderData.boxWeight!=''){
+            this.saveHeaderData.qtyApprove=((this.KGApprove-this.saveHeaderData.boxWeight)/this.qty3).toFixed(0)
+          }else {
+            this.saveHeaderData.qtyApprove=(this.KGApprove/this.qty3).toFixed(0)
+          }
+          this.approveFlag=true;
+
+        }
+        if(this.KGApprove==''){
+          this.saveHeaderData.qtyApprove=''
+          this.approveFlag=false;
+        }
+      },
       qtyReworkBlur(){
         if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.saveHeaderData.qtyRework!=''){
           this.KGRework=(this.saveHeaderData.qtyRework*this.qty3).toFixed(1)
@@ -1007,15 +1038,7 @@
           this.saveHeaderData.qtyUnApprove=''
         }
       },
-      KGApproveBlur(){
-        if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGApprove!=''){
-          this.saveHeaderData.qtyApprove=(this.KGApprove/this.qty3).toFixed(0)
-          this.moQty=''
-        }
-        if(this.KGApprove==''){
-          this.saveHeaderData.qtyApprove=''
-        }
-      },
+
       KGReworkBlur(){
         if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGRework!=''){
           this.saveHeaderData.qtyRework=(this.KGRework/this.qty3).toFixed(0)
@@ -1097,10 +1120,7 @@
           }
         })
       },
-      moQtyBlur(){
-        this.saveHeaderData.qtyApprove=Number(this.cavity*this.moQty).toFixed(1);
-        this.KGApprove='';
-      }
+
     },
     created () {
     }
diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue
index 1b20859..823a146 100644
--- a/src/views/modules/production/inspect.vue
+++ b/src/views/modules/production/inspect.vue
@@ -151,7 +151,7 @@
         prop="toTypeFlag"
         header-align="center"
         align="left"
-        min-width="90"
+        min-width="120"
         label="检验单类型">
       </el-table-column>
       <el-table-column