From 1789ce3650a2665b5abca7a3028611190d1983df Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 十二月 2023 09:45:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manufacturingorder/customerorder.vue | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/views/plan/manufacturingorder/customerorder.vue b/src/views/plan/manufacturingorder/customerorder.vue
index 81fa5d7..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,
--
Gitblit v1.9.3