Merge remote-tracking branch 'origin/master'

zss

2024-01-09 3be31836178cdb323614e7c90ab3429faa1017d3

 src/views/plan/customerorder/index.vue

@@ -855,6 +855,13 @@
        permitArr: []
      })
    }
    this.table.toolbar.push({
        text: '下载Word',
        disabled: false,
        type: 'primary',
        fun: this.downloadWord,
        permitArr: ['03plan','04planed'],
    })
    if (this.permissions.customerorder_create_masterplan) {
      this.table.toolbar.push({
        text: '主生产计划',
@@ -863,13 +870,6 @@
        permitArr: []
      })
    }
    this.table.toolbar.push({
        text: '下载Word',
        disabled: false,
        type: 'primary',
        fun: this.downloadWord,
        permitArr: ['03plan','04planed'],
    })
  },
  methods: {
    //下载word
@@ -884,7 +884,9 @@
          const blob = response.data
          const link = document.createElement('a')
          link.href = URL.createObjectURL(blob)
          link.download = '工艺文件.docx'
          const disposition = response.headers["content-disposition"]
          let temp = disposition.substring(disposition.lastIndexOf('=') + 1)
          link.download = decodeURI(temp)
          document.body.appendChild(link)
          link.click()
          window.setTimeout(function() {
@@ -1047,7 +1049,8 @@
            }
          })
          if (flag) {
            checkOA(this.multipleSelection.map((e) => e.id)).then((res) => {

            checkOA(this.multipleSelection.map((e) => e.id),{}).then((res) => {
              if (!res.data.data.success) {
                this.$confirm(`${res.data.data.message}`, '提示', {
                  confirmButtonText: '确定',