diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index fb7631b0..f8468ed3 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -302,6 +302,7 @@ export default { scrapClaims: "CP7报废和索赔", sparePart: "大众备件结算明细", hqHPlatform: "红旗H平台导入", + hqMPlatform: "红旗M平台导入", bomdatabase: "产品结构BOM", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", @@ -328,7 +329,7 @@ export default { scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入 sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入 hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //红旗H平台导入 - + hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //红旗M平台导入 bomdatabase: "/api/settleaccount/bom/ExcelImport", prebatch: "/api/settleaccount/Prebatch/ExcelImport", secondaryPriceRatio: diff --git a/vue/src/components/ImportTxt/index.vue b/vue/src/components/ImportTxt/index.vue index 6392dce9..8a2b1e7d 100644 --- a/vue/src/components/ImportTxt/index.vue +++ b/vue/src/components/ImportTxt/index.vue @@ -151,13 +151,13 @@ {{ this.resultData.successMessage }} - 下载错误数据 + > -->

@@ -427,7 +427,7 @@ export default { this.factoryList = []; // this.listQuery.SkipCount = (this.page - 1) * 500; this.$axios - .posts("/api/settleaccount/CentralizedControl/openlist") + .posts("/api/newjit/assembly-cfg-erp/import") .then((response) => { response.forEach((element) => { let options = {}; @@ -440,25 +440,25 @@ export default { this.listLoading = false; }); }, - getAllCarModel() { - //取车型列表信息 - this.carModelList = []; - this.listQueryCustom.SkipCount = (this.page - 1) * 500; - console.log(JSON.stringify(this.listQueryCustom)); - this.$axios - .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom) - .then((response) => { - response.items.forEach((element) => { - let options = {}; - options.value = element.value; - options.label = element.description; - this.carModelList.push(options); - }); - }) - .catch(() => { - this.listLoading = false; - }); - }, + // getAllCarModel() { + // //取车型列表信息 + // this.carModelList = []; + // this.listQueryCustom.SkipCount = (this.page - 1) * 500; + // console.log(JSON.stringify(this.listQueryCustom)); + // this.$axios + // .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom) + // .then((response) => { + // response.items.forEach((element) => { + // let options = {}; + // options.value = element.value; + // options.label = element.description; + // this.carModelList.push(options); + // }); + // }) + // .catch(() => { + // this.listLoading = false; + // }); + // }, handleImportExcelClick() { //父组件中，初始化此子组件时调用 this.fileuploadList = []; @@ -602,7 +602,7 @@ export default { this.stepList[0].status = "wait"; this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载 this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见 - this.resultData.successMessage = "数据导入失败！"; + this.resultData.successMessage = res.message; this.stepsActive = 3; } } diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 4f0f543f..a1bc2d5a 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -16,6 +16,10 @@ import vwFisDataRouter from './modules/vwFisData' import wheeldataRouter from './modules/wheeldata' import vwNoBarcodeRouter from './modules/vwKBNoBarcodedata' import JobTimeDataRouter from './modules/jobtimedata' +import vwMenudataRouter from './modules/vw_menu' +import hqMenudataRouter from './modules/hq_menu' +import btcarDataRouter from './modules/bt_menu' +import vwOutOrderDataRouter from './modules/vw_out_order' //import newjitRouter from './modules/newjit-basedata' import pgfis from './modules/fis' import pgfisPrint from './modules/fisprint' @@ -86,8 +90,8 @@ export const constantRoutes = [ children: [ { path: 'dashboard', - component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis - //component: () => import('@/views/ux/backGroundWork'), + //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis + component: () => import('@/views/ux/backGroundWork'), name: 'Dashboard', meta: { title: '系统首页', @@ -170,14 +174,18 @@ export const asyncRoutes = [ /** when your routing map is too long, you can split it into small modules **/ managerRouter,//系统首页 personRouter,//系统管理 - //basedataRouter,//基础数据维护 + basedataRouter,//基础数据维护 + vwMenudataRouter,//大众 + hqMenudataRouter,//红旗 + vwOutOrderDataRouter, + //btcarDataRouter,//一汽轿车 //vwFisDataRouter,//结算与开票数据导入 //billdataRouter,//销售结算与开票报表 //businessdataRouter, //wheeldataRouter,//大众看板和备件 - pgfisPrint,//排序单打印 - pgfis,//派格fis - //JobTimeDataRouter,//后台作业监控 + // pgfisPrint,//排序单打印 + // pgfis,//派格fis + JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/vue/src/router/modules/bt_menu.js b/vue/src/router/modules/bt_menu.js new file mode 100644 index 00000000..b20b3408 --- /dev/null +++ b/vue/src/router/modules/bt_menu.js @@ -0,0 +1,44 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const btcarDataRouter = { + path: '/cpat', + component: Layout, + redirect: 'pg', + name: 'btcar', + //hidden: true, + meta: { + //requiresAuth: true, + title: '一轿奔腾', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'hq-car-platform', + component: () => import('@/views/ux/vw/dataInput/hq_bt'), + name: 'ERPEI',//命名路由 + meta: { + title: '一轿奔腾导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-car-platform-export', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '一轿奔腾结算核对输出', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + + ] +} + +export default btcarDataRouter + diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js new file mode 100644 index 00000000..be030aad --- /dev/null +++ b/vue/src/router/modules/hq_menu.js @@ -0,0 +1,125 @@ + +import Layout from '@/layout' + +const hqMenudataRouter = { + path: '/capt-hq', + component: Layout, + redirect: 'ux/vw/dataInput/hq_h', + name: 'HQData', + meta: { + title: '红旗工厂', + icon: '红旗', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + keepAlive: false, + }, + children: [ + { + path: '/import-h-data', + name: 'import-h-data',//命名路由-二级 + component: () => import('@/views/ux/vw/dataInput/hq_h'), + redirect: 'ux/vw/dataInput/hq_h', + meta: { + title: 'H平台', + // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + icon: '看板' + }, + children: [ + { + path: 'hq-H-platform', + component: () => import('@/views/ux/vw/dataInput/hq_h'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗H平台导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-H-platform-export', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', + meta: { + title: 'H平台结算差异输出', + roles: ['SettleAccount.FISs'], + icon: '文件' + } + } + ] + }, + { + path: '/export-m-data', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'export-m-data',//命名路由 + redirect: '/ux/vw/dataInput/hq_m', + meta: { + title: 'M平台', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: 'hq-M-platform', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗M平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + + { + path: 'hq-M-platform-export', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: 'H平台结算差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） + icon: '二配' + } + } + ] + }, + { + path: '/export-f-data', + component: () => import('@/views/ux/vw/dataInput/hq_f'), + name: 'export-f-data',//命名路由 + redirect: '/ux/vw/dataInput/hq_f', + meta: { + title: 'F平台', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: 'hq-F-platform', + component: () => import('@/views/ux/vw/dataInput/hq_f'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗F平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + + { + path: 'hq-F-platform-export', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: 'F平台结算差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） + icon: '二配' + } + } + ] + } + ] +} + +export default hqMenudataRouter + + + + + diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index 6b4da0d5..e52fc1d1 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -88,6 +88,16 @@ const vwFisDataRouter = { icon: '结算' } }, + { + path: 'hq-M-platform', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗M平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, ] } diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js new file mode 100644 index 00000000..5d8e00ed --- /dev/null +++ b/vue/src/router/modules/vw_menu.js @@ -0,0 +1,181 @@ + +import Layout from '@/layout' + +const vwMenudataRouter = { + path: '/capt-vw', + component: Layout, + redirect: 'ux/basedata/Invoice/index', + name: 'HQData', + meta: { + title: '大众工厂', + icon: 'vw', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + keepAlive: false, + }, + children: [ + { + path: '/import-data', + name: 'import-data',//命名路由-二级 + component: () => import('@/views/ux/billManage/index'), + redirect: 'ux/basedata/Invoice/index', + meta: { + title: '数据导入', + // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + icon: '看板' + }, + children: [ + { + path: 'invoice', + component: () => import('@/views/ux/basedata/Invoice/index'), + name: 'Invoices', + meta: { + title: '发票汇总', + roles: ['SettleAccount.Invoices'], + icon: '对比' + } + }, + { + path: 'settle-account-finish', + component: () => import('@/views/ux/vw/dataInput/r3'), + name: 'SettleAccount', + meta: { + title: 'FIS结算明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '库存' + } + }, + { + path: 'unsettle-account', + component: () => import('@/views/ux/vw/dataInput/r3'), + name: 'SettleAccount', + meta: { + title: 'FIS未结明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'kan-ban', + component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'), + name: 'VWKanBan',//命名路由 + meta: { + title: '大众看板结算导入', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '看板' + } + }, + { + path: 'spare-part', + component: () => import('@/views/ux/vw/dataInput/SparePart'), + name: 'SparePart',//命名路由 + meta: { + title: '大众备件结算导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '工厂' + } + }, + { + path: 'scrap-claims', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', + meta: { + title: 'CP7报废和索赔导入', + roles: ['SettleAccount.FISs'], + icon: '文件' + } + }, + ] + }, + { + path: '/export-data', + component: () => import('@/views/ux/billManage/index'), + name: 'export-data',//命名路由 + redirect: 'export-data', + meta: { + title: '数据输出', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: '/invoice-settled/diff', + component: () => import('@/views/ux/billManage/InvoiceSettledDiff'), + name: 'InvoiceSettledDiff',//命名路由 + meta: { + title: '发票与结算核对汇总', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: '/invoice-settled/detaildiff', + component: () => import('@/views/ux/billManage/InvoiceSettledDetailDiff'), + name: 'InvoiceSettledDetailDiff',//命名路由 + meta: { + title: '准时化结算核对明细', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '结算对比' + } + }, + { + path: '/unInvoice-settled/detailDiff', + component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'), + name: 'UnInvoiceSettledDetailDiff',//命名路由 + meta: { + title: '准时化量差价差输出', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '售后' + } + }, + { + path: '/unsettle-diff/export', + component: () => import('@/views/ux/billManage/UnSettleDiffExport'), + name: 'UnSettleDiffExport',//命名路由 + meta: { + title: '准时化未结核对', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '器具' + } + }, + { + path: '/unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识） + component: () => import('@/views/ux/billManage/IssuedUnsettled/index'), + name: 'UnsettledDetail',//命名路由 + meta: { + title: '准时化未结明细', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '报表' + } + }, + { + path: '/kbwithcode', + component: () => import('@/views/ux/billManage/kanBanWithCode'), + name: 'KanBanWithCode',//命名路由 + meta: { + title: '看板结算输出', + //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色） + icon: '看板' + } + }, + + { + path: '/vwsparepart', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: '备件结算输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） + icon: '供货' + } + } + ] + } + ] +} + +export default vwMenudataRouter + + + + + diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js new file mode 100644 index 00000000..cba355fb --- /dev/null +++ b/vue/src/router/modules/vw_out_order.js @@ -0,0 +1,54 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const vwOutOrderDataRouter = { + path: '/cpat-order', + component: Layout, + redirect: 'pg', + name: '业务数据', + //hidden: true, + meta: { + //requiresAuth: true, + title: '大众出库单管理', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'vw-out-order', + component: () => import('@/views/ux/billManage/vwOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众准时化出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'kanban-out-order', + component: () => import('@/views/ux/billManage/kanbanOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众看板出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + // { + // path: 'invoice', + // component: () => import('@/views/ux/basedata/Invoice/index'), + // name: 'Invoices',//命名路由 + // meta: { + // title: '大众发票汇总导入', + // roles: ['SettleAccount.Invoices'], + // icon: '对比' + // } + // }, + + ] +} + +export default vwOutOrderDataRouter + diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue index cb254ea2..b17f9a03 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue @@ -387,6 +387,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -424,8 +426,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -524,8 +531,25 @@ export default { this.listQuery ) .then((response) => { + + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; + setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue index 2a6856c1..83226746 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue @@ -342,6 +342,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -379,8 +381,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -480,6 +487,21 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index 3f2b7d7b..d300b26a 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -99,7 +99,7 @@ type="danger" icon="el-icon-delete" size="mini" - @click="handleDelete()" + @click="print()" >作废(支持批量) @@ -195,6 +195,57 @@ /> +
+ + + + + + + + + + +
+ 取消 + 确 认 +
+ +
@@ -243,7 +294,13 @@ export default { }; return { crmType: "M100Online-MB", - getRowKeys: (row) => { + dialogTableVisible: false, + zflist: null, + zuofei: [], + getRowKeys: + + + (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, expands: [], //只展开一行放入当前行id @@ -361,6 +418,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -398,8 +457,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -499,6 +563,15 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item) => { + if (item.printType == 0) { + item.printType = "正常打印"; + } else if (item.printType == 1) { + item.printType = "重打"; + } else { + item.printType = "补打"; + } + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { @@ -559,25 +632,21 @@ export default { .catch(() => {}); } }, - //作废操作，支持批量操作-门板 - handleDelete(row) { - //批量删除 + print(row) { var params = []; - let myalert = ""; //声明变量，其变量必须在此声明后使用 - let myalertcount = []; if (row) { //单行 params.push(row.id); - myalert = row.name; } else { //多选 this.multipleSelection.forEach((element) => { let id = element.id; params.push(id); }); - myalert = "选中项"; } - console.log("作废查询参数：" + JSON.stringify(params)); + this.zuofei = params; + + this.dialogTableVisible = true; this.$axios .posts("/api/newjit/MenBanPackingList/get-all-del-List", params) .then((response) => { @@ -591,46 +660,111 @@ export default { return; } else { this.fileQuery.dataname = JSON.stringify(response); - response.forEach((itemsss) => { - myalertcount.push(itemsss.billNum); - }); + this.zflist = response; console.log( "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + JSON.stringify(this.fileQuery.dataname) ); - this.$confirm( - "是否作废选中的" + response.length + "条记录?", - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) - .then(() => { - this.$axios - .posts("/api/newjit/MenBanPackingList/scrap", 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: "已取消操作", - }); - }); } }) .catch(() => {}); }, + + //作废详情页确认按钮 + handleDelete() { + //debugger; + let params = this.zuofei; + + this.$axios + .posts("/api/newjit/MenBanPackingList/scrap", params) + .then((response) => { + console.log( + "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + JSON.stringify(response) + ); + this.$notify({ + title: "成功", + message: "作废成功", + type: "success", + duration: 2000, + }); + }); + this.dialogTableVisible = false; + this.getList(); + }, + + //作废操作，支持批量操作-门板 + // handleDelete(row) { + // //批量删除 + // var params = []; + // let myalert = ""; //声明变量，其变量必须在此声明后使用 + // let myalertcount = []; + // if (row) { + // //单行 + // params.push(row.id); + // myalert = row.name; + // } else { + // //多选 + // this.multipleSelection.forEach((element) => { + // let id = element.id; + // params.push(id); + // }); + // myalert = "选中项"; + // } + // console.log("作废查询参数：" + JSON.stringify(params)); + // this.$axios + // .posts("/api/newjit/MenBanPackingList/get-all-del-List", params) + // .then((response) => { + // //alert(response.status); + // const index = this.list.indexOf(row); + // if (response.status === false) { + // this.$message({ + // message: response.message, + // type: "error", + // }); + // return; + // } else { + // this.fileQuery.dataname = JSON.stringify(response); + // response.forEach((itemsss) => { + // myalertcount.push(itemsss.billNum); + // }); + // console.log( + // "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + // JSON.stringify(this.fileQuery.dataname) + // ); + // this.$confirm( + // "是否作废选中的" + response.length + "条记录?", + // "提示", + // { + // confirmButtonText: "确定", + // cancelButtonText: "取消", + // type: "warning", + // } + // ) + // .then(() => { + // this.$axios + // .posts("/api/newjit/MenBanPackingList/scrap", 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: "已取消操作", + // }); + // }); + // } + // }) + // .catch(() => {}); + // }, fetchData(id) { //循环动态 this.$axios diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue index e84caa89..4256dae6 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue @@ -124,7 +124,7 @@ type="danger" icon="el-icon-delete" size="mini" - @click="handleDelete()" + @click="print()" >作废(支持批量) @@ -200,6 +200,57 @@ /> +
+ + + + + + + + + + +
+ 取消 + 确 认 +
+ +
@@ -248,6 +299,9 @@ export default { }; return { crmType: "M100Online-MB", + dialogTableVisible: false, + zuofei: [], + zflist: null, getRowKeys: (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, @@ -373,6 +427,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -410,12 +466,12 @@ export default { }); tempsTabs.push({ - label: "起底盘号", + label: "起始底盘号", prop: "beginVin", width: 160, }); tempsTabs.push({ - label: "止底盘号", + label: "结束底盘号", prop: "endVin", width: 160, }); @@ -515,6 +571,15 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item) => { + if (item.printType == 0) { + item.printType = "正常打印"; + } else if (item.printType == 1) { + item.printType = "重打"; + } else { + item.printType = "补打"; + } + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { @@ -577,25 +642,21 @@ export default { .catch(() => {}); } }, - //作废操作，支持批量操作-门板 - handleDelete(row) { - //批量删除 - var params = []; - let myalert = ""; //声明变量，其变量必须在此声明后使用 - let myalertcount = []; + print(row) { + var params = []; if (row) { //单行 params.push(row.id); - myalert = row.name; } else { //多选 this.multipleSelection.forEach((element) => { let id = element.id; params.push(id); }); - myalert = "选中项"; } - console.log("作废查询参数：" + JSON.stringify(params)); + this.zuofei = params; + + this.dialogTableVisible = true; this.$axios .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params) .then((response) => { @@ -609,46 +670,109 @@ export default { return; } else { this.fileQuery.dataname = JSON.stringify(response); - response.forEach((itemsss) => { - myalertcount.push(itemsss.billNum); - }); + this.zflist = response; console.log( - "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + "柱护板-调用Handlers/Handler1.ashx?report=menban传的值：" + JSON.stringify(this.fileQuery.dataname) ); - this.$confirm( - "是否作废选中的" + response.length + "条记录?", - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) - .then(() => { - this.$axios - .posts("/api/newjit/ZhuHuBanPackingList/scrap", 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: "已取消操作", - }); - }); } }) .catch(() => {}); }, + //作废详情页确认按钮 + handleDelete() { + //debugger; + let params = this.zuofei; + + this.$axios + .posts("/api/newjit/ZhuHuBanPackingList/scrap", params) + .then((response) => { + console.log( + "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + JSON.stringify(response) + ); + this.$notify({ + title: "成功", + message: "作废成功", + type: "success", + duration: 2000, + }); + }); + this.dialogTableVisible = false; + this.getList(); + }, + //作废操作，支持批量操作-门板 + // handleDelete(row) { + // //批量删除 + // var params = []; + // let myalert = ""; //声明变量，其变量必须在此声明后使用 + // let myalertcount = []; + // if (row) { + // //单行 + // params.push(row.id); + // myalert = row.name; + // } else { + // //多选 + // this.multipleSelection.forEach((element) => { + // let id = element.id; + // params.push(id); + // }); + // myalert = "选中项"; + // } + // console.log("作废查询参数：" + JSON.stringify(params)); + // this.$axios + // .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params) + // .then((response) => { + // //alert(response.status); + // const index = this.list.indexOf(row); + // if (response.status === false) { + // this.$message({ + // message: response.message, + // type: "error", + // }); + // return; + // } else { + // this.fileQuery.dataname = JSON.stringify(response); + // response.forEach((itemsss) => { + // myalertcount.push(itemsss.billNum); + // }); + // console.log( + // "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + // JSON.stringify(this.fileQuery.dataname) + // ); + // this.$confirm( + // "是否作废选中的" + response.length + "条记录?", + // "提示", + // { + // confirmButtonText: "确定", + // cancelButtonText: "取消", + // type: "warning", + // } + // ) + // .then(() => { + // this.$axios + // .posts("/api/newjit/ZhuHuBanPackingList/scrap", 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: "已取消操作", + // }); + // }); + // } + // }) + // .catch(() => {}); + // }, fetchData(id) { //循环动态 this.$axios diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue index 41361ed5..4bc19bd0 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue @@ -857,7 +857,7 @@ export default { }, getList(data) { this.listLoading = true; - if (data != undefined) {alert() + if (data != undefined) { this.listQuery.SkipCount = (this.page - 1) * data.limit; } else { this.listQuery.SkipCount = (this.page - 1) * 15; diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 336bc746..3912ce51 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -546,7 +546,7 @@ export default { dialogFormVisible: false, formTitle: "", isEdit: false, - formLoading: false, + formLoading: false, //关闭窗口 tableHeight: document.documentElement.clientHeight - 335, detailTableHeight: 250, details: [], //修改子表数据源 @@ -1277,7 +1277,7 @@ export default { this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN); if (this.listQuery.productType === 1) { - //门板-打印 + //柱护板-打印 this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.productLine = this.listQuery.productLine; @@ -1467,7 +1467,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -1514,7 +1514,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -1973,7 +1973,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -2012,7 +2012,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue index ab0dd54d..eb065065 100644 --- a/vue/src/views/pg-fis/basedate/select/index.vue +++ b/vue/src/views/pg-fis/basedate/select/index.vue @@ -9,6 +9,40 @@ v-show="showSearch" :inline="true" > + + + + + + + + + + + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue b/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue index cb67d913..d37088e2 100644 --- a/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue @@ -512,7 +512,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 80, + width: 130, }); tempsTabs.push({ label: "当前版本", diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 93de70ed..0541e6fd 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -17,7 +17,7 @@ type="primary" icon="el-icon-plus" @click="handleCreate" - >统计 + >统计明细 生成出库单(支持批量) + 已确认 @@ -55,7 +63,7 @@ 说明：每间隔15秒进行自动刷新！说明：每间隔30秒进行自动刷新！ @@ -75,6 +83,7 @@ border highlight-current-row style="width: 100%" + @sort-change="sortChange" @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" @@ -396,21 +405,46 @@ + > + {{ item.label }} + {{ + item.value + }} + + @@ -524,28 +558,25 @@ - + - - - - + - + - - - + { clearInterval(timer); @@ -860,7 +893,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 120, }); tempsTabs.push({ label: "模块名称", @@ -882,20 +915,46 @@ export default { prop: "remark", width: 220, }); - // tempsTabs.push({ - // label: "状态", - // prop: "stateName", - // width: 100, - // }); + tempsTabs.push({ + label: "审批状态", + prop: "fileName", + width: 150, + }); return tempsTabs; }, }, methods: { + sortChange(data) { + const { prop, order } = data; + if (!prop || !order) { + this.handleFilter(); + return; + } + this.listQuery.Sorting = prop + " " + order; + console.log(this.listQuery.Sorting); + this.handleFilter(); + }, + /** 筛选操作 */ + handleFilter() { + this.page = 1; + this.getList(); + this.listQuery.Filters = []; + if (this.searchContent != "") { + var column = "taskId"; + let filter = { + logic: 0, + column: column, + action: 0, + value: this.searchContent, + }; + this.listQuery.Filters.push(filter); + } + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, - //出库单 - handleCreateBills(row){ + handleConfirm(row) { if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -917,6 +976,58 @@ export default { }); myalert = "选中项"; } + this.$confirm("是否确认" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", 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: "已取消操作", + }); + }); + }, + //出库单 + handleCreateBills(row) { + // 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.listBillQuery.guids = params; + this.listBillQuery.version = this.JobversionValue; + console.log("出库单条件：" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -924,8 +1035,14 @@ export default { }) .then(() => { this.$axios - .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .posts( + "/api/settleaccount/wmsjitoutput/WmsJitOutPut", + this.listBillQuery + ) .then((response) => { + console.log( + "检查柱护板-hostCheckQuery" + JSON.stringify(response) + ); const index = this.list.indexOf(row); this.$notify({ title: "成功", @@ -933,6 +1050,7 @@ export default { type: "success", duration: 2000, }); + this.getList(); }); }) @@ -1134,19 +1252,41 @@ export default { }); }, //获取物料组车型 + // getMaterialGroup() { + // this.$axios + // .posts("/api/settleaccount/CodeSetting/list", { + // project: "物料组", + // maxResultCount: 1000, + // skipCount: 0, + // }) + // .then((response) => { + // this.materialGroupList = []; + // response.items.forEach((element) => { + // let options = {}; + // options.value = element.description; + // options.label = element.value; + // this.materialGroupList.push(options); + // }); + // }) + // .catch(() => { + // this.listLoading = false; + // }); + // }, + //获取物料组车型 getMaterialGroup() { this.$axios .posts("/api/settleaccount/CodeSetting/list", { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting:"value ascending" }) .then((response) => { this.materialGroupList = []; response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) @@ -1363,7 +1503,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众发票与结算核对明细表"; + this.listQuery.name = "准时化结算核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) @@ -1416,7 +1556,6 @@ export default { }; - + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 736c2e9d..53b6a364 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -379,7 +379,6 @@ - @@ -627,7 +626,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -990,7 +989,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众发票与结算核对汇总表"; + this.listQuery.name = "发票与结算核对汇总"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index fe737698..6e6ac6a8 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -730,7 +730,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue index 2aa3f604..c810301d 100644 --- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue +++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue @@ -772,7 +772,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 7d837232..068ea053 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -388,20 +388,24 @@ + > + {{ item.label }} + {{ + item.value + }} + @@ -773,7 +777,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -953,13 +957,14 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) @@ -1176,7 +1181,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众准时化结算数量差异比对表"; + this.listQuery.name = "准时化量差输出"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index 5fa2d4c3..bfd56ab4 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -390,19 +390,23 @@ v-model="formCount.materialGroupValue" size="medium" multiple - collapse-tags filterable clearable + style="width: 380px; margin-right: 15px" @change="valueChange" - style="width: 350px; margin-right: 15px" placeholder="请选择" > + > + {{ item.label }} + {{ + item.value + }} + @@ -730,7 +734,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -905,13 +909,14 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) @@ -1120,7 +1125,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众准时化未结差异比对表"; + this.listQuery.name = "准时化未结差异比对输出"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/UnSettledDiff/index.vue b/vue/src/views/ux/billManage/UnSettledDiff/index.vue index fc2a3da1..c3602e58 100644 --- a/vue/src/views/ux/billManage/UnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/UnSettledDiff/index.vue @@ -728,7 +728,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/index.vue b/vue/src/views/ux/billManage/index.vue new file mode 100644 index 00000000..509198d1 --- /dev/null +++ b/vue/src/views/ux/billManage/index.vue @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 9e0f12b1..8c051717 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -35,6 +35,14 @@ @click="handleCreateBills()" >生成出库单(支持批量) + 已确认 @@ -396,20 +404,24 @@ + > + {{ item.label }} + {{ + item.value + }} + @@ -455,25 +467,23 @@ - - - + @@ -728,7 +738,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 120, }); tempsTabs.push({ label: "模块名称", @@ -745,21 +755,16 @@ export default { prop: "createdAt", width: 150, }); - tempsTabs.push({ + tempsTabs.push({ label: "说明", prop: "remark", width: 220, }); - // tempsTabs.push({ - // label: "操作名称", - // prop: "actionName", - // width: 120, - // }); - // tempsTabs.push({ - // label: "状态", - // prop: "stateName", - // width: 100, - // }); + tempsTabs.push({ + label: "审批状态", + prop: "fileName", + width: 150, + }); return tempsTabs; }, }, @@ -816,6 +821,54 @@ export default { }); }); }, + handleConfirm(row) { + 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/wms/WmsJitOutPut", 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: "已取消操作", + }); + }); + }, //出库单 handleCreateBills(row) { if (this.multipleSelection.length == 0) { @@ -957,13 +1010,14 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) @@ -1152,7 +1206,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众看板结算与交货核对明细表"; + this.listQuery.name = "看板结算数量差异输出"; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue new file mode 100644 index 00000000..c7fdcb9a --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -0,0 +1,541 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/index.vue b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue new file mode 100644 index 00000000..cd7f23ba --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue @@ -0,0 +1,317 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index a0b13a3c..567066e5 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -35,6 +35,14 @@ @click="handleCreateBills()" >生成出库单(支持批量) + 已确认 @@ -396,17 +404,24 @@ + > + {{ item.label }} + {{ + item.value + }} + @@ -416,17 +431,30 @@ - + + + + + + + @@ -471,37 +499,60 @@ - - + + - - + + - - - + + - +
@@ -565,6 +616,25 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, + pickerOptions1: { + disabledDate: (time) => { + //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now(); + return time.getTime() <= new Date(this.startTime).getTime(); + }, + }, + + pickerOptions2: { + disabledDate: (time) => { + //if (this.endTime != "") { + return time.getTime() > new Date(this.cp5endTime).getTime(); + //} + }, + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() <= new Date(this.cp5startTime).getTime(); + }, + }, startTime: "", endTime: "", pickerOptionsCp7: { @@ -589,6 +659,7 @@ export default { radio: "0", //结算状态：0未结 1部分结算 versionList: [], materialGroupList: [], + getmaterialGroupValue: "", // 是否显示详细弹出层 openView: false, versionValue: "", @@ -618,16 +689,20 @@ export default { searchContent: "", // 输入内容 form: {}, formCount: { - name: "未结算对比", - // datetime5: [], - // datetime7: [], - settledate: "", - materialCode: "", - sapMaterialCode: "", - chassisNumber: "", - kennCode: "", - version: "", + startTime: "", + endTime: "", + cp5startTime: "", + cp5endTime: "", + // name: "未结算对比", + // settledate: "", + // materialCode: "", + // sapMaterialCode: "", + // chassisNumber: "", + // kennCode: "", + // version: "", }, + cp5startTime: "", + cp5endTime: "", list: null, totalCount: 0, listLoading: true, @@ -707,12 +782,12 @@ export default { tempsTabs.push({ label: "版本号", prop: "type", - width: 85, + width: 120, }); tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -734,20 +809,24 @@ export default { prop: "remark", width: 220, }); - // tempsTabs.push({ - // label: "操作名称", - // prop: "actionName", - // width: 120, - // }); - // tempsTabs.push({ - // label: "状态", - // prop: "stateName", - // width: 100, - // }); + tempsTabs.push({ + label: "审批状态", + prop: "fileName", + width: 150, + }); return tempsTabs; }, }, methods: { + //cp5 + getdateValueCp5(val) { + this.cp5startTime = val; + this.getbalanceIndexData(); + }, + getdateValCp5(val) { + this.cp5endTime = val; + this.getbalanceIndexData(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -800,6 +879,54 @@ export default { }); }); }, + handleConfirm(row) { + 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/settleaccounWmsJitOutPutt/wms/", 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: "已取消操作", + }); + }); + }, //出库单 handleCreateBills(row) { if (this.multipleSelection.length == 0) { @@ -934,20 +1061,20 @@ export default { this.listLoading = false; }); }, - //获取物料组车型 getMaterialGroup() { this.$axios .posts("/api/settleaccount/CodeSetting/list", { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description; + options.label = element.value; this.materialGroupList.push(options); }); }) @@ -961,7 +1088,8 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; - // this.datetime7 = []; + this.cp5startTime = ""; + this.cp5endTime = ""; }, save() { this.$refs.formCount.validate((valid) => { @@ -971,22 +1099,18 @@ export default { if (this.formCount.materialCode != "") { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } - // if (this.formCount.sapMaterialCode != "") { - // this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 - // } + if (this.formCount.sapCode != "") { + this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号 + } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - alert(this.datetime5[0]); - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } + this.listExportQuery.begin = this.cp5startTime + ? this.cp5startTime + : undefined; + this.listExportQuery.end = this.cp5endTime + ? this.cp5endTime + : undefined; if (this.startTime != "") { this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 } @@ -997,8 +1121,7 @@ export default { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = - this.formCount.materialGroupValue; //物料组车型 + this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 } console.log( "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery) @@ -1036,6 +1159,11 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; + this.datetime5 = []; + this.startTime = ""; + this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; this.dialogFormVisible = true; }, filterHandler(value, row, column) { @@ -1150,7 +1278,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众准时化结算门板价格差异比对报表"; + this.listQuery.name = "备件结算数量差异输出"; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue new file mode 100644 index 00000000..b3bea7bf --- /dev/null +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -0,0 +1,616 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/vwOutOrder/index.vue b/vue/src/views/ux/billManage/vwOutOrder/index.vue new file mode 100644 index 00000000..90727815 --- /dev/null +++ b/vue/src/views/ux/billManage/vwOutOrder/index.vue @@ -0,0 +1,320 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_bt/index.vue b/vue/src/views/ux/vw/dataInput/hq_bt/index.vue new file mode 100644 index 00000000..e5d35866 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_bt/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_f/index.vue b/vue/src/views/ux/vw/dataInput/hq_f/index.vue new file mode 100644 index 00000000..e5d35866 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_f/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + 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 b14ebcbe..e5d35866 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue @@ -243,7 +243,7 @@ export default { formTitle: "", drawer: false, showExcelImport: false, - tableHeight: document.documentElement.clientHeight - 260, + tableHeight: document.documentElement.clientHeight - 220, isEdit: false, }; }, @@ -251,7 +251,7 @@ export default { var self = this; window.onresize = function () { var offsetHei = document.documentElement.clientHeight; - self.tableHeight = offsetHei - 260; + self.tableHeight = offsetHei - 220; }; }, created() { diff --git a/vue/src/views/ux/vw/dataInput/hq_m/index.vue b/vue/src/views/ux/vw/dataInput/hq_m/index.vue new file mode 100644 index 00000000..f4c47c4e --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/static/config.js b/vue/static/config.js index 448019ab..99e65d7e 100644 --- a/vue/static/config.js +++ b/vue/static/config.js @@ -2,8 +2,8 @@ let configJSON if (process.env.NODE_ENV === 'development') { configJSON = { base: { - ip: 'http://192.168.0.63', - //ip: 'http://192.168.0.140', + //ip: 'http://192.168.0.63', + ip: 'http://192.168.0.140', //ip: 'http://149.223.116.5', auth_port: '8066', public_port: '8092', @@ -37,7 +37,7 @@ if (process.env.NODE_ENV === 'development') { configJSON = { base: { - ip: 'http://192.168.0.63', + ip: 'http://192.168.0.67', //ip: 'http://192.168.0.140', //ip: 'http://149.223.116.5', //ip: 'http://114.116.225.148', diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 555b4a5d..956275ca 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2773,5 +2773,178 @@ "setting": [] } ] + }, + "hqHPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购订单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料代码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "科目号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "accountNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂名称", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factoryName", + "setting": [] + } + ] + }, + "hqMPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购订单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料代码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "科目号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "accountNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂名称", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factoryName", + "setting": [] + } + ] + }, + "vwOutOrder": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "零件号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料组", + "type": 1, + "value": "", + "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", + "取消出库,4" + ] + } + ] } } \ No newline at end of file