优化提单模板编辑器兼容性等

public/static/plugins/ueditor/ueditor.config.js

@@ -403,7 +403,7 @@
 			header: [],
 			hr:     [],
 			i:      ['class', 'style'],
-			img:    ['src', 'alt', 'title', 'width', 'height', 'id', '_src', 'loadingclass', 'class', 'data-latex'],
+			img:    ['src', 'alt', 'title', 'width', 'height', 'id', '_src', 'loadingclass', 'class', 'data-latex', 'style'],
 			ins:    ['datetime'],
 			li:     ['class', 'style'],
 			mark:   [],

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

@@ -141,11 +141,11 @@
   }
 }
 pre {
-  margin: 0;
+  /* margin: 0;
   height: 100%;
   overflow: hidden;
   max-height: calc(80vh - 32px);
-  overflow-y: auto;
+  overflow-y: auto; */
 }
 .hljs {
   word-break: break-word;

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

@@ -34,19 +34,21 @@
                 </div>
             </el-descriptions-item>
 
-            <!-- 管理折扣 -->
-            <!-- <el-descriptions-item :label="$t('申请理由')" v-if="type == 2" :span="4">
-                <div class="bold">
-                    <div>
-                        {{$t('原运费')}}：{{detail.orgFreight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}，
-                        {{$t('新运费')}}：{{detail.freight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}
-                    </div>
-                    <div>
-                        {{$t('原清关费')}}：{{detail.orgClearanceFreight}} {{ currencyMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}，
-                        {{$t('新清关费')}}：{{detail.clearanceFreight}} {{ currencyMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}
+            <!-- 重泡货 -->
+            <el-descriptions-item :label="$t('申请理由')" v-if="type == 4 || type ==5" :span="4">
+                <div class="bold" v-if="type == 4">
+                    {{$t('重货优惠标准申请为:{new}kg/cbm,原重货标准:{old}kg/cbm', {
+                        new: detail.wVolume,
+                        old: detail.orgWVolume
+                    })}}
                 </div>
+                <div class="bold" v-if="type == 5">
+                    {{$t('泡货优惠标准申请为:{new}kg/cbm,原泡货标准:{old}kg/cbm', {
+                        new: detail.vWeight,
+                        old: detail.orgVWeight
+                    })}}
                 </div>
-            </el-descriptions-item> -->
+            </el-descriptions-item>
 
             <!-- 佣金设置 -->
             <el-descriptions-item :label="$t('申请理由')" v-if="type == 3" :span="4">

src/views/ecw/order/special/Preferential.vue

@@ -8,7 +8,7 @@
           {{form.orgWVolume}} kg/cbm
         </el-form-item>
         <el-form-item :label="$t('现重货标准')" style="width: 400px" prop="clearanceFreight">
-          <el-input v-model="form.WVolume" type="number" class="w-100" /> kg/cbm
+          <el-input v-model="form.wvolume" type="number" class="w-100" /> kg/cbm
         </el-form-item>
       </template>
       <template v-else>
@@ -16,13 +16,13 @@
           {{form.orgWVolume}} kg
         </el-form-item>
         <el-form-item :label="$t('现泡货标准')" style="width: 400px" prop="clearanceFreight">
-          <el-input v-model="form.VWeight" type="number" class="w-100" /> kg
+          <el-input v-model="form.vweight" type="number" class="w-100" /> kg
         </el-form-item>
       </template>
     </el-form>
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="special_apply" v-model="ccIdArr" />
-    <div v-if="!form.applyStatus">
+    <div v-if="form.applyStatus != 1">
       <el-button type="primary" @click="handleSubmit">提交</el-button>
     </div>
     <div v-else>