|
|
@@ -50,7 +50,9 @@
|
|
|
v-for="(t, i) in extrusion"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -74,7 +76,9 @@
|
|
|
v-for="(t, i) in drying"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -98,7 +102,9 @@
|
|
|
v-for="(t, i) in temperature"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -121,7 +127,9 @@
|
|
|
v-for="(t, i) in halflong"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -144,7 +152,9 @@
|
|
|
v-for="(t, i) in furnace"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -167,7 +177,9 @@
|
|
|
v-for="(t, i) in sinter"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -190,7 +202,9 @@
|
|
|
v-for="(t, i) in quality"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -213,7 +227,9 @@
|
|
|
v-for="(t, i) in packageOpt"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -236,7 +252,9 @@
|
|
|
v-for="(t, i) in preStorage"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -262,7 +280,9 @@
|
|
|
v-for="(t, i) in deepProcesse"
|
|
|
:key="i + '-' + idx"
|
|
|
>
|
|
|
- {{ t.label }}:{{ itm[t.key] }}
|
|
|
+ {{ t.label }}:{{
|
|
|
+ (item.formatter && item.formatter(itm)) || itm[t.key]
|
|
|
+ }}
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="24" v-if="!(item.list && item.list.length)">
|
|
|
@@ -310,73 +330,118 @@
|
|
|
label: '原料牌号',
|
|
|
key: 'brandNo',
|
|
|
span: 8,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.workReportCategoryList[0]?.brandNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '原料批号',
|
|
|
key: 'xxx',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.workReportCategoryList[0]?.batchNo;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '投料重量(KG)',
|
|
|
key: 'feedingWeight',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.workReportCategoryList[0]?.number;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '合格数',
|
|
|
key: 'standardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.standardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '不合格数',
|
|
|
key: 'noStandardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-bottom'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.noStandardNum;
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
{
|
|
|
label: '设备号',
|
|
|
key: 'deviceCode',
|
|
|
span: 8,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 4
|
|
|
+ );
|
|
|
+ return obj?.code;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '模具编号/型号',
|
|
|
key: 'xxx',
|
|
|
span: 8,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 5
|
|
|
+ );
|
|
|
+ return obj?.code + '/' + obj?.model;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '舟皿名称',
|
|
|
key: 'xxx',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 8
|
|
|
+ );
|
|
|
+ return obj?.name;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '舟皿数量',
|
|
|
key: 'boatNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-bottom'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 8
|
|
|
+ );
|
|
|
+ return obj?.extraField?.boatNum;
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
{
|
|
|
label: '冲压次数',
|
|
|
key: 'stampingTimes',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right'
|
|
|
+ class: 'border-dashed-right',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 5
|
|
|
+ );
|
|
|
+ return obj?.extraField?.stampingTimes;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
+ key: 'executeTime',
|
|
|
span: 4,
|
|
|
class: 'border-dashed-right'
|
|
|
},
|
|
|
@@ -398,43 +463,62 @@
|
|
|
label: '干燥时长(分钟)',
|
|
|
key: 'dryingDuration',
|
|
|
span: 8,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.workReportArea?.extraField?.dryTime;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '合格数',
|
|
|
key: 'standardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.standardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '不合格数',
|
|
|
key: 'noStandardNum',
|
|
|
span: 4,
|
|
|
- class: ' border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.noStandardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '区域编号',
|
|
|
key: 'areaCode',
|
|
|
span: 8,
|
|
|
- class: 'border-dashed-bottom'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.workReportArea?.code;
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
{
|
|
|
- label: '周转车编码',
|
|
|
+ label: '舟皿编码',
|
|
|
key: 'xxx',
|
|
|
span: 8,
|
|
|
- class: 'border-dashed-right '
|
|
|
+ class: 'border-dashed-right ',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 8
|
|
|
+ );
|
|
|
+ return obj?.code;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right '
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 8
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -461,19 +545,31 @@
|
|
|
label: '合格数',
|
|
|
key: 'standardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.standardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '不合格数',
|
|
|
key: 'noStandardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.noStandardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '设备号',
|
|
|
key: 'deviceCode',
|
|
|
span: 4,
|
|
|
- class: ' border-dashed-bottom'
|
|
|
+ class: ' border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 4
|
|
|
+ );
|
|
|
+ return obj?.code;
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
{
|
|
|
@@ -484,14 +580,15 @@
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 8
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -512,43 +609,68 @@
|
|
|
label: '合格数',
|
|
|
key: 'standardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.standardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '不合格数',
|
|
|
key: 'noStandardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.noStandardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '设备号',
|
|
|
key: 'deviceCode',
|
|
|
span: 8,
|
|
|
- class: ' border-dashed-bottom'
|
|
|
+ class: ' border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 4
|
|
|
+ );
|
|
|
+ return obj?.code;
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
{
|
|
|
label: '舟皿名称',
|
|
|
key: 'xxx',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right'
|
|
|
+ class: 'border-dashed-right',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 8
|
|
|
+ );
|
|
|
+ return obj?.name;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '舟皿数量',
|
|
|
key: 'boatNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right'
|
|
|
+ class: 'border-dashed-right',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 8
|
|
|
+ );
|
|
|
+ return obj?.extraField?.boatNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 8
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -569,19 +691,25 @@
|
|
|
label: '设备号',
|
|
|
key: 'deviceCode',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right'
|
|
|
+ class: 'border-dashed-right',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 4
|
|
|
+ );
|
|
|
+ return obj?.code;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 8,
|
|
|
- class: ' '
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -602,31 +730,43 @@
|
|
|
label: '合格数',
|
|
|
key: 'standardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.standardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '不合格数',
|
|
|
key: 'noStandardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.noStandardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '设备号',
|
|
|
key: 'deviceCode',
|
|
|
span: 8,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 4
|
|
|
+ );
|
|
|
+ return obj?.code;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 8,
|
|
|
- class: ''
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -645,15 +785,15 @@
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 8,
|
|
|
- class: 'border-dashed-bottom'
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '成检结果',
|
|
|
@@ -663,15 +803,15 @@
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 8,
|
|
|
- class: 'border-dashed-bottom'
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '外径',
|
|
|
@@ -759,15 +899,15 @@
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 12,
|
|
|
- class: 'border-dashed-bottom'
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -781,32 +921,44 @@
|
|
|
{
|
|
|
label: '合格数',
|
|
|
key: 'standardNum',
|
|
|
- span: 8,
|
|
|
- class: 'border-dashed-right'
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.standardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '不合格数',
|
|
|
key: 'noStandardNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right'
|
|
|
+ class: 'border-dashed-bottom',
|
|
|
+ formatter (itm) {
|
|
|
+ return itm.productInfo?.noStandardNum;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '设备号',
|
|
|
key: 'deviceCode',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right'
|
|
|
+ class: 'border-dashed-right',
|
|
|
+ formatter (itm) {
|
|
|
+ const obj = itm.workReportDeviceList.find(
|
|
|
+ (i) => i.rootCategoryLevelId == 4
|
|
|
+ );
|
|
|
+ return obj?.code;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
+ key: 'executeTime',
|
|
|
span: 4,
|
|
|
- class: ' '
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -897,15 +1049,15 @@
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
- span: 8,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ key: 'executorJobNum',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
+ key: 'executeTime',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -924,15 +1076,15 @@
|
|
|
},
|
|
|
{
|
|
|
label: '员工号',
|
|
|
- key: 'reportingOperator',
|
|
|
+ key: 'executorJobNum',
|
|
|
span: 4,
|
|
|
- class: 'border-dashed-right border-dashed-bottom'
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '日期',
|
|
|
- key: 'reportWorkTime',
|
|
|
- span: 16,
|
|
|
- class: ' border-dashed-bottom'
|
|
|
+ key: 'executeTime',
|
|
|
+ span: 4,
|
|
|
+ class: 'border-dashed-right'
|
|
|
},
|
|
|
{
|
|
|
label: '备注',
|
|
|
@@ -951,8 +1103,15 @@
|
|
|
},
|
|
|
init () {
|
|
|
printWorkOrderInfo(this.workOrderId).then((res) => {
|
|
|
- console.log(res);
|
|
|
- // this.$set(p, 'list', res.list || []);
|
|
|
+ for (const t of res.taskInfo) {
|
|
|
+ for (const p of this.processList) {
|
|
|
+ if (!p.list) {
|
|
|
+ this.$set(p, 'list', t || []);
|
|
|
+ } else if (t.taskName === p.taskTypeName) {
|
|
|
+ p.list.push(t);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
cancel () {
|