From adb49a3e193b7b9cc71805a82d1d6afb8a4c339b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 27 十月 2023 09:44:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/technology/document/document-form.vue | 11 +++++++----
src/views/product/workbench/index.vue | 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index 7faa523..fcb4683 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -49,6 +49,7 @@
<el-image src="/img/workbench/icon_bg.png"></el-image>
<span class="item-name">鎶ュ伐</span>
</div>
+ <!-- 宸ユ -->
<!-- <div
v-show="isShowStepBusiness"
:class="['wb-header-menu-item', stepShow ? 'item-show' : '']"
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 87668af..09ef014 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -633,7 +633,7 @@
<img width="100%" :src="dialogStructureImageUrl" alt="" />
</el-dialog>
</el-card>
- <el-card class="document-flow">
+ <!-- <el-card class="document-flow">
<div slot="header">
<span>娴佺▼鍥�</span>
</div>
@@ -666,7 +666,7 @@
</el-select>
<div id="demo" style="margin:5px auto;"></div>
</div>
- <!--<el-upload
+ <el-upload
class="upload-demo"
action="/mes/document/uploadLct"
:headers="headers"
@@ -686,11 +686,11 @@
<div slot="tip" class="el-upload__tip">
鍙兘涓婁紶jpg鍥剧墖锛屼笖涓嶈秴杩�2MB
</div>
- </el-upload>-->
+ </el-upload>
<el-dialog :visible.sync="dialogFlowVisible">
<img width="100%" :src="dialogFlowImageUrl" alt="" />
</el-dialog>
- </el-card>
+ </el-card> -->
</el-tab-pane>
</el-tabs>
</div>
@@ -2053,6 +2053,9 @@
padding: 10px 20px;
box-sizing: border-box;
}
+.el-card.is-always-shadow{
+ width: 100%;
+ }
.document-flow {
background-color: #fff;
--
Gitblit v1.9.3