Merge branch 'dev' into pre-production

src/views/waybill/CreateZeroOrder.vue

@@ -487,7 +487,7 @@
           :key="item"
         >
           <!-- 加减按钮 -->
-          <div style="width: 55px; flex: none" class="flex-c-c" v-if="query.zeroEditStatus === 1">
+          <div style="width: 55px; flex: none" class="flex-c-c" v-if="query.zeroEditStatus !== 0">
             <el-button
               v-if="index === 0"
               @click="handleAdd"
@@ -637,7 +637,7 @@
           <div
             style="width: 55px; flex: none"
             class="flex-c-c"
-            v-if="query.zeroEditStatus === 1"
+            v-if="query.zeroEditStatus !== 0"
           ></div>
           <div style="width: 230px; flex: none">合计</div>
           <!-- 货物名称 -->