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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2021-08-04 17:16:55 +08:00
parent e5fc796cd3 281193bcaa
commit 98fa4b22c3
19 changed files with 126 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+11 -4
View File
@@ -1528,10 +1528,16 @@
this.zrUserIds = nameList
},
checkedRole (data) {
if (this.userType === 'jlUserId') {
this.roleForm.jlUserId = data.id
this.roleForm.jlUserName = data.name
}
if (this.userType === 'jlUserId') {
this.roleForm.jlUserId = data[0].id
this.roleForm.jlUserName = data[0].name
}else if(this.userType === 'zrUserId'){
this.roleForm.zrUserId=data[0].id;
this.roleForm.zrUserName=data[0].name;
}
},
// z责任人会签姓名搜索
filterNode(value, data) {
@@ -1834,6 +1840,7 @@
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
},
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+4 -4
View File
@@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { roleTreeData } from "@/api/unqualProcess.js"
import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js"
import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js"
export default {
name: "wfhxzgStep2",
@@ -373,10 +373,10 @@ export default {
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
itemsList: this.dataList,
standardInfoList: this.dataList,
commentText: this.commentText
}))
saveinboundTask(_formData).then(res => {
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
@@ -388,7 +388,7 @@ export default {
handleSubmit() {
this.isSubmit = true
let zqa = new Map();
for (let lastDataListElement of this.lastDataList) {
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
if( a == null){
a = {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+37 -3
View File
@@ -241,7 +241,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {completeTask, inboundLiaisonDetail} from "@/api/process.js";
import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
export default {
name: "wfhxzgStep3",
@@ -405,7 +405,41 @@ export default {
window.open(routeUrl.href, '_blank')
},
// 保存按钮
handleSave() {},
handleSave() {
this.isSubmit = true
let zqa = new Map();
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
if( a == null){
a = {
id: lastDataListElement.dutyPeopleInfoId,
name: lastDataListElement.dutyPeopleInfo,
standardInfoList: []
}
}
a.standardInfoList.push(lastDataListElement);
zqa.set(a.id, a);
}
let list = [];
for(let item of zqa) {
list.push(item[1])
}
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
dockUserList: list,
commentText: this.commentText
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
@@ -418,7 +452,7 @@ export default {
})
if(flag)return this.$message.warning('请选择负责人填入')
let zqa = new Map();
for (let lastDataListElement of this.lastDataList) {
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleId)
if( a == null){
a = {
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+41 -5
View File
@@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {uploadFile} from '@/api/unqualProcess.js';
import {inboundLiaisonDetail, completeTask} from "@/api/process"
import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
export default {
name: "wfhxzgStep4",
@@ -306,10 +306,13 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))]
let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info))
if (listJSON.length !== undefined) {
this.dataList = listJSON
} else {
this.dataList = [listJSON]
}
this.newDataList = []
console.log(this.dataList)
this.dataList.forEach(item => {
if (item.fileText.length !== 0) {
item.fileText.forEach(item1 => {
@@ -402,7 +405,40 @@ export default {
window.open(routeUrl.href, '_blank')
},
// 保存按钮
handleSave() {},
handleSave() {
let zqa = new Map();
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleId)
if( a == null){
a = {
standardInfoList: []
}
}
a.standardInfoList.push(lastDataListElement);
zqa.set(a.id, a);
}
let list = []
for(let item of zqa) {
list.push(item[1].standardInfoList)
}
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
responUserInfo: {
info: this.dataList.splice(-1, 1)
},
commentText: this.commentText
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+4
View File
@@ -30,6 +30,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -37,6 +38,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
@@ -232,12 +234,14 @@
<el-input
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
disabled
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
disabled
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+2
View File
@@ -30,6 +30,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -37,6 +38,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+2
View File
@@ -24,12 +24,14 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
disabled
placeholder="请输入项目名称"
clearable
></el-input>
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>