|
@@ -17,24 +17,25 @@
|
|
|
border
|
|
border
|
|
|
:default-expand-all="true"
|
|
:default-expand-all="true"
|
|
|
>
|
|
>
|
|
|
- <el-table-column type="expand" label="批量" width="80">
|
|
|
|
|
|
|
+ <el-table-column type="expand" label="批量" width="80">
|
|
|
<template slot-scope="{ row, $index }">
|
|
<template slot-scope="{ row, $index }">
|
|
|
- <div class="material" :key="$index" >
|
|
|
|
|
|
|
+ <div class="material" :key="$index">
|
|
|
<div class="btn_end">
|
|
<div class="btn_end">
|
|
|
<el-button
|
|
<el-button
|
|
|
- v-if='!isDetails'
|
|
|
|
|
|
|
+ v-if="!isDetails"
|
|
|
type="primary"
|
|
type="primary"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
@click="handAddListPL($index)"
|
|
@click="handAddListPL($index)"
|
|
|
style="margin-bottom: 4px"
|
|
style="margin-bottom: 4px"
|
|
|
>分批</el-button
|
|
>分批</el-button
|
|
|
>
|
|
>
|
|
|
-
|
|
|
|
|
|
|
|
|
|
<div class="content_table2">
|
|
<div class="content_table2">
|
|
|
<div class="head row rx-sc">
|
|
<div class="head row rx-sc">
|
|
|
<div class="item ww30">合格品数量</div>
|
|
<div class="item ww30">合格品数量</div>
|
|
|
- <div class="item ww30">报工总重量 /{{row.extInfo.weightUnit}} </div>
|
|
|
|
|
|
|
+ <div class="item ww30"
|
|
|
|
|
+ >报工总重量 /{{ row.extInfo.weightUnit }}
|
|
|
|
|
+ </div>
|
|
|
<div class="item ww30">处置</div>
|
|
<div class="item ww30">处置</div>
|
|
|
<div class="item ww10">操作</div>
|
|
<div class="item ww10">操作</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -108,8 +109,6 @@
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
<el-table-column label="编码" prop="code" minWidth="110">
|
|
<el-table-column label="编码" prop="code" minWidth="110">
|
|
|
<template slot-scope="{ row, $index }">
|
|
<template slot-scope="{ row, $index }">
|
|
|
{{ row.code }}
|
|
{{ row.code }}
|
|
@@ -193,7 +192,7 @@
|
|
|
>
|
|
>
|
|
|
</el-option>
|
|
</el-option>
|
|
|
</el-select> -->
|
|
</el-select> -->
|
|
|
- {{ row.deviceName || row.extInfo.deviceName }}
|
|
|
|
|
|
|
+ {{ row.deviceName || row.extInfo.deviceName }}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
|
@@ -226,7 +225,9 @@
|
|
|
|
|
|
|
|
<el-table-column label="操作" width="60px">
|
|
<el-table-column label="操作" width="60px">
|
|
|
<template slot-scope="{ $index, row }">
|
|
<template slot-scope="{ $index, row }">
|
|
|
- <el-link v-if='!isDetails' type="danger" @click="getDelete($index)">删除</el-link>
|
|
|
|
|
|
|
+ <el-link v-if="!isDetails" type="danger" @click="getDelete($index)"
|
|
|
|
|
+ >删除</el-link
|
|
|
|
|
+ >
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
@@ -340,7 +341,7 @@
|
|
|
);
|
|
);
|
|
|
this.$forceUpdate();
|
|
this.$forceUpdate();
|
|
|
|
|
|
|
|
- this.$message.info('投料合格品数不能大于投料数量')
|
|
|
|
|
|
|
+ this.$message.info('投料合格品数不能大于投料数量');
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
|
@@ -348,12 +349,15 @@
|
|
|
this.list[idx].extInfo.batchReportInfo.splice(yyIdx, 1);
|
|
this.list[idx].extInfo.batchReportInfo.splice(yyIdx, 1);
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
-
|
|
|
|
|
selectName(value, idx, yyIdx) {
|
|
selectName(value, idx, yyIdx) {
|
|
|
const taskObj = this.stepsList.find((item) => item.taskId === value);
|
|
const taskObj = this.stepsList.find((item) => item.taskId === value);
|
|
|
- this.$set(this.list[idx].extInfo.batchReportInfo[yyIdx], 'taskName', taskObj.taskTypeName);
|
|
|
|
|
|
|
+ this.$set(
|
|
|
|
|
+ this.list[idx].extInfo.batchReportInfo[yyIdx],
|
|
|
|
|
+ 'taskName',
|
|
|
|
|
+ taskObj.taskTypeName
|
|
|
|
|
+ );
|
|
|
this.$forceUpdate();
|
|
this.$forceUpdate();
|
|
|
- },
|
|
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
created() {
|
|
created() {
|