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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-04 17:26:03 +08:00
parent 2c6cd94f20 98fa4b22c3
commit 17ce28bb55
27 changed files with 313 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -1
View File
@@ -14,6 +14,7 @@
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
@@ -499,7 +500,7 @@
_this: this
}, res => {
this.standInfoList = res.data.list
this.total = res.data.total
this.total = res.data.count
this.spinShow = false
}, e => {
})
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+22 -2
View File
@@ -198,6 +198,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -220,7 +221,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from 'api/process'
export default {
name: "bzjdStep2",
@@ -306,7 +307,26 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('pId', this.pId)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
itemList: this.itemList,
sarType: this.sarType
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+7 -1
View File
@@ -530,7 +530,12 @@
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
const itemList = JSON.parse(data.itemList)
let itemList
if (typeof (data.itemList) == 'string') {
itemList = JSON.parse(data.itemList)
} else {
itemList = data.itemList
}
itemList.forEach(item => {
item.unitDeptName = this.$store.getters.userInfo.orgName
item.onlineData = ''
@@ -542,6 +547,7 @@
item.technicalRequir = ''
item.itemsTitle = item.itermsConditions
})
console.log(2);
this.itemList = itemList
this.loading = false
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -1
View File
@@ -363,7 +363,7 @@
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
this.loading = true
this.loading = false
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+81 -32
View File
@@ -976,38 +976,51 @@
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div>
</el-dialog>
<el-drawer
:title="drawerTitle"
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<el-input
style="width:70%;padding: 10px"
placeholder="请输入姓名"
v-model="filterText">
</el-input>
<el-tree
:filter-node-method="filterNode"
v-if="modalShowFlag"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
:data="treeData"
:props="defaultUserProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalShowFlag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- <el-drawer-->
<!-- :title="drawerTitle"-->
<!-- :visible.sync="modalShowFlag"-->
<!-- :wrapperClosable="false"-->
<!-- size="800px">-->
<!-- <el-input-->
<!-- style="width:70%;padding: 10px"-->
<!-- placeholder="请输入姓名"-->
<!-- v-model="filterText">-->
<!-- </el-input>-->
<!-- <el-tree-->
<!-- :filter-node-method="filterNode"-->
<!-- v-if="modalShowFlag"-->
<!-- node-key="id"-->
<!-- style="height: 100%; overflow: auto;"-->
<!-- class="filter-tree"-->
<!-- :data="treeData"-->
<!-- :props="defaultUserProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- @check="drawerCheck"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- show-checkbox-->
<!-- ref="tree">-->
<!-- </el-tree>-->
<!-- <div id="roleFormButton" class="demo-drawer-footer">-->
<!-- <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
<!-- <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>-->
<!-- </div>-->
<!-- </el-drawer>-->
<!-- 选择标准的弹框 -->
<el-drawer
ref="standard"
@@ -1256,6 +1269,7 @@
label: 'model'
},
nodeList: [],
nodeList2: [],
type: '',
defaultUserProps: {
children: 'children',
@@ -1267,6 +1281,7 @@
key3:4,
treeData: [], // 人员数据
modalShowFlag: false, // drawer开关
modalShowRoleFlag: false, // drawer开关
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
@@ -1491,6 +1506,39 @@
},
},
methods: {
choiceZRRS () {
if (this.userType === 'zrUserId') {
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
}
this.modalshowflag2 = true
},
checkedRole2 (data) {
var idList = ''
var nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.zrUserIds = idList
this.zrUserIds = nameList
},
checkedRole (data) {
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) {
if (!value) return true;
@@ -1792,6 +1840,7 @@
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
},
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+3 -2
View File
@@ -253,7 +253,7 @@
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
is-title="选择人员信息"
:is-visible.sync="modalshowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
@@ -303,6 +303,7 @@ export default {
dockUserName: '',
dockUser: ''
},
deleteDataList: [],
roleFormRules: {
dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
},
@@ -476,7 +477,7 @@ export default {
this.$message.warning('请选择基础信息进行添加')
} else {
if (this.roleForm.dockUserName === '') {
this.$message.warning('请选择基础信息进行添加')
this.$message.warning('请完善人员信息')
} else {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+21 -5
View File
@@ -123,7 +123,7 @@
@click.native="clickOpen(scope.row)"
v-model="scope.row.dutyPeopleInfo"
size="mini"
placeholder="请输入内容"
placeholder="请选择分发责任人"
/>
</template>
</el-table-column>
@@ -220,8 +220,8 @@
>
</ProcessFooter>
<Role-tree
is-title="选择人员信息"
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
@@ -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} from "@/api/process.js"
import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js"
export default {
name: "wfhxzgStep2",
@@ -367,12 +367,28 @@ export default {
},
// 保存按钮
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
standardInfoList: this.dataList,
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
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
+38 -4
View File
@@ -229,7 +229,7 @@
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
is-title="选择人员信息"
:is-visible.sync="modalshowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
@@ -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>