|
@@ -910,6 +910,25 @@
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
+ <el-table-column label="质检结果" prop="qualityResult">
|
|
|
|
|
+ <template slot-scope="{ row }">
|
|
|
|
|
+ <DictSelection
|
|
|
|
|
+ dictName="质检状态"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ v-model="row.qualityResult"
|
|
|
|
|
+ />
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
|
|
+ <el-table-column label="质检状态" prop="qualityStatus">
|
|
|
|
|
+ <template slot-scope="{ row }">
|
|
|
|
|
+ <DictSelection
|
|
|
|
|
+ dictName="质检结果"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ v-model="row.qualityStatus"
|
|
|
|
|
+ />
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
|
|
+
|
|
|
<el-table-column
|
|
<el-table-column
|
|
|
v-if="formData.bizType != 5"
|
|
v-if="formData.bizType != 5"
|
|
|
label="生产日期"
|
|
label="生产日期"
|
|
@@ -1056,18 +1075,12 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="质检结果" prop="qualityResult">
|
|
<el-table-column label="质检结果" prop="qualityResult">
|
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
|
- <el-select v-model="row.qualityResult" placeholder="请选择">
|
|
|
|
|
- <el-option value="0" label="合格"></el-option>
|
|
|
|
|
- <el-option value="1" label="不合格"></el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ {{ row.qualityResult }}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="质检状态" prop="qualityStatus">
|
|
<el-table-column label="质检状态" prop="qualityStatus">
|
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
|
- <el-select v-model="row.qualityStatus" placeholder="请选择">
|
|
|
|
|
- <el-option value="0" label="未质检"></el-option>
|
|
|
|
|
- <el-option value="1" label="已质检"></el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ {{ row.qualityStatus }}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
@@ -1284,7 +1297,9 @@
|
|
|
clientCode: item.clientCode,
|
|
clientCode: item.clientCode,
|
|
|
weight: item.weight / Number(item.minPackingCount),
|
|
weight: item.weight / Number(item.minPackingCount),
|
|
|
weightUnit: item.weightUnit,
|
|
weightUnit: item.weightUnit,
|
|
|
- engrave: item.engrave
|
|
|
|
|
|
|
+ engrave: item.engrave,
|
|
|
|
|
+ qualityResult: item.qualityResult,
|
|
|
|
|
+ qualityStatus: item.qualityStatus
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -1967,7 +1982,9 @@
|
|
|
weightUtil: it.weightUtil,
|
|
weightUtil: it.weightUtil,
|
|
|
engrave: it.engrave,
|
|
engrave: it.engrave,
|
|
|
materialDetails: this.materialDetails(it.onlyCode),
|
|
materialDetails: this.materialDetails(it.onlyCode),
|
|
|
- packingCount: it.packingCount
|
|
|
|
|
|
|
+ packingCount: it.packingCount,
|
|
|
|
|
+ qualityStatus: it.qualityStatus,
|
|
|
|
|
+ qualityResult: it.qualityResult
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
item.outInDetailRecordAddPOList = list;
|
|
item.outInDetailRecordAddPOList = list;
|