update - 返修率、焊漏率报表页面

src/views/report/supplementBarCode/index.vue

@@ -33,6 +33,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="打印原因" prop="printReason">
+        <el-select v-model="queryParams.printReason" placeholder="请选择打印原因" clearable>
+          <el-option label="报废重做" value="报废重做"></el-option>
+          <el-option label="切换订单" value="切换订单"></el-option>
+          <el-option label="PDA补码" value="PDA补码"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="打印时间">
         <el-date-picker
           v-model="daterangePrintTime"
@@ -117,8 +124,8 @@
       <el-table-column label="主键" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="SAP计划编号" align="center" prop="orderCode" v-if="columns[1].visible"/>
       <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[2].visible"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" width="290"  v-if="columns[3].visible"/>
-      <el-table-column label="打印条码" align="center" prop="materialBarcode" v-if="columns[4].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" width="230"  v-if="columns[3].visible"/>
+      <el-table-column label="打印条码" align="center" prop="materialBarcode" width="110" v-if="columns[4].visible"/>
       <el-table-column label="打印时间" align="center" prop="printTime" width="180" v-if="columns[5].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.printTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -126,6 +133,12 @@
       </el-table-column>
       <el-table-column label="打印类型" align="center" prop="printBartype" v-if="columns[6].visible"/>
       <el-table-column label="打印名称" align="center" prop="printName" v-if="columns[7].visible"/>
+      <el-table-column label="打印原因" align="center" prop="printReason" width="100" v-if="columns[9].visible"/>
+      <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="是否打印" align="center" prop="isPrint" v-if="columns[8].visible"/>
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
@@ -228,6 +241,7 @@ export default {
         materialCode: null,
         materialName: null,
         materialBarcode: null,
+        printReason: null,
         printTime: null,
         printBartype: null,
         printName: null,
@@ -248,6 +262,8 @@ export default {
             { key: 6, label: `打印类型`, visible: true },
             { key: 7, label: `打印名称`, visible: true },
             { key: 8, label: `是否打印`, visible: true },
+            { key: 9, label: `打印原因`, visible: true },
+            { key: 10, label: `记录时间`, visible: true },
         ]
     };
   },

src/views/report/weldLeakRate/index.vue

@@ -20,8 +20,8 @@
       </el-form-item>
       <el-form-item label="日期范围" >
       <el-select v-model="form.month" clearable placeholder="请选择">
-          <el-option label="月" value="1"></el-option>
-          <el-option label="周" value="0"></el-option>
+        <el-option label="周" value="0"></el-option>
+        <el-option label="月" value="1"></el-option>
       </el-select>
       </el-form-item>
       <!--      <el-form-item label="周期" prop="period">-->