wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024.11.4 文档收集更新 

审批业务类型、是否同时
java8
yuejiayang 1 year ago
parent
2718e0ea8c
commit
2b9764c0b2
2 changed files with 54 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      src/views/modules/auth/authRule.vue
  2. 18
      src/views/modules/eam/eamProjectInfoForUploads.vue

71
src/views/modules/auth/authRule.vue
View File

@ -171,8 +171,14 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
<div v-if="item.columnProp === 'active'">
<el-tag v-if="scope.row[item.columnProp] === 'Y'" type="success">启用</el-tag>
<el-tag v-if="scope.row[item.columnProp] === 'N'" type="danger">禁用</el-tag>
</div>
<div v-else>
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
</template>
</el-table-column>
<el-table-column
@ -223,14 +229,6 @@
<el-option label="3" value = 3></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="active" :rules="rules.active">
<el-select v-model="modalData.active" :disabled="!modalDisableFlag" style="width: 110px">
<el-option label="启用" value="Y"></el-option>
<el-option label="禁用" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="业务类型" prop="recordType" :rules="rules.recordType">
<!-- <el-input style="width: 135px;" v-model="saveAuditRuleData.recordTypeDb"></el-input>-->
<el-select v-model="modalData.recordType" placeholder=
@ -243,6 +241,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label=" ">
<el-checkbox v-model="modalData.isSimultaneous">是否同时
</el-checkbox>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="状态" prop="active" :rules="rules.active">
<el-select v-model="modalData.active" :disabled="!modalDisableFlag" style="width: 110px">
<el-option label="启用" value="Y"></el-option>
<el-option label="禁用" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item label="启用日期" prop="phaseInDate" :rules="rules.phaseInDate">
<el-date-picker v-model="modalData.phaseInDate" type="date" placeholder="选择日期" style="width: 150px"></el-date-picker>
</el-form-item>
@ -398,6 +408,7 @@ export default {
userName: this.$store.state.user.name,
buNo: '',
recordType: '',
isSimultaneous: false,
authRuleId: '',
ruleNo: '',
ruleDesc: '',
@ -1034,6 +1045,13 @@ export default {
handler: function (newV, oldV) {
this.ruleStepModalData.authGroupNo = this.ruleStepModalData.authGroupNo.toUpperCase()
}
},
// 监听 modalData.recordType 的变化，动态设置 isSimultaneous
'modalData.recordType': function (newVal) {
if (this.modalData.flag === '1') {
// 根据 recordType 的值设置 isSimultaneous
this.modalData.isSimultaneous = newVal === 2 && newVal !== undefined;
}
}
},
mounted () {
@ -1167,6 +1185,7 @@ export default {
priority: 1,
phaseInDate: new Date(),
active: 'Y',
isSimultaneous: false,
createBy: this.$store.state.user.name,
}
this.modalDisableFlag = false
@ -1209,13 +1228,6 @@ export default {
* @param row
*/
updateModal (row) {
if (row.active) {
if (row.active === '启用') {
row.active = 'Y'
} else {
row.active = 'N'
}
}
this.modalData = {
flag: '2',
title: '审批规则编辑',
@ -1233,6 +1245,7 @@ export default {
phaseOutDate: row.phaseOutDate,
remark: row.remark,
active: row.active,
isSimultaneous: row.isSimultaneous,
createBy: row.createBy,
createDate: row.createDate,
updateBy: this.$store.state.user.name,
@ -1400,17 +1413,19 @@ export default {
}
if (this.ruleStepDataList != null && this.ruleStepDataList.length > 0) {
for (let i = 0; i < this.ruleStepDataList.length; i++) {
if(this.ruleStepModalData.firstStepFlag === 'Y' && this.ruleStepDataList[i].firstStepFlag === 'Y') {
this.$alert('该审批步骤下已存在首步骤！', '提示', {
confirmButtonText: '确定'
})
return
}
if(this.ruleStepModalData.lastStepFlag === 'Y' && this.ruleStepDataList[i].lastStepFlag === 'Y') {
this.$alert('该审批步骤下已存在末步骤！', '提示', {
confirmButtonText: '确定'
})
return
if (this.ruleStepModalData.stepNo !== this.ruleStepDataList[i].stepNo) {
if(this.ruleStepModalData.firstStepFlag === 'Y' && this.ruleStepDataList[i].firstStepFlag === 'Y') {
this.$alert('该审批步骤下已存在首步骤！', '提示', {
confirmButtonText: '确定'
})
return
}
if(this.ruleStepModalData.lastStepFlag === 'Y' && this.ruleStepDataList[i].lastStepFlag === 'Y') {
this.$alert('该审批步骤下已存在末步骤！', '提示', {
confirmButtonText: '确定'
})
return
}
}
}
}

18
src/views/modules/eam/eamProjectInfoForUploads.vue
View File

@ -153,7 +153,7 @@
v-if="this.$route.query.flag !== '2' && this.$route.query.flag !== '1'"
:fields="fields()"
:data="exportData"
type="xls"
type="xlsx"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
@ -270,9 +270,10 @@ export default {
return {
// 导出
exportData: [],
exportName: '待上传文件' + this.dayjs().format('YYYYMMDDHHmmss'),
exportName: '待上传文件' + this.dayjs().format('YYYYMMDDHHmmss') + '.xlsx',
exportHeader: ['待上传文件'],
exportFooter: [],
exportList:[],
folder: '',
dataList: [],
allDataList: [],
@ -1266,9 +1267,12 @@ export default {
// 获取数据列表
getDataList (params) {
console.log(this.searchData.projectLeader)
this.selectTypeFlag = params
this.searchData.limit = 20
this.searchData.page = 1
// 如果this.pageSize/10为整数
this.searchData.limit = this.pageSize % 10 === 0 ? this.pageSize : 20
this.searchData.page = this.pageIndex
if (this.$route.query.flag === '2') {
searchProjectOverUploadsDocumentList(this.searchData).then(({data}) => {
if (data.code === 0) {
@ -1392,7 +1396,7 @@ export default {
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
this.pageIndex = 1
this.pageSize = -1
this.pageSize = this.dataList.length + 1
this.totalPage = this.dataList.length + 1
}
}
@ -1522,7 +1526,7 @@ export default {
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
this.pageIndex = 1
this.pageSize = -1
this.pageSize = this.dataList.length + 1
this.totalPage = this.dataList.length + 1
}
}
@ -1663,7 +1667,7 @@ export default {
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
this.pageIndex = 1
this.pageSize = -1
this.pageSize = this.dataList.length + 1
this.totalPage = this.dataList.length + 1
}
} else {

Write Preview
Loading…
Cancel
Save