fjl

 Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue

@@ -6,17 +6,6 @@
    append-to-body

    top="5vh"

  >

    <!-- <div>

      <FormTemplate

        v-if="type === 'batchApplyCode'"

        type="add"

        :selfColumnType="selfColumnType"

        :selfColumnConfig="selfColumnConfig"

        ref="CodeApply"

        @getFormData="getCodeApplyFormData"

        @referConfigDataUpdate="referConfigDataUpdate"

      ></FormTemplate>

    </div> -->

    <div class="flex_box">

      <div

        class="left"

@@ -75,10 +64,21 @@
                v-if="cloNamesList.length > 1"

              >

                <el-table-column

                  v-if="type !== 'batchApplyCode'"

                  type="selection"

                  width="100px"

                  align="center"

                ></el-table-column>

                <el-table-column

                  v-else

                  type="operate"

                  width="100px"

                  align="center"

                >

                  <template>

                    <el-button type="text">重新编辑</el-button>

                  </template>

                </el-table-column>

                <el-table-column

                  type="index"

                  label="序号"

@@ -134,9 +134,17 @@
              </div>

            </el-tab-pane>

            <el-tab-pane :label="tab2Name" name="tab2">

              <el-table border :data="tab2Table" height="600px">

              <el-table

                border

                :data="tab2Table"

                :height="

                  type === 'batchApplyCode' && tab2Table.length > 0

                    ? '400px'

                    : '700px'

                "

              >

                <el-table-column

                  v-for="item in cloNamesList"

                  v-for="item in successTableColumns"

                  :key="item.field"

                  :prop="item.field"

                  :label="item.title"

@@ -145,6 +153,23 @@
                >

                </el-table-column>

              </el-table>

              <el-card

                style="min-height: 200px; margintop: 10px"

                v-if="type === 'batchApplyCode' && tab2Table.length > 0"

              >

                <div slot="header" class="clearfix">

                  <h4>编码申请</h4>

                </div>

                <FormTemplate

                  v-if="type === 'batchApplyCode'"

                  type="add"

                  :selfColumnType="selfColumnType"

                  :selfColumnConfig="selfColumnConfig"

                  ref="CodeApply"

                  @getFormData="getCodeApplyFormData"

                  @referConfigDataUpdate="referConfigDataUpdate"

                ></FormTemplate>

              </el-card>

            </el-tab-pane>

          </el-tabs>

        </div>

@@ -183,7 +208,7 @@
export default {

  name: "ShowImportData",

  components: { ResembleQuery, FormTemplate },

  // mixins: [codeApply],

  mixins: [codeApply],

  props: {

    title: {

      type: String,

@@ -221,6 +246,13 @@
        this.$emit("update:visible", val);

      },

    },

    successTableColumns() {

      if (this.type === "batchApplyCode") {

        return this.cloNamesList.slice(1);

      } else {

        return this.cloNamesList;

      }

    },

  },

  data() {

    return {

@@ -236,6 +268,7 @@
      activeTab: "tab1",

      cloNamesList: [], //列表头部字段

      localCodeClassifyOid: "",

      codeRuleOid: '',

      resembleColumList: [], //相似项查出来的列表字段

      currentSelectedResemble: [],

      currentSelectedResembleRow: {

@@ -245,6 +278,7 @@
        formTemplateVisible: false,

      },

      secVOList: [],

      batchApplyCodeTableData: {},

    };

  },



@@ -261,23 +295,55 @@
      }

      this.isExpand = !this.isExpand;

    },

    treeNodeClick(data) {

    async treeNodeClick(data) {

      console.log(data);

      this.localCodeClassifyOid = data.codeClassifyOid;

      this.cloNamesList = data.cloNamesList;

      this.templateOid = data.oid;

      if (this.type === "batchApplyCode") {

        this.codeRuleOid = data.codeRuleOid

        if (!this.batchApplyCodeTableData[data.codeRuleOid]) {

          this.batchApplyCodeTableData[data.codeRuleOid] = {};

        } else {

          console.log(this.$refs.CodeApply, 'this.$refs.CodeApply');

          if (this.$refs.CodeApply) {

            console.log(this.$refs.CodeApply.validate(), 'this.$refs.CodeApply.validate()');

            if (!(await this.$refs.CodeApply.validate())) {

              this.$message.warning('请填写便编码申请！')

              return false

            }

          }

          // 校验

        }

      }

      getResembleTable({

        codeClassifyOid: this.templateOid,

        codeClassifyOid:

          this.type === "batchApplyCode" ? data.codeRuleOid : this.templateOid,

        redisOid: this.redisOid + "-resemble",

      }).then((res) => {

        this.tab1Table = res.data.data;

        if (this.type === "batchApplyCode" && this.tab1Table.length > 0) {

          this.batchApplyCodeTableData[data.codeRuleOid]["tab1"] =

            res.data.data;

          
        }

      });

      // 获取正确数据

      getSuccessTable({

        codeClassifyOid: this.templateOid,

        codeClassifyOid:

          this.type === "batchApplyCode" ? data.codeRuleOid : this.templateOid,

        redisOid: this.redisOid + "-ok",

      }).then((res) => {

        this.tab2Table = res.data.data;

        if (this.tab2Table.length > 0 && this.type === "batchApplyCode") {

          this.batchApplyCodeTableData[data.codeRuleOid]["codeApply"] = {}

          this.batchApplyCodeTableData[data.codeRuleOid]["tab2"] =

              res.data.data;

          if (this.$refs.CodeApply) {

            this.$refs.CodeApply.loading = true;

          }

          this.getCodeRule();

        }

      });

      getFormTemplate({

        templateOid: data.oid,


 Source/UBCS-WEB/src/components/BatchImport/index.vue

@@ -271,6 +271,7 @@
                cloNamesList: item.cloNamesList,

                oid: item.codeTemplateOid,

                codeClassifyOid: item.codeClassifyOid,

                codeRuleOid: item.codeRuleOid,

                name: item.codeRuleVO.name

              }

            } else {


 Source/UBCS-WEB/src/mixins/codeApply.js

@@ -41,15 +41,10 @@
      codeApplyForm: {},

    }

  },

  created() {

    if (this.type === 'batchImportApply') {

      this.getCodeRule()

    }

  },

  methods: {

    // 获取码值申请数据

    getCodeRule() {

      getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {

      getCodeRule({ codeClassifyOid: this.localCodeClassifyOid }).then((res) => {

        if (res.data && res.data.code === 200) {

          const typeList = [

            "codefixedsec",

@@ -73,6 +68,7 @@
    },

    getCodeApplyFormData(codeApplyForm) {

      this.codeApplyForm = codeApplyForm;

      this.batchApplyCodeTableData[this.codeRuleOid]["codeApply"] = codeApplyForm

    },

    getType(item) {

      console.log(item.secType, 'item.secType');


 Source/UBCS-WEB/vue.config.js

@@ -27,7 +27,7 @@
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.7:37000',
        // target: 'http://192.168.1.46:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',