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

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>

src/views/ecw/warehouse/index.vue

@@ -319,11 +319,6 @@
               <el-radio :label="0">不可见</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
-           <el-select v-model="lineform.makeBillNode">
-             <el-option v-show="item.value !== '1'" v-for="(item, index) in getDictDatas(DICT_TYPE.AIR_SHIPMENT_PROCESS)" :label="$l(item, 'label')" :value="item.value"></el-option>
-           </el-select>
-          </el-form-item>
           <el-form-item :label="$t('保费币种')">
             <el-select @change="modifyAmountUnit" v-model="lineform.currencyUnit">
               <el-option v-for="(item) in currencyList" :disabled="item.status === 1" :label="$l(item, 'title')" :value="item.id"></el-option>