田源
2023-12-01 c71cca6babec17f4bdfa54f80aeaf4135e7440ef
主数据标准需求更改
已修改4个文件
已添加2个文件
269 ■■■■■ 文件已修改
Source/UBCS-WEB/src/api/code/codeCharcter.js 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue 201 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/api/code/codeCharcter.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
import request from '@/router/axios';
export const getList = (params) => {
  return request({
    url: '/api/ubcs-code/codeRuleCharacterController/list',
    method: 'get',
    params: {
      ...params,
    }
  })
}
export const gridCodeRule = (params) => {
  return request({
    url: '/api/ubcs-code/mdmRule/gridCodeRule',
    method: 'get',
    params: {
      ...params,
    },
  })
}
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -317,9 +317,10 @@
          valueFormat: formItem.dateFormate || "yyyy-MM-dd HH:mm:ss",
          format: formItem.dateFormate,
          keyAttr: formItem.keyAttr,
          value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
          value:formItem.defaultValue || (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
            (formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
            (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null),
            (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
            (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null),
          placeholder: formItem.inputTip,
          comboxKey: formItem.comboxKey,
          tip: formItem.tooltips,
@@ -427,7 +428,8 @@
          keyAttr: formItem.keyAttr,
          value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
            (formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
            (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null),
            (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null)  ||
            (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null),
          placeholder: formItem.inputTip,
          comboxKey: formItem.comboxKey,
          tip: formItem.tooltips,
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -40,7 +40,7 @@
                        border class="cus-table"
                        @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
                        @select-all="handleSelectionAll" @selection-change="handleSelectionChange"
                        @sort-change="sortChange">
                        @sort-change="sortChange"  :header-cell-style="{background:'#FAFAFA',color:'#505050'}">
                <el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
                <el-table-column v-if="tableData.length != 0" fixed label="序号" type="index" width="55">
                </el-table-column>
@@ -108,7 +108,7 @@
          </FormTemplateDialog>
          <!--          ä¿®æ”¹-->
          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                              :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'修改编码信息'"
                              :disabledProp="disabledProp" rowOid="rowOid" :templateOid="templateOid" :title="'修改编码信息'"
                              :visible.sync="editvisible"
                              type="edit" @submit="EditSumbit"></FormTemplateDialog>
          <!--          æ‰¹é‡ç¼–辑-->
@@ -584,11 +584,24 @@
    },
    //标准修订
    codeAMENDHandler() {
      if (this.selectRow.length !== 1) {
        this.$message.warning("请选择一条数据");
      } else {
      let foundItem = false;
      this.tableHeadFindData.forEach(item => {
        if (item.field === "oldcode" && Object.keys(item.referConfig).length >= 1) {
          foundItem = true;
        }
      });
      if (foundItem) {
        this.amendvisible = true;
        this.rowOid = this.selectRow[0].oid;
        this.rowOid = this.selectRow[0].oid ;
      } else {
        if (this.selectRow.length !== 1) {
          this.$message.warning("请选择一条数据");
        }else {
          this.amendvisible = true;
          this.rowOid = this.selectRow[0].oid ;
        }
      }
    },
    //批量编辑
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -326,6 +326,7 @@
                v-loading="loading"
                :data="ProData"
                :height="this.tableHeight"
                :header-cell-style="{background:'#FAFAFA',color:'#505050'}"
                border
                style="width: 100%"
                @select="selectHandle"
Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "prefixConfig"
}
</script>
<style scoped>
</style>
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -1,13 +1,208 @@
<template>
  <basic-container>
    <el-header>
      <div style="margin-bottom: 15px">
        ç¼–码规则:
        <el-select v-model="select" filterable  :filter-method="filterValue" placeholder="请选择" size="small" @click="selectHandler">
          <el-option v-for="(item,index) in queryReleasedList"
                     :key="item.oid"
                     :label="item.name"
                     :value="item.oid"></el-option>
        </el-select>
      </div>
    </el-header>
    <el-main>
      <el-table
        :data="tableData"
        :header-cell-style="{background:'#FAFAFA',color:'#505050'}"
        border
        style="width: 100%;height:  calc(100vh - 320px)"
        @cell-click="cellClickHandler">
        <el-table-column
          align="center"
          label="1"
          prop="aa"
        >
        </el-table-column>
        <el-table-column
          align="center"
          label="2"
          prop="b"
        >
        </el-table-column>
        <el-table-column
          align="center"
          label="3"
          prop="c">
        </el-table-column>
        <el-table-column
          align="center"
          label="4"
          prop="d">
        </el-table-column>
        <el-table-column
          align="center"
          label="5"
          prop="e">
        </el-table-column>
        <el-table-column
          align="center"
          label="6"
          prop="f">
        </el-table-column>
        <el-table-column
          align="center"
          label="7"
          prop="g">
        </el-table-column>
        <el-table-column
          align="center"
          label="8"
          prop="h">
        </el-table-column>
        <el-table-column
          align="center"
          label="9"
          prop="i">
        </el-table-column>
        <el-table-column
          align="center"
          label="10"
          prop="j">
        </el-table-column>
        <el-table-column
          align="center"
          label="11"
          prop="k">
        </el-table-column>
        <el-table-column
          align="center"
          label="12"
          prop="l">
        </el-table-column>
        <el-table-column
          align="center"
          label="13"
          prop="m">
        </el-table-column>
        <el-table-column
          align="center"
          label="14"
          prop="n">
        </el-table-column>
        <el-table-column
          align="center"
          label="15"
          prop="o">
        </el-table-column>
      </el-table>
    </el-main>
    <el-footer>
      <div style="width: 260px; display: flex; align-items: center;margin-top: 5px">
        <p>值:</p>
        <el-input v-model="characterValue" size="small" style="flex: 1;"></el-input>
      </div>
    </el-footer>
    <div style="margin-bottom: 10px;text-align: center">
      <el-button icon="el-icon-plus" plain size="small" type="success">添加</el-button>
      <el-button icon="el-icon-edit" plain size="small" type="primary">修改</el-button>
      <el-button icon="el-icon-delete" plain size="small" type="danger">删除</el-button>
    </div>
  </basic-container>
</template>
<script>
import {getList} from "@/api/code/codeCharcter"
import {gridCodeRule} from "@/api/code/codeCharcter"
export default {
name: "usableCharacter"
  name: "usableCharacter",
  data() {
    return {
      //下拉框数组
      queryReleasedList:[],
      //下拉框初始数据数组
      characterReleasedList: [],
      characterValue: "",
      tableData: [
        {
          aa: 'a1',
          b: 'b1',
          c: 'c1',
          d: 'd1',
          e: 'e1',
          f: 'f1',
          g: 'b1',
          h: 'c1',
          i: 'd1',
          j: 'e1',
          k: 'f1',
          l: 'a1',
          m: 'b1',
          n: 'c1',
          o: 'd1',
        },
        {
          aa: 'a2',
          b: 'b2',
          c: 'c2',
          d: 'd2',
          e: 'e2',
          f: 'f2'
        },
      ],
      select: "",
    }
  },
  watch:{
    select:{
      handler(newV){
        // console.log(newV)
      }
    }
  },
  created() {
    getList({codeRuleId:"1717377846655193088",chartType:"charset",chartValue:"标准规则"}).then(res=>{
      console.log(res)
    })
    this.getCodeRule()
  },
  methods: {
    cellClickHandler(row, column) {
      console.log(row)
      console.log(column)
      console.log(row[column.property])
      this.characterValue = row[column.property]
    },
    getCodeRule() {
      //编码规则已发布数据源
      gridCodeRule({["conditionMap" + "[lcStatus_like]"]: "Released"}).then(res => {
        this.characterReleasedList = res.data.data.records;
        this.queryReleasedList = this.characterReleasedList;
        this.select = this.characterReleasedList[0].name;
      })
    },
    //编码规则下拉框搜索
    filterValue(query) {
      console.log(query)
      if (query !== "") {
        this.queryReleasedList = this.characterReleasedList.filter(item => {
          return item.name.includes(query.toString());
        });
      } else {
        this.queryReleasedList = this.characterReleasedList;
      }
    },
    selectHandler(val){
      console.log(1)
    }
  }
}
</script>
<style scoped>
<style lang="scss" scoped>
.el-header {
  padding: 0;
}
</style>