diff --git a/src/api/apis/ItemEntryTemplate.js b/src/api/apis/ItemEntryTemplate.js new file mode 100644 index 0000000..6f9c6d4 --- /dev/null +++ b/src/api/apis/ItemEntryTemplate.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' +// 表格数据获取 +export function confTempSaveAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/save", + method: 'post', + data, + }) +} +export function queryVoucherTypeAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryVoucherType", + method: 'post', + data, + }) +}export function tempupdateAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/update", + method: 'post', + data, + }) +}export function tempqueryAllAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/queryAll", + method: 'post', + data, + }) +} +export function tempdeleteAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/delete", + method: 'post', + data, + }) +}export function tempcheckAbstractAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/checkAbstract", + method: 'post', + data, + }) +}export function tempQueryAllAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/type/queryAll", + method: 'post', + data, + }) +}export function typeSaveAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/type/save", + method: 'post', + data, + }) +}export function typeUpdateAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/type/update", + method: 'post', + data, + }) +}export function typeDeleteAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/temp/type/delete", + method: 'post', + data, + }) +} diff --git a/src/api/apis/accountingSubject.js b/src/api/apis/accountingSubject.js new file mode 100644 index 0000000..58e14f9 --- /dev/null +++ b/src/api/apis/accountingSubject.js @@ -0,0 +1,80 @@ +//会计科技 + +import request from "@/utils/request"; + +//业务模块 + +//新增模块 +export function subjectContrastQueryAll(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/subjectContrast/queryAll", + method: "post", + data, + }); +}export function queryOrgBookVOAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryOrgBookVO", + method: "post", + data, + }); +}export function queryBdinfoListAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryBdinfoList", + method: "post", + data, + }); +}export function subjectContrastSaveAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/subjectContrast/save", + method: "post", + data, + }); +}export function subjectContrastqueryAll(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/subjectContrast/queryAll", + method: "post", + data, + }); +}export function subjectContrastdeleteAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/subjectContrast/delete", + method: "post", + data, + }); +}export function subjectContrastupdateAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/subjectContrast/update", + method: "post", + data, + }); +}export function queryDataByMapAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryDataByMap", + method: "post", + data, + }); +}export function queryDataPagedByMapAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryDataPagedByMap", + method: "post", + data, + }); +}export function queryAccSubjByOrgBookIdAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryAccSubjByOrgBookId", + method: "post", + data, + }); +}export function subjectContrastBDelete(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/subjectContrastB/delete", + method: "post", + data, + }); +}export function queryGlsubrelationAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryGlsubrelation", + method: "post", + data, + }); +} diff --git a/src/api/apis/operationalModule.js b/src/api/apis/operationalModule.js index ff3f801..f470e13 100644 --- a/src/api/apis/operationalModule.js +++ b/src/api/apis/operationalModule.js @@ -116,4 +116,22 @@ export function queryByIdAPI(data) { method: "post", data, }); +}export function queryBdinfoListAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryBdinfoList", + method: "post", + data, + }); +}export function queryCashFlowMapAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/bd/queryCashFlowMap", + method: "post", + data, + }); +}export function queryMdmAndFiledssByMdmIdAPI(data) { + return request({ + url: "/kangarooDataCenterV3/ae/conf/mdmfile/queryMdmAndFiledssByMdmId", + method: "post", + data, + }); } diff --git a/src/components/base/BaseMenuTree/index.vue b/src/components/base/BaseMenuTree/index.vue index ea6c898..5f29d87 100644 --- a/src/components/base/BaseMenuTree/index.vue +++ b/src/components/base/BaseMenuTree/index.vue @@ -6,21 +6,101 @@ @@ -31,54 +111,103 @@ export default { // 是否默认展开所有节点 expandAll: { type: Boolean, - default: true + default: true, + }, + // 操作按钮 + treeButton: { + type: Boolean, + default: false, + }, + // 操作按钮 + filterButtonShow: { + type: Boolean, + default: false, }, // 是否显示保存按钮 isSaveBtn: { type: Boolean, - default: false + default: false, }, // 是否显示全选按钮 Allshow: { type: Boolean, - default: false + default: false, }, // 是否显示多选按钮 showCheckbox: { type: Boolean, - default: false + default: false, }, // 是否居中 isCenter: { type: Boolean, - default: true + default: true, + }, + // 是否显示筛选 + filterShow: { + type: Boolean, + default: false, }, menuData: { type: Array, default: () => { - return [] - } + return []; + }, }, setting: { type: Boolean, - default: false + default: false, + }, + treeLoading: { + type: Boolean, + default: false, + }, + appendButton: { + type: Boolean, + default: true, + }, + reviseButton: { + type: Boolean, + default: true, + }, + removeButton: { + type: Boolean, + default: true, + }, + nodeLabel: { + type: String, + default: "", }, treeProps: { type: Object, - default: () => { + default() { return { - label: 'menuName', - children: 'children' - } - } - } + children: "children", + label: "label", + }; + }, + }, + }, + watch: { + defaultTheme: { + handler: function (val, oldVal) { + this.theme = val; + // document.getElementsByTagName('body')[0].style.setProperty('--active', val) + + // let arr = document.getElementsByClassName('.el-tree-node:focus>.el-tree-node__content') + // $('.el-tree-node:focus>.el-tree-node__content').css('color',val) + }, + immediate: true, + }, + filterText(val) { + this.$refs.elTree.filter(val); + }, }, data() { return { - theme: '', + filterText: "", + theme: "", powerDlog: false, - // 菜单数据 - // menuData: [], // 回显选中ids selectData: [], // 树状图设置 @@ -86,50 +215,75 @@ export default { // label: 'menuName', // children: 'id', // }, + // treeProps: { + // children: 'children', + // label: 'label' + // }, // PC菜单全选 checkedAllPc: false, // 防连点 outing: false, - treeLoading: false - } - }, - created() { - }, - mounted() { + }; }, + created() {}, + mounted() {}, computed: { defaultTheme() { - return this.$store.state.settings.theme - } - }, - watch: { - defaultTheme: { - handler: function(val, oldVal) { - this.theme = val - // document.getElementsByTagName('body')[0].style.setProperty('--active', val) - - // let arr = document.getElementsByClassName('.el-tree-node:focus>.el-tree-node__content') - // $('.el-tree-node:focus>.el-tree-node__content').css('color',val) - }, - immediate: true - } + return this.$store.state.settings.theme; + }, }, methods: { + //选中第一个 + clickFirst() { + document.querySelectorAll(".is-focusable")[0].click(); + }, + setCurrentKey(selectId) { + this.$nextTick(() => { + this.$refs.elTree.setCurrentKey(selectId); + }); + }, + dbTree(node, data) { + console.log(node, data, "node"); + this.setCurrentKey(null); + }, + // 添加 + append(node, data) { + this.$emit("append", data, node); + }, + // 编辑 + revise(node, data) { + this.$emit("revise", data, node); + }, + // 删除 + remove(node, data) { + this.$emit("remove", data, node); + }, + add() { + this.$emit("add"); + }, + filterNode(value, data, node) { + if (!value) return true; + let nodeData = + this.nodeLabel == "" + ? data[this.treeProps.label] + : data[this.treeProps.label][this.nodeLabel]; + return nodeData.indexOf(value) !== -1; + }, buttonL(el) { - el.active = !el.active - this.$forceUpdate() + el.active = !el.active; + this.$forceUpdate(); }, setData(id) { - this.selectData.push(id) + this.selectData.push(id); }, saveMenuUser() { - let allKeys = this.getKey() - this.$emit('onSaveMenu', allKeys) + let allKeys = this.getKey(); + this.$emit("onSaveMenu", allKeys); }, // 获取选中的key值 getKey() { - return this.$refs.elTree.getCheckedKeys() + return this.$refs.elTree.getCheckedKeys(); }, // 初始数据 initData() { @@ -137,21 +291,21 @@ export default { // this.menuData = []; // 回显选中ids - this.selectData = [] + this.selectData = []; }, // 关闭弹窗 handleClose() { - this.powerDlog = false - this.initData() + this.powerDlog = false; + this.initData(); }, // 全选、反选 changePcAll() { - this.checkedAllPc = !this.checkedAllPc - let selectData = [] + this.checkedAllPc = !this.checkedAllPc; + let selectData = []; if (this.checkedAllPc) { - selectData = this.cycleData(this.menuData) + selectData = this.cycleData(this.menuData); } - this.selectData = selectData + this.selectData = selectData; }, /** * @description 递归获取菜单id(树状 多叉树结构) @@ -161,46 +315,46 @@ export default { * @param {Boolean} isSelect: false返回所有id,true返回已选择id */ cycleData(outData, isSelect) { - let newData = [] + let newData = []; function cycle(data) { if (!data || data.length == 0) { - return false + return false; } else { for (var i = 0, len = data.length; i < len; i++) { - let item = data[i] + let item = data[i]; if (isSelect && item.selected == 1) { - newData.push(item.id) + newData.push(item.id); } if (!isSelect) { - newData.push(item.id) + newData.push(item.id); } - cycle(item.id) + cycle(item.id); } } } - cycle(outData) - return newData + cycle(outData); + return newData; }, getData(childIds) { - let newData = [] + let newData = []; function cycle(data) { - data.forEach(el => { - childIds.forEach(item => { + data.forEach((el) => { + childIds.forEach((item) => { if (el.id == item) { - newData.push(el) + newData.push(el); } - }) + }); if (el.children != null && el.children && el.children.length) { - cycle(el.children, childIds) + cycle(el.children, childIds); } - }) + }); } - cycle(this.menuData, childIds) - return newData + cycle(this.menuData, childIds); + return newData; }, /** * @description 节点选中状态发生变化时的回调 @@ -210,38 +364,46 @@ export default { * @param { Boolean } checked 当前节点是否选中 */ checkChange(nodeDode, checked) { - let getHalfCheckedKeys = this.$refs.elTree.getCheckedKeys().concat(this.$refs.elTree.getHalfCheckedKeys()) + let getHalfCheckedKeys = this.$refs.elTree + .getCheckedKeys() + .concat(this.$refs.elTree.getHalfCheckedKeys()); // let getHalfCheckedKeys = this.$refs.elTree.getHalfCheckedKeys() - let childIds = getHalfCheckedKeys.length != 0 ? getHalfCheckedKeys : this.selectData - let checkdata = this.getData(childIds) - this.$emit('checkChange', childIds, checkdata) - return - - let id = nodeDode.id + let childIds = + getHalfCheckedKeys.length != 0 ? getHalfCheckedKeys : this.selectData; + let checkdata = this.getData(childIds); + this.$emit("checkChange", childIds, checkdata); + return; + let id = nodeDode.id; // let childIds = this.cycleData(id) - console.log(id) // 循环设置子项是否选中 - childIds.forEach(item => { - this.$refs.elTree.setChecked(item, checked) - }) + childIds.forEach((item) => { + this.$refs.elTree.setChecked(item, checked); + }); }, // 点击事件 handleNodeClick(data, b, c) { - this.$emit('handleNodeClick', data, b.parent.data) - } - - } -} + this.$emit("handleNodeClick", data, b, c); + }, + }, +}; diff --git a/src/components/base/baseChoice/index.vue b/src/components/base/baseChoice/index.vue index 81bc03b..e8be414 100644 --- a/src/components/base/baseChoice/index.vue +++ b/src/components/base/baseChoice/index.vue @@ -1,210 +1,232 @@ diff --git a/src/components/base/baseNewForm/index.vue b/src/components/base/baseNewForm/index.vue index 1ec50fb..b5642d6 100644 --- a/src/components/base/baseNewForm/index.vue +++ b/src/components/base/baseNewForm/index.vue @@ -89,6 +89,25 @@
{{ ruleForm[row.prop] }}
+ +
+ {{ data[row.props.label] }} +
+
+ {{ data.label }} +
+
0) { + const result = getLabelPath(el, item[row.props.children], path); + if (result) return result; + } + + path.pop(); // 回退 + } + + return null; + } + + // 🧠 只处理最后一个值,不遍历 val(val 是一个“路径数组”) + const lastValue = Array.isArray(val) ? val[val.length - 1] : val; + + const labelPath = getLabelPath(lastValue, options); + valLabel = labelPath ? labelPath.join('.') : ''; + + this.$emit("cascaderChange", val, options, row, valLabel,obj); + }, + // 这行代码可复用 + clickNode($event) { + console.log(123, "?"); + console.log( + $event.target.parentElement.parentElement.firstElementChild, + "$event.target.parentElement.parentElement.firstElementChild" + ); + $event.target.parentElement.parentElement.firstElementChild.click(); + }, + addHandle(){ + + }, changeRemind() { this.$emit('changeRemind', this.ruleForm) }, @@ -399,7 +465,7 @@ export default { obj = item } }) - this.$emit('onSelect', val, index, indexRow, obj,options,this.ruleForm,row) + this.$emit('onSelect', val, index, indexRow, obj, options, this.ruleForm, row) if (row.changeRemind) { this.$emit('changeRemind', this.ruleForm) } diff --git a/src/components/base/baseTable/index.vue b/src/components/base/baseTable/index.vue index 6313ef4..2b7d85a 100644 --- a/src/components/base/baseTable/index.vue +++ b/src/components/base/baseTable/index.vue @@ -3,7 +3,7 @@ * @author: Zhangpengcheng * @date: 2022-08-30 * tabLoading 加载 headerStyle表头格式 tableData数据 border纵向边框 @current-change单选触发 summary-method合计 @cell-click某个单元格点击触发事件 @sort-change触发后台排序 -* @row-click 当某一行被点击时会触发该事件 highlight-current-row是否高亮 show-summary是否合计 SummariesIndex合计需要的index @selection-change多选 tableHeight高度 +* @row-click 当某一行被点击时会触发该事件 highlight-current-row是否高亮 show-summary是否合计 SummariesIndex合计需要的index @selection-change多选 tableHeight高度 * :style="'height:'+ tableHeight + '!important'" --> - + &-t { + width: 100%; + // height: 450px; + // border: 1px solid #d8d8d8; + overflow-y: auto; + height: 100%; + } +} + +.checkBox { + margin-top: 6px; + margin-right: 12px; +} + +.checkText { + width: 60px; + height: 30px; + line-height: 30px; + text-align: center; + color: #333; + font-size: 16px; + cursor: pointer; + transition: all 0.3s ease-in-out; + + &:hover { + color: #4570fc; + } +} + diff --git a/src/utils/loading.js b/src/utils/loading.js index ed68c81..4cdbd0a 100644 --- a/src/utils/loading.js +++ b/src/utils/loading.js @@ -36,7 +36,7 @@ export function openLoading(loadingName='加载中') { }) setTimeout(() => { appLoading.close(); - }, 10000) + }, 1000000) } export function closeLoading() { if (appLoading) { diff --git a/src/utils/util.js b/src/utils/util.js index a439f8b..2012477 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -17,6 +17,14 @@ export function getNowTime() { return nowTime; } +/** + * 根据数组对象的某个字段去重 + * item.name 是[{name:1}] 根据每条数据的name值来去重 + * */ +export function unique(arr, val) { + const res = new Map(); + return arr.filter(item => !res.has(item[val]) && res.set(item[val], 1)) +} export function getEditHtml(str) { if (!str) { return; diff --git a/src/views/ItemEntryTemplate/compoments/dialogPage/index.vue b/src/views/ItemEntryTemplate/compoments/dialogPage/index.vue new file mode 100644 index 0000000..195682b --- /dev/null +++ b/src/views/ItemEntryTemplate/compoments/dialogPage/index.vue @@ -0,0 +1,634 @@ + + + + + + + diff --git a/src/views/ItemEntryTemplate/index.vue b/src/views/ItemEntryTemplate/index.vue new file mode 100644 index 0000000..5110020 --- /dev/null +++ b/src/views/ItemEntryTemplate/index.vue @@ -0,0 +1,2341 @@ + + + + + + + + diff --git a/src/views/ItemEntryTemplate/indexNew.vue b/src/views/ItemEntryTemplate/indexNew.vue new file mode 100644 index 0000000..9d2cbe5 --- /dev/null +++ b/src/views/ItemEntryTemplate/indexNew.vue @@ -0,0 +1,2152 @@ + + + + + + + + diff --git a/src/views/ItemEntryTemplate/indexOld.vue b/src/views/ItemEntryTemplate/indexOld.vue new file mode 100644 index 0000000..d258186 --- /dev/null +++ b/src/views/ItemEntryTemplate/indexOld.vue @@ -0,0 +1,1936 @@ + + + + + + + + diff --git a/src/views/accountingSubject/compoments/dialogPage/index.vue b/src/views/accountingSubject/compoments/dialogPage/index.vue new file mode 100644 index 0000000..195682b --- /dev/null +++ b/src/views/accountingSubject/compoments/dialogPage/index.vue @@ -0,0 +1,634 @@ + + + + + + + diff --git a/src/views/accountingSubject/compoments/treePickDialog.vue b/src/views/accountingSubject/compoments/treePickDialog.vue new file mode 100644 index 0000000..55bc49a --- /dev/null +++ b/src/views/accountingSubject/compoments/treePickDialog.vue @@ -0,0 +1,149 @@ + + + + + + diff --git a/src/views/accountingSubject/index.vue b/src/views/accountingSubject/index.vue new file mode 100644 index 0000000..4da47a6 --- /dev/null +++ b/src/views/accountingSubject/index.vue @@ -0,0 +1,1171 @@ + + + + + + + + diff --git a/src/views/cashFlowChunk/compoments/dialogPage/index.vue b/src/views/cashFlowChunk/compoments/dialogPage/index.vue new file mode 100644 index 0000000..195682b --- /dev/null +++ b/src/views/cashFlowChunk/compoments/dialogPage/index.vue @@ -0,0 +1,634 @@ + + + + + + + diff --git a/src/views/cashFlowChunk/index.vue b/src/views/cashFlowChunk/index.vue new file mode 100644 index 0000000..89d5cda --- /dev/null +++ b/src/views/cashFlowChunk/index.vue @@ -0,0 +1,608 @@ + + + + + + + diff --git a/src/views/classifyDefinition/compoments/dialogPage/index.vue b/src/views/classifyDefinition/compoments/dialogPage/index.vue new file mode 100644 index 0000000..195682b --- /dev/null +++ b/src/views/classifyDefinition/compoments/dialogPage/index.vue @@ -0,0 +1,634 @@ + + + + + + + diff --git a/src/views/classifyDefinition/compoments/treePickDialog.vue b/src/views/classifyDefinition/compoments/treePickDialog.vue new file mode 100644 index 0000000..55bc49a --- /dev/null +++ b/src/views/classifyDefinition/compoments/treePickDialog.vue @@ -0,0 +1,149 @@ + + + + + + diff --git a/src/views/classifyDefinition/index.vue b/src/views/classifyDefinition/index.vue new file mode 100644 index 0000000..82c74dc --- /dev/null +++ b/src/views/classifyDefinition/index.vue @@ -0,0 +1,1146 @@ + + + + + + + + diff --git a/src/views/login.vue b/src/views/login.vue index 04fa858..e545d2e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -259,6 +259,7 @@ export default { this.$store .dispatch("Login", this.loginForm) .then(() => { + console.log(123,'123') this.loading = false; this.$router .push({ diff --git a/src/views/masterDataOptions/compoments/baseNewForm.vue b/src/views/masterDataOptions/compoments/baseNewForm.vue index 87ea049..c33c82c 100644 --- a/src/views/masterDataOptions/compoments/baseNewForm.vue +++ b/src/views/masterDataOptions/compoments/baseNewForm.vue @@ -71,6 +71,7 @@ v-model="ruleForm[row.id]" v-if="row.type == 'onecheck'" :disabled="disabled" + :true-label="row.options ? row.options[0].id : true" >是 { if (tempDist[item.elCol[0].id]) { tempArr.push({ diff --git a/src/views/masterDataOptions/index.vue b/src/views/masterDataOptions/index.vue index 00d1583..557ce0e 100644 --- a/src/views/masterDataOptions/index.vue +++ b/src/views/masterDataOptions/index.vue @@ -27,6 +27,7 @@
+
@@ -43,7 +44,11 @@
{{ row.mdmName }}
-
{{ row.mdmType == 1 ? '档案' : '数据' }}
+
+
{{ row.mdmType == 1 ? '档案' : '数据' }}
+
{{ row.tag == 1 ? '手工' : '预制' }}
+
+
{{ row.remark }}
@@ -51,7 +56,7 @@
-
+
diff --git a/src/views/masterDataOptions/masterDataAdd.vue b/src/views/masterDataOptions/masterDataAdd.vue index 2fddda6..6706c85 100644 --- a/src/views/masterDataOptions/masterDataAdd.vue +++ b/src/views/masterDataOptions/masterDataAdd.vue @@ -98,6 +98,7 @@ import configData from './configData' import baseNewForm from '@/views/intergrationTask/compoments/baseNewForm' import request from '@/utils/request' import { authApi } from '@/api/apis/auth' +import { queryBdInfoAPI } from '@/api/apis/classifyDefinition' export default { data() { @@ -206,23 +207,14 @@ export default { }, // 获取下拉数据(作废) async initSelectOptions() { - let params = { - tab_name: 'mdm', - column_name: 'mdm_type' - } - const res = await getApiModuleApi({ - tl: 'generalServiceImpl', - as: 'dictionaryshop', - dj: 'selectDictionaryshop' - }, params) + const res = await queryBdInfoAPI({}) this.formRow[1].elCol[0].options = [] res.attribute.forEach((item) => { this.formRow[1].elCol[0].options.push({ - label: item.column_content, - id: item.column_value + label: item.bdname, + id: item.pkDdinfo }) }) - console.log(this.formRow[1].elCol[0].options) }, // 复制-获取表单数据 async initCopyFormData() { @@ -281,7 +273,7 @@ export default { }, created() { // 请求下拉options - // this.initSelectOptions() + this.initSelectOptions() // 判断是什么类型进来的 if (this.$route.query.id) { this.billid = this.$route.query.id diff --git a/src/views/operationalModule/index.vue b/src/views/operationalModule/index.vue index 0a65ea0..4f8fb1a 100644 --- a/src/views/operationalModule/index.vue +++ b/src/views/operationalModule/index.vue @@ -23,6 +23,7 @@
- +
diff --git a/src/views/relevanceSetting/index.vue b/src/views/relevanceSetting/index.vue index ec68023..4fb2498 100644 --- a/src/views/relevanceSetting/index.vue +++ b/src/views/relevanceSetting/index.vue @@ -5,7 +5,7 @@
业务模块
- +
@@ -14,8 +14,8 @@ >
{{ item.name }}
- - + +
@@ -99,13 +99,15 @@ :dialogVisible.sync="masterDialog" :closeModal="false" :footerShow="true" - title="选择主数据" + title="选择映射档案" width="80%" top="10vh" @handleConfirmClick="masterPickDialog" >
- +
@@ -128,7 +130,7 @@ import { businessModuleMdmupdateListAPI, businessModulequeryAllAPI, businessModuleUpdateAPI, deleteAPI, influenceFactorqueryAllAPI, influenceFactorsaveAPI, influenceFactorupdateAPI, - queryAllAPI, + queryAllAPI, queryBdinfoListAPI, queryByIdAPI, queryMdmsByModuleIdAPI } from '@/api/apis/operationalModule' @@ -142,22 +144,14 @@ export default { masterTableData: [], masterTableColumn: [ { - label: '影响因素名称', - prop: 'factorName' + label: '基础数据编码', + prop: 'bdcode' }, { - label: '映射档案', - prop: '' + label: '基础数据名称', + prop: 'bdname' }, - { - label: '备注', - prop: 'remark' - }, - { - label: '操作', - prop: 'operation', - width: 60 - } + ], masterDialog: false, basicFormForm: [ @@ -172,7 +166,7 @@ export default { }, { label: '映射档案', - prop: 'mdmName', + prop: 'mappingFileName', tag: 'elDialog', span: 24, disabled: false, @@ -212,6 +206,9 @@ export default { ], targetDataCode: [ { required: true, message: '请输入目标数据编码', trigger: 'blur' } + ], + mappingFileName: [ + { required: true, message: '请选择映射档案', trigger: 'change' } ] }, nowBtns: [], @@ -250,7 +247,7 @@ export default { }, { label: '映射档案', - prop: '' + prop: 'mappingFileName' }, { label: '备注', @@ -273,20 +270,33 @@ export default { } }, methods: { + async getTableList(val) { + this.openLoading() + const res = await queryBdinfoListAPI({ + bdname: val + }) + this.masterTableData = res.attribute + this.$nextTick(()=>{ + this.$refs.baseChoice.optionData = '' + this.$refs.baseChoice.$refs.customtable.clearRadioIndex() + }) + + }, masterPickDialog() { - if (!this.$refs.baseChoice.optionData.id) { - this.$vmNews('请选择主数据') + if (!this.$refs.baseChoice.optionData.bdname) { + this.$vmNews('请选择映射档案') return } let row = this.$refs.baseChoice.optionData - this.$set(this.$refs.basicFormRefsName.ruleForm, 'mdmName', row.mdmName) - this.$set(this.$refs.basicFormRefsName.ruleForm, 'mdmId', row.id) - this.$set(this.$refs.basicFormRefsName.ruleForm, 'mdmCode', row.mdmCode) + this.$set(this.$refs.basicFormRefsName.ruleForm, 'mappingFileName', row.bdname) + this.$set(this.$refs.basicFormRefsName.ruleForm, 'mappingFileCode', row.tablename) + this.$set(this.$refs.basicFormRefsName.ruleForm, 'mappingFileId', row.pkBdinfo) this.masterDialog = false }, async elDialogClick(row, index) { this.masterDialog = true - const res = await businessModulequeryAllAPI({}) + this.openLoading() + const res = await queryBdinfoListAPI({}) this.masterTableData = res.attribute }, delRightTitle(item) {