Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue

@@ -36,7 +36,7 @@
      <a-button @click="handleAdd" type="primary" icon="plus">新增
      </a-button>
      <a-button type="primary" icon="download" @click="importTemplate('加工数量模板')">导入模板</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('加工数量')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('加工数量管理')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
      <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
@@ -246,8 +246,8 @@
    methods: {
      importTemplate(fileName){
        var a = document.createElement("a");
        a.href = "/static/加工数量.xls";
        a.download = "加工数量.xls";
        a.href = "/static/加工数量管理.xls";
        a.download = "加工数量管理.xls";
        a.style.display = "none";
        document.body.appendChild(a);
        a.click();
@@ -345,7 +345,7 @@
      handleEdit: function (record) {
        this.$refs.modalFormedit.edit(record);
        this.$refs.modalFormedit.title = "编辑";
        this.$refs.modalFormedit.disableSubmit = false;
        // this.$refs.modalFormedit.disableSubmit = false;
      },
      handleTableChange(pagination, filters, sorter) {
        this.dataSource = []
@@ -534,7 +534,7 @@
            //重新计算分页问题
            that.reCalculatePage(1)
            // that.$message.success(res.message);
            that.$notification.warning({
            that.$notification.success({
              message:'消息',
              description:res.message
            });