diff --git a/fe/PDA/pages/task/countFgDetail.vue b/fe/PDA/pages/task/countFgDetail.vue index 372709fa0..339b78adf 100644 --- a/fe/PDA/pages/task/countFgDetail.vue +++ b/fe/PDA/pages/task/countFgDetail.vue @@ -22,7 +22,7 @@ - {{ item.itemName }} + {{ item.itemDesc2 }} {{ item.itemDesc1 }} @@ -138,7 +138,7 @@ - + diff --git a/fe/PDA/pages/task/countRawDetail.vue b/fe/PDA/pages/task/countRawDetail.vue index 9c4782f80..4832c6fcd 100644 --- a/fe/PDA/pages/task/countRawDetail.vue +++ b/fe/PDA/pages/task/countRawDetail.vue @@ -18,7 +18,7 @@ - {{ item.itemName }} + {{ item.itemDesc2 }} {{ item.itemDesc1 }} @@ -143,7 +143,7 @@ - + diff --git a/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue b/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue index 3e274e03b..bfca16151 100644 --- a/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue +++ b/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue @@ -10,7 +10,8 @@ ({{index+1}}) ERP料号 : {{item.itemCode}} - 名称 : {{item.itemName}} + 正厂编码 : {{item.itemDesc2}} + 名称 : {{item.itemName}} 描述 : {{item.itemDesc1}} @@ -46,6 +47,12 @@ type: Boolean, default: true }, + showType: { + type: String, + default: "" + }, + + page: { type: Object, default: () => { diff --git a/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue b/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue index 313136d03..1812b4fa4 100644 --- a/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue +++ b/fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue @@ -18,6 +18,7 @@ @@ -74,6 +75,10 @@ type: Boolean, default: true }, + showType: { + type: String, + default: "" + }, @@ -227,6 +232,7 @@ res.itemCode = res.itemCode?res.itemCode:res.code res.itemName = res.itemName?res.itemName:res.name res.itemDesc1 =res.itemDesc1?res.itemDesc1:res.desc1 + res.itemDesc2 =res.itemDesc2?res.itemDesc2:res.desc2 }) if (proxyConfig.localPaging) { //前端本地分页