From 1d61ba76588d83ae43edc22c16c96fc25b4684be Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 29 十一月 2022 09:37:21 +0800
Subject: [PATCH] 1.存货档案控制默认工艺路线为必填
---
src/views/zzmx/chda.vue | 7 ---
src/views/scgl/zdpc.vue | 4 +-
src/views/scgl/sckbg.vue | 18 ++++++++-
src/views/gantt_back/gantt_back.vue | 12 +++---
src/router/index.js | 32 ++++++++--------
5 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index b1d19c1..755f4cf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -101,22 +101,22 @@
// { path: '*', redirect: '/404', hidden: true }
]
export const asyncRoutes = [
- // {
- // path: '/gtt',
- // component: Layout,
- // redirect: '/gtt/back',
- // name: '鍩虹璁剧疆',
- // code: '1001',
- // meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
- // alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
- // children: [{
- // path: 'back',
- // name: 'YYQDCancel',
- // code: '1011',
- // component: () => import('@/views/gantt_back/gantt_back'),
- // meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
- // }]
- // },
+ {
+ path: '/gtt',
+ component: Layout,
+ redirect: '/gtt/back',
+ name: '鍩虹璁剧疆',
+ code: '1001',
+ meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
+ alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ children: [{
+ path: 'back',
+ name: 'YYQDCancel',
+ code: '1011',
+ component: () => import('@/views/gantt_back/gantt_back'),
+ meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
+ }]
+ },
{
path: '/jcsz',
component: Layout,
diff --git a/src/views/gantt_back/gantt_back.vue b/src/views/gantt_back/gantt_back.vue
index 203fa8f..cc905fb 100644
--- a/src/views/gantt_back/gantt_back.vue
+++ b/src/views/gantt_back/gantt_back.vue
@@ -276,7 +276,7 @@
},
'rows': [
{
- 'YearDate': '2022-09-27',
+ 'YearDate': '2022-11-29',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -292,7 +292,7 @@
]
},
{
- 'YearDate': '2022-09-28',
+ 'YearDate': '2022-11-30',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -308,7 +308,7 @@
]
},
{
- 'YearDate': '2022-09-29',
+ 'YearDate': '2022-12-01',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -324,7 +324,7 @@
]
},
{
- 'YearDate': '2022-09-30',
+ 'YearDate': '2022-12-02',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -340,7 +340,7 @@
]
},
{
- 'YearDate': '2022-10-01',
+ 'YearDate': '2022-12-03',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -356,7 +356,7 @@
]
},
{
- 'YearDate': '2022-10-02',
+ 'YearDate': '2022-12-04',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 028a069..0bed35d 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -865,12 +865,19 @@
@click="dialogVisibleConfirm"
>寮� 宸�</el-button>
<el-button
- v-if="dialogTitle==='鑷埗鎶ュ伐'"
+ v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.nextstepname===''"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
type="primary"
@click="dialogVisibleConfirm"
>鎻愪氦/鎵撳嵃</el-button>
+ <el-button
+ v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.nextstepname!==''"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鎻愪氦</el-button>
<el-button
v-if="dialogTitle==='澶栧崗鍙戞枡'"
:loading="$store.state.app.buttonIsDisabled"
@@ -879,12 +886,19 @@
@click="dialogVisibleConfirm"
>鍙戞枡</el-button>
<el-button
- v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname===''"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
type="primary"
@click="dialogVisibleConfirm"
>鏀舵枡/鎵撳嵃</el-button>
+ <el-button
+ v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname!==''"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鏀舵枡</el-button>
</div>
</span>
</el-dialog>
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index dba7647..e33375c 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -200,7 +200,7 @@
/>
</el-form-item>
<el-form-item label="鎺掔▼鏂瑰紡" style=" display: flex;">
- <el-select v-model="formBottom.types" style="width:120px" @change="changeTypes">
+ <el-select v-model="formBottom.types" :disabled="radioSelectedId===''" style="width:120px" @change="changeTypes">
<el-option value="N" label="璁惧浼樺厛" />
<el-option value="Y" label="鏃堕棿浼樺厛" />
</el-select>
@@ -1042,7 +1042,7 @@
}
this.nitialize()// 鎵嬪姩杩囨护鎵�鏈夎澶囧凡鎺掔▼
-
+ console.log(this.facility_data, 67890)
if (this.bm_data != '' && this.formBottom.types == 'N') { // 璁惧浼樺厛
this.fun_time()
this.change_num(this.bm_data)
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