Browse Source

更新优化打包

lex 2 years ago
parent
commit
e994ee757e

+ 10 - 9
src/views/process/list/handle.vue

@@ -203,8 +203,8 @@
             <el-form-item>
               <Upload :fileUrl="fileUrl" ref="upload" />
             </el-form-item>
-            <div class="text item" style="text-align: center; margin-top: 18px">
-              <el-button round @click="handleCommit(endNodeDetail)"
+            <div class="text item" style="margin-top: 18px">
+              <el-button round type="info" @click="handleCommit(endNodeDetail)"
                 >评论</el-button
               >
               <el-button
@@ -327,7 +327,7 @@
         </div>
       </el-card> -->
 
-      <el-card class="box-card">
+      <el-card class="box-card" style="margin-top: 15px">
         <div slot="header" class="clearfix">
           <span>流程</span>
         </div>
@@ -396,9 +396,7 @@
                   {{ item.processor
                   }}{{ item.circulation ? `(${item.circulation})` : null }}
                 </p>
-                <p class="remarks" v-if="item.remarks">
-                  {{ item.remarks }}
-                </p>
+                <p class="remarks" v-if="item.remarks" v-html="dataModelFormatBr(item.remarks)"></p>
 
                 <!-- 判断是否有添加图片 -->
                 <div
@@ -1229,10 +1227,13 @@ export default {
         }
       });
     },
+    dataModelFormatBr(str) {
+      return str.replace(/\n/g, "<br />")
+    },
     formatIcon(item, index, type) {
       // 格式化ICON
-      console.log(item, index)
-      console.log(this.activeIndex)
+      // console.log(item, index)
+      // console.log(this.activeIndex)
       if(this.activeIndex >= index) {
         if(item.circulation == '转交') {
           return 'icon-transfer'
@@ -1284,8 +1285,8 @@ export default {
   padding: 8px;
   color: #323233;
   border-radius: 6px; 
+  line-height: 1.5;
 }
-
 .imgUploader {
   background: #f5f5f5;
   margin-top: 8px;

+ 2 - 4
src/views/process/list/model/upload.vue

@@ -34,11 +34,10 @@
         :limit="5"
       >
         <el-button
-          size="small"
+          size="mini"
           :loading="uploadLoading"
           icon="el-icon-picture"
           round
-          type="primary"
           >上传图片</el-button
         >
       </el-upload>
@@ -54,11 +53,10 @@
         accept="image/*, *.xlsx, *.xls,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document, *.txt, *.pdf"
       >
         <el-button
-          size="small"
+          size="mini"
           :loading="uploadFileLoading"
           icon="el-icon-document"
           round
-          type="primary"
           >上传附件</el-button
         >
       </el-upload>

File diff suppressed because it is too large
+ 0 - 0
web/index.html


File diff suppressed because it is too large
+ 0 - 0
web/static/web/css/chunk-1b9a328e.6349e596.css


File diff suppressed because it is too large
+ 0 - 0
web/static/web/js/app.cfc17742.js


File diff suppressed because it is too large
+ 0 - 0
web/static/web/js/chunk-1b9a328e.ca0d4225.js


File diff suppressed because it is too large
+ 0 - 0
web/static/web/js/chunk-ebf05266.1e7e1dab.js


Some files were not shown because too many files changed in this diff