66

src/views/saleOrder/salesToProduction.vue

@@ -40,7 +40,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col v-bind="styleResponsive ? { lg: 3, md: 6 } : { span: 3 }">
+          <!-- <el-col v-bind="styleResponsive ? { lg: 3, md: 6 } : { span: 3 }">
             <el-form-item label="使用改型:" prop="modification">
               <el-checkbox
                 v-model="form.modification"
@@ -48,7 +48,7 @@
                 :false-label="0"
               ></el-checkbox>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
             <el-form-item label="余量系数:" prop="marginCoefficient">
               <el-select
@@ -85,7 +85,7 @@
               form.contractNum
             }}</el-form-item>
           </el-col>
-          <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+          <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 4 }">
             <el-form-item label="订单总重量:">{{
               form.sumOrderWeight
             }}</el-form-item>
@@ -98,15 +98,19 @@
           <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
             <el-form-item label="牌号:">{{ form.brandNo }}</el-form-item>
           </el-col>
-          <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+          <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 5 }">
             <el-form-item label="型号:">{{ form.model }}</el-form-item>
           </el-col>
 
+          <el-col v-bind="styleResponsive ?  { lg: 4, md: 12 } : { span: 3 }">
+            <el-form-item label="规格:">{{ form.specification }}</el-form-item>
+          </el-col>
+<!-- 
           <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
             <el-form-item label="库存数量:">{{
               form.stockCountBase
             }}</el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-table :data="form.salesOrders" border>
           <el-table-column label="序号" align="center" width="60">
@@ -775,7 +779,7 @@ export default {
           }
 
           row.planProductNum =
-            ((modelLong * modeWide * modeHight) / 1000000).toFixed(5) *
+            Nu((modelLong * modeWide * modeHight) / 1000000).toFixed(5) *
             row.blockCount;
         } else if (name === 'sum') {
           //方数
@@ -823,7 +827,7 @@ export default {
             (Number(e) * modelLong * modeWide * modeHight) / 1000000;
         }
       }
-      row.planProductNum = Number(row.planProductNum.toFixed(5));
+      row.planProductNum = Number(row.planProductNum);
       row.requiredFormingNum =Number(row.planProductNum *  (this.form.marginCoefficient || 1)).toFixed(5);
  
     },