diff --git a/vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue b/vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue index f7ccd7be..489372d2 100644 --- a/vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue +++ b/vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue @@ -19,6 +19,23 @@ >导出Excel + + - - + + @@ -875,7 +875,7 @@ export default { /** 格式化字段 */ fieldFormatter(row, column) { if (column.property === "state") { - return { 0: "新建", 1: "已申请", 2: "成功", 3: "失败" }[ + return { 0: "新建", 2: "成功", 1: "失败" }[ row[column.property] ]; } diff --git a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue index 528c9df1..9e77cca6 100644 --- a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue +++ b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue @@ -291,12 +291,12 @@ export default { width: 150, }); tempsTabs.push({ label: "看板编号", prop: "kanban", width: 180 }); - tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 150 }); - tempsTabs.push({ - label: "物料组(车型)", - prop: "materialGroup", - width: 220, - }); + // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 150 }); + // tempsTabs.push({ + // label: "物料组(车型)", + // prop: "materialGroup", + // width: 220, + // }); tempsTabs.push({ label: "SAP零件号", prop: "sapMaterialCode", diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue index 615f0275..16365450 100644 --- a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue +++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue @@ -510,7 +510,7 @@ export default { } //this.listOutPutQuery.accountDate = this.accountDatelist; console.log( - "一轿车-确认出库条件:" + JSON.stringify(this.listOutPutQuery) + "一次性销售-确认出库条件:" + JSON.stringify(this.listOutPutQuery) ); this.$axios diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 9d9c6a07..99c44898 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -3187,6 +3187,34 @@ "wmsOutputDetailWithCodeReport": { "id": "36", "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "版本号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "version", + "setting": [] + }, + { + "fieldId": 2, + "formType": "select", + "isNull": 0, + "name": "出库类型", + "options": "", + "type": 3, + "value": "", + "fieldType": 0, + "fieldName": "type", + "setting": [ + "大众准时化出库,大众准时化出库", + "大众看板出库,大众看板出库", + "大众备件条码出库,大众备件条码出库", + "红旗看板出库,红旗看板出库", + "自定义发货出库,自定义发货出库" + ] + }, { "fieldId": 3, "formType": "text", @@ -3253,8 +3281,7 @@ "setting": [] } ] - } - , + }, "wmsOutputCancelDiffReport": { "id": "36", "data": [