几个bug

public/static/plugins/ueditor/ueditor.all.min.js

@@ -17972,8 +17972,9 @@ UE.plugins['video'] = function (){
             tmpCell.rowSpan = tmpCell.colSpan = 1;
         }
         //去掉宽高
+        /* @ 20221223 dragondean
         !keepPro && domUtils.removeAttributes(tmpCell,'width height');
-        !keepPro && domUtils.removeAttributes(tmpCell,'style');
+        !keepPro && domUtils.removeAttributes(tmpCell,'style'); */
 
         tmpCell.style.borderLeftStyle = "";
         tmpCell.style.borderTopStyle = "";
@@ -18232,12 +18233,13 @@ UE.plugins['video'] = function (){
                 };
             }
             //给第一行设置firstRow的样式名称,在排序图标的样式上使用到
+            /* @ 20221223 dragondean
             if(!domUtils.hasClass(this.table.rows[0], "firstRow")) {
-                domUtils.addClass(this.table.rows[0], "firstRow");
+                domUtils.addClass(this.table.rows[0], "firstRow11111");
                 for(var i = 1; i< this.table.rows.length; i++) {
-                    domUtils.removeClasses(this.table.rows[i], "firstRow");
-                }
+                    domUtils.removeClasses(this.table.rows[i], "firstRow22222");
                 }
+            } */
         },
         /**
          * 获取单元格的索引信息

src/components/bpmnProcessDesigner/package/theme/process-designer.scss

@@ -140,7 +140,7 @@
     }
   }
 }
-pre {
+.my-process-designer pre {
   margin: 0;
   height: 100%;
   overflow: hidden;

src/views/ecw/order/components/LandingBillDetail.vue

@@ -22,8 +22,8 @@
         </el-descriptions>
         <el-button type="primary" @click="ShowLandingBill=true">查看提单</el-button>
 
-        <el-dialog title="查看提单" :visible.sync="ShowLandingBill">
-            <div style="text-align:center; width: 600px; margin: auto" v-html="billContent" />
+        <el-dialog title="查看提单" :visible.sync="ShowLandingBill" width="1000px">
+            <div style="text-align:center; width: 960px; margin: auto" v-html="billContent" />
         </el-dialog>
     </div>
 </template>

src/views/ecw/order/components/UpdateDetail.vue

@@ -22,7 +22,22 @@
             <el-descriptions-item :label="$t('申请理由')" :span="4">
                 <div>
                     <div v-for="(item, index) in order.applyInfoList" :key="index">
-                    {{index+1}}、 {{item.name}} {{$t('从旧的【{orgValue}】改成新的【{newValue}】', {orgValue: item.orgValue, newValue: item.newValue })}}
+                    {{index+1}}、 {{item.name}} 
+                        <template v-if="item.type != 1">{{$t('从旧的【{orgValue}】改成新的【{newValue}】', {orgValue: item.orgValue, newValue: item.newValue })}}</template>
+                        <div v-else class="pl-30">
+                            <div>
+                                {{$t('旧值')}}：<div v-if="!item.orgExternalWarehouse" class="pl-30">{{$t('无')}}</div>
+                            </div>
+                            <div v-for="it in item.orgExternalWarehouse" class="pl-30">
+                                {{$t('时间')}}：{{it.estLoadingTime}}，{{$t('地址')}}：{{it.loadingAddress}}
+                            </div>
+                            <div>
+                                {{$t('新值')}}：<template v-if="!item.newExternalWarehouse">{{$t('无')}}</template>
+                            </div>
+                            <div v-for="it in item.newExternalWarehouse" class="pl-30">
+                                {{$t('时间')}}：{{it.estLoadingTime}}，{{$t('地址')}}：{{it.loadingAddress}}
+                            </div>
+                        </div>
                     </div>
                 </div>
             </el-descriptions-item>

src/views/ecw/order/edit.vue

@@ -326,7 +326,7 @@
                                 <el-date-picker v-model="item.estLoadingTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker>
                             </el-form-item>
                         </div>
-                        <div class="w-300">
+                        <div class="w-500">
                             <el-form-item :label="$t('装货地址')"
                             :prop="'externalWarehouseDtoList.' + index + '.loadingAddress'"
                             :rules="{