|
|
@@ -523,20 +523,23 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
let res = await listTableData(payLoad);
|
|
|
+ console.log(res,"ddddddd");
|
|
|
console.log(res.rows[0].resultMap.units,"打印数据")
|
|
|
console.log(res.rows[0].resultMap.specificationModel,"打印数据")
|
|
|
- let labelRes = await getDictLabel(purchaseMaterielId);
|
|
|
- if (res.code == 200 && labelRes.code == 200) {
|
|
|
+ // let labelRes = await getDictLabel(purchaseMaterielId);
|
|
|
+ if (res.code == 200) {
|
|
|
let data = res.rows[0]?.resultMap;
|
|
|
printData.serialNumber = purchaseSerialNumber;
|
|
|
printData.materielId = purchaseMaterielId;
|
|
|
// printData.materielName = data?.materielName;//母粒名称
|
|
|
- // printData.units = purchaseUnits;
|
|
|
- // printData.specificationModel = purchaseSpecification;
|
|
|
- printData.units = res.rows[0].resultMap.units;
|
|
|
- printData.specificationModel = res.rows[0].resultMap.specificationModel;
|
|
|
+ printData.units = data.units;
|
|
|
+ printData.specificationModel = data.specificationModel;
|
|
|
printData.quantity=purchaseQuantity
|
|
|
- // printData.dictLabel = labelRes.msg;
|
|
|
+ printData.materielName=data?.materieEncoding;//默认是转码后的名称
|
|
|
+ if(data.materieEncoding==""||data.materieEncoding==undefined){
|
|
|
+ printData.materielName=data.materielName;
|
|
|
+ }
|
|
|
+ //printData.dictLabel = labelRes.msg;
|
|
|
}
|
|
|
this.$refs.printFormRef.validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -555,7 +558,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "名称",
|
|
|
- value: labelRes.msg,
|
|
|
+ value: printData.materielName,
|
|
|
},
|
|
|
{
|
|
|
label: "序号",
|
