fujunling
2023-06-29 871f60582720a8aa94a2d8bb344544452d4f3c23
导入按钮
已修改5个文件
125 ■■■■■ 文件已修改
Source/UBCS-WEB/src/api/batchImport/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/BatchImport/index.vue 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/mixins/codeApply.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/api/batchImport/index.js
@@ -10,8 +10,8 @@
    responseType: 'blob'
  })
}
// 批量申请编码顶层节点模板下载
export const downloadCodeApplyTopTemplate = (params) => {
// 批量申请编码模板下载
export const downloadBatchApplyCodeTemplate = (params) => {
  return request({
    url: '/api/ubcs-code/mdmEngineController/downloadTopImportExcel',
    method: 'get',
Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -12,17 +12,26 @@
        {{ item }}
      </li>
    </ul>
    <div class="radio_box" v-show="currentTypeObj[type]['upParams'] === 'classifyAttr'">
    <div
      class="radio_box"
      v-show="currentTypeObj[type]['upParams'] === 'classifyAttr'"
    >
      <span>分类的路径使用的属性:</span>
      <el-radio-group v-model="classifyAttr">
        <el-radio label="id">分类编号</el-radio>
        <el-radio label="name">分类名称</el-radio>
      </el-radio-group>
    </div>
    <div style="margin-top: 20px;" v-if="showCodeApply && type === 'batchImportApply'">
      <Divider text="编码规则的码段信息,请先选择后再导入" left="30px"></Divider>
    <div
      style="margin-top: 20px"
      v-if="showCodeApply && currentTypeObj[type]['upParams'] === 'codeApply'"
    >
      <Divider
        text="编码规则的码段信息,请先选择后再导入"
        left="30px"
      ></Divider>
      <FormTemplate
        style="margin-top: 30px;"
        style="margin-top: 30px"
        type="add"
        :selfColumnType="selfColumnType"
        :selfColumnConfig="selfColumnConfig"
@@ -76,11 +85,12 @@
  downloadHistoryImportTemplate,
  downloadErrorFile,
  getHistoryLeftTree,
  downloadBatchImportApplyTemplate
  downloadBatchImportApplyTemplate,
  downloadBatchApplyCodeTemplate,
} from "../../api/batchImport/index";
import FormTemplate from "../FormTemplate/FormTemplate.vue";
import { getToken } from "@/util/auth";
import codeApply from '@/mixins/codeApply.js'
import codeApply from "@/mixins/codeApply.js";
export default {
  name: "BatchImport",
  mixins: [codeApply],
@@ -118,31 +128,37 @@
      },
    },
    title() {
      return this.currentTypeObj[this.type]['title']
      return this.currentTypeObj[this.type]["title"];
    },
    tipList() {
      return this.currentTypeObj[this.type]['tipList']
      return this.currentTypeObj[this.type]["tipList"];
    },
    downloadTemplateApi() {
      return this.currentTypeObj[this.type]['downloadTemplateFun']
      console.log(this.currentTypeObj[this.type], 'this.type');
      return this.currentTypeObj[this.type]["downloadTemplateFun"];
    },
    action() {
      return this.currentTypeObj[this.type]['action']
      return this.currentTypeObj[this.type]["action"];
    },
    upParams() {
      if (this.type === 'historyImport') {
      if (this.type === "historyImport") {
        return {
        codeClassifyOid: this.codeClassifyOid,
        classifyAttr: this.classifyAttr,
      }
      } else if(this.type === 'batchImportApply') {
          codeClassifyOid: this.codeClassifyOid,
          classifyAttr: this.classifyAttr,
        };
      } else if (this.type === "batchImportApply") {
        return {
          codeClassifyOid: this.codeClassifyOid,
          secDTOList: this.secDTOList,
          ...this.codeApplyForm
        }
          ...this.codeApplyForm,
        };
      } else if (this.type === "batchApplyCode") {
        return {
          codeClassifyOid: this.codeClassifyOid,
          classifyAttr: this.classifyAttr,
        };
      }
    }
    },
  },
  data() {
    return {
@@ -163,7 +179,7 @@
          ],
          action: "/api/ubcs-code/mdmEngineController/batchImportHistoryData",
          downloadTemplateFun: downloadHistoryImportTemplate,
          upParams: 'classifyAttr'
          upParams: "classifyAttr",
        },
        batchImportApply: {
          title: "批量申请编码",
@@ -175,26 +191,41 @@
          ],
          action: "/api/ubcs-code/mdmEngineController/batchImportCode",
          downloadTemplateFun: downloadBatchImportApplyTemplate,
          upParams: false
        }
          upParams: "codeApply",
        },
        batchApplyCode: {
          title: "批量申请编码",
          tipList: [
            "1.标题带五角星的表示关键属性,带星号表示必输项",
            "2.分类的路径需要用#分隔。从当前选择分类节点的下级开始填写,直到最末尾节点,如 产品#主机产品#主机产品",
          ],
          action: "/api/ubcs-code/mdmEngineController/batchTopImportCode",
          downloadTemplateFun: downloadBatchApplyCodeTemplate,
          upParams: "classifyAttr",
        },
      },
    };
  },
  methods: {
    async beforeUpload(file) {
      console.log(223344);
      const fileType = file.name.split(".").pop();
      if (fileType !== "xlsx" && fileType !== "xls") {
        // 上传格式不符合要求,提示错误信息并取消上传
        this.$message.error("只允许上传xlsx、xls格式的文件");
        return Promise.reject(false)
        return Promise.reject(false);
      }
      if (this.type === 'batchImportApply') {
        const flag = await this.$refs.CodeApply.validate()
      if (this.type === "batchImportApply") {
        const flag = await this.$refs.CodeApply.validate();
        if (!flag) {
          return Promise.reject(false)
          return Promise.reject(false);
        }
      }
      this.pageLoading = this.$loading({
        lock: true,
        text: "文件上传中",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.7)",
      });
      return true;
    },
    // 下载导入模板
@@ -233,21 +264,12 @@
      }
    },
    uploadChange(file) {
      if (file.status === "uploadin") {
        this.pageLoading = this.$loading({
          lock: true,
          text: "文件上传中",
          spinner: "el-icon-loading",
          background: "rgba(0, 0, 0, 0.7)",
        });
      }
      if (file.status === "success" || file.status === "error") {
        this.pageLoading.close();
      }
    },
  },
  watch: {
  },
  watch: {},
};
</script>
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -8,9 +8,9 @@
        <el-button plain size="small" type="primary" @click="editHandler"
          >编辑
        </el-button>
        <el-button plain size="small" type="primary">批量导入申请</el-button>
        <el-button plain size="small" type="primary">历史数据导入</el-button>
        <el-button plain size="small" type="primary">批量申请编码</el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">批量导入申请</el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">历史数据导入</el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">批量申请编码</el-button>
        <el-button plain size="small" type="primary">批量发布</el-button>
        <el-button plain size="small" type="primary">查看流程历史</el-button>
        <el-button plain size="small" type="primary">删除</el-button>
@@ -144,6 +144,7 @@
      >
      </el-pagination>
    </div>
    <BatchImport v-if="batchImportData.visible" :visible.sync="batchImportData.visible" v-bind="batchImportData"></BatchImport>
  </basic-container>
</template>
<script>
@@ -152,11 +153,13 @@
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
export default {
  components: {
    integrationTransfer,
    SetPersonnel,
    ResembleQueryDialog,
    BatchImport
  },
  name: "Crud.vue",
  props: {
@@ -243,6 +246,11 @@
      seniorQueryColumns: [],
      selectRow: [],
      userName: "",
      batchImportData: {
        visible: false,
        type: '',
        codeClassifyOid: ''
      }
    };
  },
  computed: {},
@@ -503,6 +511,11 @@
    EditSumbit(val) {
      this.editvisible = false;
    },
    openBatchImport(type) {
      this.batchImportData.visible = true
      this.batchImportData.type = type
      this.batchImportData.codeClassifyOid = this.codeClassifyOid
    }
  },
};
</script>
Source/UBCS-WEB/src/mixins/codeApply.js
@@ -41,7 +41,9 @@
    }
  },
  created() {
    this.getCodeRule()
    if (this.type === 'batchImportApply') {
      this.getCodeRule()
    }
  },
  methods: {
    // 获取码值申请数据
Source/UBCS-WEB/vue.config.js
@@ -27,8 +27,8 @@
      '/api': {
        // target: 'http://localhost:37000',
        // target: 'http://localhost:37000',
        target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        // target: 'http://192.168.1.51:37000',
        target: 'http://192.168.1.46:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        //   target: 'http://192.168.1.104:37000',