diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index d13d468b..6a225d73 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -284,7 +284,7 @@ export default { return this.stepsActive == 1; }, getMoudleDisable() { - if (this.crmType == "priceList" || this.crmType == "spareparts") { + if (this.crmType == "priceList" || this.crmType == "spareparts" || this.crmType == "wmsOutputSum" ) { //只状态可用 this.isEditYearMont = true; this.isEditFactory = true; @@ -336,6 +336,8 @@ export default { secondaryAdjustment: "二配数量调整输入", secondaryDiscount: "二配折扣调整输入", Wms_HqKB_Output: "红旗数据调整", + Wms_onetimesale_Output: "一次性寄售销售", + wmsOutputSum: "WMS未结出库单", }[this.crmType] || "" ); }, @@ -393,8 +395,10 @@ export default { HQ_H_CHECKOUT: "/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入 HQ_M_CHECKOUT: "/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入 - Wms_HqKB_Output: - "/api/settleaccount/WmsHQKBOutput/ExcelImport", //红旗数据调整导入 + Wms_HqKB_Output: "/api/settleaccount/WmsHQKBOutput/ExcelImport", //红旗数据调整导入 + Wms_onetimesale_Output: + "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //红旗数据调整导入 + wmsOutputSum: "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //WMS未结出库单 //HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入 }[this.crmType] || "" ); @@ -403,20 +407,20 @@ export default { //模板名称 return ( { - invoice: "大众发票汇总导入.xlsx", - bomdatabase: "产品结构Bom导入模板.xlsx", - secondaryPriceRatio: "二配价格比例导入模板.xlsx", - factory: "工厂设置模板.xlsx", - materialRelation: "零件匹配关系.xlsx", - carMaterialConfig: "车型代码与零件匹配.xlsx", - materialRelationSupplier: "供应商零件设置表.xlsx", - material: "物料主数据.xlsx", - inventorydetail: "库存明细信息.xlsx", - codeSetting: "通用代码设置数据.xlsx", - estimatedSum: "应付暂估汇总.xlsx", - estimatedInventoryDetail: "应付暂估收货明细.xlsx", - customerStorageLocation: "客户存储地点.xlsx", - secondaryAdjustment: "二配调整输入.xlsx", + // invoice: "大众发票汇总导入.xlsx", + // bomdatabase: "产品结构Bom导入模板.xlsx", + // secondaryPriceRatio: "二配价格比例导入模板.xlsx", + // factory: "工厂设置模板.xlsx", + // materialRelation: "零件匹配关系.xlsx", + // carMaterialConfig: "车型代码与零件匹配.xlsx", + // materialRelationSupplier: "供应商零件设置表.xlsx", + // material: "物料主数据.xlsx", + // inventorydetail: "库存明细信息.xlsx", + // codeSetting: "通用代码设置数据.xlsx", + // estimatedSum: "应付暂估汇总.xlsx", + // estimatedInventoryDetail: "应付暂估收货明细.xlsx", + // customerStorageLocation: "客户存储地点.xlsx", + // secondaryAdjustment: "二配调整输入.xlsx", }[this.crmType] || "" ); }, diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 739087fd..1830bf2b 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -21,7 +21,7 @@ import hqMenudataRouter from './modules/hq_menu' import btcarDataRouter from './modules/bt_menu' import vwOutOrderDataRouter from './modules/vw_out_order' import hqOutOrderDataRouter from './modules/hq_out_order' -//import newjitRouter from './modules/newjit-basedata' +import vwsOutOrderDataRouter from './modules/wms_out_order' import pgfis from './modules/fis' import pgfisPrint from './modules/fisprint' @@ -181,6 +181,7 @@ export const asyncRoutes = [ hqMenudataRouter,//红旗 vwOutOrderDataRouter, hqOutOrderDataRouter, + vwsOutOrderDataRouter,//wms相关操作 //btcarDataRouter,//一汽轿车 //vwFisDataRouter,//结算与开票数据导入 //billdataRouter,//销售结算与开票报表 diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index ca67ca68..8331ad3b 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -13,6 +13,16 @@ const hqMenudataRouter = { keepAlive: false, }, children: [ + { + path: 'hq-unsettle', + component: () => import('@/views/ux/vw/dataInput/hq_open'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗工厂未结明细', + roles: ['SettleAccount.HQ_HPlatform'],//控制页面角色（可以设置多个角色） + icon: '单据导入' + } + }, { path: 'hq-platform', component: () => import('@/views/ux/vw/dataInput/hq_h'), @@ -48,7 +58,7 @@ const hqMenudataRouter = { component: () => import('@/views/ux/vw/dataInput/hq_unsettle_report'), name: 'HQUnSettle', meta: { - title: '红旗工厂未结明细', + title: '红旗看板未结明细', roles: ['SettleAccount.Reports'], icon: '文件' } diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 0b2f51aa..cb579b39 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -147,6 +147,16 @@ const vwMenudataRouter = { icon: '器具' } }, + { + path: '/fisupdate/export', + component: () => import('@/views/ux/billManage/FisUpdateExport'), + name: 'FisUpdateExport',//命名路由 + meta: { + title: '更新FIS状态', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '器具' + } + }, { path: '/unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识） component: () => import('@/views/ux/billManage/IssuedUnsettled/index'), @@ -206,17 +216,8 @@ const vwMenudataRouter = { roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '工厂' } - }, - { - path: '/WmsOutputSum', - component: () => import('@/views/ux/billManage/WmsOutputSumExport'), - name: 'WmsOutputSumExport',//命名路由 - meta: { - title: 'WMS统计汇总报表', - roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '零件' - } } + ] } ] diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js index 0c0e3ce2..c451ee38 100644 --- a/vue/src/router/modules/vw_out_order.js +++ b/vue/src/router/modules/vw_out_order.js @@ -68,6 +68,8 @@ const vwOutOrderDataRouter = { } }, + + ] } diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js new file mode 100644 index 00000000..6c915f17 --- /dev/null +++ b/vue/src/router/modules/wms_out_order.js @@ -0,0 +1,47 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const vwsOutOrderDataRouter = { + path: '/cpat-wms-order', + component: Layout, + redirect: 'pg', + name: '业务数据', + //hidden: true, + meta: { + //requiresAuth: true, + title: 'WMS相关统计查询', + index: 0, + type: 'crm', + icon: '单据导入', + roles: ['SettleAccount.Reports'], + keepAlive: false, + }, + children: [ + { + path: '/WmsOutputSum', + component: () => import('@/views/ux/billManage/WmsOutputSumExport'), + name: 'WmsOutputSumExport',//命名路由 + meta: { + title: 'WMS统计汇总报表', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '零件' + } + }, + { + path: '/nonDeliveryList', + component: () => import('@/views/ux/billManage/NonDeliveryList'), + name: 'NonDeliveryList',//命名路由 + meta: { + title: 'WMS未出库清单', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '零件' + } + }, + + + + ] +} + +export default vwsOutOrderDataRouter + diff --git a/vue/src/views/ux/basedata/centralizedControl/index.vue b/vue/src/views/ux/basedata/centralizedControl/index.vue index 22fe7223..8a0a1410 100644 --- a/vue/src/views/ux/basedata/centralizedControl/index.vue +++ b/vue/src/views/ux/basedata/centralizedControl/index.vue @@ -167,6 +167,23 @@ label-width="120px" > + + + + + + + + + + +
- - - 导入文件（Excel） - + > --> 导入文件（Excel） + + 导出Excel - - + --> 导入文件（Excel） + + 导出Excel - - + --> + + + + + + + + diff --git a/vue/src/views/ux/billManage/NonDeliveryList/index.vue b/vue/src/views/ux/billManage/NonDeliveryList/index.vue new file mode 100644 index 00000000..3a615bac --- /dev/null +++ b/vue/src/views/ux/billManage/NonDeliveryList/index.vue @@ -0,0 +1,567 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/billManage/WmsOutputSumExport/index.vue b/vue/src/views/ux/billManage/WmsOutputSumExport/index.vue index 24d9bdc2..1dbf85cd 100644 --- a/vue/src/views/ux/billManage/WmsOutputSumExport/index.vue +++ b/vue/src/views/ux/billManage/WmsOutputSumExport/index.vue @@ -27,6 +27,14 @@ @click="handleDelete()" >删除(支持批量) + 导入文件（Excel） +
@@ -200,6 +208,13 @@ :limit.sync="listQuery.MaxResultCount" @pagination="getList" /> + +
@@ -279,17 +294,18 @@ import Pagination from "@/components/Pagination"; // secondary package based on import permission from "@/directive/permission/index.js"; import { downloadFile } from "@/utils/crmindex.js"; import CRMTableHead from "../../components/CRMTableHead"; +import importExcel from "@/components/ImportExcel-base"; import moment from "moment"; import JobSelectVerson from "@/components/CreateCom/Job-Select.vue"; export default { name: "WmsOutputSumExport", - components: { Pagination, CRMTableHead, JobSelectVerson }, + components: { Pagination, CRMTableHead, importExcel, JobSelectVerson }, directives: { permission }, data() { return { - crmType: "backJob", + crmType: "wmsOutputSum", rules: { versionValue: [ { required: true, message: "必须输入！", trigger: "change" }, @@ -367,6 +383,7 @@ export default { multipleSelection: [], tableHeight: document.documentElement.clientHeight - 260, isEdit: false, + showExcelImport: false, stateNameCateMap: [ { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" }, @@ -446,6 +463,69 @@ export default { }, }, methods: { + //已确认 + handleConfirm(row) { + this.isEdit = false; + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否确认" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts( + "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPutAudit", + params + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "操作成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + handleImportExcel() { + //导入 + this.showExcelImport = true; + this.$refs.importexcel.handleImportExcelClick(); + }, + importExcelData() { + //关闭导入窗体时调用 + this.showExcelImport = false; + this.getList(); + }, dblhandleCurrentChange(row, column, cell, event) { if (column.label === "说明") { row.isEditCell = true; @@ -643,7 +723,7 @@ export default { this.formLoading = true; this.listExportQuery.version = this.formCount.versionValue; //版本 //零件号 - this.listExportQuery.state =JSON.stringify(this.formCount.state); + this.listExportQuery.state = JSON.stringify(this.formCount.state); console.log( "出库单合计汇总输出-保存条件：" + JSON.stringify(this.listExportQuery) diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue index b8b59fd5..da7417a9 100644 --- a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue +++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue @@ -347,7 +347,7 @@ export default { "大众备件出库单导出：" + JSON.stringify(this.listOutPutQuery) ); this.$axios - .posts("/api/settleaccount/WmsHQKBOutput/Export", this.listOutPutQuery) + .posts("/api/settleaccount/WmsOneTimeSaleOutput/Export", this.listOutPutQuery) .then((res) => { let fileNameOfProject = res; this.$axios @@ -428,7 +428,7 @@ export default { ); this.$axios .posts( - "/api/settleaccount/WmsHQKBOutput/WmsSharePartOutPutModify", + "/api/settleaccount/WmsOneTimeSaleOutput/WmsSharePartOutPutModify", this.listOutPutQuery ) .then((response) => { @@ -482,7 +482,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Cancel", + "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Cancel", this.listOutPutQuery ) .then((response) => { @@ -535,7 +535,7 @@ export default { this.$axios .posts( - "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Pass", + "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Pass", this.listOutPutQuery ) .then((response) => { @@ -582,7 +582,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/WmsHQKBOutput/WmsOutPutDelete", + "/api/settleaccount/WmsOneTimeSaleOutput/WmsOutPutDelete", this.listDeleteQuery ) .then((response) => { @@ -639,7 +639,7 @@ export default { console.log("查询条件：" + JSON.stringify(this.listQuery)); this.$axios .posts( - "/api/settleaccount/WmsHQKBOutput/WmsKanbanDetailList", + "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanDetailList", this.listQuery ) .then((response) => { diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue index 8ae55017..d6546933 100644 --- a/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue +++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue @@ -156,12 +156,12 @@ import importExcel from "@/components/ImportExcel-base"; import { formatTimeToTimestamp } from "@/utils/index"; export default { - name: "WmsHQKBOutput", + name: "WmsOneTimeSaleOutput", components: { Pagination, Detail, importExcel }, directives: { permission }, data() { return { - crmType: "Wms_HqKB_Output", + crmType: "Wms_onetimesale_Output", rules: { // version: [{ required: true, message: "必须输入！", trigger: "change" }], // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }], @@ -265,7 +265,7 @@ export default { let getguid = row.id; let getremark = row.remark; this.$axios - .gets("/api/settleaccount/WmsHQKBOutput/UpdateRemark", { + .gets("/api/settleaccount/WmsOneTimeSaleOutput/UpdateRemark", { id: getguid, remark: getremark, }) @@ -363,7 +363,7 @@ export default { this.listQuery.SkipCount = (this.page - 1) * 15; } this.$axios - .posts("/api/settleaccount/WmsHQKBOutput/WmsKanbanList", this.listQuery) + .posts("/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanList", this.listQuery) .then((response) => { this.list = response.items; //alert(JSON.stringify(response.Items)) diff --git a/vue/src/views/ux/vw/dataInput/erpei/index.vue b/vue/src/views/ux/vw/dataInput/erpei/index.vue index 1d43be43..0d1cc5aa 100644 --- a/vue/src/views/ux/vw/dataInput/erpei/index.vue +++ b/vue/src/views/ux/vw/dataInput/erpei/index.vue @@ -364,12 +364,12 @@ export default { tempsTabs.push({ label: "差异原因", prop: "remark", width: 120 }); return tempsTabs; }, - MoreTypes() { - var moreTypes = []; - moreTypes.push({ type: "updateFis", name: "刷新FIS结算状态" }); - moreTypes.push({ type: "enter", name: "刷新数据开票状态" }); - return moreTypes; - }, + // MoreTypes() { + // var moreTypes = []; + // moreTypes.push({ type: "updateFis", name: "刷新FIS结算状态" }); + // moreTypes.push({ type: "enter", name: "刷新数据开票状态" }); + // return moreTypes; + // }, }, methods: { selectValue(params) { 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 b8b59fd5..ebec5d02 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 @@ -330,8 +330,14 @@ export default { prop: "materialDesc", width: 220, }); + tempsTabs.push({ label: "寄售库存", prop: "sockQty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ + label: "实际出库数量", + prop: "realityNumber", + width: 120, + }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, @@ -730,7 +736,7 @@ export default { }, /** 通过回调控制style */ cellStyle({ row, column, rowIndex, columnIndex }) { - if (column.property === "qty" || column.property === "stockQty") { + if (column.property === "qty" || column.property === "realityNumber" || column.property === "sockQty") { return { textAlign: "right" }; } else { return { textAlign: "left" }; diff --git a/vue/src/views/ux/vw/dataInput/hq_open/index.vue b/vue/src/views/ux/vw/dataInput/hq_open/index.vue new file mode 100644 index 00000000..3e4a38eb --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_open/index.vue @@ -0,0 +1,581 @@ + + + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue index 54341819..fd3713c5 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue @@ -237,7 +237,7 @@ - + - - - - - - - - - - - + @@ -304,56 +289,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -365,38 +300,25 @@ + - + - - - - - - - - - + - + - + -
+