diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 1508200d4..5022f0ccd 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.17" + "version": "1.0.18" } \ No newline at end of file diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue index 3556f2d6b..181807975 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue @@ -128,11 +128,11 @@ export default { { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [ // {logic:"And",column:"canMake",action:"==",value:"true"}, - {logic:"And",column:"type",action:"==",value:"半成品"} + {logic:"And",column:"type",action:"==",value:"10C04"} ])}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[ // {logic:"And",column:"canMake",action:"==",value:"true"}, - {logic:"And",column:"type",action:"==",value:"半成品"} + {logic:"And",column:"type",action:"==",value:"10C04"} ]) }, colSpan: 12, },