Merge remote-tracking branch 'origin/master'

cl

2024-01-30 ecf3c9735379270912d16f37c486d085b36f4c8a

 jcdm-ui/src/views/main/bs/orderScheduling/index.vue

@@ -145,6 +145,15 @@
              v-hasPermi="['bs:orderScheduling:export']"
            >导出</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-close"
              size="mini"
              @click="handleClose"
            >关闭</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>

@@ -606,6 +615,11 @@
      this.download('bs/orderScheduling/export', {
        ...this.queryParams
      }, `orderScheduling_${new Date().getTime()}.xlsx`)
    },
    /** 返回按钮操作 */
    handleClose() {
      const obj = { path: "/main/om/productionOrde" };
      this.$tab.closeOpenPage(obj);
    }
  }
};