FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改问题清单

Browse Source
This commit is contained in:
zyx.net
2022-11-04 18:29:01 +08:00
parent 5b1bd2cc81
commit 5175648a10
12 changed files with 102 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+22 -10
View File
@@ -245,7 +245,7 @@
<el-input v-model="addForm.parent"
placeholder="请选择上级角色"
@click.native="SuperiorRole"
clearable></el-input>
></el-input>
</el-form-item>
<el-form-item label="角色描述" prop="remarks" label-width="100px" class="add-form-item">
<el-input v-model="addForm.remarks"
@@ -285,14 +285,14 @@
:props="defaultProps"
style="height: 100%; overflow: auto;"
default-expand-all
check-strictly
:check-strictly="true"
node-key="id"
:default-checked-keys="nodeList3"
show-checkbox
:show-checkbox="true"
highlight-current
@check="drawerCheck"
:expand-on-click-node="false"
ref="tree4">
ref="tree9">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button
@@ -553,16 +553,28 @@ export default {
});
},
drawerCheck(data) {
var getlist = this.$refs.tree4.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
var getlist = this.$refs.tree9.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
// if (getlist.length == 1) {
// } else {
// this.$refs.tree9.setCheckedKeys([data.id]);
// }
if (getlist.length > 1) {
this.$message.warning('只能选择一个角色')
} else {
this.$refs.tree4.setCheckedKeys([data.id]);
}
this.SuperiorRoleData = data
console.log(getlist)
this.SuperiorRoleData = getlist
},
SuperiorRoleOk() { // 上级角色确定
this.addForm.parentId = this.SuperiorRoleData.id
this.addForm.parent = this.SuperiorRoleData.name
console.log(this.SuperiorRoleData)
if(this.SuperiorRoleData.length != 0){
this.addForm.parentId = this.SuperiorRoleData[0].id
this.addForm.parent = this.SuperiorRoleData[0].name
}else{
this.addForm.parentId = ''
this.addForm.parent = ''
}
this.nodeList3 = []
this.nodeList3.push(this.addForm.parentId)
this.SuperiorRoleModel = false
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+10 -3
View File
@@ -865,7 +865,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
uploadFileStatus: true,
saveLoading: false,
@@ -918,7 +918,7 @@
defaultCheckedKeys3: [],
fileUrl: 'api/att/attFile/uploadNew',
fileMadel: false,
fileType: '',
fileType: 'footFile',
countryArr:'',
commentCycleDate:'',
form: {
@@ -2168,6 +2168,8 @@
// if (fileList.length > 1) {
// this.fileList = fileList.splice(0, 1)
// }
console.log(fileList)
console.log(this.fileType)
if (response.ok) {
switch (this.fileType){
@@ -2187,11 +2189,14 @@
this.GLWJBUSSFileList = fileList
break;
case 'footFile':
console.log(fileList)
this.footFileList = fileList
this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
break;
default : ;
}
this.formKey++
console.log(this.footFileList)
this.$message({
showClose: true,
message: response.message,
@@ -2257,6 +2262,8 @@
break;
default : ;
}
this.formKey++
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
@@ -2371,7 +2378,7 @@
this.drawerTitle = '转办处理人'
},
handleUploadFile(){
this.fileType = '';
// this.fileType = '';
this.fileType = 'footFile';
this.fileList=this.footFileList
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+7 -2
View File
@@ -1098,7 +1098,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2872,7 +2872,12 @@
this.$message.success(res.message)
}
})
}})
}else {
this.$message.warning('请确认是否填写完整')
}
})
}else {
this.$message.warning('请确认会签评分是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+7 -2
View File
@@ -1075,7 +1075,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
uploadFileStatus: true,
saveLoading: false,
@@ -2967,7 +2967,12 @@
// console.log(e)
// // this.$message.warning('文件不存在,预览失败')
// })
}})
}else {
this.$message.warning('请确认是否填写完整')
}
})
}else {
this.$message.warning('请确认评分是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+6 -2
View File
@@ -858,7 +858,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2315,6 +2315,8 @@
this.$refs['form'].validate((valid) => {
if (valid) {
this.handleSubmit()
}else {
this.$message.warning('请确认复审评分是否填写完整')
}
})
},
@@ -2485,7 +2487,9 @@
this.$message.success(res.message)
}
})
}})
}else{
}
})
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+3 -1
View File
@@ -871,7 +871,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2469,6 +2469,8 @@
this.$refs['form'].validate((valid) => {
if (valid) {
this.handleSubmit()
}else{
this.$message.warning('请检查是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+3 -2
View File
@@ -921,7 +921,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2463,7 +2463,6 @@
this.fileMadel = true;
},
removeOneFile(file, fileList) {
switch (this.fileType){
case 'FBGBUSS':
this.FBGBUSSFileList = fileList
@@ -2487,7 +2486,9 @@
this.madelSubList = fileList
break;
default : ;
}
this.formKey++
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+3 -1
View File
@@ -1075,7 +1075,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
uploadFileStatus: true,
saveLoading: false,
@@ -2966,6 +2966,8 @@
// // this.$message.warning('文件不存在,预览失败')
// })
}})
}else{
this.$message.warning('请检查是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+35
View File
@@ -419,6 +419,7 @@ import ProcessTitle from "process/components/ProcessTitle";
import MechanismTree from "@/components/mechanismTree";
import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
import {processEditFile } from "api/process";
export default {
name: "establish",
components: {
@@ -429,6 +430,21 @@ export default {
},
props: ['message'],
data(){
const validateFsOnlineFile = async (rule, value, callback) => {
if(this.qbfsForm.FSD){
let fileObj = await this.processEditFile(this.qbfsForm.FSD)
if (fileObj) {
const editFileInfo = fileObj
if (editFileInfo && editFileInfo.editStatus === '1') {
callback()
} else {
callback(new Error('请先在线编辑,再提交流程！'))
}
}
}else {
callback(new Error('请先在线编辑,再提交流程！'))
}
};
const standNameVerify = async (rule, value, callback) => {
debugger
if (value === '' || value === null) {
@@ -567,6 +583,9 @@ export default {
newReason: [
{required: true, message: '请输入立项原因', trigger: 'blur'},
],
LXDName: [
{ required: true, validator: validateFsOnlineFile, trigger: 'blur' }
],
},
}
@@ -635,6 +654,22 @@ export default {
}
},
methods: {
processEditFile(id) {
return new Promise((resolve, reject) => {
processEditFile({
id
}).then(res => {
if (res) {
const history = res;
resolve(history)
} else {
reject()
}
}).catch(e => {
reject(e)
})
})
},
saveEditFile(){
if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
this.$http.get('/lawss/activiti/saveEditFile', {
src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+1
View File
@@ -77,6 +77,7 @@ export default {
this.downloadFile(attId)
return true
}else{
// this.$previewZl(attId) 39部署注释
this.$preview(attId)
}
},
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+3 -3
View File
@@ -267,12 +267,12 @@
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-option label="未完成" value="0"></el-option>
<!-- <el-option label="未完成" value="0"></el-option>-->
<el-option label="制定中" value="1"></el-option>
<el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option>
<el-option label="立项已完成" value="5"></el-option>
<!-- <el-option label="立项已完成" value="5"></el-option>-->
<el-option label="计划已确认" value="6"></el-option>
</el-select>
</el-form-item>
@@ -1279,7 +1279,7 @@
LXDName:'',
}
this.DrawerType = 'add'
this.addForm.planStatus = '0'
this.addForm.planStatus = '6'
this.$http.get('/lawss/activiti/saveEditFile', {
model: 'model_lx'
},{
src/pages/searchCenter/pages/advancedSearch.vue
+2 -2
View File
@@ -341,11 +341,11 @@
></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<el-col :span="12">
<!-- <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">