导入修改

fe/PC/src/mixins/mixins.js

@@ -227,18 +227,19 @@ export const mixins = {
             fd.append("file", formFile[0])
             
             postImport(fd, _uploadURL, _isSpecial).then(res => {
+              const headers = JSON.parse(res.headers)
               // 判断是否有错误记录
-              if (res.errorNum > 0) {
-                that.$alert('发现导入错误数据共：' + res.errorNum + '条', '错误报告', {
+              if (headers.result.ErrorNum > 0) {
+                that.$alert('发现导入错误数据共：' + headers.result.ErrorNum + '条', '错误报告', {
                   confirmButtonText: '下载错误报告',
                   callback: action => {
                     if (action == 'confirm') {
-                      that.blob(res.bytes, menuName + '错误报告')
+                      that.blob(res, menuName + '错误报告')
                     }
                   }
                 })
-              } else if (res.exceptionMessage != null) {
-                that.$alert('错误信息：' + res.exceptionMessage, '错误', {
+              } else if (headers.result.ExceptionMessage != null) {
+                that.$alert('错误信息：' + headers.result.ExceptionMessage, '错误', {
                   confirmButtonText: '确定',
                   callback: action => {
                   }
@@ -259,6 +260,7 @@ export const mixins = {
               that.displayDialog.importDialog = false;
               that.paging()
             }).catch(err => {
+              that.$errorMsg('导入过程中发生错误！请联系管理员！')
               that.Loading.importLoading = false
               that.FormRemove(val[0]);
               that.displayDialog.importDialog = false;

fe/PC/src/utils/request.js

@@ -57,9 +57,10 @@ service.interceptors.response.use(
    */
   response => {
     const res = response.data
-    console.log(response)
     if(response.headers['content-disposition']){
       res.disposition = response.headers['content-disposition']
+    } else if (response.headers['x-response']) {
+      res.headers = response.headers['x-response']
     }
     // if the custom code is not 20000, it is judged as an error.
     // if (res.code !== 20000) {

fe/PC/src/views/basicData/BomManage/Bom.vue

@@ -156,7 +156,7 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' },
-        { type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 },
+        { type: "input", label: "子物料用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
         { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },