hzya
/
middleground_code_v2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加搜索

This commit is contained in:
neymar_Zhang 2025-07-26 10:28:29 +08:00
parent 7f65edea2a
commit 45dc8abc4e
10 changed files with 382 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/apis/businessVoucher.js
View File

@ -7,3 +7,19 @@ export function logqueryBillAPI(data) {
data,
});
}
// 生成
export function coreGenerateAPI(data) {
return request({
url: "/kangarooDataCenterV3/ae/core/generate",
method: "post",
data,
});
}
// 凭证明细查询
export function queryDetailsByBillCodeAPI(data) {
return request({
url: "/kangarooDataCenterV3/ae/push/log/queryDetailsByBillCode",
method: "post",
data,
});
}

13
src/components/base/baseTable/index.vue
View File

@ -110,6 +110,10 @@
color: item.color ? item.color : '#333',
cursor: item.isClick ? 'pointer' : 'default',
}"
:title="!item.stateOption
? scope.row[item.prop]
: item.stateOption[scope.row[item.prop]]"
class='multipleLines_one'
>{{
!item.stateOption
? scope.row[item.prop]
@ -571,6 +575,15 @@ export default {
::v-deep .el-table--border {
border: none;
}
.multipleLines_one {
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 1;
display: -webkit-box !important;
-webkit-box-orient: vertical;
word-break: break-all;
white-space: pre-line;
}
// ::v-deep .el-table .sort-caret.ascending {
// top: 1px
// }

31
src/views/ItemEntryTemplate/index.vue
View File

@ -71,6 +71,19 @@
</el-option>
</el-select>
</div>
<div style="margin-left: 10px;display: flex;align-items: center">
凭证类别：
<p v-if="!editFlag">{{typeMerge == 'Y'?'合并':typeMerge == 'N'?'拆分':''}}</p>
<el-switch
v-else
v-model="typeMerge"
active-value="Y"
active-text="合并"
inactive-text="拆分"
inactive-value="N"
>
</el-switch>
</div>
</div>
<div style="display: flex;align-items: center;justify-content: flex-end;">
<!-- 查看状态 -->
@ -1168,8 +1181,8 @@ export default {
billTreeProps: {
children: 'sublistMdmModuleDbFileds',
label: 'name'
}
},
typeMerge:''
}
},
methods: {
@ -1217,7 +1230,7 @@ export default {
}
let obj =this.$refs.baseChoice2.optionData
this.$set(this.$refs.fixedValueFormRefsName.ruleForm, 'recordData', obj[this.fixedValueClickRow.namefieldname])
this.textarea += `@@${this.fixedValueClickRow.dbName}:${this.fixedValueClickRow.tablepkname}=${obj[this.fixedValueClickRow.tablepkname]}`
this.textarea += `@@$${this.fixedValueClickRow.dbName}:${this.fixedValueClickRow.tablepkname}=${obj[this.fixedValueClickRow.tablepkname]}`
// this.$set(this.clickRow, `factorid${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.key])
// this.$set(this.clickRow, `factorname${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.labelKey])
// this.$set(this.clickRow, `factorpk${this.clickNum}`, this.$refs.baseChoice.optionData['id'])
@ -1341,8 +1354,14 @@ export default {
}
})
})
let tableData = this.tableData.map(el=>{
return{
...el,
typeMerge:this.typeMerge
}
})
console.log(this.tableData, 'this.tableData')
const res = await confTempSaveAPI(this.tableData)
const res = await confTempSaveAPI(tableData)
this.$vmNews('保存成功', 'success')
this.editFlag = false
this.getTableData()
@ -1965,6 +1984,7 @@ export default {
templateTypeId: this.voucherClickId//20250704
})
this.tableData = res.attribute
this.typeMerge = this.tableData[0].typeMerge
this.$nextTick(() => {
this.$refs.customtable.clearRadioIndex()
this.$refs.customtable.clearSelection()
@ -2098,7 +2118,8 @@ export default {
glOrgbookName: this.pkglbookClickObj.glorgbookname,
currencyFieArr: [],
assistEntityList: [],
templateTypeId: this.voucherClickId
templateTypeId: this.voucherClickId,
typeMerge:this.typeMerge
}
this.tableData.push(obj)
return

29
src/views/accountingSubject/compoments/treePickDialog.vue
View File

@ -10,7 +10,12 @@
@handleConfirmClick="billClickHandle"
>
<div class="rightDialogClass_main" style="background-color: #fff;" v-if="billDialog">
<div flex="cross:center" style="margin-bottom: 10px;">
<el-input v-model="subjcode" clearable></el-input>
<el-button @click="getMenuData" type="primary" style="margin-left: 5px;">搜索</el-button>
</div>
<div class="showList" style="height: 60vh;overflow: auto">
<base-tree ref="baseTree" :isCenter="false" :isSaveBtn="false" :Allshow="false" :showCheckbox="true"
:expandAll="false" :menuData="billTableData"
:treeProps="billTreeProps"
@ -42,7 +47,8 @@ export default {
label: 'dispname',
value: 'pkAccsubj'
},
checkBoxList: []
checkBoxList: [],
subjcode:''
}
},
methods: {
@ -106,15 +112,26 @@ export default {
this.billTreeActive = item
this.billTreeActiveFather = row
},
async openDialog() {
this.billDialog = true
async getMenuData(){
const res = await queryAccSubjByOrgBookIdAPI({
pkGlorgbook: this.nameClickRow.pkglorgbook
pkGlorgbook: this.nameClickRow.pkglorgbook,
subjcode:this.subjcode
})
console.log(res, 'res')
let arr = this.dataDispose(res.attribute)
this.billTableData = res.attribute
console.log(this.billTableData, 'this.billTableData', arr)
},
async openDialog() {
this.subjcode = ''
this.billDialog = true
this.getMenuData()
// const res = await queryAccSubjByOrgBookIdAPI({
// pkGlorgbook: this.nameClickRow.pkglorgbook,
// subjcode:this.subjcode
// })
// console.log(res, 'res')
// let arr = this.dataDispose(res.attribute)
// this.billTableData = res.attribute
// console.log(this.billTableData, 'this.billTableData', arr)
},
dataDispose(arr) {
arr.forEach(item => {

34
src/views/accountingSubject/index.vue
View File

@ -267,7 +267,7 @@
@handleConfirmClick="addPickDialog"
>
<div class="rightDialogClass_main" style="background-color: #fff;" v-if="addDialog">
<baseChoice ref="baseChoice" :tableData="addTableData" :tableColumn="addTableColumn" @onQuery="addonQuery" @getTableList="getTableAddList"
<baseChoice ref="baseChoice" :tableData="addTableData" :tableColumn="addTableColumn" @onQuery="addonQuery" @getTableList="getAddTableData"
:showSearch="true" :placeholder="addTiTle+'搜索'"
></baseChoice>
</div>
@ -450,11 +450,22 @@ export default {
passwordDialogShow: false,
passwordDialogTitle: '新增',
billTypeADDName: '',
billTypeADDID: ''
billTypeADDID: '',
bdInfoRow:{}
}
},
methods: {
getTableAddList(val){
async getTableAddList(val){
let params = {
tablename:this.bdInfoRow.tablename,
prop7:this.bdInfoRow.codefieldname,
propValue7:val,
prop8:this.bdInfoRow.namefieldname,
propValue8:val,
}
let res = await queryDataByMapAPI(params)
this.addTableData = []
this.addTableData = res.attribute.list
},
handleNodeClick(node) {
@ -522,13 +533,23 @@ export default {
this.addDialog = true
this.getAddTableData()
},
async getAddTableData() {
const res = await queryDataPagedByMapAPI({
async getAddTableData(val = false) {
let params = {
pageNum: this.pageModel.page,
pageSize: this.pageModel.limit,
tablename: this.clickObj.factortable,
pkentityorg: this.nameClickRow.pkentityorg,
})
}
if(val){
this.pageModel.page = 1
params.tablename=this.bdInfoRow.tablename
params.prop7=this.bdInfoRow.codefieldname
params.propValue7=val
params.prop8=this.bdInfoRow.namefieldname
params.propValue8=val
}
const res = await queryDataPagedByMapAPI(params)
console.log(res, 'res??')
this.$refs.baseChoice.pageModel.total = res.attribute.total
this.addTableData = res.attribute.list
@ -563,6 +584,7 @@ export default {
const res = await queryBdinfoListAPI({
pkBdinfo: id
})
this.bdInfoRow = res.attribute[0]
//转大写
//value 编码
let key = res.attribute[0].codefieldname

81
src/views/businessVoucher/compoments/assistTableDialog.vue Normal file
View File

@ -0,0 +1,81 @@
<template>
<div>
<base-dialog :dialogVisible.sync="dialogVisible" :closeModal="false" :footerShow="true" :title="'查看分录信息'"
width="800px" top="15vh">
<div class="rightDialogClass_main" style="background-color: #fff;">
<base-table ref="assistTable" :showIndex="false" :slotrow="false" tableHeight="calc(60vh - 80px)"
:tableData="tableData" :tableColumn="tableColumn" id="printMe">
</base-table>
</div>
</base-dialog>
</div>
</template>
<script>
import baseDialog from '@/components/base/BaseNewDialog/index.vue'
import baseTable from '@/components/base/baseTable/index.vue'
import {queryDetailsByBillCodeAPI } from '@/api/apis/businessVoucher'
export default {
components: {
baseDialog,
baseTable
},
data() {
return {
dialogVisible: false,
tableData: [],
tableColumn: [{
label: '摘要',
prop: 'abstractStr'
},
{
label: '会计科目',
prop: 'subjdispname'
},
{
label: '辅助核算',
prop: 'assist'
},
{
label: '币种编码',
prop: 'currencyCode'
},
{
label: '币种名称',
prop: 'currencyName'
},
{
label: '借方原币',
prop: 'jybSum'
},
{
label: '借方本币',
prop: 'jbbSum'
},
{
label: '贷方原币',
prop: 'dybSum'
},
{
label: '贷方本币',
prop: 'dbbSum'
},
]
}
},
methods: {
async openDialog(row) {
this.dialogVisible = true
let res = await queryDetailsByBillCodeAPI({
id: row.id
})
this.tableData = res.attribute
}
}
}
</script>
<style>
</style>

82
src/views/businessVoucher/compoments/customFormDialog.vue Normal file
View File

@ -0,0 +1,82 @@
<template>
<div>
<base-right-dialog
@handleClose="dialogVisible = false"
:dialogVisible="dialogVisible"
size="900px"
:appendBody="true"
:loading="true"
:footerShow="true"
:submitShow="false"
:title="'查看推送'"
>
<div class="rightDialogClass_main" style="background-color: #fff;" v-if="dialogVisible">
<base-form
ref="basicFormRefsName"
:formRow="basicFormForm"
:isFunBtn="false"
:spanWidth="'100px'"
justifyContent="flex-end"
:view-status="true"
>
</base-form>
</div>
</base-right-dialog>
</div>
</template>
<script>
import baseRightDialog from '@/components/base/baseRightDialog'
import baseForm from '@/components/base/baseNewForm'
export default{
components:{
baseRightDialog,
baseForm
},
data(){
return{
dialogVisible:false,
basicFormForm:[
{
elCol: [
{
label: '单据号',
prop: 'billCode',
tag: 'elLook',
},
{
label: '单据日期',
prop: 'billDate',
tag: 'elLook',
},
{
label: '生成状态',
prop: 'billStatusName',
tag: 'elLook',
},
{
label: '推送信息',
prop: 'pushInfo',
tag: 'elLook',
span:24
},
],
}
]
}
},
methods:{
openDialog(row){
this.dialogVisible = true
this.$nextTick(()=>{
row.billStatusName = row.billStatus == 'Y'?'已生成' : '未生成'
this.$refs.basicFormRefsName.choiceAssignment(row)
})
}
}
}
</script>
<style>
</style>

91
src/views/businessVoucher/index.vue
View File

@ -60,11 +60,11 @@
@radioChange="radioChange" id="printMe"
>
<template #billStatus="{row}">
<div>{{ row.billStatus === 'Y' ? '已生成' : '未生成' }}</div>
<div>{{ row.row.billStatus === 'Y' ? '已生成' : '未生成' }}</div>
</template>
<template #operation="{row}">
<div @click="generateHandle(row)" style="cursor: pointer">
生成
<div @click="generateHandle(row.row)" style="cursor: pointer">
{{row.row.billStatus === 'Y' ? '查看' : '生成'}}
</div>
</template>
</base-table>
@ -72,16 +72,23 @@
<!-- 辅助核算-->
<template v-if="this.selected.length">
<div class="table">
<base-table ref="customtable" :showIndex="false" :slotrow="false"
tableHeight="calc(50vh - 100px)" :tableData="this.selected[0].assistEntityList"
<base-table ref="assistTable" :showIndex="false" :slotrow="false"
tableHeight="calc(50vh - 100px)" :tableData="assistTableData"
:tableColumn="assistTableColumn"
id="printMe"
>
<template #operate="{row}">
<div @click="expandOperate(row)" style="cursor: pointer">
查看凭证明细
</div>
</template>
</base-table>
</div>
</template>
</div>
<customFormDialog ref="customFormDialog"></customFormDialog>
<assistTableDialog ref="assistTableDialog"></assistTableDialog>
</div>
</template>
@ -122,11 +129,12 @@ import {
tempupdateAPI, typeDeleteAPI, typeSaveAPI, typeUpdateAPI
} from '@/api/apis/ItemEntryTemplate'
import { subjectClassificationqueryAllAPI } from '@/api/apis/classifyDefinition'
import { logqueryBillAPI } from '@/api/apis/businessVoucher'
import { logqueryBillAPI,coreGenerateAPI,queryDetailsByBillCodeAPI } from '@/api/apis/businessVoucher'
import customFormDialog from './compoments/customFormDialog'
import assistTableDialog from './compoments/assistTableDialog'
export default {
name: 'recordContrast',
components: { baseDialog, baseChoice, basePage, baseTable, baseRightDialog, baseForm, baseTree },
components: { baseDialog, baseChoice, basePage, baseTable, baseRightDialog, baseForm, baseTree,customFormDialog,assistTableDialog },
data() {
return {
searchObjTable: {},
@ -192,36 +200,41 @@ export default {
assistTableColumn: [
{
label: '账簿',
prop: 'mdmName'
prop: 'glOrgbookName'
},
{
label: '单据日期',
prop: 'fieldName',
width: 150
prop: 'billDate',
width: 120
},
{
label: '凭证类别',
prop: 'remark',
width: 150
prop: 'voucherTypeName',
width: 120
},
{
label: '凭证号',
prop: 'operation',
prop: 'voucherNo',
width: 100
},
{
label: '摘要',
prop: 'operation',
prop: 'abstractStr',
width: 160
},
{
label: '借方',
prop: 'operation',
width: 160
prop: 'jYbSum',
width: 120
},
{
label: '贷方',
prop: 'operation',
prop: 'dYbSum',
width: 120
},
{
label: '操作',
prop: 'operate',
width: 160
},
],
@ -494,12 +507,12 @@ export default {
{
label: '单据日期',
prop: 'billDate',
width: 251
width: 120
},
{
label: '生成状态',
prop: 'billStatus',
width: 300
width: 120
},
{
label: '推送信息',
@ -549,8 +562,28 @@ export default {
},
methods: {
//生成方法
generateHandle(row) {
async generateHandle(row) {
if(row.billStatus == 'Y'){
this.$refs.customFormDialog.openDialog(row)
}else{
this.coreData(row)
}
},
async expandOperate(row){
this.$refs.assistTableDialog.openDialog(row)
// let res= await queryDetailsByBillCodeAPI({id:row.id})
// console.log(res)
},
async coreData(row){
let params = {
mdmId: this.billTypeClickID,
billCode:row.billCode
}
let res = await coreGenerateAPI(params)
if(res.status == '200'){
this.$vmNews('生成成功', 'success')
this.resetTable()
}
},
async ixedValueFormelDialogClick(row) {
if (row.label === '参照') {
@ -582,7 +615,7 @@ export default {
}
},
getTableAddList(val) {
console.log(val, 'val', this.fixedValueClickRow)
// console.log(val, 'val', this.fixedValueClickRow)
this.pageModel.propValue7 = val
this.pageModel.propValue8 = val
this.pageModel.prop7 = this.fixedValueClickRow.codefieldname
@ -596,7 +629,7 @@ export default {
}
let obj = this.$refs.baseChoice2.optionData
this.$set(this.$refs.fixedValueFormRefsName.ruleForm, 'recordData', obj[this.fixedValueClickRow.namefieldname])
this.textarea += `@@${this.fixedValueClickRow.dbName}:${this.fixedValueClickRow.tablepkname}=${obj[this.fixedValueClickRow.tablepkname]}`
this.textarea += `@@$${this.fixedValueClickRow.dbName}:${this.fixedValueClickRow.tablepkname}=${obj[this.fixedValueClickRow.tablepkname]}`
// this.$set(this.clickRow, `factorid${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.key])
// this.$set(this.clickRow, `factorname${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.labelKey])
// this.$set(this.clickRow, `factorpk${this.clickNum}`, this.$refs.baseChoice.optionData['id'])
@ -678,7 +711,7 @@ export default {
})
this.voucherList = res.attribute
console.log(res, 'res')
// console.log(res, 'res')
},
async voucherDialogClickHandle() {
@ -1341,7 +1374,7 @@ export default {
this.tableData = res.attribute
this.$nextTick(() => {
this.$refs.customtable.clearRadioIndex()
this.$refs.customtable.clearSelection()
// this.$refs.customtable.clearSelection()
this.selected = []
})
},
@ -1355,7 +1388,7 @@ export default {
radioChange(val) {
this.selected = []
this.selected.push(val)
console.log(val.assistEntityList, '?val.assistEntityList')
console.log(val.logList, '?val.assistEntityList')
let row = {
props: {
children: 'sublistMdmModuleDbFileds',
@ -1363,12 +1396,12 @@ export default {
value: 'id'
}
}
val.assistEntityList.forEach(item => {
val.logList.forEach(item => {
console.log(item.fieldId, 'item.fieldId')
item.fieldArr = item.fieldId ? this.searchIDHandle(item.fieldId, this.propertyTree, row) : []
console.log(item.fieldArr, '?fieldArr', item, this.propertyTree)
})
this.assistTableData = val.assistEntityList ? val.assistEntityList : []
this.assistTableData = val.logList ? val.logList : []
},
// 删除

28
src/views/classifyDefinition/index.vue
View File

@ -160,7 +160,7 @@
>
<div class="rightDialogClass_main" style="background-color: #fff;" v-if="addDialog">
<baseChoice ref="baseChoice" :tableData="addTableData" :tableColumn="addTableColumn" @onQuery="addonQuery"
@getTableList="getTableAddList"
@getTableList="getAddTableData"
:showSearch="true" :placeholder="addTiTle+'搜索'"
></baseChoice>
</div>
@ -350,7 +350,8 @@ export default {
passwordDialogTitle: '新增',
billTypeADDName: '',
billTypeADDID: '',
contrastClickObj: {}
contrastClickObj: {},
bdInfoRow: {},
}
},
methods: {
@ -428,12 +429,21 @@ export default {
this.addDialog = true
this.getAddTableData()
},
async getAddTableData() {
const res = await queryDataPagedByMapAPI({
async getAddTableData(val = false) {
let params = {
pageNum: this.pageModel.page,
pageSize: this.pageModel.limit,
tablename: this.clickObj.factortable
})
}
if(val){
this.pageModel.page = 1
params.tablename=this.bdInfoRow.tablename
params.prop7=this.bdInfoRow.codefieldname
params.propValue7=val
params.prop8=this.bdInfoRow.namefieldname
params.propValue8=val
}
const res = await queryDataPagedByMapAPI(params)
console.log(res, 'res??')
this.$refs.baseChoice.pageModel.total = res.attribute.total
this.addTableData = res.attribute.list
@ -468,6 +478,7 @@ export default {
const res = await queryBdinfoListAPI({
pkBdinfo: id
})
this.bdInfoRow = res.attribute[0]
//转大写
//value 编码
let key = res.attribute[0].codefieldname
@ -768,14 +779,15 @@ export default {
async radioChange(row) {
this.selected = []
this.selected.push(row)
this.masterTableData2 = row.contrastBEntityList
this.masterTableData2 = row.contrastBEntityList || []
console.log(row,213131)
let arr = [
{
label: '来源组织',
prop: 'glorgname'
}
]
if(row.factorids){
for (let i = 0; i < row.factorids.split(',').length; i++) {
let item = row.factornames.split(',')[i]
let id = row.factorids.split(',')[i]
@ -796,6 +808,8 @@ export default {
arr.push(obj)
}
}
arr.push(
{
label: '会计科目',

2
src/views/relevance/index.vue
View File

@ -579,7 +579,7 @@ export default {
}
let obj = this.$refs.baseChoice2.optionData
this.$set(this.$refs.fixedValueFormRefsName.ruleForm, 'recordData', obj[this.fixedValueClickRow.namefieldname])
this.textarea += `@@${this.fixedValueClickRow.dbName}:${this.fixedValueClickRow.tablepkname}=${obj[this.fixedValueClickRow.tablepkname]}`
this.textarea += `@@$${this.fixedValueClickRow.dbName}:${this.fixedValueClickRow.tablepkname}=${obj[this.fixedValueClickRow.tablepkname]}`
// this.$set(this.clickRow, `factorid${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.key])
// this.$set(this.clickRow, `factorname${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.labelKey])
// this.$set(this.clickRow, `factorpk${this.clickNum}`, this.$refs.baseChoice.optionData['id'])