update - 2025报表需求更新

src/views/base/stationDefectRelation/index.vue

@@ -24,7 +24,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
+          @click="handleBatchAdd"
           v-hasPermi="['base:stationDefectRelation:add']"
         >新增</el-button>
       </el-col>
@@ -186,6 +186,36 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="batchOpen" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="质检工位" prop="stationCode">
+          <el-select v-model="form.stationCode" placeholder="请选择质检工位">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="缺陷描述" prop="defectCodeList">
+          <el-select v-model="form.defectCodeList"  multiple filterable placeholder="请选择缺陷描述"  style="width: 100%">
+            <el-option
+              v-for="item in defectList"
+              :key="item.qualityDefectCode"
+              :label="item.qualityDefectName"
+              :value="item.qualityDefectCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -217,6 +247,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      batchOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -230,7 +261,8 @@ export default {
         createdBy: null,
         createdTime: null,
         updatedBy: null,
-        updatedTime: null
+        updatedTime: null,
+        defectCodeList: [],
       },
       // 表单参数
       form: {},
@@ -278,6 +310,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.batchOpen = false;
       this.reset();
     },
     // 表单重置
@@ -320,6 +353,12 @@ export default {
       this.open = true;
       this.title = "添加质检工位/缺陷维护";
     },
+    handleBatchAdd() {
+      this.reset();
+      this.form.stationCode = this.queryParams.stationCode;
+      this.batchOpen = true;
+      this.title = "添加质检工位/缺陷维护";
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -338,12 +377,14 @@ export default {
             updateStationDefectRelation(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.batchOpen = false;
               this.getList();
             });
           } else {
             addStationDefectRelation(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.batchOpen = false;
               this.getList();
             });
           }

src/views/report/codeBandingReport/index.vue

@@ -43,6 +43,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="箱体型号" prop="BOX_NAME">
+        <el-input
+          v-model="queryParams.BOX_NAME"
+          placeholder="请输入箱体码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="壳胆绑定时间">
         <el-date-picker
           v-model="daterangeBeginTime"

src/views/report/electricalInspection/index.vue

@@ -27,6 +27,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="产品型号" prop="materialModel">
+        <el-input
+          v-model="queryParams.materialModel"
+          placeholder="请输入产品型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="记录时间">
         <el-date-picker
           v-model="daterangeRecordTime"

src/views/report/highFault/index.vue

@@ -21,6 +21,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="产品型号" prop="MATERIAL_MODEL">
+        <el-input
+          v-model="form.MATERIAL_MODEL"
+          placeholder="请输入产品型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="下线日期" >
         <el-date-picker
           v-model="form.date"
@@ -98,6 +106,7 @@ export default {
         pageSize: 10,
         FACTORY_CODE: '1301',
         productionLine: 'CX_02',
+        MATERIAL_MODEL: '',
         date: []
       },
       tableData: [],
@@ -123,7 +132,7 @@ export default {
     getList() {
       highFaultList({
         beginBeginTime: this.form?.date?.[0], endBeginTime: this.form?.date?.[1]
-        , FACTORY_CODE: this.form.factory, PRODUCT_LINE_CODE: this.form.productionLine
+        , FACTORY_CODE: this.form.factory, PRODUCT_LINE_CODE: this.form.productionLine, MATERIAL_MODEL: this.form.MATERIAL_MODEL
       }).then(response => {
         //分页查询
         this.total = response?.total || 0

src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue

@@ -82,6 +82,7 @@
       <el-table-column label="质检工位编号" align="center" prop="STATION_CODE" v-if="columns[4].visible"/>
       <el-table-column label="质检工位名称" align="center" prop="STATION_NAME" v-if="columns[5].visible"/>
       <el-table-column label="检测数不合格数" align="center" prop="REWORK_NUMBER" v-if="columns[6].visible"/>
+      <el-table-column label="合计数量" align="center" prop="INSPECTION_NUMBER" v-if="columns[8].visible"/>
       <el-table-column label="合格率(%)" align="center" prop="RATE" v-if="columns[7].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -128,13 +129,15 @@
             <el-table :data="qualityDefectstList" ref="detailElectricalinspection"
             >
               <el-table-column type="selection" width="50" align="center"/>
-              <el-table-column label="序号" prop="SEQ" width="150">
+              <el-table-column label="序号" align="center" prop="SEQ" width="50">
               </el-table-column>
-              <el-table-column label="缺陷名称" prop="QUALITY_DEFECT_NAME" width="150">
+              <el-table-column label="箱体型号" align="center" prop="MATERIAL_MODEL" width="150">
               </el-table-column>
-              <el-table-column label="数量" prop="DEFECT_NUMBER" width="150">
+              <el-table-column label="缺陷名称" align="center" prop="QUALITY_DEFECT_NAME" width="150">
               </el-table-column>
-              <el-table-column label="比例" prop="RATE" width="150">
+              <el-table-column label="数量" align="center" prop="DEFECT_NUMBER" width="80">
+              </el-table-column>
+              <el-table-column label="比例" align="center" prop="RATE" width="80">
               </el-table-column>
             </el-table>
           </el-col>
@@ -222,7 +225,8 @@ export default {
         {key: 4, label: `质检工位编号`, visible: false},
         {key: 5, label: `质检工位名称`, visible: true},
         {key: 6, label: `检测数不合格数`, visible: true},
-        {key: 7, label: `合格率(%)`, visible: true}
+        {key: 7, label: `合格率(%)`, visible: true},
+        {key: 8, label: `合计数量`, visible: true},
       ],
       // 产线选项
       productLineList: [],
@@ -317,6 +321,16 @@ export default {
         endBeginTime: this.queryParams.endBeginTime
       }).then(response => {
         this.qualityDefectstList = response.data
+        const resultList = Object.values(response.data.reduce((acc, item) => {
+          const defectName = item.QUALITY_DEFECT_NAME;
+          acc[defectName] = acc[defectName] || {
+            QUALITY_DEFECT_NAME: defectName,
+            DEFECT_NUMBER: 0
+          };
+          acc[defectName].DEFECT_NUMBER += item.DEFECT_NUMBER;
+          return acc;
+        }, {}));
+
         this.form.PRODUCT_LINE_NAME = row.PRODUCT_LINE_NAME
         this.form.STATION_NAME = row.STATION_NAME
         this.open = true
@@ -338,7 +352,7 @@ export default {
         //   xAxis: [
         //     {
         //       type: 'category',
-        //       data: response.data.map(val => val.QUALITY_DEFECT_NAME),
+        //       data: resultList.map(val => val.QUALITY_DEFECT_NAME),
         //       axisTick: {
         //         alignWithLabel: true,
         //       },
@@ -392,7 +406,7 @@ export default {
         //           ]),
         //         },
         //       },
-        //       data: response.data.map(val => val.DEFECT_NUMBER),
+        //       data: resultList.map(val => val.DEFECT_NUMBER),
         //     }
         //   ]
         // })
@@ -405,7 +419,7 @@ export default {
               name: '缺陷名称',
               type: 'pie',
               radius: '60%',
-              data: response.data.map(e=>{
+              data: resultList.map(e=>{
                 return {
                   name:e.QUALITY_DEFECT_NAME,
                   value:e.DEFECT_NUMBER