From 4c7d7472142f9a8e4306910b8fd72200f3c66d1a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 29 十一月 2022 09:40:17 +0800
Subject: [PATCH] 1.存货档案控制默认工艺路线为必填
---
src/views/zzmx/chda.vue | 7 +------
src/views/scgl/sckbg.vue | 20 ++++++++++----------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 42f77f3..8b06dd7 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -870,7 +870,7 @@
:disabled="$store.state.app.buttonIsDisabled"
type="primary"
@click="dialogVisibleConfirm"
- >鎻愪氦/鎵撳嵃</el-button>
+ >鎻愪氦</el-button>
<el-button
v-if="dialogTitle==='澶栧崗鍙戞枡'"
:loading="$store.state.app.buttonIsDisabled"
@@ -884,7 +884,7 @@
:disabled="$store.state.app.buttonIsDisabled"
type="primary"
@click="dialogVisibleConfirm"
- >鏀舵枡/鎵撳嵃</el-button>
+ >鏀舵枡</el-button>
</div>
</span>
</el-dialog>
@@ -1998,10 +1998,10 @@
if (res.code === '200') {
this.dialogVisible = false
this.$message.success('鏀舵枡鎴愬姛锛�')
- if (this.dialogForm.nextstepcode === '') {
- this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.inuser).username)
- this.dialogVisible2 = true
- }
+ // if (this.dialogForm.nextstepcode === '') {
+ // this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.inuser).username)
+ // this.dialogVisible2 = true
+ // }
this.tabClick()
this.$store.state.app.buttonIsDisabled = false
} else {
@@ -2076,10 +2076,10 @@
if (res.code === '200') {
this.dialogVisible = false
this.$message.success('鎶ュ伐鎴愬姛锛�')
- if (this.dialogForm.nextstepcode === '') {
- this.ZZprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.operation).username)
- this.dialogVisible2 = true
- }
+ // if (this.dialogForm.nextstepcode === '') {
+ // this.ZZprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.operation).username)
+ // this.dialogVisible2 = true
+ // }
this.tabClick()
this.$store.state.app.buttonIsDisabled = false
} else {
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 1916029..5966c89 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -958,10 +958,6 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- if (this.defaultroute_codeArr.length > 0 && this.defaultroute_code === '') {
- return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
- }
-
this.$refs.dialogForm.validate(valid => {
if (valid) {
this.$store.state.app.buttonIsDisabled = true
@@ -1071,8 +1067,7 @@
},
// 纭畾
async routeDialogVisibleConfirm() {
- const temp = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
- if (this.defaultroute_code === '' && temp.length > 0) {
+ if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
}
--
Gitblit v1.9.3