Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2024-01-25 36653c98622c8a74cb850575b2001457121b794c

 src/views/product/producttraceability/index.vue

@@ -94,7 +94,7 @@
                      </div>
                    </el-col>
                  </el-row>
                </el-col>
                </el-col>changePart
                <el-col
                  :span="10"
                  :offset="1"
@@ -1001,19 +1001,31 @@
      selectLoading: false,
      systemNo: null,
      selectedProductSystemNo: null,
      valueColumn: 'systemNo',
      valueColumn: 'customerOrderId',
      partColumn: [
        {
          prop: 'batchNo',
          label: '批次号'
          prop: 'customerOrderNo',
          label: '销售订单号'
        },
        {
          prop: 'systemNo',
          label: '系统号'
          prop: 'entityName',
          label: '项目名称'
        }, 
        {
          prop: 'partNo',
          label: '产品编号'
        }, 
        {
          prop: 'productName',
          label: '产品名称'
        },
        {
          prop: 'partName',
          label: '零件名称'
          prop: 'specs',
          label: '产品型号'
        }, 
        {
          prop: 'productType',
          label: '产品类型'
        }
      ],
      partList: [],
@@ -1182,14 +1194,14 @@
      const part = this.partList.find((item) => ele.systemNo === item.systemNo)
      if (part !== undefined) {
        partLabel =
          '系统号：' +
          part.systemNo +
          '销售订单号：' +
          part.customerOrderNo +
          '     ' +
          '零件名称：' +
          part.partName +
          '产品名称：' +
          part.productName +
          '     ' +
          '批次号：' +
          part.batchNo
          '产品编号：' +
          part.partNo
      }
      return partLabel
    },
@@ -1262,7 +1274,6 @@
          _that.selectedProductSystemNo = nodeData.key.split('_')[0]
          // const query = { systemNo: 'XT000131' }
          const query = { systemNo: nodeData.key.split('_')[0] }
          console.log(query)
          queryOperationTask(query)
            .then((response) => {
              var data = response.data
@@ -1356,7 +1367,6 @@
                  _that.paramTabs = []
                } else {
                  // 工步信息
                  console.log('nodeData', nodeData.batchNo)
                  _that.getStepRecords({
                    id: _that.currOperateTask.id,
                    sn: nodeData.batchNo.split('SN号:')[1]
@@ -1384,7 +1394,6 @@
            })
        }
      })
      console.log(param.diagram.selection)
    },
    // 根据工单id，查询对应的工艺参数信息
    queryTechnologyInfo(taskId) {
@@ -1570,7 +1579,6 @@
    },
    // 切换追溯模式
    changeTraceType() {
      console.log('traceType', this.traceType)
      this.changePart()
    },
    paramsTableHeaderStyle({ row, column, rowIndex, columnIndex }) {