From c71cca6babec17f4bdfa54f80aeaf4135e7440ef Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 01 十二月 2023 14:35:55 +0800
Subject: [PATCH] 主数据标准需求更改
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 1
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 25 +++-
Source/UBCS-WEB/src/api/code/codeCharcter.js | 21 ++++
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue | 201 +++++++++++++++++++++++++++++++++++++++
Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue | 13 ++
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 8 +
6 files changed, 257 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/code/codeCharcter.js b/Source/UBCS-WEB/src/api/code/codeCharcter.js
new file mode 100644
index 0000000..0e2a5f4
--- /dev/null
+++ b/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,
+ },
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index bfd0254..e75483c 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/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,
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index a8121e9..36ca0b3 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/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 ;
+ }
}
},
//鎵归噺缂栬緫
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 5e44b6a..3ee51de 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/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"
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
new file mode 100644
index 0000000..afe8ad3
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+name: "prefixConfig"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index f983576..0ac88fd 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/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>
--
Gitblit v1.9.3