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

commit

Browse Source
This commit is contained in:
zhutianqi
2021-08-03 13:37:05 +08:00
parent ff0a97cf7c
commit 1ab9e81ded
6 changed files with 166 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+8 -6
View File
@@ -600,12 +600,6 @@
} }
this.modalshowflag = false this.modalshowflag = false
}, },
handleSelectionChange (val) {
this.zrIdList = []
val.forEach( item => {
this.zrIdList.push(item.id)
})
},
choiceZRRS (row, type, index) { choiceZRRS (row, type, index) {
this.type = type this.type = type
if (type === 1) { if (type === 1) {
@@ -632,6 +626,12 @@
this.modalshowflag = true this.modalshowflag = true
} }
}, },
handleSelectionChange (val) {
this.zrIdList = []
val.forEach( item => {
this.zrIdList.push(item.id)
})
},
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
@@ -650,6 +650,7 @@
if (b > 0) { if (b > 0) {
this.$message.warning('请选择责任人') this.$message.warning('请选择责任人')
} else { } else {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', { this.$http.get('lawss/activiti/startProcess', {
type: '9' type: '9'
}, {}, res => { }, {}, res => {
@@ -672,6 +673,7 @@
this.$message.warning('流程启动失败') this.$message.warning('流程启动失败')
} }
}) })
this.isSubmit = false
} }
} else { } else {
return this.$message.warning('请完善人员信息') 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-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.number" v-model="form.itemsNum"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.name" v-model="form.itemsName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
></el-input> ></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -198,7 +198,6 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -206,32 +205,14 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<el-drawer <Role-tree
title="选择责任部门对接人" check-box
:visible.sync="modalshowflag2" :is-title="drawerTitle"
:wrapperClosable="false" :is-visible.sync="modalshowflag2"
size="800px"> @checkedRole="saveUserInfo"
<el-tree :nodeList="nodeList2"
v-if="modalshowflag2" ></Role-tree>
node-key="id" <loading :loading="loading">加载中...</loading>
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>
</div> </div>
</template> </template>
@@ -245,33 +226,30 @@
name: "bzjdStep2", name: "bzjdStep2",
data() { data() {
return { return {
type: '',
drawerTitle: '',
histortData: [], histortData: [],
sarType: '', sarType: '',
zxIndex: '', zxIndex: '',
zxType: '', zxType: '',
zxIdList: [], zxIdList: [],
modalshowflag2: false, modalshowflag2: false,
treeData: [],
nodeList2: [], nodeList2: [],
defaultProps: { loading: true,
children: 'children',
label: 'name'
},
loading: false,
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
roleRow: {}, roleRow: {},
type: '',
drawerTitle: '', //drawer标题
textarea: '', // 意见 textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
number: '', itemsNum: '',
name: '', itemsName: '',
itemsNum1: '',
itemsName1: '',
}, },
json: {}, json: {},
itemList: [] itemList: []
@@ -290,26 +268,18 @@
this.histortData = res this.histortData = res
}, e => {}) }, 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) { choiceZRRS (row, type, index) {
this.type = type
if (type === 1) { if (type === 1) {
this.drawerTitle = '选择责任部门对接人'
this.nodeList2 = [] this.nodeList2 = []
this.zxIndex= index this.zxIndex= index
this.zxType = type
this.nodeList2.push(row) this.nodeList2.push(row)
this.modalshowflag2 = true this.modalshowflag2 = true
} else { } else {
// 批量 // 批量
this.drawerTitle = '批量选择责任部门对接人'
if (this.zxIdList.length > 0) { if (this.zxIdList.length > 0) {
this.zxType = type
this.nodeList2 = [] this.nodeList2 = []
this.modalshowflag2 = true this.modalshowflag2 = true
} else { } else {
@@ -317,39 +287,21 @@
} }
} }
}, },
saveUserInfo2 () { saveUserInfo (data) {
var idList = '' if (this.type === 1) {
var nameList = '' this.itemList[this.zxIndex].zxUserId = data[0].id
this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { this.itemList[this.zxIndex].zxUserIdName = data[0].name
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
} else { } else {
this.itemList.forEach( item => { this.itemList.forEach( item => {
this.zxIdList.forEach( items => { this.zxIdList.forEach( items => {
if (item.id === items) { if (item.id === items) {
item.zxUserId = idList item.zxUserId = data[0].id
item.zxUserIdName = nameList item.zxUserIdName = data[0].name
} }
}) })
}) })
} }
this.modalshowflag2 = false this.modalshowflag = false
},
cancleUserInfo2 () {
this.modalshowflag2 = false
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
}, },
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
@@ -366,20 +318,23 @@
} }
if (b > 0) { if (b > 0) {
this.$message.warning('请选择执行人') 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 { } else {
return this.$message.warning('请完善基础信息') return this.$message.warning('请完善基础信息')
} }
@@ -398,10 +353,10 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.number = data.number this.form.itemsNum = data.itemsNum
this.form.name = data.name this.form.itemsName = data.itemsName
this.form.number1 = data.number1 this.form.itemsNum1 = data.itemsNum1
this.form.name1 = data.name1 this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData this.sarType = data.standInData
this.json = data this.json = data
var arr = [] var arr = []
@@ -411,6 +366,7 @@
item.zxUserIdName = '' item.zxUserIdName = ''
}) })
this.itemList = arr this.itemList = arr
this.loading = false
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -418,7 +374,6 @@
}, },
mounted () { mounted () {
this.getHistoryData() this.getHistoryData()
this.getTree()
this.getData() 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-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.number" v-model="form.itemsNum"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.name" v-model="form.itemsName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
></el-input> ></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -189,6 +189,11 @@
width="150" width="150"
label="适用车型" label="适用车型"
align="center"> 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>
<el-table-column <el-table-column
prop="unitDeptName" prop="unitDeptName"
@@ -203,7 +208,6 @@
align="center"> align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -278,7 +282,6 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -339,6 +342,11 @@
placeholder="选择在产车实施日期"> placeholder="选择在产车实施日期">
</el-date-picker> </el-date-picker>
</el-form-item> </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> </el-form>
</div> </div>
<div id="roleFormButton2" class="demo-drawer-footer"> <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> <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
<loading :loading="loading">加载中...</loading>
</div> </div>
</template> </template>
@@ -359,6 +368,7 @@
name: "bzjdStep3", name: "bzjdStep3",
data() { data() {
return { return {
cxList: [],
histortData: [], histortData: [],
plForm: { plForm: {
technicalRequir: '', // 核心技术要求 technicalRequir: '', // 核心技术要求
@@ -367,11 +377,12 @@
complianceState: '', // 合规性分析 complianceState: '', // 合规性分析
newData: '', // 新车型实施日期 newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期 onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型
}, },
modalshowflag: false, modalshowflag: false,
sarType: '', sarType: '',
itemList: [], itemList: [],
loading: false, loading: true,
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
@@ -380,10 +391,10 @@
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
number: '', itemsNum: '',
name: '', itemsName: '',
number1: '', itemsNum1: '',
name1: '' itemsName1: '',
}, },
json: {}, json: {},
idList: [] idList: []
@@ -412,6 +423,7 @@
this.itemList[a].complianceState = this.plForm.complianceState this.itemList[a].complianceState = this.plForm.complianceState
this.itemList[a].newData = this.plForm.newData this.itemList[a].newData = this.plForm.newData
this.itemList[a].onlineData = this.plForm.onlineData this.itemList[a].onlineData = this.plForm.onlineData
this.itemList[a].applyArctic = this.plForm.applyArctic
} }
} }
} }
@@ -446,7 +458,7 @@
handleSubmit() { handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => { this.$refs['bzzqyjForm'].validate((valid) => {
if (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++) { for (let a = 0; a < this.itemList.length; a++) {
if (!this.itemList[a].technicalRequir) { if (!this.itemList[a].technicalRequir) {
num1++ num1++
@@ -463,6 +475,9 @@
if (!this.itemList[a].onlineData) { if (!this.itemList[a].onlineData) {
num5++ num5++
} }
if (!this.itemList[a].applyArctic) {
num6++
}
} }
if (num1 > 0) { if (num1 > 0) {
this.$message.warning('请输入核心技术要求') this.$message.warning('请输入核心技术要求')
@@ -478,7 +493,10 @@
this.$message.warning('请输入新车型实施日期') this.$message.warning('请输入新车型实施日期')
} else if (num5 > 0) { } else if (num5 > 0) {
this.$message.warning('请输入在产车实施日期') this.$message.warning('请输入在产车实施日期')
} else if (num6 > 0) {
this.$message.warning('请选择适用车型')
} else { } else {
this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText
json.itemList = this.itemList json.itemList = this.itemList
@@ -492,6 +510,7 @@
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
}) })
this.isSubmit = false
} }
} else { } else {
return this.$message.warning('请完善基础信息') return this.$message.warning('请完善基础信息')
@@ -505,10 +524,10 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.number = data.number this.form.itemsNum = data.itemsNum
this.form.name = data.name this.form.itemsName = data.itemsName
this.form.number1 = data.number1 this.form.itemsNum1 = data.itemsNum1
this.form.name1 = data.name1 this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData this.sarType = data.standInData
this.json = data this.json = data
const itemList = JSON.parse(data.itemList) const itemList = JSON.parse(data.itemList)
@@ -524,6 +543,7 @@
item.itemsTitle = item.itermsConditions item.itemsTitle = item.itermsConditions
}) })
this.itemList = itemList this.itemList = itemList
this.loading = false
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -532,6 +552,11 @@
mounted () { mounted () {
this.getHistoryData() this.getHistoryData()
this.getData() this.getData()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.cxList = res.data.ENERGYTYPES // 适用车型
})
} }
} }
</script> </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-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.number" v-model="form.itemsNum"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.name" v-model="form.itemsName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
></el-input> ></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -176,7 +176,6 @@
align="center"> align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -250,8 +249,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<loading :loading="loading">加载中...</loading>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -278,7 +277,7 @@
histortData: [], histortData: [],
sarType: '', sarType: '',
itemList: [], itemList: [],
loading: false, loading: true,
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
@@ -287,10 +286,10 @@
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
number: '', itemsNum: '',
name: '', itemsName: '',
number1: '', itemsNum1: '',
name1: '' itemsName1: '',
}, },
json: {}, json: {},
} }
@@ -313,6 +312,7 @@
}, },
handleSave() {}, handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true
var json = this.json var json = this.json
json.resolveFlag = 1 json.resolveFlag = 1
json.commentText = this.commentText json.commentText = this.commentText
@@ -325,10 +325,12 @@
this.$message.success('提交成功') this.$message.success('提交成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false
}) })
}, },
handleSubmitNo () { handleSubmitNo () {
if (this.commentText) { if (this.commentText) {
this.isSubmit = true
var json = this.json var json = this.json
json.resolveFlag = 2 json.resolveFlag = 2
json.commentText = this.commentText json.commentText = this.commentText
@@ -341,6 +343,7 @@
this.$message.success('驳回成功') this.$message.success('驳回成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false
}) })
} else { } else {
this.$message.warning('请输入反馈意见') this.$message.warning('请输入反馈意见')
@@ -353,13 +356,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.number = data.number this.form.itemsNum = data.itemsNum
this.form.name = data.name this.form.itemsName = data.itemsName
this.form.number1 = data.number1 this.form.itemsNum1 = data.itemsNum1
this.form.name1 = data.name1 this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData this.sarType = data.standInData
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.loading = false
}).catch(e => { }).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-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.number" v-model="form.itemsNum"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.name" v-model="form.itemsName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
></el-input> ></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -176,7 +176,6 @@
align="center"> align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -251,7 +250,6 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -262,6 +260,7 @@
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<loading :loading="loading">加载中...</loading>
</div> </div>
</template> </template>
@@ -278,7 +277,7 @@
histortData: [], histortData: [],
sarType: '', sarType: '',
itemList: [], itemList: [],
loading: false, loading: true,
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
@@ -287,10 +286,10 @@
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
number: '', itemsNum: '',
name: '', itemsName: '',
number1: '', itemsNum1: '',
name1: '' itemsName1: '',
}, },
json: {}, json: {},
} }
@@ -313,6 +312,7 @@
}, },
handleSave() {}, handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true
var json = this.json var json = this.json
json.zrApplyFlag = 1 json.zrApplyFlag = 1
json.commentText = this.commentText json.commentText = this.commentText
@@ -325,10 +325,12 @@
this.$message.success('提交成功') this.$message.success('提交成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false
}) })
}, },
handleSubmitNo () { handleSubmitNo () {
if (this.commentText) { if (this.commentText) {
this.isSubmit = true
var json = this.json var json = this.json
json.zrApplyFlag = 2 json.zrApplyFlag = 2
json.commentText = this.commentText json.commentText = this.commentText
@@ -341,6 +343,7 @@
this.$message.success('驳回成功') this.$message.success('驳回成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false
}) })
} else { } else {
this.$message.warning('请输入反馈意见') this.$message.warning('请输入反馈意见')
@@ -353,13 +356,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.number = data.number this.form.itemsNum = data.itemsNum
this.form.name = data.name this.form.itemsName = data.itemsName
this.form.number1 = data.number1 this.form.itemsNum1 = data.itemsNum1
this.form.name1 = data.name1 this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData this.sarType = data.standInData
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.loading = true
}).catch(e => { }).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-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.number" v-model="form.itemsNum"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
@@ -34,7 +34,7 @@
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.name" v-model="form.itemsName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
></el-input> ></el-input>
@@ -42,28 +42,28 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.number1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.name1" v-model="form.itemsName1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -177,7 +177,6 @@
align="center"> align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -252,17 +251,15 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave" @save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-back
@back="handleSubmitNo"
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<loading :loading="loading">加载中...</loading>
</div> </div>
</template> </template>
@@ -279,7 +276,7 @@
histortData: [], histortData: [],
sarType: '', sarType: '',
itemList: [], itemList: [],
loading: false, loading: true,
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
@@ -288,10 +285,10 @@
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
number: '', itemsNum: '',
name: '', itemsName: '',
number1: '', itemsNum1: '',
name1: '' itemsName1: '',
}, },
json: {}, json: {},
} }
@@ -314,6 +311,7 @@
}, },
handleSave() {}, handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true
var json = this.json var json = this.json
json.gcApplyFlag = 1 json.gcApplyFlag = 1
json.commentText = this.commentText json.commentText = this.commentText
@@ -326,10 +324,12 @@
this.$message.success('提交成功') this.$message.success('提交成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false
}) })
}, },
handleSubmitNo () { handleSubmitNo () {
if (this.commentText) { if (this.commentText) {
this.isSubmit = true
var json = this.json var json = this.json
json.gcApplyFlag = 2 json.gcApplyFlag = 2
json.commentText = this.commentText json.commentText = this.commentText
@@ -342,6 +342,7 @@
this.$message.success('驳回成功') this.$message.success('驳回成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false
}) })
} else { } else {
this.$message.warning('请输入反馈意见') this.$message.warning('请输入反馈意见')
@@ -354,13 +355,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.number = data.number this.form.itemsNum = data.itemsNum
this.form.name = data.name this.form.itemsName = data.itemsName
this.form.number1 = data.number1 this.form.itemsNum1 = data.itemsNum1
this.form.name1 = data.name1 this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData this.sarType = data.standInData
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.loading = false
}).catch(e => { }).catch(e => {
}) })
}) })