Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

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

@@ -19985,7 +19985,7 @@ UE.plugins['table'] = function () {
         "averagedistributerow":1
     };
     me.ready(function () {
-        utils.cssRule('table',
+        /* utils.cssRule('table',
             //选中的td上的样式
             '.selectTdClass{background-color:#edf5fa !important}' +
                 'table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}' +
@@ -19996,7 +19996,7 @@ UE.plugins['table'] = function () {
                 'th{border-top:1px solid #BBB;background-color:#F7F7F7;}' +
                 'table tr.firstRow th{border-top-width:2px;}' +
                 '.ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }' +
-                'td p{margin:0;padding:0;}', me.document);
+                'td p{margin:0;padding:0;}', me.document); */
 
         var tableCopyList, isFullCol, isFullRow;
         //注册del/backspace事件

src/views/ecw/box/indexSea.vue

@@ -124,7 +124,7 @@
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
-              <el-dropdown-item :disabled="scope.row.ldStatus<42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus<46" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">

src/views/ecw/box/indexSeaAir.vue

@@ -226,7 +226,7 @@
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
-              <el-dropdown-item :disabled="scope.row.ldStatus<42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus<46" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">

src/views/ecw/box/ladingBill/index.vue

@@ -64,6 +64,7 @@
             </template>
             <template v-if="scope.row.status === 3">
               {{$t('审核拒绝')}}
+              <el-button type="text" size="small" @click="handleCommand('queryBill',scope.row)">{{$t('重新制作')}}</el-button>
             </template>
           </template>
         </el-table-column>

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -24,7 +24,7 @@
       </div>
     </el-row>
 
-    <el-dialog :title="dialogCfg.title" :visible.sync="visible" width="850px" append-to-body class="shippingSea-dialog">
+    <el-dialog :title="dialogCfg.title" :visible.sync="visible" width="1000px" append-to-body class="shippingSea-dialog">
       <previewBill v-if="visible" :contentHtml="billContent" :currRow="currRow" :type="dialogCfg.type" />
     </el-dialog>
   </el-row>