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-03 14:05:04 +08:00
parent 23e9389958 af7a749369
commit 1281868ed3
10 changed files with 728 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+19 -6
View File
@@ -248,6 +248,17 @@
<!-- <span v-else>{{ scope.row.standName }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="fileTypeShow"
label="文本状态"
align="center">
</el-table-column>
<el-table-column
prop="fileName"
label="文件名称"
show-overflow-tooltip
align="center">
</el-table-column>
</el-table>
</div>
</div>
@@ -600,12 +611,6 @@
}
this.modalshowflag = false
},
handleSelectionChange (val) {
this.zrIdList = []
val.forEach( item => {
this.zrIdList.push(item.id)
})
},
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
@@ -632,6 +637,12 @@
this.modalshowflag = true
}
},
handleSelectionChange (val) {
this.zrIdList = []
val.forEach( item => {
this.zrIdList.push(item.id)
})
},
handleTabs(name) {
this.active = name
},
@@ -650,6 +661,7 @@
if (b > 0) {
this.$message.warning('请选择责任人')
} else {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '9'
}, {}, res => {
@@ -672,6 +684,7 @@
this.$message.warning('流程启动失败')
}
})
this.isSubmit = false
}
} else {
return this.$message.warning('请完善人员信息')
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+52 -97
View File
@@ -26,7 +26,7 @@
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
@@ -198,7 +198,6 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -206,32 +205,14 @@
@submit="handleSubmit"
>
</ProcessFooter>
<el-drawer
title="选择责任部门对接人"
:visible.sync="modalshowflag2"
:wrapperClosable="false"
size="800px">
<el-tree
v-if="modalshowflag2"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList2"
highlight-current
check-strictly
@check="drawerCheck2"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree2">
</el-tree>
<div id="roleFormButton2" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
</div>
</el-drawer>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag2"
@checkedRole="saveUserInfo"
:nodeList="nodeList2"
></Role-tree>
<loading :loading="loading">加载中...</loading>
</div>
</template>
@@ -245,33 +226,30 @@
name: "bzjdStep2",
data() {
return {
type: '',
drawerTitle: '',
histortData: [],
sarType: '',
zxIndex: '',
zxType: '',
zxIdList: [],
modalshowflag2: false,
treeData: [],
nodeList2: [],
defaultProps: {
children: 'children',
label: 'name'
},
loading: false,
loading: true,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
type: '',
drawerTitle: '', //drawer标题
textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
itemsNum: '',
itemsName: '',
itemsNum1: '',
itemsName1: '',
},
json: {},
itemList: []
@@ -290,26 +268,18 @@
this.histortData = res
}, e => {})
},
drawerCheck2 (data) {
var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
if(getlist.length == 1) {
this.roleRow = getlist[0]
}else {
this.$refs.tree2.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
}
},
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
this.drawerTitle = '选择责任部门对接人'
this.nodeList2 = []
this.zxIndex= index
this.zxType = type
this.nodeList2.push(row)
this.modalshowflag2 = true
} else {
// 批量
this.drawerTitle = '批量选择责任部门对接人'
if (this.zxIdList.length > 0) {
this.zxType = type
this.nodeList2 = []
this.modalshowflag2 = true
} else {
@@ -317,39 +287,21 @@
}
}
},
saveUserInfo2 () {
var idList = ''
var nameList = ''
this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if (this.zxType == 1) {
this.itemList[this.zxIndex].zxUserId = idList
this.itemList[this.zxIndex].zxUserIdName = nameList
saveUserInfo (data) {
if (this.type === 1) {
this.itemList[this.zxIndex].zxUserId = data[0].id
this.itemList[this.zxIndex].zxUserIdName = data[0].name
} else {
this.itemList.forEach( item => {
this.zxIdList.forEach( items => {
if (item.id === items) {
item.zxUserId = idList
item.zxUserIdName = nameList
item.zxUserId = data[0].id
item.zxUserIdName = data[0].name
}
})
})
}
this.modalshowflag2 = false
},
cancleUserInfo2 () {
this.modalshowflag2 = false
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
this.modalshowflag = false
},
handleTabs(name) {
this.active = name
@@ -366,20 +318,23 @@
}
if (b > 0) {
this.$message.warning('请选择执行人')
} else {
this.isSubmit = true
var json = this.json
json.itemList = this.itemList
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
this.isSubmit = false
}
var json = this.json
json.itemList = this.itemList
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
} else {
return this.$message.warning('请完善基础信息')
}
@@ -398,10 +353,10 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
var arr = []
@@ -411,6 +366,7 @@
item.zxUserIdName = ''
})
this.itemList = arr
this.loading = false
}).catch(e => {
})
})
@@ -418,7 +374,6 @@
},
mounted () {
this.getHistoryData()
this.getTree()
this.getData()
}
}
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+43 -18
View File
@@ -26,7 +26,7 @@
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
@@ -189,6 +189,11 @@
width="150"
label="适用车型"
align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
prop="unitDeptName"
@@ -203,7 +208,6 @@
align="center">
</el-table-column>
</el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
@@ -278,7 +282,6 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -339,6 +342,11 @@
placeholder="选择在产车实施日期">
</el-date-picker>
</el-form-item>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select v-model="plForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div id="roleFormButton2" class="demo-drawer-footer">
@@ -346,6 +354,7 @@
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
<loading :loading="loading">加载中...</loading>
</div>
</template>
@@ -359,6 +368,7 @@
name: "bzjdStep3",
data() {
return {
cxList: [],
histortData: [],
plForm: {
technicalRequir: '', // 核心技术要求
@@ -367,11 +377,12 @@
complianceState: '', // 合规性分析
newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型
},
modalshowflag: false,
sarType: '',
itemList: [],
loading: false,
loading: true,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
@@ -380,10 +391,10 @@
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
number1: '',
name1: ''
itemsNum: '',
itemsName: '',
itemsNum1: '',
itemsName1: '',
},
json: {},
idList: []
@@ -412,6 +423,7 @@
this.itemList[a].complianceState = this.plForm.complianceState
this.itemList[a].newData = this.plForm.newData
this.itemList[a].onlineData = this.plForm.onlineData
this.itemList[a].applyArctic = this.plForm.applyArctic
}
}
}
@@ -446,7 +458,7 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0
let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0, num6 = 0
for (let a = 0; a < this.itemList.length; a++) {
if (!this.itemList[a].technicalRequir) {
num1++
@@ -463,6 +475,9 @@
if (!this.itemList[a].onlineData) {
num5++
}
if (!this.itemList[a].applyArctic) {
num6++
}
}
if (num1 > 0) {
this.$message.warning('请输入核心技术要求')
@@ -478,7 +493,10 @@
this.$message.warning('请输入新车型实施日期')
} else if (num5 > 0) {
this.$message.warning('请输入在产车实施日期')
} else if (num6 > 0) {
this.$message.warning('请选择适用车型')
} else {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.itemList = this.itemList
@@ -492,6 +510,7 @@
this.$router.push('/processCenter')
}
})
this.isSubmit = false
}
} else {
return this.$message.warning('请完善基础信息')
@@ -505,10 +524,10 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
const itemList = JSON.parse(data.itemList)
@@ -524,6 +543,7 @@
item.itemsTitle = item.itermsConditions
})
this.itemList = itemList
this.loading = false
}).catch(e => {
})
})
@@ -532,6 +552,11 @@
mounted () {
this.getHistoryData()
this.getData()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.cxList = res.data.ENERGYTYPES // 适用车型
})
}
}
</script>
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+21 -17
View File
@@ -26,7 +26,7 @@
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
@@ -176,7 +176,6 @@
align="center">
</el-table-column>
</el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
@@ -250,8 +249,8 @@
</el-table-column>
</el-table>
</div>
<loading :loading="loading">加载中...</loading>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -278,7 +277,7 @@
histortData: [],
sarType: '',
itemList: [],
loading: false,
loading: true,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
@@ -287,10 +286,10 @@
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
number1: '',
name1: ''
itemsNum: '',
itemsName: '',
itemsNum1: '',
itemsName1: '',
},
json: {},
}
@@ -313,6 +312,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.resolveFlag = 1
json.commentText = this.commentText
@@ -325,10 +325,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo () {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.resolveFlag = 2
json.commentText = this.commentText
@@ -341,6 +343,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
@@ -353,13 +356,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
this.loading = false
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+21 -17
View File
@@ -26,7 +26,7 @@
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
@@ -176,7 +176,6 @@
align="center">
</el-table-column>
</el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
@@ -251,7 +250,6 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -262,6 +260,7 @@
submitBTNText="同意"
>
</ProcessFooter>
<loading :loading="loading">加载中...</loading>
</div>
</template>
@@ -278,7 +277,7 @@
histortData: [],
sarType: '',
itemList: [],
loading: false,
loading: true,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
@@ -287,10 +286,10 @@
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
number1: '',
name1: ''
itemsNum: '',
itemsName: '',
itemsNum1: '',
itemsName1: '',
},
json: {},
}
@@ -313,6 +312,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.zrApplyFlag = 1
json.commentText = this.commentText
@@ -325,10 +325,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo () {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.zrApplyFlag = 2
json.commentText = this.commentText
@@ -341,6 +343,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
@@ -353,13 +356,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
this.loading = true
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+21 -19
View File
@@ -26,7 +26,7 @@
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
@@ -177,7 +177,6 @@
align="center">
</el-table-column>
</el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
@@ -252,17 +251,15 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
<loading :loading="loading">加载中...</loading>
</div>
</template>
@@ -279,7 +276,7 @@
histortData: [],
sarType: '',
itemList: [],
loading: false,
loading: true,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
@@ -288,10 +285,10 @@
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
number1: '',
name1: ''
itemsNum: '',
itemsName: '',
itemsNum1: '',
itemsName1: '',
},
json: {},
}
@@ -314,6 +311,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.gcApplyFlag = 1
json.commentText = this.commentText
@@ -326,10 +324,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo () {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.gcApplyFlag = 2
json.commentText = this.commentText
@@ -342,6 +342,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
@@ -354,13 +355,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
this.loading = false
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+103 -23
View File
@@ -29,7 +29,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standName" label="标准号/标准名称" align="center"/>
<el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -87,6 +96,42 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="确认+选择责任人" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>确认+选择责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="上传佐证材料填选择写信息" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
<el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="选择负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.checkUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>分发负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.checkUser" style="display: none;"></el-input>
<el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
</el-form>
</el-timeline>
</div>
@@ -103,7 +148,7 @@
<el-form :modal="queryUnqualidiedData" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
v-model="queryUnqualidiedData.standId"
v-model="queryUnqualidiedData.standSerialNumber"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
@@ -154,25 +199,44 @@
</div>
</div>
<el-table
ref="searchTable"
:data="unqualidiedData"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
ref="searchTable"
:data="unqualidiedData"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectedChange"
>
@selection-change="selectedChange"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称"/>
<el-table-column prop="productName" label="项目名称"/>
<el-table-column prop="itemsNum" label="条款号"/>
<el-table-column prop="itemsName" label="条款名称"/>
<el-table-column prop="planCloseTime" label="整改完成时间"/>
<el-table-column prop="responsibleUnit" label="责任部门"/>
<el-table-column prop="dutyEngineer" label="责任工程师"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" align="center" show-overflow-tooltip label="项目名称"/>
<el-table-column prop="itemsNum" align="center" label="条款号"/>
<el-table-column prop="itemsName" align="center" label="条款名称"/>
<el-table-column prop="planCloseTime" align="center" label="整改完成时间">
<template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" align="center" label="责任部门"/>
<el-table-column prop="dutyEngineer" align="center" label="责任工程师"/>
</el-table>
<pagination
style="position: relative;"
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"/>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
@@ -217,13 +281,17 @@ export default {
// 责任部门
zrbmOptions: [],
standModel: false,
// 总数
total: 0,
// 当前页数
pageNo: 1,
// 查询未符合项整改数据库数据
queryUnqualidiedData: {
pageNo: 1,
pageSize: 10,
total: 0,
closeState: '1',
standId: '', // 标准号/名称
standSerialNumber: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
},
@@ -269,9 +337,9 @@ export default {
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText','')
this.$set(item,'fileTextId','')
this.$set(item,'fileTextPath','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
})
this.total = res.data.total
})
@@ -308,6 +376,18 @@ export default {
});
}
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
//选择标准取消事件
closeDrawer() {
this.standModel = false
@@ -432,7 +512,7 @@ export default {
// 清空 查询条件
clearAllSearch (search = true) {
this.queryUnqualidiedData = {
standId: '',
standSerialNumber: '',
productName: '',
responsibleUnit: ''
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+28 -7
View File
@@ -13,7 +13,7 @@
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form">
<!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input v-model="nonSearch.standId"
size="small"
@@ -76,7 +76,7 @@
清空
</el-button>
</el-form-item>
</el-form>
</el-form>-->
<div class="content-center">
<el-button
style="text-align: end"
@@ -97,7 +97,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称" align="center"/>
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -119,7 +128,6 @@
</template>
</el-table-column>
</el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
@@ -316,9 +324,9 @@ export default {
const params = {
taskIds: this.taskIds,
pId: this.pId,
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
// standId: '', // 标准号/名称
// productName: '', // 项目名称
// responsibleUnit: '' // 责任部门
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
@@ -328,6 +336,7 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
})
},
// 批量选择分发责任人
@@ -455,6 +464,18 @@ export default {
})
this.dataList = this.realList
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 清空 查询条件
clearAllSearch () {
this.nonSearch = {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+45 -8
View File
@@ -13,7 +13,7 @@
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form">
<!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
size="small"
@@ -78,7 +78,7 @@
清空
</el-button>
</el-form-item>
</el-form>
</el-form>-->
<div class="content-center">
<el-button
style="text-align: end"
@@ -99,7 +99,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称" align="center"/>
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -125,7 +134,6 @@
</template>
</el-table-column>
</el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
@@ -316,6 +324,7 @@ export default {
for (let i = 0; i<fileData.length; i++) {
if (fileData[i].name === this.$store.getters.userInfo.userName) {
this.dataList = fileData[i].standardInfoList
this.standardInfoList = this.dataList
}
}
})
@@ -344,15 +353,31 @@ export default {
handleTabs(name) {
this.active = name
},
// 退回按钮
handleSubmitNo() {
if (this.commentText) {
var json = {
actionFlag: 1,
commentText: this.commentText
commentText: this.commentText,
standardInfoList: this.standardInfoList,
}
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskIds)
completeTask(params).then(res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
/* this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
@@ -365,7 +390,19 @@ export default {
})
} else {
this.$message.warning('请输入反馈意见')
}
}*/
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 保存按钮
handleSave() {},