Merge remote-tracking branch 'origin/master'

jiang

2024-01-25 901b68695fcdab7e3ff1d5df3df88bd5001b0181

 jcdm-ui/src/views/main/kb/repairMark/index.vue

@@ -24,95 +24,79 @@
    <el-row>
      <el-col :span="20">
        <el-card style="margin-top: 10px; height: 490px;" class="box-card">
          <el-table border ref="multipleTable" :data="passingStationCollectionList"  @selection-change="handleSelectionChange">
            <el-table-column type="selection" width="55" align="center" />
            <el-table-column label="工单编号" width="120" align="center" prop="workOrderNo">
            </el-table-column>
            <el-table-column label="总成序列号" width="150" align="center" prop="sfcCode">
            </el-table-column>
            <el-table-column label="产品编号" align="center" prop="productCode">
            </el-table-column>
            <el-table-column label="产线编号" align="center" prop="productionLine">
            </el-table-column>
            <el-table-column label="工位编号" align="center" prop="locationCode">
            </el-table-column>
            <el-table-column label="入站时间" align="center" prop="inboundTime" width="100">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="出站时间" align="center" prop="outboundTime" width="100">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="是否合格" align="center" prop="outRsSign">
            </el-table-column>
            <el-table-column label="NG原因" align="center" prop="outMsgSign">
            </el-table-column>
            <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="节拍时间" align="center" prop="beatTime">
            </el-table-column>
          </el-table>
          <el-tabs v-model="activeName" @tab-click="handleClick">
            <el-tab-pane label="过站采集" name="first">
              <el-table max-height="410px" border ref="multipleTable" :data="passingStationCollectionList"  @selection-change="handleSelectionChange">
                <el-table-column type="selection" width="55" align="center" />
                <el-table-column label="工单编号" width="120" align="center" prop="workOrderNo">
                </el-table-column>
                <el-table-column label="总成序列号" width="150" align="center" prop="sfcCode">
                </el-table-column>
                <el-table-column label="产品编号" align="center" prop="productCode">
                </el-table-column>
                <el-table-column label="产线编号" align="center" prop="productionLine">
                </el-table-column>
                <el-table-column label="工位编号" align="center" prop="locationCode">
                </el-table-column>
                <el-table-column label="入站时间" align="center" prop="inboundTime" width="160">
                  <template slot-scope="scope">
                    <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                  </template>
                </el-table-column>
                <el-table-column label="出站时间" align="center" prop="outboundTime" width="160">
                  <template slot-scope="scope">
                    <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                  </template>
                </el-table-column>
                <el-table-column label="是否合格" align="center" prop="outRsSign">
                </el-table-column>
                <el-table-column label="NG原因" align="center" prop="outMsgSign">
                </el-table-column>
                <el-table-column label="采集时间" align="center" prop="collectionTime" width="160">
                  <template slot-scope="scope">
                    <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                  </template>
                </el-table-column>
                <el-table-column label="节拍时间" align="center" prop="beatTime">
                </el-table-column>
              </el-table>
            </el-tab-pane>
            <el-tab-pane label="返修记录" name="second">
              <el-table max-height="410px" border :data="repairRecordList">
                <el-table-column label="发动机号" width="150" align="center" prop="boxCode" />
                <el-table-column label="工位号" align="center" prop="processesCode" />
                <el-table-column label="返修结果" align="center" prop="repairResults" />
                <el-table-column label="原结果" align="center" prop="originalResult" />
                <el-table-column label="返修时间" align="center" width="160" prop="repairTime" />
              </el-table>
            </el-tab-pane>
          </el-tabs>

        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card style="margin-top: 10px; min-height: 490px">
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-s-grid" @click="selectAll" >选择所有</el-button>

            <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-s-grid" @click="selectAll" >选 择 所 有</el-button>
          </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-close" @click="clearAll">取消选择</el-button>

            <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-close" @click="clearAll">取 消 选 择</el-button>
          </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">选择不合格</el-button>

            <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-document-remove" @click="selectUnqualified">选择不合格</el-button>
          </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-s-flag" @click="markComplete">标记完成</el-button>

          </el-row>    <el-row class="centered-row">
          <el-button type="success" icon="el-icon-files" @click="repairRecord">返修记录</el-button>

            <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-s-flag" @click="markComplete">标 记 完 成</el-button>
          </el-row>
          <el-row class="centered-row">
          <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-files" @click="repairRecord">返 修 记 录</el-button>
        </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-date" @click="operationLog" >操作日志</el-button>

            <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-date" @click="operationLog" >操 作 日 志</el-button>
          </el-row>



<!--          <el-button type="success" icon="el-icon-close" @click="clearAll">取消选择</el-button>-->
<!--          <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">选择不合格</el-button>-->
<!--          <el-button type="success" icon="el-icon-s-flag" @click="markComplete">标记完成</el-button>-->
<!--          <el-button type="success" icon="el-icon-files" @click="repairRecord">返修记录</el-button>-->
<!--          <el-button type="success" icon="el-icon-date" @click="operationLog" >操作日志</el-button>-->
        </el-card>
      </el-col>
    </el-row>

    <el-dialog v-dialogpop-up :visible.sync="open" width="700px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        返修进度
      </span>
      <el-table border :data="repairRecordList">
        <el-table-column label="发动机号" width="150" align="center" prop="boxCode" />
        <el-table-column label="工位号" align="center" prop="processesCode" />
        <el-table-column label="返修结果" align="center" prop="repairResults" />
        <el-table-column label="原结果" align="center" prop="originalResult" />
        <el-table-column label="返修时间" align="center" width="160" prop="repairTime" />
      </el-table>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>


  </div>
@@ -120,15 +104,17 @@

<script>
import {
  listPassingStationCollection,
  noPageList,
  insertRepairRecordByIds
} from "@/api/main/da/passingStationCollection/passingStationCollection";
import {listRepairRecord} from "@/api/main/rm/repairRecord/repairRecord";
import {noPagelist} from "@/api/main/rm/repairRecord/repairRecord";
export default {
  name: "index",
  dicts: ['sys_normal_disable'],
  data(){
    return{
      activeName: 'first',

      // 返修记录表格数据
      repairRecordList: [],
      // 是否显示弹出层
@@ -141,12 +127,13 @@
        outRsSign: '',
      },
      ids: [],
      allSelected: false
      allSelected: false,
      boxCode: '',

    }
  },
  mounted() {
    this.getList()
    // this.getList()
  },
  methods:{
    // 取消按钮
@@ -194,26 +181,25 @@
      this.multiple = !selection.length
    },
    repairProgressHandleQuery(){
      this.open = true;
      if(this.queryParams.engineNo === ''||this.queryParams.engineNo=== null){
        this.$modal.msgSuccess('请输入发动机号');
      }else {
        /** 查询返修记录列表 */
        let queryParams = {
          boxCode: this.queryParams.engineNo
        }
        listRepairRecord(queryParams).then(response => {
          this.repairRecordList = response.rows;
        });
      this.activeName = 'second'
    },
    initRepairRecord(){
      /** 查询返修记录列表 */
      let queryParams = {
        boxCode: this.queryParams.sfcCode
      }
      noPagelist(queryParams).then(response => {
        this.repairRecordList = response.rows;
      });
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.getList();
      this.initRepairRecord();
    },
    /** 查询产品过站采集列表 */
    getList() {
      listPassingStationCollection(this.queryParams).then(response => {
      noPageList(this.queryParams).then(response => {
        this.passingStationCollectionList = response.rows;
        this.total = response.total;
      });