Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

jiangping

2023-08-18 40609a1bd11ce79445562ac23f16af23a48c3933

 web_standard/src/views/ext/workorderPutRecordExt.vue

@@ -120,19 +120,33 @@
            <span class="long-title-style">{{ row.procedureName }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="qualifiedNum" label="合格数量" min-width="100px">
        <!-- <el-table-column prop="qualifiedNum" label="合格数量" min-width="100px">
          <template slot-scope="{row}">
            <span class="valid-style">{{ row.qualifiedNum + row.umodel.name }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="unqualifiedNum" label="不良数量" min-width="100px">
          <template slot-scope="{row}">
            <span class="unvalid-style">{{ row.num + row.umodel.name}}</span>
            <!-- <span :class="row.materialDonetype==0 ? 'valid-style' : ''">{{ row.num + row.umodel.name }}</span> -->
            <span class="unvalid-style">{{ row.unqualifiedNum + row.umodel.name}}</span>
          </template>
        </el-table-column> -->
        <el-table-column prop="doneType" label="质量属性" min-width="100px">
           <template slot-scope="{row}">
            <span v-if="row.materialDonetype==0" class="valid-style">合格</span>
            <span v-else-if="row.materialDonetype==1" class="unvalid-style">不良</span>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column prop="num" label="报工数量" min-width="100px"></el-table-column>
        <!-- <el-table-column prop="amodel.code" label="工装器具" min-width="100px"></el-table-column> -->
        <el-table-column prop="num" label="数量" min-width="100px">
           <template slot-scope="{row}">
            <span :class="row.materialDonetype==0 ? 'valid-style' : 'unvalid-style'">{{ row.num + row.umodel.name }}</span>
           </template>
         </el-table-column>
        <!-- <el-table-column prop="num" label="报工数量" min-width="100px">
          <template slot-scope="{row}">
            {{ row.num + row.umodel.name }}
          </template>
        </el-table-column> -->
        <el-table-column prop="deviceCode" label="设备" show-overflow-tooltip min-width="100px">
          <template slot-scope="{row}">
            <span class="long-title-style" :title="row.deviceCode + ' | ' + row.deviceName">{{ row.deviceCode + ' | ' + row.deviceName}}</span>
@@ -264,7 +278,7 @@
        if (index === 0) {
          sums[index] = '合计';
          return;
        } else if (index === 4 || index === 6 || index === 8 || index === 10) {
        } else if (index === 4 || index === 8 || index === 10) {
          // || index === 8 || index === 9 || index === 16 || index === 17
          sums[index] = '-';
          return;