From 4ecf2612e4b61cbfbd0690b434752662ebc4a025 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 30 Nov 2024 13:30:59 +0800 Subject: [PATCH 01/17] =?UTF-8?q?YT-1422WMS=20=E5=BA=93=E5=AD=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E6=8E=89=E5=A4=9A=E4=BA=8E=E7=9A=84=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRecordMain.data.ts | 22 +++++++-------- .../inventorychangeRequestMain.data.ts | 28 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts index bb57a9d99..4e4544489 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts @@ -314,14 +314,14 @@ export const InventorychangeRecordMainRules = reactive({ * @returns {Array} 库存修改记录子表 */ export const InventorychangeRecordDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, + // { + // label: '单据号', + // field: 'number', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, { label: '物料代码', field: 'itemCode', @@ -760,9 +760,9 @@ export const InventorychangeRecordDetailRules = reactive({ areaCode: [ { required: true, message: '请选择库区代码', trigger: 'change' } ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], + // number: [ + // { required: true, message: '请输入单据号', trigger: 'blur' } + // ], itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } ], diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index a13e66361..183985577 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -370,20 +370,20 @@ export const InventorychangeRequestMainRules = reactive({ * @returns {Array} 库存修改申请子表 */ export const InventorychangeRequestDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, + // { + // label: '单据号', + // field: 'number', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTableForm: false, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, { label: '从包装号', field: 'fromPackingNumber', From 28886cfcb984aea7f91bd124f98606b485343af1 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 30 Nov 2024 13:39:28 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=BC=E5=87=BA=E4=BA=8C=E7=BB=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index dcc78a985..326cb52b1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -378,7 +378,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入 // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出 defaultButtons.defaultExportDetailsBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出明细 - defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表 + //defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表 // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From ca4e027d81c1a284acfb032f5b6a63cde96c84df Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 30 Nov 2024 14:19:29 +0800 Subject: [PATCH 03/17] =?UTF-8?q?YT-1432=E6=96=B0=E5=A2=9E=E8=A6=81?= =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E8=AE=A1=E5=88=92=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=A1=AB=E5=86=99=E5=B0=8F=E6=95=B0=E6=97=B6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/validator.ts | 13 +++++++++++-- .../purchasePlanMain/purchasePlanMain.data.ts | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/utils/validator.ts b/src/utils/validator.ts index 46d266b35..d0c78aa4c 100644 --- a/src/utils/validator.ts +++ b/src/utils/validator.ts @@ -823,7 +823,15 @@ export function validatePositiveNumber(rule, value, callback){ callback(new Error('必须是一个正数')); } } - +// 校验带0的正数 +export function validatePositiveNumber0(rule, value, callback) { + const numericValue = Number(value); + if (numericValue >= 0) { + callback(); + } else { + callback(new Error('必须是一个正数')); + } +} export default { validateCode, validateEmail, @@ -858,5 +866,6 @@ export default { validateMaxNumber5, validatePercent, validateNumSix, - validateSixNum + validateSixNum, + validatePositiveNumber0 } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index ba5671a8d..4aac3316e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -8,6 +8,7 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import { validatePositiveNumber0 } from "@/utils/validator"; const { t } = useI18n() // 国际化 /** @@ -994,7 +995,7 @@ export const PurchasePlanDetailRules = reactive({ uom: [{ required: true, message: '请选择计量单位', trigger: 'change' }], planQty: [ { required: true, message: '请输入计划数量', trigger: 'blur' }, - { validator: validatePlanQty, message: '计划数量不能小于0', trigger: 'blur' } + { validator: validatePositiveNumber0, message: '计划数量不能小于0', trigger: ['blur','change'] } ], remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }] }) From 22fd925f05dfffbce9da106defe60a1eac5b081d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 30 Nov 2024 14:29:03 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8F=AF=E6=98=BE=E7=A4=BA=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=92=8C=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain/index.vue | 73 +++++++++---------- .../unplannedreceiptRequestMain.data.ts | 51 +++++++++++++ 2 files changed, 84 insertions(+), 40 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 6437a5922..a73900573 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -134,6 +134,8 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import * as SubjectAccountApi from '@/api/wms/subjectAccount' +import * as SupplieritemApi from '@/api/wms/supplieritem' +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' const { loadStart, loadDone } = usePageLoading() import * as ruleApi from '@/api/wms/rule/index' // 计划外入库申请 @@ -443,6 +445,10 @@ const butttondata = (row,$index) => { } // 列表-操作按钮事件 + +const enableBuyOrenableMake = ref()//是可制造还是可采购 +const enableMake = ref('')//可制造 +const enableBuy = ref('')//可采购 const buttonTableClick = async (val, row) => { console.log("val",val) if (val == 'mainClose') { // 关闭 @@ -498,50 +504,37 @@ const buttonTableClick = async (val, row) => { // dialogVisible.value = true formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 - ItembasicApi.getItembasicPage({ - pageSize: 10, - pageNo: 1, - code: item.itemCode, - sort: '', - by: 'ASC', - }).then(res => { - if (res.list.length > 0) { - // 判断物料 可采购 可制造 - if (res.list[0].enableMake == "FALSE") { + if (item.itemType=='可采购') { + detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') // 修改 tableform 属性 - detailListTableColumns.tableFormColumns.map(item => { - if(item.field == 'productionLineCodePackage') { - item.tableForm.isInpuFocusShow = false - item.tableForm.disabled = true - UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = false - } - if(item.field == 'supplierItemCode') { - item.tableForm.isInpuFocusShow = true - item.tableForm.disabled = false - UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = true - } + SupplieritemApi.getSupplieritemPage({ + pageSize: 10, + pageNo: 1, + itemCode: item.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'supplierItemCode') { + item.supplierItemCode = response?.list[0]?.supplierCode + } + }) }) - } else { - // 修改 tableform 属性 - detailListTableColumns.tableFormColumns.map(item => { - if(item.field == 'supplierItemCode') { - item.tableForm.isInpuFocusShow = false - item.tableForm.disabled = true - UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = false - } - if(item.field == 'productionLineCodePackage') { - item.tableForm.isInpuFocusShow = true - item.tableForm.disabled = false - UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = true + }else if (item.itemType=='可制造') { + detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') + ProductionlineitemApi.getProductionlineitemPage({ + pageNo: 1, + itemCode: item.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'productionLineCodePackage') { + item.productionLineCodePackage = response?.list[0]?.productionLineCode } }) - } - } else { - message.warning('没有查询到物料代码：【' + item.itemCode + '】') - return - } - }) + }) + } ruleApi.getManagementPrecision({ itemCodes: [item['itemCode']], locationCode:item['toLocationCode'] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index e82223e60..e849b3ff6 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -24,6 +24,12 @@ import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadPr import * as QadProjectApi from '@/api/wms/qadProject' import * as BusinesstypeApi from '@/api/wms/businesstype' +import * as SupplieritemApi from '@/api/wms/supplieritem' +import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' + +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' + const businessType = 'UnplannedReceipt' const { t } = useI18n() // 国际化 @@ -1762,6 +1768,51 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive Date: Sat, 30 Nov 2024 14:37:46 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E8=B0=83=E6=95=B4=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=92=8C=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index ebd29e5b7..0ad5c78dc 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1408,51 +1408,7 @@ export const ProductionreturnRequestDetailRules = reactive({ * @returns {Array} 生产退料申请子表创建标签 */ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive([ - { - label: '标签生产线代码', - field: 'productionLineCodePackage', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 - searchField: 'productionLineCode', // 查询弹窗赋值字段 - searchTitle: '生产线物料关系信息', // 查询弹窗标题 - searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 - searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'itemCode', - value: 'itemCode', - isMainValue: true - }] - } - }, - { - label: '标签供应商代码', - field: 'supplierItemCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - enterSearch:true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'supplierCode', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 - searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'itemCode', - value: 'itemCode', - message: '请填写物料代码！', - isMainValue: true - }] - } - }, + { label: '物料代码', field: 'itemCode', @@ -1663,6 +1619,51 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive Date: Sat, 30 Nov 2024 14:53:37 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E5=92=8C=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain/index.vue | 14 +++++++------- .../unplannedreceiptRequestMain.data.ts | 4 ++-- .../productionreturnRequestMain/index.vue | 13 ++++++------- .../productionreturnRequestMain.data.ts | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index a73900573..2df8821a5 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -505,7 +505,7 @@ const buttonTableClick = async (val, row) => { formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { if (item.itemType=='可采购') { - detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') + detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCode') // 修改 tableform 属性 SupplieritemApi.getSupplieritemPage({ pageSize: 10, @@ -515,13 +515,13 @@ const buttonTableClick = async (val, row) => { by: 'ASC', }).then(response => { detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'supplierItemCode') { - item.supplierItemCode = response?.list[0]?.supplierCode + if(itemColumns.field == 'supplierCode') { + item.supplierCode = response?.list[0]?.supplierCode } }) }) }else if (item.itemType=='可制造') { - detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') + detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item => item.field != 'supplierCode') ProductionlineitemApi.getProductionlineitemPage({ pageNo: 1, itemCode: item.itemCode, @@ -529,8 +529,8 @@ const buttonTableClick = async (val, row) => { by: 'ASC', }).then(response => { detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'productionLineCodePackage') { - item.productionLineCodePackage = response?.list[0]?.productionLineCode + if(itemColumns.field == 'productionLineCode') { + item.productionLineCode = response?.list[0]?.productionLineCode } }) }) @@ -930,7 +930,7 @@ const tableFormSelectOnBlur = (field, val, row, index) => { // 标签打印 const BASE_URL = getJmreportBaseUrl() -const src = ref(BASE_URL + '/jmreport/view/936912164754612224?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) const labelPrint = async (row) => { await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then((res) => { if (res.length > 0) { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index e849b3ff6..d6d1806f3 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1770,7 +1770,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive { delete detailListTableColumnsRules.value.productionLineCodePackage // 修改 tableform 属性 detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'supplierItemCode') { + if(itemColumns.field == 'supplierCode') { SupplieritemApi.getSupplieritemPage({ pageSize: 10, pageNo: 1, @@ -585,7 +585,7 @@ const buttonTableClick = async (val, row) => { sort: '', by: 'ASC', }).then(response => { - item.supplierItemCode = response.list[0].supplierCode + item.supplierCode = response.list[0].supplierCode formLabelRef.value.formLoading = false }) } @@ -594,17 +594,16 @@ const buttonTableClick = async (val, row) => { // 判断物料 可制造 if (res.list[0].enableMake == "TRUE") { // 修改 tableform 属性 - detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierItemCode') - delete detailListTableColumnsRules.value.supplierItemCode + detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierCode') detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'productionLineCodePackage') { + if(itemColumns.field == 'productionLineCode') { ProductionlineitemApi.getProductionlineitemPage({ pageNo: 1, itemCode: item.itemCode, sort: '', by: 'ASC', }).then(response => { - item.supplierItemCode = response.list[0].supplierCode + item.productionLineCode = response.list[0].productionLineCode formLabelRef.value.formLoading = false }) } @@ -729,7 +728,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r if (array1.length > 0) { await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => { console.log(res) - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) window.open(src.value + '&asn_number=' + res) }).catch(err => { console.log(err) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 0ad5c78dc..23689b1c4 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1621,7 +1621,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive Date: Sat, 30 Nov 2024 15:06:05 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 589358d0a..e8e42dfef 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -907,7 +907,7 @@ const handlePoint = async (row) => { }).then((res) => { if(res.list.length > 0) { isCreateLabel.value = true - if (res.list[0].supplierItemCode != null) { + if (res.list[0].supplierCode != null) { labelType.value = 'cg' } else if(res.list[0].productionLineCode != null){ labelType.value = 'zz' From 887f858e22830f3b63b13f1b4c2b6fd997848c85 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 30 Nov 2024 15:10:35 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnRequestMain/index.vue | 3 +-- .../productionreturnRequestMain.data.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index e8e42dfef..af0e31d1c 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -573,8 +573,7 @@ const buttonTableClick = async (val, row) => { // 判断物料 可采购 detailListTableColumnsRules.value = cloneDeep(ProductionreturnRequestDetailLabelRules) if (res.list[0].enableBuy == "TRUE") { - detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') - delete detailListTableColumnsRules.value.productionLineCodePackage + detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCode') // 修改 tableform 属性 detailListTableColumns.tableFormColumns.map(itemColumns => { if(itemColumns.field == 'supplierCode') { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 23689b1c4..d046b5309 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1671,7 +1671,7 @@ export const ProductionreturnRequestDetailLabelRules = reactive({ // supplierItemCode: [ // { required: true, message: '请选择供应商', trigger: 'change' } // ], - // productionLineCodePackage: [ + // productionLineCode: [ // { required: true, message: '请选择生产线', trigger: 'change' } // ], batch: [ From f28e5dac6ee9c4c724b4e8842f5a8f4de2073cdc Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 30 Nov 2024 15:11:26 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index d046b5309..b754df42d 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1668,7 +1668,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive Date: Sat, 30 Nov 2024 15:19:40 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 2df8821a5..22bec7b92 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -138,6 +138,7 @@ import * as SupplieritemApi from '@/api/wms/supplieritem' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' const { loadStart, loadDone } = usePageLoading() import * as ruleApi from '@/api/wms/rule/index' +import { cloneDeep } from 'lodash-es' // 计划外入库申请 defineOptions({ name: 'UnplannedreceiptRequestMain' }) @@ -150,7 +151,7 @@ routeName.value = route.name const tableColumns = ref([...UnplannedreceiptRequestMain.allSchemas.tableColumns,...UnplannedreceiptRequestDetail.allSchemas.tableMainColumns]) //创建标签 -const detailListTableColumns = UnplannedreceiptRequestDetailLabel.allSchemas +const detailListTableColumns = cloneDeep(UnplannedreceiptRequestDetailLabel.allSchemas) const isCreateLabel = ref(false) const formLabelRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 From d1f8f4f686b7d33ab65c438aa033c07c210747e9 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 30 Nov 2024 16:03:11 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/package/index.ts | 4 ++++ .../unplannedreceiptRequestMain/index.vue | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index a69fd81c7..6bb42be07 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -100,6 +100,10 @@ export const createPackageLabel = async (data: PackageVO) => { export const batchPrintingLable = async (data: any) => { return await request.post({ url: `/wms/package/batchPrintingLable`, data }) } +// 批量打印标签计划外入库申请用的 +export const batchPrintingLableForYT = async (data: any) => { + return await request.post({ url: `/wms/package/batchPrintingLableForYT`, data }) +} // 获取标签信息 export const getPrintingLableId = async (data: any) => { return await request.put({ url: `/wms/package/getLablesByPackingNumber`, data }) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 22bec7b92..b7106fc7b 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -941,7 +941,15 @@ const labelPrint = async (row) => { window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&request_number=' + row.number) } if (itemType1) { - window.open(src.value + '&request_number=' + row.number) + // window.open(src.value + '&request_number=' + row.number) + PackageApi.batchPrintingLableForYT(row.number).then(res => { + console.log(res) + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) } } }) From de273995c2b341a1d971351ffe2698e88ec0a5c8 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 2 Dec 2024 10:53:24 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=B2=A1=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E7=82=B9=E5=87=BB=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA=E6=B2=A1?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=B2=A1=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E4=B9=9F=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=82=B9=E5=87=BB=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=20=20YT-1431?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain/index.vue | 781 ++++++++++-------- 1 file changed, 453 insertions(+), 328 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index b7106fc7b..893f27bb4 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -1,23 +1,31 @@