Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/operate/allot/index.vue

@@ -57,7 +57,7 @@
  data() {
    return {
      tableList: {},
      showcol: ["从", "至", "联系人", "日期", "来源单据", "公司", "状态"],
      showcol: ["调出位置", "调入位置", "联系人", "日期", "来源单据", "公司", "状态"],
      searchOptions: [],
      editConfig: {
        visible: false,
@@ -99,15 +99,15 @@
          default: true
        },
        {
          label: "从",
          label: "调出位置",
          prop: "from",
          isShowColumn: showcol.includes("从"),
          isShowColumn: showcol.includes("调出位置"),
          default: false
        },
        {
          label: "至",
          label: "调入位置",
          prop: "to",
          isShowColumn: showcol.includes("至"),
          isShowColumn: showcol.includes("调入位置"),
          default: false
        },
        {