diff --git a/src/pages/fg/coms/comNoReceiptPopup.vue b/src/pages/fg/coms/comNoReceiptPopup.vue index 7014a8da..84bb8a81 100644 --- a/src/pages/fg/coms/comNoReceiptPopup.vue +++ b/src/pages/fg/coms/comNoReceiptPopup.vue @@ -112,7 +112,7 @@ - + 创建检验申请 @@ -156,6 +156,10 @@ import { calc } from '@/common/calc.js'; + + import { + getSwitchInfoByCode + } from '@/common/basic.js'; import uom from '@/mycomponents/qty/uom.vue' import packQty from '@/mycomponents/qty/packQty.vue' @@ -200,7 +204,8 @@ workshop: "", bomVersion: "", putAwayRequestSwitch:true, - putAwayInspectSwitch:true + putAwayInspectSwitch:true, + EnableQms:true } }, props: { @@ -213,6 +218,9 @@ default: [] }, }, + mounted() { + this.EnableQms = getSwitchInfoByCode('EnableQms') + }, methods: { openRequestPopup() { @@ -291,7 +299,9 @@ this.showErrorMessage("请选择包装规格") return } - + if (!this.EnableQms) { + this.putAwayInspectSwitch = false + } this.callback(); }, diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue index 4f7bf20a..dff4d848 100644 --- a/src/pages/fg/coms/comReceiptPopup.vue +++ b/src/pages/fg/coms/comReceiptPopup.vue @@ -107,7 +107,7 @@ - + 创建检验申请 @@ -151,7 +151,9 @@ import { calc } from '@/common/calc.js'; - +import { + getSwitchInfoByCode + } from '@/common/basic.js'; import uom from '@/mycomponents/qty/uom.vue' import packQty from '@/mycomponents/qty/packQty.vue' import balanceStatus from '@/mycomponents/status/balanceStatus.vue' @@ -193,7 +195,8 @@ fgLocationCode: "", rawLocationCode: "", putAwayRequestSwitch:true, - putAwayInspectSwitch:true + putAwayInspectSwitch:true, + EnableQms:true } }, props: { @@ -206,6 +209,10 @@ default: [] }, }, + mounted() { + this.EnableQms = getSwitchInfoByCode('EnableQms') + console.log(777,this.EnableQms) + }, methods: { openRequestPopup() { this.initData(); @@ -279,7 +286,9 @@ this.showErrorMessage("请选择包装规格") return } - + if (!this.EnableQms) { + this.putAwayInspectSwitch = false + } this.callback(); }, diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue index a112d5c4..44b65e22 100644 --- a/src/pages/fg/receiptByPlan.vue +++ b/src/pages/fg/receiptByPlan.vue @@ -130,9 +130,7 @@ import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue" import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue" import light from '@/mycomponents/balance/light.vue' - import { - Exception - } from 'sass'; + import { nextTick } from 'vue'; diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue index d4625d95..3fd09b51 100644 --- a/src/pages/fg/receiptNoPlan.vue +++ b/src/pages/fg/receiptNoPlan.vue @@ -124,9 +124,7 @@ import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue" import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue" import light from '@/mycomponents/balance/light.vue' - import { - Exception - } from 'sass'; + export default { components: { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 0fb9ea53..bde4f960 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -388,7 +388,7 @@ console.log("包装规格获取失败", res) }) - var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; + var switchCode="EnableQms,FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; getSwitchByCode(switchCode).then(res=>{ uni.setStorageSync("switch", res.data)