-换型bug修改

admin

5 天以前 0a926b3ce629047a88dbc65cc38ec86c43520336

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

@@ -1,18 +1,31 @@
<template>
  <div class="app-container">
   <el-row :gutter="5">
     <el-col :span="7">
     <el-col :span="5">
       <el-card shadow="never">
         <span class="head-font">工位编号 : {{headContent.processesCode}}</span>
         <span hidden>{{headContent.inboundTime}}</span>
       </el-card>
     </el-col>
     <el-col :span="7">
     <el-col :span="5">
       <el-card shadow="never">
         <span class="head-font">工位名称 : {{headContent.processesName}}</span>
       </el-card>
     </el-col>
     <el-col :span="10">
     <el-col :span="6">
       <el-card style="height: 57px" shadow="never">
         <span class="head-font">产品型号 : </span>
         <el-select style="width: 70%;margin-top: -10px" v-model="selectProductCode" placeholder="请选择">
           <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value">
           </el-option>
         </el-select>
       </el-card>
     </el-col>
     <el-col :span="8">
       <el-card shadow="never">
         <span class="head-font">产品序列号 : {{headContent.sfcCode}}</span>
<!--         <el-input v-model="content" style="float: right;width: 150px;" placeholder="请输入内容"></el-input>-->
@@ -30,17 +43,19 @@
           <span slot="label"> <a class="el-icon-date"></a>首页</span>
           <el-col :span="24">
             <el-table height="500" :cell-style="rowStyle" :data="formulaChildList">
               <el-table-column label="排序" width="60" align="center" type="index">
<!--               <el-table-column label="排序" width="60" align="center" type="index">-->
<!--               </el-table-column>-->
               <el-table-column label="拧紧步号" width="80" align="center" prop="stepSort">
               </el-table-column>
               <el-table-column label="操作内容" :show-overflow-tooltip='true' align="center" prop="operationSteps">
               </el-table-column>
               <el-table-column label="产品编号" align="center" prop="productCode">
               <el-table-column label="产品编号" width="80" align="center" prop="productCode">
               </el-table-column>
               <el-table-column label="物料编码" align="center" prop="materialCode">
               <el-table-column label="物料编码" width="140" align="center" prop="materialCode">
               </el-table-column>
               <el-table-column label="采集值" align="center" prop="collectData">
               </el-table-column>
               <el-table-column label="结果" align="center" prop="results">
               <el-table-column label="结果" width="60" align="center" prop="results">
               </el-table-column>
             </el-table>
           </el-col>
@@ -212,6 +227,17 @@
  name: "stationTerminal",
  data() {
    return {
      selectProductCode: 'PE01B',
      options: [{
        value: 'PE01B',
        label: 'PE01B'
      }, {
        value: 'PE01F',
        label: 'PE01F'
      }, {
        value: 'PE01H',
        label: 'PE01H'
      }],
      showInput: true,
      serialPortContent: '',
      // 查询参数
@@ -261,8 +287,9 @@
      },
      content: '',
      activeName: 'first',
      url: "ws://10.103.210.248:8080/websocket/message/",
      // url: "ws://192.168.2.76:8080/websocket/message/",
      // url: "ws://192.168.2.248:8080/websocket/message/",
      // url: "ws://10.103.210.248:8080/websocket/message/",
      url: "ws://192.168.2.76:8080/websocket/message/",
      message: "",
      text_content: "",
      ws: null,
@@ -360,7 +387,7 @@
        scanBarcode: value,
        sfcBarcode: this.headContent.sfcCode,
        workOrderNo: this.workpieceInformation.workOrderNo,
        productCode: "1P102S",
        productCode: this.selectProductCode,
        locationCode: this.headContent.processesCode,
        collectionTime: new Date()
      }
@@ -378,7 +405,7 @@
    },
    /** 查询配方配置子信息列表 */
    getListFormulaChild() {
      this.formulaChildParams.productCode = "1P102S"
      this.formulaChildParams.productCode = this.selectProductCode
      this.formulaChildParams.processesCode = this.headContent.processesCode
      console.log(this.formulaChildParams)
      noPageListFormulaChild(this.formulaChildParams).then(response => {
@@ -412,7 +439,7 @@
    },
    clearClick(){
      const param = {
        productCode: '1P102S',
        productCode: this.selectProductCode,
        locationCode: this.headContent.processesCode,
      }
      clearWorkpieceRelease(param).then(response => {});
@@ -433,6 +460,7 @@
    /** 查询工单列表 */
    async getList() {
      const param = {
        productCode: this.selectProductCode,
        processesCode: this.headContent.processesCode,
      }
      fistSetpNumber(param).then(response => {});
@@ -491,7 +519,7 @@
      this.ws = new WebSocket(wsuri);
      const self = this;
      this.ws.onopen = function (event) {
        this.$message('websocket连接成功！');
        self.$message('websocket连接成功！');
      };
      this.ws.onmessage = function (event) {
        if(event.data.includes("[")) {
@@ -511,7 +539,7 @@
            tightenTheArray: event.data,
            paramCode: formulaChilds.paramCode,
            // workOrderNo: self.workpieceInformation.workOrderNo,
            // productCode: "1P102S",
            productCode: self.selectProductCode,
            locationCode: self.headContent.processesCode,
            productBarcode: self.headContent.sfcCode,
            spareField2: formulaChilds.spareField2,
@@ -538,9 +566,13 @@
                  self.getListFormulaChild()
                }else {
                  const param = {
                    id: formulaChilds.id,
                    locationCode: self.headContent.processesCode,
                    productBarcode: self.headContent.sfcCode,
                    inboundTime: self.headContent.inboundTime
                    inboundTime: self.headContent.inboundTime,
                    productCode: self.selectProductCode,
                    workOrderNo: "-",

                  }
                  preInstallOut(param).then(response => {});
                  workpieceRelease(param).then(response => {});
@@ -569,9 +601,14 @@
          console.log(scanValue)
          this.serialPortMethod(scanValue)
        } else {
          this.headContent.sfcCode = scanValue;
          this.headContent.inboundTime = this.getCurrentTime();
          this.getList()
          if(scanValue.includes("P9900183275") || scanValue.includes("P9900173252")){
            this.headContent.sfcCode = scanValue;
            this.headContent.inboundTime = this.getCurrentTime();
            this.getList()
          }else {
            this.$message.error('总成码扫描错误！');
          }

        }

      }