Merge remote-tracking branch 'origin/master'

zss

2023-12-15 619f774244a75d747878a9618e960bcede1a077b

 src/views/quality/teststandard/index.vue

@@ -78,7 +78,7 @@
                align="center"
                width="50"
              />
              <el-table-column
              <!-- <el-table-column
                label="是否引用工艺参数"
                prop="isReference"
                align="center"
@@ -125,7 +125,7 @@
                <template slot-scope="scope">
                  <el-input v-model="scope.row.wireCore"></el-input>
                </template>
              </el-table-column>
              </el-table-column> -->
              <el-table-column label="参数编号" prop="code" align="center" />
              <el-table-column
                label="参数项"
@@ -188,8 +188,28 @@
                <template slot-scope="scope">
                  <el-input v-model="scope.row.parameterFormat"></el-input>
                </template>
              </el-table-column><el-table-column
                label="测试方法"
                prop="purpose"
                align="center"
                width="80"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.purpose"></el-input>
                </template>
              </el-table-column>
              <el-table-column
                label="测试目的"
                prop="method"
                align="center"
                width="80"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.method"></el-input>
                </template>
              </el-table-column>

              <!-- <el-table-column
                label="通道"
                prop="aisle"
                align="center"
@@ -208,7 +228,7 @@
                <template slot-scope="scope">
                  <el-input v-model="scope.row.position"></el-input>
                </template>
              </el-table-column>
              </el-table-column> -->
              <el-table-column label="单位" prop="unit" align="center" />
              <!--<el-table-column label="参数类型" prop="type" align="center" :formatter="getParam"/>-->
              <el-table-column label="操作" align="center">
@@ -220,13 +240,13 @@
                    v-if="editable"
                    >插入
                  </el-button>
                  <el-button
                  <!-- <el-button
                    type="text"
                    size="mini"
                    @click.stop="editTestStandardParam(scope.row)"
                    v-if="editable && scope.row.id != null"
                    >公式
                  </el-button>
                  </el-button> -->
                  <el-button
                    type="text"
                    size="mini"