Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/batchMarkup.vue

@@ -69,7 +69,7 @@
         <div class="document-status" v-if="sectionObj">
           <span>{{$t('单证状态')}}：</span>
           <template v-for="(item, index) in getDocStatus(sectionObj.sectionOrderList)">
-            <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item" :key="index" />
+            <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item" :key="index" class="document" />
           </template>
         </div>
       </div>
@@ -391,5 +391,7 @@ export default {
 </script>
 
 <style scoped>
-
+.document-status .document ~ .document:before{
+  content: '，';
+}
 </style>

src/views/ecw/box/shippingAir/nodePage/preinstall.vue

@@ -114,19 +114,19 @@
               <p>{{$t('重量')}}：</p>
               <p>{{preList.remainWeight || 0}}kg</p>
             </div-->
-            <div class="table-button">
+            <div v-if="false" class="table-button">
               <el-button type="success" size="small" @click="addPart" :disabled="isAudit">{{$t('增加')}}</el-button>
             </div>
           </el-row>
           <el-scrollbar style="height:calc(100% - 43px)">
             <el-row v-for="(part, index) in preList.sectionGoodList" :key="index" class="pre-part">
               <el-row class="preinstall-title">
-                <div class="pre-part-info">
+                <div v-if="false" class="pre-part-info">
                   <p>{{$t('第{index}部分', {index: index+1})}}</p>
                   <p>{{getTotlContent(part.secStatistics)}}</p>
                 </div>
                 <div class="table-button">
-                  <el-button type="danger" size="small" @click="deletePart(part)" :disabled="isAudit">{{$t('删除部分')}}</el-button>
+                  <el-button v-if="false" type="danger" size="small" @click="deletePart(part)" :disabled="isAudit">{{$t('删除部分')}}</el-button>
                   <el-button type="danger" size="small" @click="deleteOrder('selected', part)" :disabled="isAudit">{{$t('删除订单')}}</el-button>
                   <el-button type="primary" size="small" @click="foldTable(index, part)">{{part.fold ? $t('展开') : $t('收起')}}</el-button>
                 </div>

src/views/ecw/box/shippingAir/seaProcess.vue

@@ -202,7 +202,7 @@ export default {
             this.$set(this.dialogConfig, "title", this.$t("分拣反审"));
           } else {
             this.$set(this.dialogConfig, "fullscreen", true);
-            this.$set(this.dialogConfig, "title", this.$t("空运-排单"));
+            this.$set(this.dialogConfig, "title", this.$t("空运-分拣"));
           }
         // 装柜
         case "cabinet":

src/views/ecw/order/pending.vue

@@ -104,6 +104,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('处理人')" align="center" prop="userName" />
+        <el-table-column :label="$t('处理备注')" align="center" prop="handlerRemark" />
         <el-table-column :label="$t('创建时间')" align="center">
           <template slot-scope="scope">
              <span>{{parseTime(scope.row.createTime)}}</span>
@@ -173,7 +174,7 @@
             <el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
-            <el-button v-else-if="scope.row.orderExceptionType=='channel_packaging_overweight_exception'" v-hasPermi="['ecw:exception:channelPackagingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>   
+            <el-button v-else-if="scope.row.orderExceptionType=='channel_packaging_overweight_exception'" v-hasPermi="['ecw:exception:channelPackagingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
           </template>
         </el-table-column>
       </el-table>