Merge branch 'master' into sit

src/components/globalComponents/process-time-line/main.vue

@@ -21,11 +21,8 @@
         >
           {{ item.status_name }}
         </div>
-        <div
-          slot="description"
-          v-if="index + 1 !== options.length"
-          style="padding: 20px 0 0 0"
-        >
+        <!-- v-if="index + 1 !== options.length" -->
+        <div slot="description" style="padding: 20px 0 0 0">
           <p class="name">
             &nbsp;操&nbsp;作&nbsp;人&nbsp;：
             {{ item.action_name ? item.action_name : "未知" }}

src/views/goodStore/goodsCost/components/costFormAddEdit.vue

@@ -335,7 +335,8 @@ export default {
     },
 
     number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
+      const res = e ?? "";
+      this.ruleForm[key] = res === "" ? "0" : res;
       this.$refs.ruleForm.validateField(key);
     },
 

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -822,7 +822,8 @@ export default {
       this.addrForm.good_ladder.splice(index, 1);
     },
     async num_change(e, key, index) {
-      this.addrForm.good_ladder[index][key] = e + "" || "0";
+      const resNum = e ?? "";
+      this.addrForm.good_ladder[index][key] = resNum === "" ? "0" : resNum;
       if (key === "min_num") {
         const { min_num } = this.addrForm.good_ladder[index];
         if (min_num === "" || min_num === "0") {