Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-21 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061

 src/views/product/producttraceability/index.vue

@@ -382,9 +382,9 @@
                    >
                      <template slot-scope="scope">
                        {{
                          scope.row.isQualified == 0
                          scope.row.result == 0
                            ? '不合格'
                            : (scope.row.isQualified==1?'合格':'')
                            : (scope.row.result==1?'合格':'')
                        }}
                      </template>
                    </el-table-column>
@@ -433,9 +433,9 @@
                    >
                      <template slot-scope="scope">
                        {{
                          scope.row.isQualified == 0
                          scope.row.result == 0
                            ? '不合格'
                            : (scope.row.isQualified==1?'合格':'')
                            : (scope.row.result==1?'合格':'')
                        }}
                      </template>
                    </el-table-column>
@@ -1306,7 +1306,7 @@
    },
    labelFormatter(ele) {
      let partLabel
      const part = this.partList.find((item) => ele.systemNo === item.systemNo)
      const part = this.partList.find((item) => ele.customerOrderId === item.customerOrderId)
      if (part !== undefined) {
        partLabel =
          '销售订单号：' +