diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index cb579b39..504d4afc 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -202,7 +202,7 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/sparePart'), name: 'SparePartReport',//命名路由 meta: { - title: '大众备件结算输出', + title: '大众备件手工汇总', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '供货' } @@ -212,7 +212,7 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/sparePart90'), name: 'SparePart90Report',//命名路由 meta: { - title: '备件数据调整输出', + title: '大众备件明细输出', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '工厂' } diff --git a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue index bc77097a..b2217960 100644 --- a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue +++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue @@ -34,6 +34,36 @@ + + + + + + + + + + + + + @@ -231,7 +261,7 @@ - + - +
@@ -517,6 +547,11 @@ export default { this.listQuery.state = params; this.getList(); }, + SelectType(params) { + //版本下拉选择 + this.listQuery.type = params; + this.getList(); + }, //从期间管理中获取版本数据，生成结算出库用 getAllVersionList() { this.$axios diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index 897f994a..51736b7b 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -61,7 +61,7 @@ @click="handleFilter" >搜索 - 全部导出 - - + -->

- {{ this.resultData.successMessage }} + {{ this.resultData.successMessage }} + 下载错误数据 @@ -283,6 +285,7 @@ export default { SkipCount: 0, MaxResultCount: 15, billNum: "", + version: "", }, listOutPutQuery: { version: "", @@ -656,19 +659,19 @@ export default { this.showExcelImport = false; this.getList(); }, - //导出全部功能 + //导出全部功能 handleDownload(command) { this.listLoading = true; - this.listOutPutQuery.version = this.customerInfo.version; - this.listOutPutQuery.billNum = this.customerInfo.parentId; + this.listQuery.version = this.customerInfo.version; + this.listQuery.billNum = this.customerInfo.parentId; console.log( - "大众无条码看板出库单-导出：" + JSON.stringify(this.listOutPutQuery) + "大众无条码看板出库单-导出：" + JSON.stringify(this.listQuery) ); this.$axios .posts( "/api/settleaccount/wmskanbanoutputextend/Export", - this.listOutPutQuery + this.listQuery ) .then((res) => { let fileNameOfProject = res; diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index 0c9a15c1..1ed000ae 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -45,7 +45,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照零件号搜索..." + placeholder="按照SAP号搜索..." style="width: 230px" class="search-container" @keyup.enter.native="handleFilter" @@ -66,13 +66,13 @@ >全部导出 - - + --> { let fileNameOfProject = res; diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue index da7417a9..8e602b5b 100644 --- a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue +++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue @@ -33,11 +33,11 @@ @click="handleDelete()" >删除出库单(支持批量) - + 全部导出 - - + --> { let fileNameOfProject = res; this.$axios diff --git a/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/vue/src/views/ux/vw/dataInput/hq_h/index.vue index d71d45e1..8e704bc0 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue @@ -271,6 +271,11 @@ export default { width: 170, }); tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 }); + tempsTabs.push({ + label: "外部看板编号", + prop: "externalKanbanNumber", + width: 180, + }); tempsTabs.push({ label: "物料凭证号", prop: "materialVoucherNo", diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue index 1de4f2b8..06db6a22 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue @@ -58,13 +58,13 @@ >全部导出 - - + --> @@ -260,6 +260,7 @@ export default { SkipCount: 0, MaxResultCount: 1000, billNum: "", + version: "", }, listOutPutQuery: { version: "", @@ -361,16 +362,16 @@ export default { //导出全部功能 handleDownload(command) { this.listLoading = true; - this.listOutPutQuery.version = this.customerInfo.version; - this.listOutPutQuery.billNum = this.customerInfo.parentId; + this.listQuery.version = this.customerInfo.version; + this.listQuery.billNum = this.customerInfo.parentId; console.log( - "红旗H平台备件-出库单导出：" + JSON.stringify(this.listOutPutQuery) + "红旗H平台备件-出库单导出：" + JSON.stringify(this.listQuery) ); this.$axios .posts( "/api/settleaccount/WmsHQHSharePartoutput/Export", - this.listOutPutQuery + this.listQuery ) .then((res) => { let fileNameOfProject = res; diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue index ebec5d02..71b09b1c 100644 --- a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue @@ -33,11 +33,11 @@ @click="handleDelete()" >删除出库单(支持批量) - + 全部导出 - - + --> { let fileNameOfProject = res; this.$axios @@ -626,6 +627,12 @@ export default { 4: "取消出库", }[row[column.property]]; } + if (column.property == "isBack") { + return { + 0: "批量", + 1: "备件", + }[row[column.property]]; + } return row[column.property] || "--"; }, importExcelData() { @@ -667,7 +674,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "materialCode"; + var column = "sapMaterialCode"; let filter = { logic: 0, column: column, diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue index 1dcc46b7..2034e0ca 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue @@ -33,11 +33,12 @@ @click="handleDelete()" >删除出库单(支持批量) + 全部导出 - - + --> { let fileNameOfProject = res; this.$axios diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 8a912528..de62aa58 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -3009,6 +3009,23 @@ "fieldType": 1, "fieldName": "materialGroup", "setting": [] + }, + { + "fieldId": 2, + "formType": "select", + "isNull": 0, + "name": "状态", + "options": "", + "type": 3, + "value": "", + "fieldType": 0, + "fieldName": "state", + "setting": [ + "新建,0", + "已申请,1", + "成功,2", + "失败,3" + ] } ] }, @@ -3203,6 +3220,39 @@ } ] }, + "hqkboutput": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "SAP编码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "sapMaterialCode", + "setting": [] + }, + { + "fieldId": 2, + "formType": "select", + "isNull": 0, + "name": "状态", + "options": "", + "type": 3, + "value": "", + "fieldType": 0, + "fieldName": "state", + "setting": [ + "未处理,0", + "申请出库,1", + "确认出库,2", + "不能出库,3", + "取消出库,4" + ] + } + ] + }, "kanbanOutOrder": { "id": "36", "data": [