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 }}
-
- {{ getTag(row.revokeFlag).label}}
-
@@ -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)