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

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -130,7 +130,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].volume }}</span>
-                      <el-input v-else v-model.number="tableData[$index].volume" placeholder=""></el-input>
+                      <el-input v-else v-model="tableData[$index].volume" placeholder="" type="number"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -141,7 +141,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].weight }}</span>
-                      <el-input v-else v-model.number="tableData[$index].weight" placeholder=""></el-input>
+                      <el-input v-else v-model="tableData[$index].weight" placeholder="" type="number"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>

src/views/ecw/order/warehousing/index.vue

@@ -343,7 +343,7 @@ export default {
         if (r.code === 0) {
           this.escapeBol = false;
           this.finishVisible = false
-          const message = r.data ? '该订单已成功入仓，是否打印？' : "<h3>货物已入仓，存在异常</h3>该订单已成功入仓，是否打印？"
+          const message = !r.data ? '该订单已成功入仓，是否打印？' : "<h3>货物已入仓，存在异常</h3>该订单已成功入仓，是否打印？"
           this.$confirm(
             message,
             '货物已入仓',