Merge remote-tracking branch 'origin/master'

cl

2024-02-02 129a317ff36d49fcc096cdd60d066594176e9e0e

 jcdm-ui/src/views/main/rm/repairData/index.vue

@@ -1,398 +1,249 @@
<template>
  <div class="app-container">
    <el-card class ="box-card">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="返修标识" prop="repairIdentification">
        <el-input
          v-model="queryParams.repairIdentification"
          placeholder="请输入返修标识"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="箱体编码" prop="boxCode">
        <el-input
          v-model="queryParams.boxCode"
          placeholder="请输入箱体编码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item style="float: right">
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
      </el-card>
    <el-card style="margin-top: 10px"  height="250" class="box-card">
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['rm:repairData:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['rm:repairData:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['rm:repairData:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['rm:repairData:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading"  border :data="repairRecordList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="返修标识" align="center" prop="repairIdentification" />
      <el-table-column label="箱体编码" align="center" prop="boxCode" />
      <el-table-column label="工序编码" align="center" prop="processesCode" />
      <el-table-column label="原结果" align="center" prop="originalResult" />
      <el-table-column label="返修结果" align="center" prop="repairResults" />
      <el-table-column label="创建用户" align="center" prop="createUser" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['rm:repairData:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['rm:repairData:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>
    <el-card class="box-card">
      <div class="headClass">
        <div style="display: flex;height: 20px">
          <div>
            <span style="font-size: large; font-weight: bold; text-decoration: underline; margin-bottom: 10px">返修记录报表</span>
          </div>
          <div style="margin-left: 30%">
            <el-form :inline="true" :model="queryParams" class="myFrom" size="mini">
              <el-form-item label="返修标识">
                <el-input v-model="queryParams.repairIdentification" placeholder="返修标识"></el-input>
              </el-form-item>
              <el-form-item label="箱体编码">
                <el-input v-model="queryParams.boxCode" placeholder="箱体编码">
                </el-input>
              </el-form-item>
              <el-form-item>
                <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
              </el-form-item>
              <el-form-item>
                <el-button type="primary" icon="el-icon-download" style="background-color: #6dbf6d" @click="exportReport">导出报表</el-button>
              </el-form-item>
            </el-form>
          </div>
        </div>
        <div style="margin-top: 10px">
          <el-table
            style="width: 100%;"
            border height="190"
            v-loading="loading"
            highlight-current-row
            :data="orderSchedulingList"
            @selection-change="handleSelectionChange"
            @current-change="handleCurrentChange">
            <el-table-column
              type="index"
              width="50"></el-table-column>
            <el-table-column type="selection" width="55" align="center" />
            <el-table-column label="返修标识" align="center" prop="repairIdentification" />
            <el-table-column label="箱体编码" align="center" prop="boxCode" />
            <el-table-column label="工序编码" align="center" prop="processesCode" />
            <el-table-column label="原结果" align="center" prop="originalResult" />
            <el-table-column label="返修结果" align="center" prop="repairResults" />
            <el-table-column label="创建用户" align="center" prop="createUser" />
          </el-table>
        </div>
      </div>
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="queryParams.pageNum"
        :limit.sync="queryParams.pageSize"
        @pagination="getRepairRecordList"
        @pagination="getMainList"
      />
    </el-card>
    <el-card style="margin-top: 10px" class="box-card">
      <el-tabs type="border-card" >
        <el-tab-pane>
          <span slot="label"> <a class="el-icon-date"></a>拧紧数据</span>
          <template>
            <el-table v-loading="loading" border :data="repairDataList" @selection-change="handleSelectionChange">
              <el-table-column type="selection" width="55" align="center" />
              <el-table-column label="箱体编码" align="center" prop="boxCode">
              </el-table-column>
              <el-table-column label="工位" align="center" prop="station">
              </el-table-column>
              <el-table-column label="拧紧次数" align="center" prop="tightenFrequency">
              </el-table-column>
              <el-table-column label="拧紧颗数" align="center" prop="tightenPiecesNumber">
              </el-table-column>
              <el-table-column label="扭力" align="center" prop="torqueForce">
              </el-table-column>
              <el-table-column label="角度" align="center" prop="angle">
              </el-table-column>
              <el-table-column label="结果" align="center" prop="result">
                <template slot-scope="scope">
                  <dict-tag :options="dict.type.qualified_status" :value="scope.row.status"/>
                </template>

              </el-table-column>
              <el-table-column label="保存时间" align="center" prop="boxCode">
              </el-table-column>

            </el-table>
          </template>
    <div>
      <el-tabs type="border-card">
        <el-tab-pane>
          <span slot="label"><i class="el-icon-date"></i>拧紧数据</span>
          <report1 :list1 = this.list1></report1>
        </el-tab-pane>
        <el-tab-pane>
          <span slot="label"> <b class="el-icon-date"></b>相机检测</span>
          <el-empty >
            <span slot="description">暂无数据</span>
          </el-empty>
          <span slot="label"><i class="el-icon-date"></i>相机检测</span>
          <report2 :list2 = this.list2></report2>
        </el-tab-pane>
        <el-tab-pane>
          <span slot="label"> <c class="el-icon-date"></c>外漏检测</span>
          <el-empty >
            <span slot="description">暂无数据</span>
          </el-empty>
          <span slot="label"><i class="el-icon-date"></i>外漏检测</span>
          <report3 :list3 = this.list3></report3>
        </el-tab-pane>
        <el-tab-pane>
          <span slot="label"> <d class="el-icon-date"></d>机轴加注</span>
          <el-empty >
            <span slot="description">暂无数据</span>
          </el-empty>
          <span slot="label"><i class="el-icon-date"></i>机油加注</span>
          <report4 :list4 = this.list4></report4>
        </el-tab-pane>
        <el-tab-pane>
          <span slot="label"> <e class="el-icon-date"></e>工位结果</span>
          <el-empty >
            <span slot="description">暂无数据</span>
          </el-empty>
          <span slot="label"><i class="el-icon-date"></i>工位结果</span>
          <report5 :list5 = this.list5></report5>
        </el-tab-pane>
      </el-tabs>
    </el-card>



    <!-- 添加或修改返修数据对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
      <el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
        <el-form-item label="总成编码" prop="snCode">
          <el-input v-model="form.snCode" placeholder="请输入总成编码" />
        </el-form-item>
        <el-form-item label="箱体编码" prop="boxCode">
          <el-input v-model="form.boxCode" placeholder="请输入箱体编码" />
        </el-form-item>
        <el-form-item label="工序编码" prop="processesCode">
          <el-input v-model="form.processesCode" placeholder="请输入工序编码" />
        </el-form-item>
        <el-form-item label="拧紧次数" prop="tightenFrequency">
          <el-input v-model="form.tightenFrequency" placeholder="请输入拧紧次数" />
        </el-form-item>
        <el-form-item label="拧紧颗数" prop="tightenPiecesNumber">
          <el-input v-model="form.tightenPiecesNumber" placeholder="请输入拧紧颗数" />
        </el-form-item>
        <el-form-item label="扭力" prop="torqueForce">
          <el-input v-model="form.torqueForce" placeholder="请输入扭力" />
        </el-form-item>
        <el-form-item label="角度" prop="angle">
          <el-input v-model="form.angle" placeholder="请输入角度" />
        </el-form-item>
        <el-form-item label="结果" prop="result">
          <el-input v-model="form.result" placeholder="请输入结果" />
        </el-form-item>
        <el-form-item label="创建用户" prop="createUser">
          <el-input v-model="form.createUser" placeholder="请输入创建用户" />
        </el-form-item>
        <el-form-item label="更新用户" prop="updateUser">
          <el-input v-model="form.updateUser" placeholder="请输入更新用户" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
        <el-form-item label="预留字段1" prop="spareField1">
          <el-input v-model="form.spareField1" placeholder="请输入预留字段1" />
        </el-form-item>
        <el-form-item label="预留字段2" prop="spareField2">
          <el-input v-model="form.spareField2" placeholder="请输入预留字段2" />
        </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>
  </div>
</template>

<script>
import { listRepairRecord, getRepairRecord, delRepairRecord, addRepairRecord, updateRepairRecord } from "@/api/main/rm/repairRecord/repairRecord";
import { listRepairData, getRepairData, delRepairData, addRepairData, updateRepairData } from "@/api/main/rm/repairData/repairData";
import { listRepairRecord, getRepairData } from "@/api/main/rm/repairRecord/repairRecord";
import {getFollowReport, listOrderScheduling} from "../../../../api/main/bs/orderScheduling/orderScheduling";
import report1 from "../../da/followReport/report1";
import report2 from "../../da/followReport/report2";
import report3 from "../../da/followReport/report3";
import report4 from "../../da/followReport/report4";
import report5 from "../../da/followReport/report5";

export default {
  name: "RepairData",
  dicts: ['qualified_status'],
  components: { report1, report2, report3, report4, report5,},
  data() {
    return {
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      loading: false,
      total: 0,
      // 返修数据表格数据
      repairDataList: [],
      repairRecordList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      orderSchedulingList: [],
      list1: [],
      list2: [],
      list3: [],
      list4: [],
      list5: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        snCode: null,
        orderNo: null,
        boxCode: null,
        processesCode: null,
        tightenFrequency: null,
        tightenPiecesNumber: null,
        torqueForce: null,
        angle: null,
        result: null,
        repairIdentification: null,
        engineNo: null,
        productType: null,
        model: null,
        productionStatus: null,
        workingHours: null,
        currentWorkstation: null,
        qualityStatus: null,
        whetherOrPrint: null,
        report10: null,
        report20: null,
        combinedBoxTime: null,
        finalAssemblyTime: null,
        operator: null,
        operateTime: null,
        status: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,
        spareField4: null,
        createUser: null,
        updateUser: null,
        remarks: null,
        spareField1: null,
        station: null,
        spareField2: null
        dateConditions: [],
        engineNoList: [],
        engineNoListExcel: []
      },
      // 表单参数
      form: {},
      // 表单校验
      rules: {
        id: [
          { required: true, message: "主键id不能为空", trigger: "blur" }
        ],
      }
    };
      multipleSelection: [],
      multipleSelectionExcel: [],
      currentRow: null
    }
  },

  created() {
    this.getList();
    this.getRepairRecordList();
    let workOrderNo = this.$route.query.workOrderNo;
    this.queryParams.orderNo = workOrderNo
    this.getMainList();
    this.getChildList();
  },
  methods: {
    /** 查询返修记录列表 */
    getRepairRecordList() {
    toggleSelection(rows) {
      if (rows) {
        rows.forEach(row => {
          this.$refs.multipleTable.toggleRowSelection(row);
        });
      } else {
        this.$refs.multipleTable.clearSelection();
      }
    },
    handleSelectionChange(val) {
      this.multipleSelectionExcel = val;
      console.log('MMMMM--',this.multipleSelectionExcel)
      if (this.multipleSelectionExcel !== null && this.multipleSelectionExcel.length > 0){
        this.queryParams.engineNoListExcel = []
        this.multipleSelectionExcel.forEach(x => {
          this.queryParams.engineNoListExcel.push(x.boxCode)

        })
      }else {
        this.queryParams.engineNoListExcel = []
      }
      console.log('this.handleSelectionChange ',this.queryParams.engineNoListExcel )
    },
    handleCurrentChange(val) {
      this.currentRow = val;
      //查询选中行数据
      this.queryParams.engineNoList = []
      this.queryParams.engineNoList.push(this.currentRow.boxCode)
      this.getChildList()
      console.log('handleCurrentChange',this.queryParams.engineNoList)
      console.log('handleCurrentChange222',this.queryParams.engineNoListExcel)
    },
    //导出
    exportReport(){
      if (this.queryParams.engineNoListExcel.length === 0){
        this.$message.error("请勾选需要导出的数据")
      }else {
        this.queryParams.engineNoList = []
        this.download('rm/repairRecord/exportRepair', {
          ...this.queryParams
        }, `返修记录报表_${new Date().getTime()}.xlsx`)
      }

    },
    /** 查询订单排产列表 */
    getMainList() {
      this.loading = true;
      console.log(this.queryParams)
      listRepairRecord(this.queryParams).then(response => {
        this.repairRecordList = response.rows;
        this.orderSchedulingList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    /** 查询返修数据列表 */
    getList() {
      this.loading = true;
      listRepairData(this.queryParams).then(response => {
        this.repairDataList = response.rows;
        this.total = response.total;
        this.loading = false;
    getChildList(){
      getRepairData(this.queryParams).then(response => {
        this.list1 = response.data.list1;
        console.log('list111111',this.list1)
        this.list2 = response.data.list2;
        this.list3 = response.data.list3;
        this.list4 = response.data.list4;
        this.list5 = response.data.list5;

      });
    },
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
        id: null,
        snCode: null,
        boxCode: null,
        processesCode: null,
        tightenFrequency: null,
        tightenPiecesNumber: null,
        torqueForce: null,
        angle: null,
        result: null,
        createUser: null,
        createTime: null,
        updateTime: null,
        updateUser: null,
        remarks: null,
        spareField1: null,
        station: null,
        spareField2: null
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加返修数据";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids
      getRepairData(id).then(response => {
        this.form = response.data;
        this.open = true;
        this.title = "修改返修数据";
      });
    },
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {
            updateRepairData(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addRepairData(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除返修数据编号为"' + ids + '"的数据项？').then(function() {
        return delRepairData(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('rm/repairData/export', {
        ...this.queryParams
      }, `repairData_${new Date().getTime()}.xlsx`)
    getList(){
      this.getMainList()
      this.getChildList()
    }
    // handleCurrentChange(val) {
    //   this.multipleSelection = val;
    //   console.log('this.multipleSelection ',this.multipleSelection )
    // }
  }
};
</script>
<style scoped>
.headClass {
  height: 200px;
}
::v-deep .el-table--scrollable-x .el-table__body-wrapper {
  z-index: 3;
}
::v-deep .el-table__body-wrapper::-webkit-scrollbar {
  height: 6px;
}
::v-deep .el-form .myFrom .el-form--inline{
  height: 20px;
}
::v-deep .el-card__body {
  padding: 10px 15px 10px 15px;
}
.app-container{
  height: 625px;
}
</style>