From fee31880a6e3434220442eb614cab435e64437c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Sun, 25 Jun 2023 10:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=80=E6=9C=89=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=8D=B0=E7=9A=84=E6=94=BE=E5=A4=A7=E9=95=9C?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/config.js | 2 +- fe/PC/public/version.json | 2 +- .../PartiallyPreparedProducts.vue | 14 +++++++------- .../RecycledMaterialsLabel.vue | 14 +++++++------- .../productionReturnLabel.vue | 14 +++++++------- .../PartiallyPreparedProducts/splitLabels.vue | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 83e03df11..c443cca3b 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -22,7 +22,7 @@ window.SITE_CONFIG['reportsUrl'] = 'http://dev.ccwin-in.com:60074/#/reports/' window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070' window.SITE_CONFIG['companyName'] = '长春一汽富维东阳汽车塑料零部件（安徽）有限公司' // 接口看板地址 -window.SITE_CONFIG['interfaceBoardUrl'] = 'https://www.baidu.com/' +window.SITE_CONFIG['interfaceBoardUrl'] = 'http://dev.ccwin-in.com:60090/' // mock // window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33' diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 27a00b650..5d0247b5f 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.28" + "version": "1.0.29" } \ 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 181807975..c5a4b2afc 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue @@ -130,10 +130,10 @@ export default { // {logic:"And",column:"canMake",action:"==",value:"true"}, {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:"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:"10C04"} + // ]) }, colSpan: 12, }, { type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 }, @@ -152,9 +152,9 @@ export default { hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true, beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData, - this.isFilter("itemCode", this.selectData.itemCode) - ) }, + // searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData, + // this.isFilter("itemCode", this.selectData.itemCode) + // ) }, colSpan: 12, }, { diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue index 849bed6ab..4d0cde98f 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue @@ -52,7 +52,7 @@ @handleSelectionChange="prepareFormData" @SizeChange="searchAlterResultCount($event, searchPageListParams)" @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)" - @tableButtonClick="searchSubmit(arguments)" + @tableButtonClick="searchSubmit" > @@ -129,9 +129,9 @@ export default { focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件 )}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData, - // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件 - )}, + // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData, + // // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件 + // )}, colSpan: 12, }, { type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 }, @@ -150,9 +150,9 @@ export default { hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true, beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData, - this.isFilter("itemCode", this.selectData.itemCode) - ) }, + // searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData, + // this.isFilter("itemCode", this.selectData.itemCode) + // ) }, colSpan: 12, }, { diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue index 00a0198a6..ef5beda6a 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue @@ -118,19 +118,19 @@ export default { {logic:"And",column:"canMake",action:"!=",value:"true"}, {logic:"And",column:"isRecycled",action:"!=",value:"true"}, ])}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[ - {logic:"And",column:"canMake",action:"!=",value:"true"}, - {logic:"And",column:"isRecycled",action:"!=",value:"true"}, - ]) }, + // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[ + // {logic:"And",column:"canMake",action:"!=",value:"true"}, + // {logic:"And",column:"isRecycled",action:"!=",value:"true"}, + // ]) }, colSpan: 12, }, { type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 }, { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true, beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData, - this.isFilter("itemCode", this.selectData.itemCode) - ) }, + // searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData, + // this.isFilter("itemCode", this.selectData.itemCode) + // ) }, colSpan: 12, }, { diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue index a8e1a652d..55b7020d5 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue @@ -134,10 +134,10 @@ export default { {logic:"And",column:"labelType",action:"==",value:"1"}, {logic:"And",column:"qty",action:">",value:"0"}, ])}, - searchButton: (val) => { this.showSerarchPage(val, 'label/inventory-label', 'labelsList', '箱标签选择', this.selectData,[ - {logic:"And",column:"labelType",action:"==",value:"1"}, - {logic:"And",column:"qty",action:">",value:"0"}, - ]) }, + // searchButton: (val) => { this.showSerarchPage(val, 'label/inventory-label', 'labelsList', '箱标签选择', this.selectData,[ + // {logic:"And",column:"labelType",action:"==",value:"1"}, + // {logic:"And",column:"qty",action:">",value:"0"}, + // ]) }, colSpan: 12, }, { type: "inputNumber", label: "拆出数量", prop: "qty",colSpan: 12 },