From 3004cc98e50c625a54c5f43dd81a35f42719d03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 11 Apr 2023 11:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/config.js | 3 ++- fe/PC/src/api/wms-api.js | 3 ++- fe/PC/src/mixins/mixins.js | 9 ++++++--- fe/PC/src/mixins/printMixin.js | 12 ++++++------ .../RecycledMaterialsLabel.vue | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index aa046d202..d7e30dedf 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -11,7 +11,8 @@ // dev-new window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth' -window.SITE_CONFIG['print'] = 'print' +// window.SITE_CONFIG['print'] = 'print'21384 +window.SITE_CONFIG['print'] = 'http://dev.ccwin-in.com:60074' window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:21093' window.SITE_CONFIG['warehouseCode'] = 'T8' window.SITE_CONFIG['company'] = 'DongYang' diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index 7d96a106d..48d85a466 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -2,6 +2,7 @@ import request from '@/utils/request' import store from '@/store' // let baseURL = process.env.VUE_APP_BASE_API + '/' let baseURL = localStorage.getItem('base') + '/api/' +let printURL = localStorage.getItem('print') + '/api/' //新建 export function postCreate(data, url) { if (Object.keys(data).includes('company')) { @@ -242,7 +243,7 @@ export function getPage(data, url) { //打印标签 export function PrintServices(data) { return request({ - url: baseURL + 'reporting/PrintServices', + url: printURL + 'reporting/PrintServices', method: 'post', headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' diff --git a/fe/PC/src/mixins/mixins.js b/fe/PC/src/mixins/mixins.js index 28308e0ab..9624bd714 100644 --- a/fe/PC/src/mixins/mixins.js +++ b/fe/PC/src/mixins/mixins.js @@ -54,9 +54,10 @@ export const mixins = { methods: { // 结合默认及缓存中的列表tableColumns数据做初始化 initTableColumns(){ + let _list_defalut = this.$isTableColumns[this.$route.name] + if(!_list_defalut)return let _local = localStorage.getItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name) let _list_local = JSON.parse(localStorage.getItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name)) - let _list_defalut = this.$isTableColumns[this.$route.name] let _new_list = [] //格式化后的数据 // 如果没有缓存则直接为默认值 if(!_local){ @@ -175,8 +176,10 @@ export const mixins = { // window.open(process.env.VUE_APP_PRINT_API + '/' + res) // window.open('http://10.74.150.81:9082' + '/' + res) //杭州 - const BaseURL = localStorage.getItem('base') + '/' + res - window.open(BaseURL) + // const BaseURL = localStorage.getItem('base') + '/' + res + // window.open(BaseURL) + const PrintURL = localStorage.getItem('print') + '/' + res + window.open(PrintURL) loading.close() resolve() }).catch(err => { diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js index 6b47c491f..6cc373c19 100644 --- a/fe/PC/src/mixins/printMixin.js +++ b/fe/PC/src/mixins/printMixin.js @@ -93,7 +93,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){ // 打印【箱标签-单页4个】 (xiangbq_many.rdlx) // 使用位置：半成品上架标签 (PartiallyPreparedProducts.vue) | 生产退库标签 (productionReturnLabel.vue) -// | 创建标签 (RecycledMaterialsLabel.vue) | 到货请求详情 (PurchaseReceiptRequest.vue) +// | 创建标签 (RecycledMaterialsLabel.vue) | 到货请求 (PurchaseReceiptRequest.vue) /** * @param {*} propsData 必填 详情数据 示例：this.propsData * @param {*} options 自定义特殊配置值 示例：{'number':'poNumber'} (number值将传为poNumber) @@ -243,7 +243,7 @@ const printEnumOption = { // 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationCode; 实际调拨量:qty; 调出储位:fromLocationCode; // fscll.rdlx | fsctl.rdlx 使用参数 -// 使用位置:非生产领料申请 (lineSideWarehouseAllocationNote.vue - fscll.rdlx) +// 使用位置:非生产领料申请 (pickingRequest.vue - fscll.rdlx) // 使用位置:非生产退料申请 (materialReturnRequest.vue - fsctl.rdlx) // 单号:number; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName // 物品代码:itemCode; 物品名称:itemName; 预计量:preQty; 实际量:qty; 单位:uom; 储位:locationCode; @@ -270,14 +270,14 @@ const printEnumOption = { // 物品代码:itemCode; 物品名称:itemName; 储位:locationCode; 数量:adjustQty; 原因说明:reasonStr; 参考单据:requestNumber; // xbcll.rdlx 使用参数 -// 使用位置:自动发料任务 (automaticCallJob-msQuery.vue) | 自动发料记录 (automaticCallNote.vue) +// 使用位置:?自动发料任务 (automaticCallJob-msQuery.vue) | 自动发料记录 (automaticCallNote.vue) // 使用位置:人工发料任务 (IssueJob.vue) | 人工发料记录 (IssueNote.vue) // 单号:number; 制表日:creationTime; 部门名称:deptName; // 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; // xbctl.rdlx 使用参数 xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段 -// 使用位置:生产退库记录 (productionReturn => returnNote.vue) +// 使用位置:生产退库记录 (productionReturn => returnNote.vue productionReturnNote) // zjfl.rdlx 使用参数 // 使用位置:直接发料记录 (directIssueNote.vue) @@ -286,12 +286,12 @@ const printEnumOption = { // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; // hslrkd.rdlx 使用参数 -// 使用位置:回收料收货记录 (materialsReceipt.vue) +// 使用位置:回收料收货记录 (materialsReceipt.vue recycledMaterialsReceipt) // 入库单号:number; 制表日:creationTime; 入库日期:activeDate; 部门代码:deptCode; 部门名称:deptName; // 物品代码:itemCode; 物品名称:itemName; 物品描述1:itemDesc1; 物品描述2:itemDesc2; 数量:qty; 储位:locationErpCode; // chdmxb.rdlx 使用参数 -// 使用位置:原料直发记录 (materialDirectSendNote.vue) +// 使用位置:原料直发客户记录 (materialDirectSendNote.vue) // 出货单号:number; 出货日期:deliverTime; 制表日:creationTime; 客户名称:customerCode; 客户地址:customerAddressCode; // 序号:xh, 物品代码:itemCode; 物品名称:itemName; 单位:uom; 箱标签:packingCode, 出货数量:qty; 正厂编号:itemDesc2; diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue index 6d3d37f06..7671d2e86 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue @@ -96,7 +96,7 @@ export default { currenTableFlex, resultStatus, }, - name: "createNewLabel", + name: "RecycledMaterialsLabel", data () { let _this = this return {