Merge branch 'dev' into pre-production

src/utils/LodopFuncs.js

@@ -200,7 +200,7 @@ export function getLodop(oOBJECT, oEMBED) {
             }
         }
         //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
-        LODOP.SET_LICENSES("","4AE3961B0A17F2B39DCDA3787D40445D677","","");
+        LODOP.SET_LICENSES("","4AE3961B0A17F2B39DCDA3787D40445D677","61FAE433D2E6000CC9624C9B3A4E687431C","");
 
         //===============================================================================
         return LODOP;

src/views/waybill/WarehousingByTrainNumber.vue

@@ -64,7 +64,7 @@
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
             <el-text
-              v-if="Number(slotProps.scope.row.isIncoming) === 1"
+              v-if="Number(slotProps.scope.row.isIncoming) !== 0"
               @click="handlePutInStorage(slotProps.scope)"
             >
               入库