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

gaoluyang

3 天以前 4657a22f93317d5ba9a1cdab5d34e9f756b6380d

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -214,7 +214,7 @@
      type: "warning",
   })
      .then(() => {
         proxy.download("/stockmanagement/export", {}, "出库台账.xlsx");
         proxy.download("/stockOutRecord/exportStockOutRecord", {type: props.type}, props.type === '0' ? "合格出库台账.xlsx" : "不合格出库台账.xlsx");
      })
      .catch(() => {
         proxy.$modal.msg("已取消");