From 043e11131a46b0bb4f621b3fb6ad3bf4b85054ed Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 16 Oct 2024 13:17:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?YT-421=E3=80=81YT-421=E9=A2=84=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E3=80=81=E9=A2=84?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productreceiptJobMain/index.ts | 16 ++++++++++++++++ src/api/wms/productreceiptRequestMain/index.ts | 12 +++++++++++- .../productreceiptJobMain/index.vue | 3 ++- .../productreceiptRequestMain/index.vue | 3 ++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts index e18fece95..437d43478 100644 --- a/src/api/wms/productreceiptJobMain/index.ts +++ b/src/api/wms/productreceiptJobMain/index.ts @@ -116,6 +116,22 @@ export const exportProductreceiptJobMain = async (params) => { } } +export const exportProductreceiptJobMainPredict = async (params) => { + params.type = 'predict' + if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) + const data = {...params} + return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params }) + } +} + // 导出装配收货任务主 Excel export const exportProductreceiptJobMainAssemble = async (params) => { diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts index 58529a98f..6c28f7978 100644 --- a/src/api/wms/productreceiptRequestMain/index.ts +++ b/src/api/wms/productreceiptRequestMain/index.ts @@ -93,6 +93,16 @@ export const exportProductreceiptRequestMain = async (params) => { } } +export const exportProductreceiptRequestMainPredict = async (params) => { + params.type = 'predict' + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params }) + } +} + // 导出制品收货申请主 Excel export const exportProductreceiptRequestMainAssemble = async (params) => { params.type = 'assemble' @@ -143,4 +153,4 @@ export const handle = (id) => { // 创建标签 export const productCreateLabel = async (data: ProductreceiptRequestMainVO) => { return await request.post({ url: `/wms/productreceipt-request-main/productCreateLabel`, data }) -} \ No newline at end of file +} diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index 9f076b485..bc10aba3e 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -106,6 +106,7 @@ import { import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' +import {exportProductreceiptJobMainPredict} from "@/api/wms/productreceiptJobMain"; const { loadStart, loadDone } = usePageLoading() // 制品收货任务主 // 预生产收货任务主 @@ -352,7 +353,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params) + const data = await ProductreceiptJobMainApi.exportProductreceiptJobMainPredict(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index e78a592ce..00d1f931c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -189,6 +189,7 @@ import { formatDate } from '@/utils/formatTime' import * as WorkshopApi from '@/api/wms/workshop' import * as ConfigApi from '@/api/infra/config' import { usePageLoading } from '@/hooks/web/usePageLoading' +import {exportProductreceiptRequestMainPredict} from "@/api/wms/productreceiptRequestMain"; const { loadStart, loadDone } = usePageLoading() // 制品收货申请 // 预生产收货申请 @@ -687,7 +688,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain( + const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMainPredict( tableObject.params ) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) From 055b2f9f78e519bede1d76d971c737691205fab3 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 16 Oct 2024 13:47:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=BB=E6=8E=89q3?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnJobMain/index.vue | 4 ++-- .../customerreturnRecordMain/index.vue | 4 ++-- .../customerreturnRequestMain/index.vue | 3 ++- .../inventoryjobManage/scrap/scrapJobMain/index.vue | 4 ++-- .../scrap/scrapRecordMain/index.vue | 4 ++-- .../scrap/scrapRequestMain/index.vue | 3 ++- .../productionscrapRecordMain/index.vue | 3 ++- .../productionscrapRequestMain/index.vue | 3 ++- .../productscrap/productscrapRecordMain/index.vue | 12 ++---------- .../productscrap/productscrapRequestMain/index.vue | 5 +++-- .../purchasereturn/purchasereturnJobMain/index.vue | 3 ++- .../purchasereturnRecordMain/index.vue | 3 ++- .../purchasereturnRequestMainNew/index.vue | 6 +++--- 13 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue index a3523ca59..01b57fef7 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue @@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 客户退货任务主 defineOptions({ name: 'CustomerreturnJobMain' }) @@ -87,8 +88,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...CustomerreturnJobMain.allSchemas.tableColumns,...CustomerreturnJobDetail.allSchemas.tableMainColumns]) - -const CustomerreturnJobMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnJobMain))) +const CustomerreturnJobMainAllSchema = ref(cloneDeep(CustomerreturnJobMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue index e0802e765..db7add425 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue @@ -73,6 +73,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 客户退货记录主 defineOptions({ name: 'CustomerreturnRecordMain' }) @@ -84,8 +85,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...CustomerreturnRecordMain.allSchemas.tableColumns,...CustomerreturnRecordDetail.allSchemas.tableMainColumns]) - -const CustomerreturnRecordMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnRecordMain))) +const CustomerreturnRecordMainAllSchema = ref(cloneDeep(CustomerreturnRecordMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 799793a0b..16539e72d 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -121,6 +121,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 客户退货申请 defineOptions({ name: 'CustomerreturnRequestMain' }) @@ -133,7 +134,7 @@ const routeName = ref() const customerCode = ref() const genLabelId = ref(); //主表ID routeName.value = route.name -const CustomerreturnRequestMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnRequestMain))) +const CustomerreturnRequestMainAllSchema = ref(cloneDeep(CustomerreturnRequestMain)) const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns, ...CustomerreturnRequestDetail.allSchemas.tableMainColumns]) // 是否启用QMS开启显示q1q2q3 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue index e7e6ecf7f..6c3d5aa35 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue @@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 报废出库任务主 defineOptions({ name: 'ScrapJobMain' }) @@ -87,8 +88,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...ScrapJobMain.allSchemas.tableColumns,...ScrapJobDetail.allSchemas.tableMainColumns]) - -const ScrapJobMainAllSchema =ref(JSON.parse(JSON.stringify(ScrapJobMain))) +const ScrapJobMainAllSchema = ref(cloneDeep(ScrapJobMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue index ddfa35d62..c76298be3 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue @@ -71,6 +71,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 报废出库记录主 defineOptions({ name: 'ScrapRecordMain' }) @@ -82,8 +83,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...ScrapRecordMain.allSchemas.tableColumns,...ScrapRecordDetail.allSchemas.tableMainColumns]) - -const ScrapRecordMainAllSchema =ref(JSON.parse(JSON.stringify(ScrapRecordMain))) +const ScrapRecordMainAllSchema = ref(cloneDeep(ScrapRecordMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index fbc71c901..15ebf50c0 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -122,6 +122,7 @@ import * as StdcostpriceApi from '@/api/wms/stdcostprice' import { getSwitchByCode } from '@/api/wms/switch' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 报废出库申请 defineOptions({ name: 'ScrapRequestMain' }) @@ -136,7 +137,7 @@ const tableColumns = ref([ ...ScrapRequestMain.allSchemas.tableColumns, ...ScrapRequestDetail.allSchemas.tableMainColumns ]) -const ScrapRequestMainAllSchema =ref(JSON.parse(JSON.stringify(ScrapRequestMain))) +const ScrapRequestMainAllSchema = ref(cloneDeep(ScrapRequestMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue index 02f63edee..7f36eb2e2 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue @@ -78,6 +78,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 生产退料记录主 defineOptions({ name: 'ProductionscrapRecordMain' }) @@ -89,7 +90,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...ProductionscrapRecordMain.allSchemas.tableColumns,...ProductionscrapRecordDetail.allSchemas.tableMainColumns]) -const ProductionscrapRecordMainAllSchema =ref(JSON.parse(JSON.stringify(ProductionscrapRecordMain))) +const ProductionscrapRecordMainAllSchema = ref(cloneDeep(ProductionscrapRecordMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 5889d6aa2..b351ccb11 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -127,6 +127,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 线标原料报废申请 defineOptions({ name: 'ProductionscrapRequestMain' }) @@ -138,7 +139,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...ProductionscrapRequestMain.allSchemas.tableColumns,...ProductionscrapRequestDetail.allSchemas.tableMainColumns]) -const ProductionscrapRequestMainAllSchema =ref(JSON.parse(JSON.stringify(ProductionscrapRequestMain))) +const ProductionscrapRequestMainAllSchema = ref(cloneDeep(ProductionscrapRequestMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue index 00349f9e1..e309491dd 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue @@ -33,9 +33,6 @@ {{ row.number }} - @@ -101,8 +98,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' -import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -const dictOptions= ref(getStrDictOptions(DICT_TYPE.TRUE_FALSE)) +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 制品报废记录主 defineOptions({ name: 'ProductscrapRecordMain' }) @@ -114,7 +110,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...ProductscrapRecordMain.allSchemas.tableColumns,...ProductscrapRecordDetail.allSchemas.tableMainColumns]) -const ProductscrapRecordMainAllSchema =ref(JSON.parse(JSON.stringify(ProductscrapRecordMain))) +const ProductscrapRecordMainAllSchema = ref(cloneDeep(ProductscrapRecordMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) @@ -136,10 +132,6 @@ const getSwitchByCode1 =async () => { } getSwitchByCode1() -const getTag = (value) => { - return dictOptions.value.find(item=>item.value === value) -} - // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ label: 'Bom', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 178fd96fe..ff47b78c7 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -145,6 +145,7 @@ import * as BalanceApi from "@/api/wms/balance"; import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 制品报废申请 defineOptions({ name: 'ProductscrapRequestMain' }) @@ -156,7 +157,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...ProductscrapRequestMain.allSchemas.tableColumns,...ProductscrapRequestDetail.allSchemas.tableMainColumns]) -const ProductscrapRequestMainAllSchema =ref(JSON.parse(JSON.stringify(ProductscrapRequestMain))) +const ProductscrapRequestMainAllSchema = ref(cloneDeep(ProductscrapRequestMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) @@ -166,7 +167,7 @@ const getSwitchByCode1 =async () => { if (EnableQms.value) { ProductscrapRequestMain.allSchemas = ProductscrapRequestMainAllSchema.value.allSchemas } else { - ProductscrapRequestMain.allSchemas.formSchema = ProductscrapRequestMainAllSchema.value.allSchemas.formSchema.filter(item =>item.field != 'q3Number') + ProductscrapRequestMain.allSchemas.formSchema = ProductscrapRequestMainAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q3Number') ProductscrapRequestMain.allSchemas.tableColumns = ProductscrapRequestMainAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q3Number') ProductscrapRequestMain.allSchemas.tableFormColumns = ProductscrapRequestMainAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q3Number') ProductscrapRequestMain.allSchemas.tableMainColumns = ProductscrapRequestMainAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q3Number') diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index a91864288..eb6f0d841 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 采购退货任务主 defineOptions({ name: 'PurchasereturnJobMain' }) @@ -87,7 +88,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...PurchasereturnJobMain.allSchemas.tableColumns,...PurchasereturnJobDetail.allSchemas.tableColumns]) -const PurchasereturnJobMainAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnJobMain))) +const PurchasereturnJobMainAllSchema = ref(cloneDeep(PurchasereturnJobMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 9ab16f26e..10e18ee6e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -73,6 +73,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 采购退货记录主 defineOptions({ name: 'PurchasereturnRecordMain' }) @@ -84,7 +85,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...PurchasereturnRecordMain.allSchemas.tableColumns,...PurchasereturnRecordDetail.allSchemas.tableMainColumns]) -const PurchasereturnRecordMainAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnRecordMain))) +const PurchasereturnRecordMainAllSchema = ref(cloneDeep(PurchasereturnRecordMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index 87a66d973..8ce35bf16 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -187,6 +187,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import { getSwitchByCode } from '@/api/wms/switch' +import { cloneDeep } from 'lodash-es' const { loadStart, loadDone } = usePageLoading() // 采购退货申请 defineOptions({ name: 'PurchasereturnRequestMainNew' }) @@ -204,9 +205,8 @@ const tableColumns = ref([ const isShowButton = ref(true) - -const PurchasereturnRequestMainNewAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnRequestMainNew))) -const PurchasereturnRequestMainAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnRequestMain))) +const PurchasereturnRequestMainNewAllSchema = ref(cloneDeep(PurchasereturnRequestMainNew)) +const PurchasereturnRequestMainAllSchema = ref(cloneDeep(PurchasereturnRequestMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) From d61f4836eeb3414ca9f4184d40cb2cefe9f5f5c3 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 16 Oct 2024 14:25:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?YT-430=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=87=E6=8D=A2=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=B8=85=E7=A9=BA=E8=BF=94=E4=BF=AE=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E3=80=81=E6=98=8E=E7=BB=86=EF=BC=9B=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=BF=94=E4=BF=AE=E7=94=9F=E4=BA=A7=E7=BA=BF=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productrepair/productrepairRequestMain/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index dd3aa3841..14c93554f 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -284,6 +284,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} + if(formField == 'workshopCode'){ + setV['productionLineCode'] = '' + tableData.value = [] + } + if(formField == 'productionLineCode'){ + tableData.value = [] + } setV[formField] = val[0][searchField] formRef.setValues(setV) } From edf9d86a5670e9ef59812a5ca3b419a7e4ad8f46 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 16 Oct 2024 14:52:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?YT-429=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E3=80=81=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=EF=BC=8C=E8=BD=A6=E9=97=B4=E4=BB=A3=E7=A0=81=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantle/productdismantleRequestMain/index.vue | 3 +++ .../productscrap/productscrapRequestMain/index.vue | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index 284817860..2ef30eb73 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -300,6 +300,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} + if(formField == 'workshopCode'){ + tableData.value = [] + } setV[formField] = val[0][searchField] formRef.setValues(setV) } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index ff47b78c7..d84487ae8 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -542,6 +542,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['costCenterType'] = val[0]['costcentreType'] }else if(formField == 'productionLineCode'){ tableData.value = [] + } else if(formField == 'workshopCode'){ + tableData.value = [] } formRef.setValues(setV) }