From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manufacturingorder/customerorder.vue | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/views/plan/manufacturingorder/customerorder.vue b/src/views/plan/manufacturingorder/customerorder.vue
index 18f47fd..b6bf324 100644
--- a/src/views/plan/manufacturingorder/customerorder.vue
+++ b/src/views/plan/manufacturingorder/customerorder.vue
@@ -207,7 +207,7 @@
></el-input
></el-form-item>
</el-row>
- </el-card>
+ <!-- </el-card> -->
</el-tab-pane>
<el-tab-pane label="闄勪欢" type="card" name="闄勪欢">
<div style="display: flex;justify-content:flex-end;">
@@ -321,16 +321,6 @@
</el-tab-pane>
</el-tabs>
</el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible = false">鍙栨秷</el-button>
- <el-button
- type="primary"
- :disabled="buttonDisable"
- v-thinclick="`dataFormSubmit`"
- v-if="editable"
- >纭畾</el-button
- >
- </span>
</el-tab-pane>
</el-tabs>
</template>
@@ -369,6 +359,8 @@
fileList: [],
title: '',
orderParamList: [],
+ progrecessFileLoading: false,
+ editable: true,
isFullScreen: false,
visible: false,
buttonDisable: false,
@@ -572,7 +564,6 @@
//闄勪欢鐨勬煡璇�
downs(label, e){
if(this.activeFileName=='闄勪欢'){
- console.log('1');
getProcessConfigFile({
orderNumber: this.dataForm.contractNo,
lineNumber: this.dataForm.customerNo
--
Gitblit v1.9.3