2024-01-8 MES-完产清线点检

src/api/mes/selfMutualInspection.js

@@ -37,7 +37,7 @@ export function getProductList(query) {
   });
 }
 
-// 修改表头表尾部记录
+// 修改
 export function updateTable(data) {
 	return request({
 		url: '/mes/inspectionReport/updateTable',
@@ -46,8 +46,15 @@ export function updateTable(data) {
 	});
 }
 
+// 修改点检
+export function updatePointInspectionTable(data) {
+	return request({
+		url: '/mes/inspectionReport/updatePointInspectionTable',
+		method: 'put',
+		data: data
+	});
+}
 
-// 查询组线列表
 export function getWorkList(query) {
   return request({
     url: '/mes/inspectionReport/getWorkList',
@@ -83,12 +90,3 @@ export function listPointInspection(query) {
     params: query
   })
 }
-
-// 查询点检listCheckBox
-export function listCheckBox(query) {
-  return request({
-    url: '/mes/inspectionReport/listCheckBox',
-    method: 'get',
-    params: query
-  })
-}

src/views/mes/pointInspection/index.vue

@@ -19,7 +19,7 @@
         <div class="formCode">表单编号:08GL05C001-014A</div>
         <br />
         <el-row>
-          <el-col :span="9">
+          <el-col :span="8">
             <div>
               生产产线:
               <el-select
@@ -27,6 +27,7 @@
                 filterable
                 placeholder="请选择产线"
                 style="width: 160px"
+                @change="handleSelectLineChange"
               >
                 <el-option
                   v-for="item in lineCodeOption"
@@ -39,7 +40,7 @@
             </div>
             <br />
           </el-col>
-          <el-col :span="10">
+          <el-col :span="8">
             <div>
               检查日期:
               <el-date-picker
@@ -52,7 +53,7 @@
               </el-date-picker>
             </div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -71,6 +72,22 @@
               @click="handlePrintPre"
               >打印
             </el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-check"
+              size="mini"
+              @click="handleSubmit"
+              >提交
+            </el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-check"
+              size="mini"
+              @click="AddNewColumn"
+              >新增一列
+            </el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -81,18 +98,27 @@
             <th rowspan="2" style="width: 50px">车间</th>
             <th rowspan="2" style="width: 120px">黑蚊香</th>
             <th style="width: 250px">产线：{{ headerParameters.lineName }}</th>
+
             <th
-              th
+              v-for="(item, key) in tableData[0]"
-              v-for="item in checkBoxData[0]"
               :key="item.key"
+              v-if="key !== '序号' && key !== '点检内容' && key !== '点检项目'"
               :width="tableTittleWidth"
             >
-              <row>
+              <el-row>
                 <label>
                   <input
                     type="checkbox"
                     class="check-box"
-                    v-model="item.openLine"
+                    :checked="item.whetherOpenLine === true"
+                    @change="
+                      handleCheckboxChange(
+                        item,
+                        'openLine',
+                        key,
+                        $event.target.checked
+                      )
+                    "
                     size="4"
                   />开线
                 </label>
@@ -100,21 +126,37 @@
                   <input
                     type="checkbox"
                     class="check-box"
-                    v-model="item.clearLine"
+                    :checked="item.whetherOpenLine === false"
+                    @change="
+                      handleCheckboxChange(
+                        item,
+                        'openLine',
+                        key,
+                        $event.target.checked
+                      )
+                    "
                     size="4"
                   />清换线
                 </label>
-              </row>
+              </el-row>
             </th>
           </tr>
           <tr>
             <th>日期：{{ headerParameters.checkDate }}</th>
             <td
               columnspan="1"
-              v-for="(value, key) in checkBoxData[1]"
+              v-for="(item, key) in tableData[0]"
-              :key="key"
+              :key="item.key"
+              v-if="key !== '序号' && key !== '点检内容' && key !== '点检项目'"
             >
-              {{ value }}
+              <el-row>
+                <el-col :span="10"><span>班次：</span></el-col>
+                <el-col :span="14"
+                  ><el-input
+                    type="text"
+                    v-model="item.remark"
+                    @change="handleRemarkChange(key, $event)" /></el-col
+              ></el-row>
             </td>
           </tr>
           <tr>
@@ -155,12 +197,24 @@
           <tr v-for="item in tableData" :key="item.id">
             <!-- 动态渲染列值 -->
             <td columnspan="1" v-for="(value, key) in item" :key="key">
-              {{ value }}
+              <template
+                v-if="
+                  key !== '序号' && key !== '点检内容' && key !== '点检项目'
+                "
+              >
+                <el-select v-model="item[key].checkResult">
+                  <el-option label="√" value="√"></el-option>
+                  <el-option label="×" value="×"></el-option>
+                </el-select>
+              </template>
+              <template v-else>
+                {{ value.data }}
+              </template>
             </td>
           </tr>
         </table>
       </div>
-      <br />
+      <br>
       <div>
         <el-row>填写要求：</el-row>
         <el-row>1.产线组长在开线、品种转换时填写该表。</el-row>
@@ -207,17 +261,18 @@
                 产线：{{ headerParameters.lineName }}
               </th>
               <th
-                th
+                v-for="(item, key) in tableData[0]"
-                v-for="item in checkBoxData[0]"
                 :key="item.key"
+                v-if="key !== '序号' && key !== '点检内容' && key !== '点检项目'"
                 :width="tableTittleWidth"
               >
-                <row>
+                <el-row>
                   <label>
                     <input
                       type="checkbox"
                       class="check-box"
-                      v-model="item.openLine"
+                      :checked="item.whetherOpenLine === true"
+                      @change="handleCheckboxChange(item, 'openLine')"
                       size="4"
                     />开线
                   </label>
@@ -225,21 +280,26 @@
                     <input
                       type="checkbox"
                       class="check-box"
-                      v-model="item.clearLine"
+                      :checked="item.whetherOpenLine === false"
+                      @change="handleCheckboxChange(item, 'clearLine')"
                       size="4"
                     />清换线
                   </label>
-                </row>
+                </el-row>
               </th>
             </tr>
             <tr>
               <th>日期：{{ headerParameters.checkDate }}</th>
+              <!-- 班次 -->
               <td
                 columnspan="1"
-                v-for="(value, key) in checkBoxData[1]"
+                v-for="(item, key) in tableData[0]"
-                :key="key"
+                :key="item.key"
+                v-if="
+                  key !== '序号' && key !== '点检内容' && key !== '点检项目'
+                "
               >
-                {{ value }}
+                班次：{{ item.remark }}
               </td>
             </tr>
             <tr>
@@ -280,14 +340,23 @@
             <tr v-for="item in tableData" :key="item.id">
               <!-- 动态渲染列值 -->
               <td columnspan="1" v-for="(value, key) in item" :key="key">
-                {{ value }}
+                <template
+                  v-if="
+                    key !== '序号' && key !== '点检内容' && key !== '点检项目'
+                  "
+                >
+                  {{ value.checkResult }}
+                </template>
+                <template v-else>
+                  {{ value.data }}
+                </template>
               </td>
             </tr>
           </table>
         </el-col>
       </row>
-      <br />
+      <br>
-      <br />
+      <br>
       <el-row>填写要求：</el-row>
       <el-row>1.产线组长在开线、品种转换时填写该表。</el-row>
       <el-row>
@@ -304,7 +373,7 @@ import {
   listPointInspection,
   getSelfMutualInspectionData,
   getLineCodeList,
-  listCheckBox,
+  updatePointInspectionTable,
 } from "@/api/mes/selfMutualInspection";
 
 export default {
@@ -326,7 +395,6 @@ export default {
       tableTittle2: [],
       tableTittleWidth: null,
       tableData: [],
-      checkBoxData: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -347,14 +415,14 @@ export default {
       queryParams: {},
       //表头参数
       headerParameters: {
-        reportName: "ConversionReport", //表类型
+        reportName: "CheckReport", //表类型
         productionWorkshop: null, //生产车间
         lineCode: null, //生产产线编码
         lineName: null, //生产产线名称
         createBy: null, //检查人
         productName: null, //产品名称
         checkDate: null, //检查日期
-        bz: null, //异常处理
+        whetherOpenLine: null, //异常处理
         remark: null, //备注
       },
       // 表单参数
@@ -369,16 +437,72 @@ export default {
     this.getList();
   },
   methods: {
+    handleCheckboxChange(item, checkboxType, transKey, newBz) {
+      if (checkboxType === "openLine") {
+        this.$set(item, "whetherOpenLine", true);
+      } else {
+        this.$set(item, "whetherOpenLine", false);
+      }
+
+      this.tableData.forEach((dataItem) => {
+        Object.keys(dataItem).forEach((key) => {
+          if (key === transKey) {
+            this.$set(dataItem[transKey], "whetherOpenLine", newBz);
+          }
+        });
+      });
+
+      // this.tableData.forEach((dataItem) => {
+      //   if (dataItem.hasOwnProperty(transKey)) {
+      //     dataItem[transKey][whetherOpenLine] = newBz;
+      //   }
+      // });
+    },
+
+    //在选择产线时候，存产线名称
+    handleSelectLineChange(value) {
+      const selectedOption = this.lineCodeOption.find(
+        (option) => option.equipmentCode === value
+      );
+      if (selectedOption) {
+        this.headerParameters.lineName = selectedOption.equipmentName;
+      }
+    },
+
     dynamicWidthStyle() {
       return { width: `${1000 / this.propertyNum}px` };
     },
 
     //预处理
     handlePrintPre() {
-      this.showTable = false; //页面上的表格不显示
+      this.$confirm("是否确定提交当前页面信息并进行打印操作？", "提示", {
-      this.showPrintPage = true; //打印的表格显示
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // 用户点击确定后执行的逻辑
+          this.showTable = false;
+          this.showPrintPage = true;
           this.$nextTick(() => {
-        this.handlePrint();
+            this.handleSubmit(); //提交
+            this.handlePrint(); //打印
+          });
+        })
+        .catch(() => {
+          // 用户点击取消后执行的逻辑，这里简单打印提示信息，可按需调整
+          console.log("用户取消了打印预处理操作");
+        });
+    },
+
+    handleSubmit() {
+      this.headerParameters.tableData = this.tableData;
+      updatePointInspectionTable(this.headerParameters).then((response) => {
+        this.$modal.msgSuccess("提交成功");
+        if (response.code == 200) {
+          this.headerParameters.tableData = null;
+          this.getList();
+        }
       });
     },
 
@@ -425,20 +549,6 @@ export default {
       });
     },
 
-    /**获取默认查询时间段**/
-    // getDate() {
-    // 	let start = this.Fungetdate (0)
-    // 	this.headerParameters.checkDate = start;
-    // },
-    // Fungetdate (num) {
-    // 	var dd = new Date();
-    // 	dd.setDate(dd.getDate() + num);
-    // 	var y = dd.getFullYear();
-    // 	var m = dd.getMonth() + 1;//获取当前月份的日期
-    // 	var d = dd.getDate();
-    // 	return y + "-" + m +"-"+d;
-    // },
-
     /** 重置按钮操作 */
     resetQuery() {
       (this.headerParameters.productionWorkshop = null), //生产车间
@@ -447,38 +557,61 @@ export default {
         (this.headerParameters.createBy = null), //检查人
         (this.headerParameters.productName = null), //产品名称
         (this.headerParameters.checkDate = null), //检查日期
-        (this.headerParameters.bz = null), //异常处理
+        (this.headerParameters.whetherOpenLine = null), //异常处理
         (this.headerParameters.remark = null), //备注
         // this.getDate();
         this.getList();
     },
 
-    // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    handleRemarkChange(transKey, newRemark) {
-    //   if (columnIndex === 1) {
+      // 遍历表格数据，更新该列所有对象的checkTime属性
-    //     // 获取当前单元格的值
+      this.tableData.forEach((item) => {
-    //     const currentValue = row[column.property];
+        Object.keys(item).forEach((key) => {
-    //     // 获取上一行相同列的值
+          if (key == transKey) {
-    //     const preRow = this.tableData[rowIndex - 1];
+            const originalRemark = item[key].remark;
-    //     const preValue = preRow ? preRow[column.property] : null;
+            item[key].remark = newRemark;
-    //     // 如果当前值和上一行的值相同，则将当前单元格隐藏
+            console.log(
-    //     if (currentValue === preValue) {
+              key + "原来的班组：",
-    //       return { rowspan: 0, colspan: 0 };
+              originalRemark + "现在的班组：",
-    //     } else {
+              item[key].remark
-    //       // 否则计算当前单元格应该跨越多少行
+            );
-    //       let rowspan = 1;
+          }
-    //       for (let i = rowIndex + 1; i < this.detailList.length; i++) {
+        });
-    //         const nextRow = this.tableData[i];
+      });
-    //         const nextValue = nextRow[column.property];
+    },
-    //         if (nextValue === currentValue) {
+
-    //           rowspan++;
+    AddNewColumn() {
-    //         } else {
+      this.propertyNum = Object.keys(this.tableData[0]).length - 3 + 1; //属性个数
-    //           break;
+      this.tableTittle.push({
-    //         }
+        label: "点检结果",
-    //       }
+        key: this.propertyNum + 3,
-    //       return { rowspan, colspan: 1 };
+      });
-    //     }
+      this.tableTittleWidth = 880 / this.propertyNum + "px";
-    //   }
+      //前端直接构建
-    // },
+      let tableLines = [];
+      for (let key in table[0]) {
+        if (key !== "序号" && key !== "点检项目" && key !== "点检内容") {
+          Object.keys(item).forEach((key) => {
+            if (key === "tableLine") {
+              tableLines.push(item[key]);
+            }
+          });
+        }
+      }
+      let maxEndTimeInMinutes = Math.max(...tableLines);
+      console.log("maxEndTimeInMinutes", maxEndTimeInMinutes);
+
+      //前端直接构建
+      this.tableData.forEach((item) => {
+        var dynamicPropertyName = "第" + this.propertyNum + "列";
+        let newProperty = {};
+        newProperty.productCode = this.headerParameters.productCode;
+        newProperty.productName = this.headerParameters.productName;
+        newProperty.tableLine = this.propertyNum;
+        newProperty.remark = "";
+        this.$set(item, dynamicPropertyName, newProperty);
+      });
+    },
 
     /** 查询检查项维护列表 */
     getList() {
@@ -492,24 +625,16 @@ export default {
       this.propertyNum = null;
       this.loading = true;
 
-      //查询上方
-      listCheckBox(this.headerParameters).then((response) => {
-        this.checkBoxData = response;
-      });
-
       getSelfMutualInspectionData(this.headerParameters).then((response) => {
         this.headerParameters.createBy = response.createBy; //检查人
         this.headerParameters.productName = response.productName; //产品名称
         this.headerParameters.remark = response.remark; //备注
-        this.headerParameters.bz = response.bz; //异常处理
+        this.headerParameters.whetherOpenLine = response.whetherOpenLine; //异常处理
-        this.headerParameters.lineName = response.lineName; 
+        this.headerParameters.id = response.id; //主表id
-        //this.headerParameters.checkDate = response.checkDate 检查日期
-        //生产产线
-      });
 
         listPointInspection(this.headerParameters).then((response) => {
           this.tableData = response;
-        console.log("this.tableData", this.tableData);
+
           this.propertyNum = Object.keys(this.tableData[0]).length - 3; //属性个数
           this.tableTittle0.push({
             label: "序号",
@@ -532,6 +657,7 @@ export default {
 
           this.tableTittleWidth = 880 / this.propertyNum + "px";
         });
+      });
     },
   },
 };