From bcae9a345264fcc94081497023cf1034c4491934 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 16 Oct 2024 10:40:26 +0800
Subject: [PATCH] =?UTF-8?q?YT-408pda=E6=8C=89=E8=AE=A1=E5=88=92=E6=8A=A5?=
=?UTF-8?q?=E5=B7=A5=E3=80=81=E6=97=A0=E8=AE=A1=E5=88=92=E6=8A=A5=E5=B7=A5?=
=?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=88=9B=E5=BB=BA=E6=A3=80=E9=AA=8C?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/fg/coms/comNoReceiptPopup.vue | 16 +++++++++++++---
src/pages/fg/coms/comReceiptPopup.vue | 17 +++++++++++++----
src/pages/fg/receiptByPlan.vue | 4 +---
src/pages/fg/receiptNoPlan.vue | 4 +---
src/pages/index/index.vue | 2 +-
5 files changed, 29 insertions(+), 14 deletions(-)
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)