Merge remote-tracking branch 'origin/master'

src/views/report/WIPInquiryReport/index.vue

@@ -66,14 +66,14 @@
           type="info"
         >合计数量：{{ totalSum }}
         </el-button>
-        <!--              <el-button-->
+        <el-button
-        <!--                type="warning"-->
+          type="warning"
-        <!--                plain-->
+          plain
-        <!--                icon="el-icon-download"-->
+          icon="el-icon-download"
-        <!--                size="mini"-->
+          size="mini"
-        <!--                @click="handleExport"-->
+          @click="handleExport"
-        <!--              >导出-->
+        >导出
-        <!--              </el-button>-->
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
@@ -86,20 +86,20 @@
       <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" width="130" v-if="columns[4].visible"/>
       <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="430" v-if="columns[5].visible"/>
       <el-table-column label="产品编号" align="center" prop="PRODUCT_CODE" width="130" v-if="columns[6].visible"/>
-      <el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" width="200" v-if="columns[7].visible"/>
+      <el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" width="230" v-if="columns[7].visible"/>
-      <el-table-column label="数量" align="center" prop="COMP_AMOUNT" width="80" v-if="columns[8].visible"/>
+      <el-table-column label="数量" align="center" prop="COMP_AMOUNT" width="120" v-if="columns[8].visible"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <el-button
+<!--          <el-button-->
-            size="mini"
+<!--            size="mini"-->
-            type="text"
+<!--            type="text"-->
-            icon="el-icon-edit"
+<!--            icon="el-icon-edit"-->
-            @click="handleOrderDetails(scope.row)"
+<!--            @click="handleOrderDetails(scope.row)"-->
-            v-hasPermi="['report:pointDnb:edit']"
+<!--            v-hasPermi="['report:pointDnb:edit']"-->
-          >查看订单明细
+<!--          >查看订单明细-->
-          </el-button>
+<!--          </el-button>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
     </el-table>
     <!--    <pagination-->
     <!--      v-show="total>0"-->
@@ -271,9 +271,9 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/report/productionReport/export', {
+      this.download('/report/productionReport/WIPInquiryReportList/export', {
         ...this.queryParams
-      }, `report_${new Date().getTime()}.xlsx`)
+      }, `在制品查询报表_${new Date().getTime()}.xlsx`)
     }
 
   }

src/views/report/productionExecutionReport/index.vue

@@ -78,14 +78,14 @@
           size="mini"
         >合计数量：{{ totalSum }}
         </el-button>
-        <!--              <el-button-->
+        <el-button
-        <!--                type="warning"-->
+          type="warning"
-        <!--                plain-->
+          plain
-        <!--                icon="el-icon-download"-->
+          icon="el-icon-download"
-        <!--                size="mini"-->
+          size="mini"
-        <!--                @click="handleExport"-->
+          @click="handleExport"
-        <!--              >导出-->
+        >导出
-        <!--              </el-button>-->
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
@@ -300,9 +300,9 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/report/productionReport/export', {
+      this.download('/report/productionReport/productionExecutionReportList/export', {
         ...this.queryParams
-      }, `report_${new Date().getTime()}.xlsx`)
+      }, `生产执行报表_${new Date().getTime()}.xlsx`)
     }
 
   }

src/views/report/repairRateReport/index.vue

@@ -224,7 +224,7 @@ export default {
           },
           legend: {
             itemWidth: 3 * vw,
-            data: ['不良数', '一次不合格率', '目标'],
+            data: ['不良数', '返修率(%)', '目标(%)'],
             textStyle: {
               color: "#000",
               margin: 15,
@@ -309,7 +309,7 @@ export default {
               },
             },
             {
-              name: '返修率',
+              name: '返修率(%)',
               type: 'line',
               yAxisIndex: 1,
               data: e.map(val => parseFloat(val.REPAIR_RATE)),
@@ -320,7 +320,7 @@ export default {
               },
             },
             {
-              name: '目标',
+              name: '目标(%)',
               type: 'line',
               yAxisIndex: 1,
               data: e.map(val => 10),