diff --git a/vue/src/components/ImportExcel-normal/index.vue b/vue/src/components/ImportExcel-normal/index.vue
new file mode 100644
index 0000000..ff2e329
--- /dev/null
+++ b/vue/src/components/ImportExcel-normal/index.vue
@@ -0,0 +1,808 @@
+<template>
+  <el-dialog
+    :visible="show"
+    :title="'导入' + crmTypeName"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    width="600px"
+    @close="closeView"
+  >
+    <!-- <el-tabs
+      v-model="activeName"
+      :class="stepsActive == 1 ? '' : 'el-tabs__active-go'"
+      @tab-click="handleClick"
+    >
+      <el-tab-pane
+        label="①文件上传"
+        name="first"
+        :disabled="stepsActive == 2 ? true : false"
+      >
+        <div class="dialog-body">
+          <div v-if="stepsActive == 1" class="step-section">
+            <div class="sections">
+              <div class="sections__title" v-loading="loading">
+                一、导入说明：
+                <div class="sections__tips">
+                  1、提供的导入模板不支持“.xls”文件，即不支持Excel97-2003!
+                </div>
+                <div class="sections__tips">
+                  2、模板名称可以进行修改，但不要删除模板中设置的字段！
+                </div>
+                <div class="sections__tips">
+                  3、导入文件大小请勿超过100MB！且目前只支持单个Sheet页签！
+                </div>
+              </div>
+            </div>
+            <div class="sections">
+              <div class="sections__title">
+                二、导入条件设置（没有则不用设置）
+              </div>
+              <div class="sections__tips">
+                <span class="demonstration">选择版本：</span>
+                <el-select
+                  v-model="versionValue"
+                  clearable
+                  :disabled="isEditFactory"
+                  style="width: 188px"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in factoryList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div> -->
+            <div class="sections">
+              <!-- <div class="sections__title">三、请选择需要导入的文件</div> -->
+              <div class="content">
+                <flexbox class="file-select">
+                  <el-upload
+                    ref="upload"
+                    class="avatar-uploader"
+                    drag
+                    action="#"
+                    :http-request="httpRequestfiles"
+                    :headers="httpHeader"
+                    :file-list="fileuploadList"
+                    :before-upload="beforeAvatarUpload"
+                    :before-remove="beforeRemove"
+                    :on-remove="handleRemove"
+                    multiple
+                    :limit="10"
+                  >
+                    <i class="el-icon-upload"></i>
+                    <div class="el-upload__text">
+                      将文件拖到此处，或
+                      <em>点击上传</em>
+                    </div>
+                  </el-upload>
+                </flexbox>
+              </div>
+            </div>
+          <!-- </div>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane
+        label="②导入数据"
+        name="second"
+        :disabled="stepsActive == 2 ? false : true"
+      >
+        <div
+          v-loading="loading"
+          v-if="stepsActive == 2"
+          element-loading-text="导入中"
+          element-loading-spinner="el-icon-loading"
+          class="step-section"
+        />
+        <div
+          v-loading="loading"
+          v-else-if="stepsActive == 3"
+          class="step-section"
+        >
+          <div class="result-info">
+            <el-card style="height: 300px; margin-top: -20px" shadow="always">
+              <i class="el-icon-error" />
+              <p class="result-info__detail">
+                <span class="result-info__detail--all"
+                  >{{ this.resultData.successMessage }}
+                </span>
+                <el-button
+                  v-if="this.resultData && this.resultData.errSize > 0"
+                  class="result-info__btn--err"
+                  type="text"
+                  @click="downloadErrData"
+                  >下载错误数据</el-button
+                >
+              </p>
+            </el-card>
+          </div>
+        </div>
+
+        <div v-loading="loading" v-if="stepsActive == 4" class="step-section">
+          <div class="result-info">
+            <el-card style="height: 300px" shadow="always">
+              <i class="el-icon-success" />
+              <p class="result-info__detail">
+                <span class="result-info__detail--all"
+                  >{{ this.resultData.successMessage }}
+                </span>
+              </p>
+              <p class="result-info__detail">
+                <router-link
+                  :to="{
+                    name: 'BackGroundWork',
+                    params: { taskId: this.resultData.taskId },
+                  }"
+                  >[单击跳转至后台监控界面]</router-link
+                >
+              </p>
+            </el-card>
+          </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs> -->
+    <span slot="footer" class="dialog-footer">
+      <el-popover
+        v-model="historyPopoverShow"
+        placement="top"
+        width="800"
+        popper-class="no-padding-popover"
+        trigger="click"
+      >
+      </el-popover>
+
+      <!-- <el-button  @click="closeView">取消</el-button> -->
+      <el-button @click="closeView">取消</el-button>
+      <el-button  type="primary" @click="sureClick">立即导入</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { downloadFile } from "@/utils/crmindex.js";
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  name: "CRMImport", // 文件导入
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    // CRM类型
+    crmType: {
+      type: String,
+      default: "",
+    },
+    api:{
+      type: String,
+      default: "",
+    }
+  },
+  data() {
+    return {
+      options: [
+        {
+          value: "3",
+          label: "新增",
+        },
+        {
+          value: "0",
+          label: "修改",
+        },
+      ],
+      loading: false,
+      fieldList: [],
+      factoryList: [], //工厂列表
+      YearMonthValue: "TH", //年度期间选择项
+      yearMonthList: [], //年度期间
+      versionValue: "",
+      stateValue: "",
+      config: 1, // 	1 覆盖，2跳过
+      /** 编辑控制 */
+      isEditFactory: false, // 是否是编辑中
+      isEditYearMont: false, // 是否是编辑中
+      isState: true, // 是否是编辑中
+      //file: { name: "" },
+      stepsActive: 1,
+      stepList: [
+        {
+          icon: "wk wk-upload",
+          title: "上传文件",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-data-import",
+          title: "导入数据",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-success",
+          title: "导入完成",
+          status: "wait",
+        },
+      ],
+      //resultData: null,
+      resultData: {
+        totalSize: 0,
+        errSize: 0,
+        errTemplate: "",
+        errMessage: "",
+        successMessage: "",
+        taskId: "",
+      },
+      processData: {
+        count: 0,
+        status: "",
+      },
+      messageId: null,
+      intervalTimer: null,
+      fileuploadList: [],
+      isLt2M: "",
+      isFileType: "",
+      historyPopoverShow: false,
+      yeareVale: "",
+      monthVale: "",
+      page: 1,
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "project",
+            action: 0,
+            value: "factory",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      listQueryCustom: {
+        Filters: [
+          {
+            logic: 0,
+            column: "customerCode",
+            action: 0,
+            value: "U22000",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      activeName: "first",
+    };
+  },
+  computed: {
+    sureTitle() {
+      return {
+        1: "立即导入",
+        // 2: "导入中...",
+        // 3: "确定",
+        // 4: "确定",
+      }[this.stepsActive];
+    },
+    showCancel() {
+      return this.stepsActive == 1;
+    },
+    // getMoudleDisable() {
+    //   if (
+    //     this.crmType == "codeSetting" ||
+    //     this.crmType == "factory" ||
+    //     this.crmType == "customerStorageLocation" ||
+    //     this.crmType == "materialRelationSupplier" ||
+    //     this.crmType == "carMaterialConfig" ||
+    //     this.crmType == "materialRelation"
+    //   ) {
+    //     //版本和工厂都可以用
+    //     this.isEditYearMont = true;
+    //     this.isEditFactory = true;
+    //   } else if (
+    //     this.crmType == "secondaryPriceRatio" ||
+    //     this.crmType == "secondaryAdjustment" ||
+    //     this.crmType == "secondaryDiscount" ||
+    //     this.crmType == "estimatedInventoryDetail" ||
+    //     this.crmType == "estimatedSum"
+    //   ) {
+    //     //只版本可用
+    //     this.isEditYearMont = true;
+    //     this.isEditFactory = false;
+    //   } else if (this.crmType == "material") {
+    //     //只工厂可用
+    //     this.isEditYearMont = false;
+    //     this.isEditFactory = true;
+    //   } else if (this.crmType == "prebatch") {
+    //     //只状态可用
+    //     this.isEditYearMont = true;
+    //     this.isEditFactory = true;
+    //     this.isState = false;
+    //   } else {
+    //     this.isEditYearMont = false;
+    //     this.isEditFactory = false;
+    //   }
+    // },
+    crmTypeName() {
+      return (
+        {
+          invoice: "开票数据",
+        }[this.crmType] || ""
+      );
+    },
+    getWebApi() {
+      return (
+        {
+          invoice: "/api/settleaccount/Invoices/ExcelImport-TH",
+        }[this.crmType] || ""
+      );
+    },
+    getImportTemplate() {
+      //模板名称
+      return (
+        {
+          invoice: "发票模板.xlsx",
+        }[this.crmType] || ""
+      );
+    },
+    httpHeader() {
+      //文件上传时，带token认证信息，提高安全性
+      return {
+        Authorization: "Bearer " + getToken(),
+      };
+    },
+  },
+  watch: {
+    show: function (val) {
+      this.stepsActive = 1;
+      // this.getAllYearMonth(); //加载版本
+      // this.getMoudleDisable(); //判断设置条件是否可用
+      if (val) {
+        this.stepsActive = 1;
+      } else {
+        if (this.stepsActive == 3) {
+          //以下是重置数据
+          this.stepsActive = 1;
+          this.stepList = [
+            {
+              icon: "wk wk-upload",
+              title: "上传文件",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-data-import",
+              title: "导入数据",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-success",
+              title: "导入完成",
+              status: "wait",
+            },
+          ];
+          this.resultData = null;
+        }
+      }
+    },
+
+    stepsActive() {
+      this.$emit(
+        "status",
+        {
+          1: "wait",
+          2: "process",
+          3: "finish",
+        }[this.stepsActive]
+      );
+    },
+  },
+  mounted() {},
+  methods: {
+    // getAllYearMonth() {
+    //   this.$axios
+    //     .posts("/api/settleaccount/CentralizedControl/openlist")
+    //     .then((response) => {
+    //       this.factoryList = [];
+    //       response.forEach((element) => {
+    //         let options = {};
+    //         options.value = element.version;
+    //         options.label = element.version;
+    //         this.factoryList.push(options);
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    handleImportExcelClick() {
+      //父组件中，初始化此子组件时调用
+      this.fileuploadList = [];
+      //this.$refs.upload.clearFiles();
+    },
+    httpRequestfiles(data) {
+      let _this = this;
+      let rd = new FileReader(); // 创建文件读取对象
+      let file = data.file;
+      this.fileuploadList.push(file);
+      rd.readAsDataURL(file); // 文件读取装换为base64类型
+    },
+    beforeAvatarUpload(file) {
+      var FileExt = file.name.replace(/.+\./, "");
+      if (["xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
+        this.$message({
+          type: "warning",
+          message: "只支持xlsx类型文件！",
+        });
+        this.isFileType = "0";
+        return false;
+      } else {
+        this.isFileType = "1";
+      }
+      this.isLt2M = file.size / 1024 / 1024 < 100 ? "1" : "0";
+      if (this.isLt2M === "0") {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return this.isLt2M === "1" ? true : false;
+    },
+    beforeRemove(file, fileList) {
+      if (this.isLt2M === "1" && this.isFileType === "1") {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      }
+    },
+    handleRemove(file, fileList) {
+      //附件列表删除操作
+      const index = this.fileuploadList.indexOf(file.originFileObj);
+      const newFileList = this.fileuploadList.slice();
+      newFileList.splice(index, 1);
+      this.fileuploadList = newFileList;
+    },
+    //执行按钮
+    sureClick() {
+      if (
+        this.fileuploadList === [] ||
+        JSON.stringify(this.fileuploadList) === "[]"
+      ) {
+        this.$message.error("请选择导入文件");
+        return false;
+      }
+      if (this.stepsActive == 1) {
+        if (this.stepList[0].status == "wait") {
+          this.stepsActive = 2;
+          this.saveTemplateData();
+          this.activeName = "second";
+          console.log(this.crmTypeName);
+          if (this.stepList[1].status == "finish") {
+          }
+        } else {
+          if (this.fileuploadList === "[]") {
+            this.$message.error("请选择导入文件");
+          }
+        }
+      } else {
+        this.closeView();
+      }
+    },
+
+    saveTemplateData() {
+      this.loading = true;
+      //保存项目、合同管理、客户等信息的共用方法
+      //--上传附件，批量或拖拽
+      if (JSON.stringify(this.fileuploadList) != "[]") {
+        let fd = new FormData();
+        const { fileuploadList } = this;
+        fileuploadList.forEach((file) => {
+          fd.append("files", file); // 添加文件
+        });
+        fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
+        fd.append("year", "2021");
+        fd.append("period", "03");
+        //fd.append("customerCode", "03");
+        //fd.append("factory", "TH");
+        fd.append("version", this.versionValue);
+        const webapi = this.getWebApi;
+        console.log(502,webapi)
+        this.$axios
+          .posts(this.api, fd)
+          .then(async (res) => {
+            console.log("发票导入条件：" + JSON.stringify(res));
+            // if (Number.isInteger(res)) {
+            if(res.status){
+              this.resultData.taskId = res;
+              this.$notify({
+                title: "成功",
+                message: "文件上传成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.$emit("close");
+              // this.stepList[1].status = "finish";
+              // this.resultData.successMessage =
+              //   "文件已经上传至后台，任务号：" +
+              //   res +
+              //   "，请在后台作业监控界面中查看进度！";
+              // this.stepsActive = 4;
+            }
+            // if (res === "Success") {
+            //   if (this.isLt2M === "1" && this.isFileType === "1") {
+            //     this.$notify({
+            //       title: "成功",
+            //       message: "数据导入成功！",
+            //       type: "success",
+            //       duration: 2000,
+            //     });
+            //     this.stepList[1].status = "finish";
+            //     this.resultData.successMessage = "数据导入成功！";
+            //     this.stepsActive = 4;
+            //   }
+            // }
+            else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
+            }
+            // console.log(this.stepsActive);
+            // this.$emit("status", "finish");
+            // this.$nextTick(() => {
+            //   this.loading = false;
+            // });
+            this.loading = false;
+          })
+          .catch(() => {
+            this.stepList[1].status = "finish";
+            this.resultData.errSize = 0;
+            this.resultData.successMessage = "导入模板有错误，请检查！";
+            this.stepsActive = 3;
+            this.loading = false;
+          });
+      } else {
+        this.loading = false;
+        this.$message({
+          message: "未上传任何附件，请查检！",
+          type: "warning",
+        });
+      }
+    },
+    goTo() {
+      //直接跳转
+      this.$router.push("/views/ux/backGroundWork");
+    },
+
+    /**
+     * 下载错误模板
+     */
+    downloadErrData() {
+      let fileNameOfProject = this.resultData.errTemplate;
+      this.$axios
+        .BolbGets(
+          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+        )
+        .then((response) => {
+          if (fileNameOfProject.indexOf("_") != -1) {
+            let downName =
+              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+            downloadFile(response, downName);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          } else {
+            downloadFile(response, fileNameOfProject);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          }
+          this.listLoading = false;
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
+    // 关闭操作
+    closeView() {
+      this.$emit("update:show", false);
+      this.$emit("close");
+      this.activeName = "first";
+    },
+    handleClick(tab) {
+      // console.log(tab.index)
+      // console.log(tab.name)
+      if (tab.name == "first") {
+        //  console.log(tab.name)
+        this.fileuploadList = [];
+        this.stepsActive = 1;
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "@/styles/xr-theme.scss";
+/deep/.el-dialog {
+  margin-top: 9vh !important;
+}
+/deep/.el-dialog__body {
+  padding: 20px 20px;
+}
+//Tabs标签Flex布局
+/deep/.el-tabs__nav {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+//去掉el-tab-pane底部灰色线条
+/deep/.el-tabs__nav-wrap::after {
+  height: 0 !important;
+}
+//Tabs标签el-tab-pane蓝色下划线
+/deep/.el-tabs__active-bar {
+  left: 90px;
+  width: 90px !important;
+}
+//Tabs标签el-tab-pane蓝色下划线点击录入后样式
+/deep/ .el-tabs__active-go {
+  .el-tabs__active-bar {
+    transform: translateX(297px) !important;
+  }
+}
+
+/deep/.el-tabs__item {
+  padding: 0 20px;
+}
+.el-steps {
+  margin-bottom: 15px;
+
+  /deep/ .el-step__title {
+    font-size: 14px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::before,
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    height: 10px;
+    width: 2px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    transform: rotate(45deg) translateY(3px);
+  }
+  /deep/ .el-step.is-simple .el-step__arrow::before {
+    transform: rotate(-45deg) translateY(-2px);
+  }
+}
+
+.step-section {
+  min-height: 250px;
+
+  /deep/ .el-loading-spinner {
+    top: 45%;
+    .el-icon-loading {
+      font-size: 40px;
+      color: #999;
+    }
+
+    .el-loading-text {
+      color: #333;
+    }
+  }
+}
+
+.sections {
+  font-size: 14px;
+  color: #333;
+
+  &__title {
+    font-weight: 600;
+  }
+
+  &__tips {
+    padding-left: 30px;
+    margin: 8px 0 15px;
+    color: #999;
+    font-size: 12px;
+    line-height: 1.4;
+  }
+
+  .download {
+    cursor: pointer;
+    color: #2362fb;
+  }
+}
+
+.sections__tips + .content {
+  padding-top: 0;
+}
+
+.content {
+  padding: 10px 10px 10px 30px;
+  .el-select {
+    width: 400px;
+  }
+  .user-cell {
+    width: 400px;
+  }
+}
+
+#importInputFile {
+  display: none;
+}
+
+.file-select {
+  .el-input {
+    width: 400px;
+  }
+  button {
+    margin-left: 20px;
+  }
+}
+
+.is-hidden {
+  visibility: hidden;
+}
+
+.history-btn {
+  float: left;
+  margin-left: 15px;
+}
+
+// 结果信息
+.result-info {
+  text-align: center;
+  .el-card {
+    border: none;
+    height: 250px !important;
+  }
+  /deep/.el-card__body {
+    padding: 60px 20px 20px 20px;
+  }
+  i {
+    font-size: 60px;
+  }
+  // 错误结果icon
+  .el-icon-error {
+    color: red;
+  }
+  //正确结果icon
+  .el-icon-success {
+    color: chartreuse;
+  }
+
+  &__des {
+    margin-top: -15px;
+    color: #333;
+    font-size: 30px;
+  }
+
+  &__detail {
+    margin-top: 25px;
+    font-size: 20px;
+    color: #666;
+    &--all {
+      color: #333;
+      font-weight: 600;
+    }
+
+    &--suc {
+      color: $xr-color-primary;
+      font-weight: 600;
+    }
+
+    &--err {
+      margin-top: 25px;
+      color: #f94e4e;
+      font-weight: 600;
+    }
+  }
+
+  &__btn--err {
+    margin-top: 10px;
+    font-size: 20px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
index 0a1f0dd..83db8b3 100644
--- a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
@@ -26,7 +26,7 @@
           clearable
           size="small"
           placeholder=""
-          style="width: 200px"
+          style="width: 150px"
           class="search-container"
           @keyup.enter.native="handleFilter"
         />
@@ -38,7 +38,7 @@
           clearable
           size="small"
           placeholder=""
-          style="width: 200px"
+          style="width: 150px"
           class="search-container"
           @keyup.enter.native="handleFilter"
         />
@@ -50,7 +50,7 @@
           clearable
           placeholder="请选择"
           size="medium"
-          style="margin-right: 15px"
+          style="margin-right: 15px;width: 170px"
         >
           <!-- @change="valueselectChange" -->
           <el-option
@@ -67,7 +67,7 @@
           clearable
           placeholder="请选择"
           size="medium"
-          style="margin-right: 15px"
+          style="margin-right: 15px;width: 170px"
         >
           <!-- @change="valueselectChange" -->
           <el-option
@@ -105,7 +105,16 @@
           >重置
         </el-button>
       </el-form-item>
-
+      <el-form-item>
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload2"
+          @click="handleImportExcel()"
+          >导入Excel
+        </el-button>
+      </el-form-item>
       <el-form-item>
         <el-button
           class="filter-item"
@@ -193,6 +202,7 @@
         :show="showExcelImport"
         :crmType="crmType"
         @close="importExcelData"
+        :api="'api/newjit/part-cfg/import'"
       />
     </div>
   </div>
@@ -201,7 +211,7 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-invoice";
+import importExcel from "@/components/ImportExcel-normal";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
 import Lockr from "lockr";
@@ -378,6 +388,11 @@ export default {
     },
   },
   methods: {
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
     selectValue(params) {
       //版本下拉选择
       this.versionValue = params.value;
@@ -482,6 +497,7 @@ export default {
     },
     importExcelData() {
       //this.getVersionInfo();
+      this.getList();
       this.listLoading = false;
       //关闭导入窗体时调用
       this.showExcelImport = false;
diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
index 3f4c1fb..d01df2a 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
@@ -628,37 +628,70 @@ export default {
     //         }
     //       })
     //       .catch(() => {});
-		
-		debugger //重新打印
         var params = MBVin1; //选中的ID列表
+        if(!params || params.length <= 0){
+          this.$message({
+            message: '请先选择重打数据',
+            type: "error",
+          });
+          return
+        }
         console.log("打印-主界面传过来的值：" + JSON.stringify(params));
         this.$axios
-          .posts("/api/newjit/bill-m100/load-menban-report", params)
+          .posts("/api/newjit/bill-m100/load-menban-report2", params)
           .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
+            if(response.mainList1 && response.mainList1.length >0 && response.mainList1[0].vehicleModel){
+              console.log("加载报表");
+              this.dialogFormVisible = false;
+              this.fileQuery.dataname = JSON.stringify(response);
+              //this.fileQuery.dataname = "";
+              console.log("打印json");
+              let _report = response.mainList1[0].vehicleModel + `_` + this.customerInfo.productLine
+              this.$axios
+              .posts(
+                "/Handlers/Handler1.ashx?report="+_report,
+                qs.stringify(this.fileQuery)
+              )
+              .then((response) => {
+                console.log("获取文件base64编码");
+                // this.formLoading = false;
+                this.isDisable = false;
+                this.printpdf(response); //打印我文件流
+              })
+              .catch((error) => {
+                // this.formLoading = false;
+                this.isDisable = false;
+              });
+            }else{
               this.$message({
-                message: response.message,
+                message: '暂无可重打数据',
                 type: "error",
               });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-               this.getList();
             }
+            //alert(response.status);
+            // const index = this.list.indexOf(row);
+            // if (response.status === false) {
+            //   this.$message({
+            //     message: response.message,
+            //     type: "error",
+            //   });
+            //   return;
+            // } else if (response.status === true) {
+            //   this.fileQuery.dataname = JSON.stringify(response.item);
+            //   console.log(
+            //     "调用Handlers/Handler1.ashx?report=menban传的值：" +
+            //       JSON.stringify(this.fileQuery.dataname)
+            //   );
+            //   this.$axios
+            //     .posts(
+            //       "/Handlers/Handler1.ashx?report=menban",
+            //       qs.stringify(this.fileQuery)
+            //     )
+            //     .then((response) => {
+            //       this.printpdf(response); //打印我文件流
+            //     });
+            //    this.getList();
+            // }
           })
           .catch(() => {});		
 
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 427aba7..b07defa 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -122,9 +122,12 @@
           width="180px"
         >
           <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            <!-- <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
               scope.row.vin
-            }}</span>
+            }}</span> -->
+            {{
+              scope.row.vin
+            }}
           </template>
         </el-table-column>
         <el-table-column
@@ -241,7 +244,7 @@
             >取消</el-button
           >
           <el-button
-            v-loading="formLoading"
+            v-loading="isDisable"
             type="primary"
             :disabled="isDisable"
             @click="save"
@@ -451,7 +454,7 @@ export default {
       dialogFormVisible: false,
       formTitle: "",
       isEdit: false,
-      formLoading: false, //关闭窗口
+      // formLoading: false, //关闭窗口
       tableHeight: document.documentElement.clientHeight - 335,
       detailTableHeight: 250,
       details: [], //修改子表数据源
@@ -507,7 +510,6 @@ export default {
     }, sysConfig && sysConfig.m100PrintFreshTime ? sysConfig.m100PrintFreshTime : 60000);
   },
   created() {
-    console.log("created")
     this.billState.forEach((element, index) => {
       if (index === 0) {
         this.listQuery.state.push(element.id);
@@ -520,7 +522,7 @@ export default {
   },
   methods: {
     // 更改主表格高度
-    changeMainTableHeight(){
+    changeMainTableHeight(isToBottom){
       this.$nextTick(()=>{
         var offsetHei = document.documentElement.clientHeight;
         // let boxH = this.$refs.box.offsetHeight;
@@ -528,12 +530,19 @@ export default {
         let footerH = this.totalCount > 0 ? 67 : 0 //footer高度
         this.tableHeight = offsetHei - headerH - 67 - 79; //79为页面上部标签高度
         //this.tableHeight = offsetHei -260
+        
+        // table默认滚到底部
+        if(isToBottom){
+          this.$nextTick(() => {
+            this.tabelToBottom()
+          })
+        }
       })
     },
     opens() {
       this.getList();
     },
-    open() {
+    open(isToBottom) {
       let productLineListMain = { productLineList: [] };
       this.PLChildList.forEach((itm) => {
         productLineListMain.productLineList.push(itm.productLineCode);
@@ -576,7 +585,7 @@ export default {
               return;
             }
           }
-          this.changeMainTableHeight()
+          this.changeMainTableHeight(isToBottom)
         });
     },
     debounceClick() {
@@ -751,6 +760,7 @@ export default {
       return projectTypeKeyValue[type];
     },
     getList(data,isFlesh) {
+      this.open(true);
       if(!isFlesh)this.listLoading = true;
       if (data != undefined) {
         this.listQueryList.SkipCount = (this.page - 1) * data.limit;
@@ -786,17 +796,27 @@ export default {
           _M110Row.isM110Data = true
           this.list.push(_M110Row)
           this.totalCount = response.m100_TotalCount;
+          // table默认滚到底部
+          this.$nextTick(() => {
+            this.tabelToBottom()
+          })
+          //大数据量加载时
           setTimeout(() => {
-            //大数据量加载时
             this.listLoading = false;
           }, 500);
+          
         })
         .catch(() => {
           this.listLoading = false;
         });
       this.changeMainTableHeight()
     },
-
+    tabelToBottom(){
+      let bodyWrapper = this.$refs.multipleTable.$el.querySelector('.el-table__body-wrapper');
+      if (bodyWrapper) {
+        bodyWrapper.scrollTop = bodyWrapper.scrollHeight + 100;
+      }
+    },
     getDetialList(partCode) {
       this.listLoading = true;
       console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
@@ -960,6 +980,9 @@ export default {
           this.isShowHostSN = true;
           this.isShowVin = false;
           this.listLoading = false
+          this.$nextTick(()=>{
+            if(this.$refs.form)this.$refs.form.clearValidate()
+          })
         })
         .catch(err=>{
           this.listLoading = false
@@ -1126,7 +1149,6 @@ export default {
                   }
                   this.$axios.posts("/api/newjit/bill-m100/check-already-print",_data)
                   .then(res=>{
-                    console.log(1130,res)
                     if(res.item && res.item.length > 0){
                       let _tip = res.item.join(","); //todo-an:
                       this.$confirm(_tip, "检测已打印，是否确定继续打印？",{
@@ -1186,44 +1208,43 @@ export default {
         } else if (response.status === true) {
               let loadInput = response.item;
               //-------------------------------------------
-              this.$axios
-                .posts(
-                "/api/newjit/bill-m100/load-menban-report2",
-                loadInput
-                )
+              this.$axios.posts("/api/newjit/bill-m100/load-menban-report2",loadInput)
                 .then((response) => {
+                  if(response.mainList1 && response.mainList1.length >0 && response.mainList1[0].vehicleModel){
                     console.log("加载报表");
                     this.dialogFormVisible = false;
-                    if (response.status === false) {
-                      this.$message({
-                      message: response.message,
-                      type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
+                    // if (response.status === false) {
+                    //   this.$message({
+                    //   message: response.message,
+                    //   type: "error",
+                    //   });
+                    //   return;
+                    // } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(
-                      response.item
+                        response
                       );
                       //this.fileQuery.dataname = "";
                       console.log("打印json");
+                      let _report = response.mainList1[0].vehicleModel + `_` + this.listQuery.productLine
                       this.$axios
                       .posts(
-                        "/Handlers/Handler1.ashx?report=menban",
+                        "/Handlers/Handler1.ashx?report="+_report,
                         qs.stringify(this.fileQuery)
                       )
                       .then((response) => {
                         console.log("获取文件base64编码");
-                        this.formLoading = false;
+                        // this.formLoading = false;
                         this.isDisable = false;
                         this.printpdf(response); //打印我文件流
                       })
                       .catch((error) => {
-                        this.formLoading = false;
+                        // this.formLoading = false;
                         this.isDisable = false;
                       });
-                    }
+                    // }
+                  }
                 });
               //-------------------------------------------
         }
diff --git a/vue/src/views/pg-fis/basedate/m110Search/index.vue b/vue/src/views/pg-fis/basedate/m110Search/index.vue
index c489dff..ee6be17 100644
--- a/vue/src/views/pg-fis/basedate/m110Search/index.vue
+++ b/vue/src/views/pg-fis/basedate/m110Search/index.vue
@@ -212,9 +212,11 @@
           width="180px"
         >
           <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            <!-- <span class="link-type" @click="handleDrawerOpen(scope.row)"> -->
+            {{
               scope.row.vin
-            }}</span>
+            }}
+            <!-- </span> -->
           </template>
         </el-table-column>
         <el-table-column
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue
index 998a732..a78018e 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -206,9 +206,11 @@
           width="180px"
         >
           <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            <!-- <span class="link-type" @click="handleDrawerOpen(scope.row)"> -->
+            {{
               scope.row.knr
-            }}</span>
+            }}
+            <!-- </span> -->
           </template>
         </el-table-column>
         <el-table-column
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index be3f49b..01bd511 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -212,9 +212,11 @@
           width="180px"
         >
           <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            <!-- <span class="link-type" @click="handleDrawerOpen(scope.row)"> -->
+            {{
               scope.row.vin
-            }}</span>
+            }}
+            <!-- </span> -->
           </template>
         </el-table-column>
         <el-table-column