Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -110,12 +110,12 @@
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
show-back
|
||||
approval
|
||||
@back="handleSubmitNo"
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
|
||||
@@ -44,6 +44,34 @@
|
||||
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.number1"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@@ -136,7 +164,7 @@
|
||||
<el-input v-model="roleForm.deptUserId" style="display: none;"/>
|
||||
<el-input
|
||||
v-model="roleForm.deptUserIdName"
|
||||
placeholder="选择标准法规部部长·"
|
||||
placeholder="选择标准法规部部长"
|
||||
@click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
|
||||
/>
|
||||
</div>
|
||||
@@ -232,6 +260,59 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-drawer
|
||||
title="标准拆分数据库"
|
||||
:visible.sync="listModel2"
|
||||
size="900px"
|
||||
custom-class="demo-drawer"
|
||||
>
|
||||
<div class="standardForComments">
|
||||
<div class="content">
|
||||
<!-- 顶部工具栏 -->
|
||||
<div class="table-wrap">
|
||||
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
|
||||
<el-table
|
||||
v-if="listModel2"
|
||||
ref="selection"
|
||||
:data="standInfoList2"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;padding:0 0 20px 0;"
|
||||
height="100%"
|
||||
border
|
||||
@selection-change="handleSelection2"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
prop="showNumber"
|
||||
label="标准号/政策号"
|
||||
width="170"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>
|
||||
<div v-else>{{ scope.row.showNumber }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
label="标准名称/政策名称"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>
|
||||
<span v-else>{{ scope.row.standName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<pagination :page="standCommonlySearch2.page" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button size="mini" @click="closeDrawer2">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="enterDrawer2">确定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-drawer
|
||||
:title="drawerTitle"
|
||||
:visible.sync="modalshowflag"
|
||||
@@ -297,6 +378,9 @@
|
||||
name: "bzjdStep1",
|
||||
data() {
|
||||
return {
|
||||
listModel2: false,
|
||||
standInfoList2: [],
|
||||
sarType: '',
|
||||
loading: false,
|
||||
standId: '',
|
||||
commentText: '',
|
||||
@@ -311,6 +395,9 @@
|
||||
number: '',
|
||||
name: '',
|
||||
id: '',
|
||||
number1: '',
|
||||
name1: '',
|
||||
id1: ''
|
||||
},
|
||||
formRules: {
|
||||
number: [
|
||||
@@ -325,13 +412,21 @@
|
||||
numOrName: '',
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
result: '1'
|
||||
result: '1',
|
||||
},
|
||||
standCommonlySearch2: {
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
result: '1',
|
||||
sarType: 'INLAND'
|
||||
},
|
||||
spinShow: false,
|
||||
standInfoList: [],
|
||||
tableHeight: null,
|
||||
total: 0,
|
||||
total2: 0,
|
||||
selectedList: [],
|
||||
selectedList2: [],
|
||||
data: [],
|
||||
roleForm: {
|
||||
applyUserIdName: this.$store.getters.userInfo.userName,
|
||||
@@ -370,14 +465,6 @@
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
mounted () {
|
||||
this.getTree()
|
||||
this.sarStandCompareHis()
|
||||
this.tableHeight = $('.content').height() - 44
|
||||
window.onresize = () => {
|
||||
this.tableHeight = $('.content').height() - 44
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
addZqyjList() {
|
||||
this.title = '标准拆分数据库'
|
||||
@@ -412,6 +499,16 @@
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
sarStandCompareHis2 () {
|
||||
var form = this.standCommonlySearch2
|
||||
this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.standInfoList2 = res.data.list
|
||||
this.total2 = res.data.total
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
pageChange (page) {
|
||||
this.standCommonlySearch.page = page
|
||||
this.sarStandCompareHis()
|
||||
@@ -419,9 +516,19 @@
|
||||
// 分页每页显示数改变后方法
|
||||
pageSizeChange (pageSize) {
|
||||
this.$store.getters.userInfo.configContent = pageSize
|
||||
this.standCommonlySearch.size = pageSize
|
||||
this.standCommonlySearch.pageSize = pageSize
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
pageChange2 (page) {
|
||||
this.standCommonlySearch2.page = page
|
||||
this.sarStandCompareHis2()
|
||||
},
|
||||
// 分页每页显示数改变后方法
|
||||
pageSizeChange2 (pageSize) {
|
||||
this.$store.getters.userInfo.configContent = pageSize
|
||||
this.standCommonlySearch2.pageSize = pageSize
|
||||
this.sarStandCompareHis2()
|
||||
},
|
||||
/** 选择带入数据的方法操作
|
||||
* */
|
||||
handleSelection(data) {
|
||||
@@ -430,6 +537,12 @@
|
||||
this.selectedList.push(data[i].id);
|
||||
}
|
||||
},
|
||||
handleSelection2 (data) {
|
||||
this.selectedList2 = [];
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.selectedList2.push(data[i].id);
|
||||
}
|
||||
},
|
||||
closeDrawer() {
|
||||
this.listModel = false
|
||||
},
|
||||
@@ -452,8 +565,10 @@
|
||||
this.form.name = bringData[0].standName
|
||||
}
|
||||
this.form.id = bringData[0].id
|
||||
this.sarType = bringData[0].sarType
|
||||
this.standId = bringData[0].standId
|
||||
this.listModel = false;
|
||||
this.listModel2 = true
|
||||
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
|
||||
infoId: this.form.id,
|
||||
page: 1,
|
||||
@@ -476,6 +591,34 @@
|
||||
this.$message.warning("请选择一条数据进行带入");
|
||||
}
|
||||
},
|
||||
closeDrawer2() {
|
||||
this.listModel2 = false
|
||||
},
|
||||
enterDrawer2() {
|
||||
if (this.selectedList2.length === 1) {
|
||||
let deposit = new Map();
|
||||
this.standInfoList2.forEach(item => {
|
||||
deposit.set(item.id, item);
|
||||
});
|
||||
let bringData = [];
|
||||
for (let i = 0; i < this.selectedList2.length; i++) {
|
||||
bringData.push(deposit.get(this.selectedList2[i]));
|
||||
}
|
||||
if (bringData[0].splitStatus === '0') {
|
||||
this.form.number1 = bringData[0].standNumSplit
|
||||
this.form.name1 = bringData[0].standNameSplit
|
||||
} else {
|
||||
this.form.number1 = bringData[0].showNumber
|
||||
this.form.name1 = bringData[0].standName
|
||||
}
|
||||
this.form.id1 = bringData[0].id
|
||||
this.listModel2 = false
|
||||
} else if (this.selectedList2.length > 1) {
|
||||
this.$message.warning("只能选择一条数据进行带入");
|
||||
} else {
|
||||
this.$message.warning("请选择一条数据进行带入");
|
||||
}
|
||||
},
|
||||
/*** **********************************************/
|
||||
/** 流程节点负责人的选择 *****************************/
|
||||
choiceZRR (type, title, id) {
|
||||
@@ -526,6 +669,7 @@
|
||||
},
|
||||
choiceZRRS (row, type, index) {
|
||||
if (type === 1) {
|
||||
this.nodeList2 = []
|
||||
this.zrIndex= index
|
||||
this.zrType = type
|
||||
this.nodeList2.push(row)
|
||||
@@ -594,7 +738,7 @@
|
||||
if (res.ok) {
|
||||
var json = Object.assign(this.form, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.standInData = this.standId
|
||||
json.standInData = this.sarType
|
||||
json.itemList = this.itemList
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
@@ -620,7 +764,16 @@
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
this.getTree()
|
||||
this.sarStandCompareHis()
|
||||
this.sarStandCompareHis2()
|
||||
this.tableHeight = $('.content').height() - 44
|
||||
window.onresize = () => {
|
||||
this.tableHeight = $('.content').height() - 44
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -2,18 +2,17 @@
|
||||
<div class="bzjdStep2">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">对接人选择责任人</template>
|
||||
<template slot="proName">标准解读流程</template>
|
||||
<template slot="proNode">选择执行人</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<div style="overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
@@ -39,19 +38,91 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
|
||||
<el-input
|
||||
v-model="form.zxUserId"
|
||||
style="display: none;"
|
||||
disabled
|
||||
v-model="form.number1"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
clearable
|
||||
></el-input>
|
||||
<el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="action-bar">
|
||||
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
|
||||
</div>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="itemList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="handleSelectionChange"
|
||||
row-key="id">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itermsConditions"
|
||||
label="条款内容"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserIdName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="执行人"
|
||||
width="170"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.zxUserId" style="display: none;"/>
|
||||
<el-input v-model="scope.row.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRRS(scope.row.zxUserId, 1, scope.$index)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
@@ -76,28 +147,29 @@
|
||||
>
|
||||
</ProcessFooter>
|
||||
<el-drawer
|
||||
title="选择责任人"
|
||||
:visible.sync="modalshowflag"
|
||||
title="选择责任部门对接人"
|
||||
:visible.sync="modalshowflag2"
|
||||
:wrapperClosable="false"
|
||||
size="800px">
|
||||
<el-tree
|
||||
v-if="modalshowflag"
|
||||
style="height: 100%; overflow: auto;"
|
||||
v-if="modalshowflag2"
|
||||
node-key="id"
|
||||
style="height: 100%; overflow: auto;"
|
||||
class="filter-tree"
|
||||
:data="treeData"
|
||||
:props="defaultProps"
|
||||
:default-checked-keys="nodeList"
|
||||
:default-checked-keys="nodeList2"
|
||||
highlight-current
|
||||
check-strictly
|
||||
@check="drawerCheck2"
|
||||
default-expand-all
|
||||
:expand-on-click-node="false"
|
||||
show-checkbox
|
||||
ref="tree">
|
||||
ref="tree2">
|
||||
</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="cancleUserInfo">取消</el-button>
|
||||
<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>
|
||||
@@ -113,18 +185,23 @@
|
||||
name: "bzjdStep2",
|
||||
data() {
|
||||
return {
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: '',
|
||||
sarType: '',
|
||||
zxIndex: '',
|
||||
zxType: '',
|
||||
zxIdList: [],
|
||||
modalshowflag2: false,
|
||||
treeData: [],
|
||||
nodeList2: [],
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
loading: false,
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
type: '',
|
||||
drawerTitle: '', //drawer标题
|
||||
textarea: '', // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
@@ -132,17 +209,11 @@
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
number: '', // 编号
|
||||
name: '', // 结束日期
|
||||
zxUserId: '',
|
||||
zxUserIdName: ''
|
||||
number: '',
|
||||
name: '',
|
||||
},
|
||||
formRules: {
|
||||
zxUserId: [
|
||||
{ required: true, message: '请选择执行人', trigger: 'change' },
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
json: {},
|
||||
itemList: []
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -151,10 +222,37 @@
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
saveUserInfo () {
|
||||
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) {
|
||||
if (type === 1) {
|
||||
this.nodeList2 = []
|
||||
this.zxIndex= index
|
||||
this.zxType = type
|
||||
this.nodeList2.push(row)
|
||||
this.modalshowflag2 = true
|
||||
} else {
|
||||
// 批量
|
||||
if (this.zxIdList.length > 0) {
|
||||
this.zxType = type
|
||||
this.nodeList2 = []
|
||||
this.modalshowflag2 = true
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
}
|
||||
},
|
||||
saveUserInfo2 () {
|
||||
var idList = ''
|
||||
var nameList = ''
|
||||
this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
|
||||
this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
|
||||
if (nameList.length > 0) {
|
||||
nameList += ','
|
||||
idList += ','
|
||||
@@ -162,19 +260,23 @@
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
this.form.zxUserId = idList
|
||||
this.form.zxUserIdName = nameList
|
||||
this.modalshowflag = false
|
||||
},
|
||||
cancleUserInfo () {
|
||||
this.modalshowflag = false
|
||||
},
|
||||
choiceZRR () {
|
||||
this.nodeList = []
|
||||
if (this.form.zxUserId.length > 0) {
|
||||
this.nodeList = this.form.zxUserId.split(',')
|
||||
if (this.zxType == 1) {
|
||||
this.itemList[this.zxIndex].zxUserId = idList
|
||||
this.itemList[this.zxIndex].zxUserIdName = nameList
|
||||
} else {
|
||||
this.itemList.forEach( item => {
|
||||
this.zxIdList.forEach( items => {
|
||||
if (item.id === items) {
|
||||
item.zxUserId = idList
|
||||
item.zxUserIdName = nameList
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
this.modalshowflag = true
|
||||
this.modalshowflag2 = false
|
||||
},
|
||||
cancleUserInfo2 () {
|
||||
this.modalshowflag2 = false
|
||||
},
|
||||
getTree () {
|
||||
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
|
||||
@@ -188,17 +290,18 @@
|
||||
handleSubmit() {
|
||||
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
let b = 0
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
if (!this.itemList[a].zxUserId) {
|
||||
b++
|
||||
}
|
||||
}
|
||||
if (b > 0) {
|
||||
this.$message.warning('请选择执行人')
|
||||
}
|
||||
var json = this.json
|
||||
json.itemList = this.itemList
|
||||
json.commentText = this.commentText
|
||||
var arr = this.form.zxUserId.split(',')
|
||||
var newArr = []
|
||||
arr.forEach(item => {
|
||||
var json1 = {}
|
||||
json1.id = item
|
||||
newArr.push(json1)
|
||||
})
|
||||
json.zxUserId = newArr
|
||||
json.zxUserIdName = this.form.zxUserIdName
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
@@ -214,6 +317,12 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSelectionChange (val){
|
||||
this.zxIdList = []
|
||||
val.forEach( item => {
|
||||
this.zxIdList.push(item.id)
|
||||
})
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
@@ -223,7 +332,17 @@
|
||||
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.sarType = data.standInData
|
||||
this.json = data
|
||||
var arr = []
|
||||
arr = JSON.parse(data.itemList)
|
||||
arr.forEach(item => {
|
||||
item.zxUserId = ''
|
||||
item.zxUserIdName = ''
|
||||
})
|
||||
this.itemList = arr
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -2,18 +2,17 @@
|
||||
<div class="bzjdStep3">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">对接人选择责任人</template>
|
||||
<template slot="proName">标准解读流程</template>
|
||||
<template slot="proNode">填写解读分析</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<div style="overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
@@ -39,19 +38,171 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
|
||||
<el-input
|
||||
v-model="form.zxUserId"
|
||||
style="display: none;"
|
||||
disabled
|
||||
v-model="form.number1"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
clearable
|
||||
></el-input>
|
||||
<el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="action-bar">
|
||||
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
|
||||
</div>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="itemList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="handleSelectionChange"
|
||||
row-key="id"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="70"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
width="100"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsTitle"
|
||||
label="条款内容"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="technicalRequir"
|
||||
width="150"
|
||||
label="核心技术要求"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.technicalRequir" placeholder="请输入核心技术要求" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'INLAND'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="基于上一版本差异"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.changePoint" placeholder="请输入基于上一版本差异" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'FOREIGN'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.changePoint" placeholder="请输入相对于国行标差异点" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceRequir"
|
||||
width="150"
|
||||
label="符合项状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.complianceRequir">
|
||||
<el-option value="1" label="符合" key="1"></el-option>
|
||||
<el-option value="2" label="不符合" key="2"></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceState"
|
||||
width="150"
|
||||
label="合规性分析"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.complianceState" placeholder="请输入合规性分析" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newData"
|
||||
width="250"
|
||||
label="新车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-date-picker
|
||||
v-model="scope.row.newData"
|
||||
type="date"
|
||||
placeholder="选择新车型实施日期">
|
||||
</el-date-picker>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="onlineData"
|
||||
width="250"
|
||||
label="在产车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-date-picker
|
||||
v-model="scope.row.onlineData"
|
||||
type="date"
|
||||
placeholder="选择新车型实施日期">
|
||||
</el-date-picker>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applyArctic"
|
||||
width="150"
|
||||
label="适用车型"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="unitDeptName"
|
||||
label="责任部门"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserIdName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
@@ -76,26 +227,61 @@
|
||||
>
|
||||
</ProcessFooter>
|
||||
<el-drawer
|
||||
title="选择责任人"
|
||||
title="批量填写"
|
||||
:visible.sync="modalshowflag"
|
||||
:wrapperClosable="false"
|
||||
size="800px">
|
||||
<el-tree
|
||||
v-if="modalshowflag"
|
||||
style="height: 100%; overflow: auto;"
|
||||
node-key="id"
|
||||
class="filter-tree"
|
||||
:data="treeData"
|
||||
:props="defaultProps"
|
||||
:default-checked-keys="nodeList"
|
||||
highlight-current
|
||||
check-strictly
|
||||
default-expand-all
|
||||
:expand-on-click-node="false"
|
||||
show-checkbox
|
||||
ref="tree">
|
||||
</el-tree>
|
||||
<div id="roleFormButton" class="demo-drawer-footer">
|
||||
<div class="demo-drawer-content">
|
||||
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
|
||||
<el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="plForm.technicalRequir"
|
||||
placeholder="请输入核心技术要求"
|
||||
></el-input>
|
||||
</el-formItem>
|
||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'">
|
||||
<el-input
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'">
|
||||
<el-input
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入上一版本差异点"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
|
||||
<el-select
|
||||
v-model="plForm.complianceRequir"
|
||||
placeholder="请选择符合性要求">
|
||||
<el-option value="1" label="符合"></el-option>
|
||||
<el-option value="2" label="不符合"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="合规性分析" prop="complianceState" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="plForm.complianceState"
|
||||
placeholder="请输入合规性分析"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
|
||||
<el-date-picker
|
||||
v-model="plForm.newData"
|
||||
type="date"
|
||||
placeholder="选择新车型实施日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
|
||||
<el-date-picker
|
||||
v-model="plForm.onlineData"
|
||||
type="date"
|
||||
placeholder="选择在产车实施日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div id="roleFormButton2" 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="cancleUserInfo">取消</el-button>
|
||||
</div>
|
||||
@@ -113,36 +299,33 @@
|
||||
name: "bzjdStep3",
|
||||
data() {
|
||||
return {
|
||||
plForm: {
|
||||
technicalRequir: '', // 核心技术要求
|
||||
changePoint: '', // 国内标准的差异点
|
||||
complianceRequir: '1', // 符合性要求
|
||||
complianceState: '', // 合规性分析
|
||||
newData: '', // 新车型实施日期
|
||||
onlineData: '', // 在产车实施日期
|
||||
},
|
||||
modalshowflag: false,
|
||||
sarType: '',
|
||||
itemList: [],
|
||||
loading: false,
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: '',
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: '', //drawer标题
|
||||
textarea: '', // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
active: '1', // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
number: '', // 编号
|
||||
name: '', // 结束日期
|
||||
zxUserId: '',
|
||||
zxUserIdName: ''
|
||||
number: '',
|
||||
name: '',
|
||||
number1: '',
|
||||
name1: ''
|
||||
},
|
||||
formRules: {
|
||||
zxUserId: [
|
||||
{ required: true, message: '请选择执行人', trigger: 'change' },
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
json: {},
|
||||
idList: []
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -152,33 +335,40 @@
|
||||
},
|
||||
methods: {
|
||||
saveUserInfo () {
|
||||
var idList = ''
|
||||
var nameList = ''
|
||||
this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
|
||||
if (nameList.length > 0) {
|
||||
nameList += ','
|
||||
idList += ','
|
||||
for( let a = 0; a < this.itemList.length; a++) {
|
||||
for ( let b = 0; b < this.idList.length; b++) {
|
||||
if (this.itemList[a].id === this.idList[b]) {
|
||||
this.itemList[a].technicalRequir = this.plForm.technicalRequir
|
||||
this.itemList[a].changePoint = this.plForm.changePoint
|
||||
this.itemList[a].complianceRequir = this.plForm.complianceRequir
|
||||
this.itemList[a].complianceState = this.plForm.complianceState
|
||||
this.itemList[a].newData = this.plForm.newData
|
||||
this.itemList[a].onlineData = this.plForm.onlineData
|
||||
}
|
||||
}
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
this.form.zxUserId = idList
|
||||
this.form.zxUserIdName = nameList
|
||||
}
|
||||
this.modalshowflag = false
|
||||
},
|
||||
cancleUserInfo () {
|
||||
this.modalshowflag = false
|
||||
},
|
||||
choiceZRR () {
|
||||
this.nodeList = []
|
||||
if (this.form.zxUserId.length > 0) {
|
||||
this.nodeList = this.form.zxUserId.split(',')
|
||||
if (this.idList.length > 0) {
|
||||
this.plForm.technicalRequir = ''
|
||||
this.plForm.changePoint = ''
|
||||
this.plForm.complianceRequir = '1'
|
||||
this.plForm.complianceState = ''
|
||||
this.plForm.newData = ''
|
||||
this.plForm.onlineData = ''
|
||||
this.modalshowflag = true
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
this.modalshowflag = true
|
||||
},
|
||||
getTree () {
|
||||
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
|
||||
this.treeData = res.data
|
||||
handleSelectionChange (val) {
|
||||
this.idList = []
|
||||
val.forEach( item => {
|
||||
this.idList.push(item.id)
|
||||
})
|
||||
},
|
||||
handleTabs(name) {
|
||||
@@ -188,27 +378,53 @@
|
||||
handleSubmit() {
|
||||
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
var json = this.json
|
||||
json.commentText = this.commentText
|
||||
var arr = this.form.zxUserId.split(',')
|
||||
var newArr = []
|
||||
arr.forEach(item => {
|
||||
var json1 = {}
|
||||
json1.id = item
|
||||
newArr.push(json1)
|
||||
})
|
||||
json.zxUserId = newArr
|
||||
json.zxUserIdName = this.form.zxUserIdName
|
||||
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')
|
||||
let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
if (!this.itemList[a].technicalRequir) {
|
||||
num1++
|
||||
}
|
||||
})
|
||||
if (!this.itemList[a].changePoint) {
|
||||
num2++
|
||||
}
|
||||
if (!this.itemList[a].complianceRequir) {
|
||||
num3++
|
||||
}
|
||||
if (!this.itemList[a].newData) {
|
||||
num4++
|
||||
}
|
||||
if (!this.itemList[a].onlineData) {
|
||||
num5++
|
||||
}
|
||||
}
|
||||
if (num1 > 0) {
|
||||
this.$message.warning('请输入核心技术要求')
|
||||
} else if (num2 > 0) {
|
||||
if (this.sarType === 'INLAND') {
|
||||
this.$message.warning('请输入国内标准的差异点')
|
||||
} else {
|
||||
this.$message.warning('请输入基于上一版本差异')
|
||||
}
|
||||
} else if (num3 > 0) {
|
||||
this.$message.warning('请输入符合性要求')
|
||||
} else if (num4 > 0) {
|
||||
this.$message.warning('请输入新车型实施日期')
|
||||
} else if (num5 > 0) {
|
||||
this.$message.warning('请输入在产车实施日期')
|
||||
} else {
|
||||
var json = this.json
|
||||
json.commentText = this.commentText
|
||||
json.itemList = this.itemList
|
||||
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('请完善基础信息')
|
||||
}
|
||||
@@ -223,14 +439,29 @@
|
||||
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.sarType = data.standInData
|
||||
this.json = data
|
||||
const itemList = JSON.parse(data.itemList)
|
||||
itemList.forEach(item => {
|
||||
item.unitDeptName = this.$store.getters.userInfo.orgName
|
||||
item.onlineData = ''
|
||||
item.newData = ''
|
||||
item.complianceState = ''
|
||||
item.oldNumber = ''
|
||||
item.complianceRequir = '1'
|
||||
item.changePoint = ''
|
||||
item.technicalRequir = ''
|
||||
item.itemsTitle = item.itermsConditions
|
||||
})
|
||||
this.itemList = itemList
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getTree()
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,364 @@
|
||||
<template>
|
||||
|
||||
<div class="bzjdStep4">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准解读流程</template>
|
||||
<template slot="proNode">责任人审核</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.number"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.name"
|
||||
placeholder="请输入标准名称"
|
||||
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.number1"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="itemList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
row-key="id"
|
||||
>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="70"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
width="100"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsTitle"
|
||||
label="条款内容"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="technicalRequir"
|
||||
width="150"
|
||||
label="核心技术要求"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'INLAND'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="基于上一版本差异"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'FOREIGN'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceRequir"
|
||||
width="150"
|
||||
label="符合项状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.complianceRequir === '1'">符合</div>
|
||||
<div v-else>不符合</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceState"
|
||||
width="150"
|
||||
label="合规性分析"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newData"
|
||||
width="250"
|
||||
label="新车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="onlineData"
|
||||
width="250"
|
||||
label="在产车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applyArctic"
|
||||
width="150"
|
||||
label="适用车型"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="unitDeptName"
|
||||
label="责任部门"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserIdName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
||||
|
||||
export default {
|
||||
name: "step4"
|
||||
name: "bzjdStep4",
|
||||
data() {
|
||||
return {
|
||||
sarType: '',
|
||||
itemList: [],
|
||||
loading: false,
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
textarea: '', // 意见
|
||||
active: '1', // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
number: '',
|
||||
name: '',
|
||||
number1: '',
|
||||
name1: ''
|
||||
},
|
||||
json: {},
|
||||
}
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
var json = this.json
|
||||
json.resolveFlag = 1
|
||||
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')
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSubmitNo () {
|
||||
if (this.commentText) {
|
||||
var json = this.json
|
||||
json.resolveFlag = 2
|
||||
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 {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
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.sarType = data.standInData
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.bzjdStep4 {
|
||||
/deep/.el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
.fileClass:hover{
|
||||
color: #0c91e5;
|
||||
}
|
||||
position: relative;
|
||||
height: 100%;
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,13 +1,364 @@
|
||||
<template>
|
||||
|
||||
<div class="bzjdStep5">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准解读流程</template>
|
||||
<template slot="proNode">工程师审核</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.number"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.name"
|
||||
placeholder="请输入标准名称"
|
||||
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.number1"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="itemList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
row-key="id"
|
||||
>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="70"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
width="100"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsTitle"
|
||||
label="条款内容"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="technicalRequir"
|
||||
width="150"
|
||||
label="核心技术要求"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'INLAND'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="基于上一版本差异"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'FOREIGN'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceRequir"
|
||||
width="150"
|
||||
label="符合项状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.complianceRequir === '1'">符合</div>
|
||||
<div v-else>不符合</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceState"
|
||||
width="150"
|
||||
label="合规性分析"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newData"
|
||||
width="250"
|
||||
label="新车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="onlineData"
|
||||
width="250"
|
||||
label="在产车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applyArctic"
|
||||
width="150"
|
||||
label="适用车型"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="unitDeptName"
|
||||
label="责任部门"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserIdName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
||||
|
||||
export default {
|
||||
name: "step5"
|
||||
name: "bzjdStep5",
|
||||
data() {
|
||||
return {
|
||||
sarType: '',
|
||||
itemList: [],
|
||||
loading: false,
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
textarea: '', // 意见
|
||||
active: '1', // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
number: '',
|
||||
name: '',
|
||||
number1: '',
|
||||
name1: ''
|
||||
},
|
||||
json: {},
|
||||
}
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
var json = this.json
|
||||
json.zrApplyFlag = 1
|
||||
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')
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSubmitNo () {
|
||||
if (this.commentText) {
|
||||
var json = this.json
|
||||
json.zrApplyFlag = 2
|
||||
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 {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
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.sarType = data.standInData
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.bzjdStep5 {
|
||||
/deep/.el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
.fileClass:hover{
|
||||
color: #0c91e5;
|
||||
}
|
||||
position: relative;
|
||||
height: 100%;
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,13 +1,365 @@
|
||||
<template>
|
||||
|
||||
<div class="bzjdStep6">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准解读流程</template>
|
||||
<template slot="proNode">部长审批</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.number"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.name"
|
||||
placeholder="请输入标准名称"
|
||||
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.number1"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="itemList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
row-key="id"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="70"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
width="100"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsTitle"
|
||||
label="条款内容"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="technicalRequir"
|
||||
width="150"
|
||||
label="核心技术要求"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'INLAND'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="基于上一版本差异"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'FOREIGN'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceRequir"
|
||||
width="150"
|
||||
label="符合项状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.complianceRequir === '1'">符合</div>
|
||||
<div v-else>不符合</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceState"
|
||||
width="150"
|
||||
label="合规性分析"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newData"
|
||||
width="250"
|
||||
label="新车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="onlineData"
|
||||
width="250"
|
||||
label="在产车型实施日期"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applyArctic"
|
||||
width="150"
|
||||
label="适用车型"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="unitDeptName"
|
||||
label="责任部门"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserIdName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
||||
|
||||
export default {
|
||||
name: "step6"
|
||||
name: "bzjdStep6",
|
||||
data() {
|
||||
return {
|
||||
sarType: '',
|
||||
itemList: [],
|
||||
loading: false,
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
textarea: '', // 意见
|
||||
active: '1', // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
number: '',
|
||||
name: '',
|
||||
number1: '',
|
||||
name1: ''
|
||||
},
|
||||
json: {},
|
||||
}
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
var json = this.json
|
||||
json.gcApplyFlag = 1
|
||||
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')
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSubmitNo () {
|
||||
if (this.commentText) {
|
||||
var json = this.json
|
||||
json.gcApplyFlag = 2
|
||||
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 {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
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.sarType = data.standInData
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.bzjdStep6 {
|
||||
/deep/.el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
.fileClass:hover{
|
||||
color: #0c91e5;
|
||||
}
|
||||
position: relative;
|
||||
height: 100%;
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="listForm.applyRegion"-->
|
||||
<!-- placeholder="请输入适用区域"-->
|
||||
@@ -48,7 +48,7 @@
|
||||
<el-select
|
||||
width="120"
|
||||
v-model="listForm.applyRegion"
|
||||
placeholder="请选择"
|
||||
placeholder="请选择适用区域"
|
||||
filterable
|
||||
>
|
||||
<el-option
|
||||
@@ -67,28 +67,48 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
|
||||
<el-upload
|
||||
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
|
||||
:action="uploadFileListPath"
|
||||
show-file-list
|
||||
:file-list="fileInfoList"
|
||||
name="file"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
style="display: none;"
|
||||
v-model="listForm.modelName"
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="listForm.modelName" @click="fileUpload" class="fileClass">
|
||||
{{ listForm.modelName }}
|
||||
</div>
|
||||
<div v-else>
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
@click="fileUpload"
|
||||
size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-upload>
|
||||
<el-input
|
||||
v-else
|
||||
v-model="listForm.fileId"
|
||||
placeholder=""
|
||||
></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-upload-->
|
||||
<!-- v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "-->
|
||||
<!-- :action="uploadFileListPath"-->
|
||||
<!-- show-file-list-->
|
||||
<!-- :file-list="fileInfoList"-->
|
||||
<!-- name="file"-->
|
||||
<!-- accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"-->
|
||||
<!-- :on-remove="delFileInfo"-->
|
||||
<!-- :on-success="uploadBackSuccess"-->
|
||||
<!-- :before-upload="beforeUpload"-->
|
||||
<!-- >-->
|
||||
<!-- <el-button class="common-button-default" size="mini">-->
|
||||
<!-- 点击上传-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-upload>-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-else-->
|
||||
<!-- v-model="listForm.fileId"-->
|
||||
<!-- placeholder=""-->
|
||||
<!-- ></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="signFlag" @change="selectSign">
|
||||
<el-radio label="1">是</el-radio>
|
||||
@@ -125,6 +145,7 @@
|
||||
prop="code"
|
||||
fixed="left"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="标准号">
|
||||
<template slot-scope="scope">
|
||||
<a v-if="scope.row.standYear" class="table-jump"
|
||||
@@ -137,26 +158,30 @@
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
label="标准名称"
|
||||
align="center"
|
||||
width="260px"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
sortable
|
||||
align="center"
|
||||
label="发布日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="xcxssrq"
|
||||
align="center"
|
||||
label="新车型实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
align="center"
|
||||
width="120px"
|
||||
label="文本状态">
|
||||
</el-table-column>
|
||||
@@ -182,7 +207,7 @@
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
|
||||
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
|
||||
<el-card>
|
||||
<el-form-item prop="dockUserName" style="margin-bottom: 0">
|
||||
<h4>会签人</h4>
|
||||
@@ -195,6 +220,19 @@
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
|
||||
<el-card>
|
||||
<el-form-item prop="dockUserName2" style="margin-bottom: 0">
|
||||
<h4>会签人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.dockUserName" 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.ministerUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
|
||||
@@ -233,6 +271,50 @@
|
||||
<div class="demo-drawer-content">
|
||||
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
|
||||
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
|
||||
<div class="left">
|
||||
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">
|
||||
<!-- <el-form-item label="国家/地区" class="search-item search-item-last">-->
|
||||
<!-- <el-select-->
|
||||
<!-- v-model="sarSarAccessEOSearch.countryArea"-->
|
||||
<!-- placeholder="请选择"-->
|
||||
<!-- filterable-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in countryOptions"-->
|
||||
<!-- :value="item.value"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- >-->
|
||||
<!-- </el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="清单名称" class="search-item search-item-last">
|
||||
<el-input
|
||||
v-model="sarSarAccessEOSearch.detailedListName"
|
||||
placeholder="请输入清单名称"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
:loading="searching"
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="small"
|
||||
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
|
||||
@click="selectionList">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
size="small"
|
||||
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
|
||||
@click="clearSearch">清空
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table
|
||||
v-if="listType === 'country'"
|
||||
:data="sarAccessListDatas"
|
||||
@@ -269,8 +351,9 @@
|
||||
label="清单状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.detailedListState === '1'">未发布</span>
|
||||
<span v-if="scope.row.detailedListState === '2'">已发布</span>
|
||||
<span v-if="scope.row.detailedListState === '0'">未发布</span>
|
||||
<span v-if="scope.row.detailedListState === '1'">已发布</span>
|
||||
<span v-if="scope.row.detailedListState === '3'">审核中</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -347,8 +430,9 @@
|
||||
label="清单状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.detailedListState === '1'">未发布</span>
|
||||
<span v-if="scope.row.detailedListState === '2'">已发布</span>
|
||||
<span v-if="scope.row.detailedListState === '0'">未发布</span>
|
||||
<span v-if="scope.row.detailedListState === '1'">已发布</span>
|
||||
<span v-if="scope.row.detailedListState === '3'">审核中</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -425,8 +509,9 @@
|
||||
label="清单状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.detailedListState === '1'">未发布</span>
|
||||
<span v-if="scope.row.detailedListState === '2'">已发布</span>
|
||||
<span v-if="scope.row.detailedListState === '0'">未发布</span>
|
||||
<span v-if="scope.row.detailedListState === '1'">已发布</span>
|
||||
<span v-if="scope.row.detailedListState === '3'">审核中</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -511,6 +596,7 @@
|
||||
<el-table-column
|
||||
prop="code"
|
||||
fixed="left"
|
||||
align="center"
|
||||
label="标准号">
|
||||
<template slot-scope="scope">
|
||||
<a v-if="scope.row.standYear" class="table-jump"
|
||||
@@ -522,25 +608,30 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
align="center"
|
||||
label="标准名称"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
align="center"
|
||||
label="发布日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="xcxssrq"
|
||||
align="center"
|
||||
label="新车型实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
align="center"
|
||||
label="文本状态">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -598,6 +689,24 @@
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
|
||||
<el-upload
|
||||
multiple
|
||||
drag
|
||||
:action="fileUrl"
|
||||
ref="importfile"
|
||||
name="file"
|
||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
|
||||
:before-upload="beginImportFile"
|
||||
:on-success="importFileSuccess"
|
||||
:show-file-list="false"
|
||||
>
|
||||
<div style="padding: 20px 0">
|
||||
<i class="el-icon-upload" style="color: #3399ff"></i>
|
||||
<p>点击或拖拽上传文件</p>
|
||||
</div>
|
||||
</el-upload>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -617,6 +726,16 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
fileUrl: 'api/att/attFile/upload',
|
||||
fileMadel: false,
|
||||
searching: false,
|
||||
// 查询相关参数
|
||||
sarSarAccessEOSearch: {
|
||||
countryArea: "",
|
||||
detailedListName: "",
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent
|
||||
},
|
||||
standList: [], //新添加的标准
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: "", //drawer标题
|
||||
@@ -686,7 +805,9 @@ export default {
|
||||
listName: "", //清单名称
|
||||
applyRegion: "", //适用区域
|
||||
descriptionList: "", //清单说明
|
||||
fileId: "", //附件
|
||||
fileId:'',
|
||||
model: '', // 上传模板
|
||||
modelName: '',
|
||||
standId: "", //选择的清单的id
|
||||
signFlag: "1", //是否会签 1为会签 2为不会签
|
||||
inforlist: "", //用来存放标准列表的标准id
|
||||
@@ -756,10 +877,13 @@ export default {
|
||||
},
|
||||
// //判断当前选中的是哪个清单
|
||||
selectionList(type) {
|
||||
type = this.listType
|
||||
console.log(type);
|
||||
if (type === "project") {
|
||||
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
|
||||
page: this.page,
|
||||
pageSize: this.pageSize,
|
||||
...this.sarSarAccessEOSearch,
|
||||
sortKey: 2
|
||||
}, {
|
||||
_this: this
|
||||
@@ -772,6 +896,7 @@ export default {
|
||||
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
|
||||
page: this.page,
|
||||
pageSize: this.pageSize,
|
||||
...this.sarSarAccessEOSearch,
|
||||
sortKey: 3
|
||||
}, {
|
||||
_this: this
|
||||
@@ -780,10 +905,11 @@ export default {
|
||||
this.total = res.data.total;
|
||||
}, e => {
|
||||
});
|
||||
} else {
|
||||
} else if(type === 'country') {
|
||||
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
|
||||
page: this.page,
|
||||
pageSize: this.pageSize,
|
||||
...this.sarSarAccessEOSearch,
|
||||
sortKey: 1
|
||||
}, {
|
||||
_this: this
|
||||
@@ -794,13 +920,23 @@ export default {
|
||||
});
|
||||
}
|
||||
},
|
||||
clearSearch() {
|
||||
this.sarSarAccessEOSearch = {
|
||||
countryArea: "",
|
||||
detailedListName: ""
|
||||
};
|
||||
this.selectionList();
|
||||
},
|
||||
//点击添加事件
|
||||
addList() {
|
||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
|
||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
|
||||
page: this.pageNo,
|
||||
pageSize: this.pageSizeNo
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.standardData = res.data.list;
|
||||
this.totalNo = res.data.pageCount
|
||||
this.totalNo = res.data.count
|
||||
}, e => {
|
||||
});
|
||||
this.standModel = true;
|
||||
@@ -856,12 +992,12 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
// let json = this.listForm;
|
||||
let json = Object.assign(this.listForm, this.roleForm)
|
||||
json.zrUserId = this.$store.getters.userInfo.userId;
|
||||
json.jlUserId = this.$store.getters.userInfo.userId;
|
||||
let json = this.listForm;
|
||||
// let json = Object.assign(this.listForm, this.roleForm)
|
||||
json.zrUserId = this.roleForm.dockUser; //会签人
|
||||
json.jlUserId = this.roleForm.directorUser; //业务经理
|
||||
// (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
|
||||
json.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
|
||||
json.approvalOpinion = "";
|
||||
json.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
json.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
@@ -900,23 +1036,92 @@ export default {
|
||||
},
|
||||
// 删除上传的文件
|
||||
delFileInfo(file, fileList) {
|
||||
// this.fileInfoList = fileList
|
||||
this.fileInfoList = fileList
|
||||
},
|
||||
// 上传文件成功回调
|
||||
uploadBackSuccess(res, file, fileList) {
|
||||
// if (res.ok) {
|
||||
// this.fileInfoList = fileList
|
||||
// this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
|
||||
// this.$message.success('上传成功')
|
||||
// } else {
|
||||
// this.$message.error(res.message)
|
||||
// fileList.pop()
|
||||
// }
|
||||
fileUpload () {
|
||||
this.fileMadel = true
|
||||
},
|
||||
//上传之前的钩子
|
||||
beforeUpload() {
|
||||
|
||||
// 点击查看
|
||||
handlePreview (item) {
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: 'OtherStandardDetails',
|
||||
params: {
|
||||
id: item.id,
|
||||
pageType: 'INLAND_STAND'
|
||||
}
|
||||
})
|
||||
window.open(routeUrl.href, '_blank')
|
||||
},
|
||||
// 导入标准数据成功后执行
|
||||
importFileSuccess (response, file) {
|
||||
if (response.ok) {
|
||||
this.fileMadel = false
|
||||
this.listForm.model = response.data.id
|
||||
this.listForm.modelName = response.data.name
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: response.message,
|
||||
type: 'success'
|
||||
})
|
||||
}
|
||||
},
|
||||
// 导入按钮 上传之前的钩子
|
||||
beginImportFile (file) {
|
||||
var filename = file.name
|
||||
var index1 = filename.lastIndexOf('.')
|
||||
var index2 = filename.length
|
||||
var fileSuffix = filename.substring(index1, index2)
|
||||
// const fileSuffix = file.name.split('.')[1] // 后缀名
|
||||
// 判断上传文件格式
|
||||
if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
|
||||
|| fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
|
||||
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' ||
|
||||
fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt'
|
||||
|| fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx'
|
||||
|| fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') {
|
||||
return true
|
||||
} else {
|
||||
this.spinShow = false
|
||||
this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
|
||||
return false
|
||||
}
|
||||
// 判断文件上传大小
|
||||
// eslint-disable-next-line no-unreachable
|
||||
if (file.size / 1024 / 1024 <= 200) {
|
||||
return true
|
||||
} else {
|
||||
this.$message.error('文件' + file.name + '大小不超过200M')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
},
|
||||
// beginImportFile (file) {
|
||||
// var filename = file.name
|
||||
// var index1 = filename.lastIndexOf('.')
|
||||
// var index2 = filename.length
|
||||
// var fileSuffix = filename.substring(index1, index2)
|
||||
// // const fileSuffix = file.name.split('.')[1] // 后缀名
|
||||
// // 判断上传文件格式
|
||||
// // 判断上传文件格式
|
||||
// if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
|
||||
// || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
|
||||
// || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
|
||||
// return true
|
||||
// } else {
|
||||
// this.spinShow = false
|
||||
// this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
|
||||
// return false
|
||||
// }
|
||||
// // 判断文件上传大小
|
||||
// // eslint-disable-next-line no-unreachable
|
||||
// if (file.size / 1024 / 1024 <= 200) {
|
||||
// return true
|
||||
// } else {
|
||||
// this.$message.error('文件' + file.name + '大小不超过200M')
|
||||
// return false
|
||||
// }
|
||||
// return true
|
||||
// },
|
||||
//选择清单取消事件
|
||||
closeDrawer() {
|
||||
this.ListModel = false;
|
||||
@@ -1026,7 +1231,7 @@ export default {
|
||||
this.selectionList();
|
||||
},
|
||||
pageChangeNo(page){
|
||||
this.page = page
|
||||
this.pageNo = page
|
||||
this.addList()
|
||||
},
|
||||
pageSizeChangeNo(pageSize){
|
||||
@@ -1123,7 +1328,11 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.add-form-el-select{
|
||||
/deep/ .el-select{
|
||||
width: 210px;
|
||||
}
|
||||
}
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-if="active == '1'">
|
||||
<div class="content" v-show="active == '1'">
|
||||
<div style="flex: auto; overflow: auto">
|
||||
<process-title>
|
||||
<template slot="title">基础信息</template>
|
||||
@@ -53,15 +53,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
|
||||
v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
|
||||
placeholder="暂无数据"
|
||||
>
|
||||
</el-input>
|
||||
<el-input
|
||||
v-else
|
||||
v-model="listForm.fileId"
|
||||
v-model="listForm.modelName"
|
||||
placeholder=""
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
@@ -135,7 +135,7 @@
|
||||
</el-collapse>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-if="active == '2'">
|
||||
<div class="content" v-show="active == '2'">
|
||||
<div class="block" style="padding-top: 20px;">
|
||||
<el-timeline>
|
||||
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
|
||||
@@ -175,7 +175,7 @@
|
||||
</el-timeline>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-if="active === '3'">
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
@@ -344,6 +344,7 @@ export default {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
console.log(res.mesg);
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.getFormFieldList(processForm)
|
||||
@@ -363,6 +364,9 @@ export default {
|
||||
this.listForm['id'] = item.id
|
||||
this.listForm.dataList = item.dataList
|
||||
this.dataList = item.dataList
|
||||
this.listForm.applyUpdUserId = item.applyUpdUserId
|
||||
this.listForm.jlUserId = item.jlUserId
|
||||
this.listForm.zrUserId = item.zrUserId
|
||||
})
|
||||
},
|
||||
|
||||
@@ -373,10 +377,11 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
|
||||
this.listForm.zrUserId = this.listForm.zrUserId;
|
||||
this.listForm.jlUserId = this.listForm.jlUserId;
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.approvalOpinion = "";
|
||||
this.listForm.standId = this.listForm.standId;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-if="active == '1'">
|
||||
<div class="content" v-show="active == '1'">
|
||||
<div style="flex: auto; overflow: auto">
|
||||
<process-title>
|
||||
<template slot="title">基础信息</template>
|
||||
@@ -51,9 +51,9 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
|
||||
<el-upload
|
||||
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
|
||||
v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
|
||||
:action="uploadFileListPath"
|
||||
show-file-list
|
||||
:file-list="fileInfoList"
|
||||
@@ -69,7 +69,7 @@
|
||||
</el-upload>
|
||||
<el-input
|
||||
v-else
|
||||
v-model="listForm.fileId"
|
||||
v-model="listForm.modelName"
|
||||
placeholder=""
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
@@ -139,7 +139,7 @@
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-if="active === '3'">
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
@@ -499,6 +499,9 @@ export default {
|
||||
this.listForm['id'] = item.id
|
||||
this.listForm.dataList = item.dataList
|
||||
this.dataList = item.dataList
|
||||
this.listForm.applyUpdUserId = item.applyUpdUserId
|
||||
this.listForm.jlUserId = item.jlUserId
|
||||
this.listForm.zrUserId = item.zrUserId
|
||||
})
|
||||
},
|
||||
//保存事件
|
||||
@@ -515,11 +518,12 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
|
||||
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
|
||||
this.listForm.zrUserId = this.listForm.zrUserId;
|
||||
this.listForm.jlUserId = this.listForm.jlUserId;
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
|
||||
this.listForm.approvalOpinion = "";
|
||||
this.listForm.standId = this.listForm.standId;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-if="active == '1'">
|
||||
<div class="content" v-show="active == '1'">
|
||||
<div style="flex: auto; overflow: auto">
|
||||
<process-title>
|
||||
<template slot="title">基础信息</template>
|
||||
@@ -53,16 +53,16 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
|
||||
v-model="listForm.fileId"
|
||||
v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
|
||||
v-model="listForm.modelName"
|
||||
placeholder="暂无数据"
|
||||
>
|
||||
</el-input>
|
||||
<el-input
|
||||
v-else
|
||||
v-model="listForm.fileId"
|
||||
v-model="listForm.modelName"
|
||||
placeholder=""
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
@@ -136,7 +136,7 @@
|
||||
</el-collapse>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-if="active === '3'">
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
@@ -335,6 +335,9 @@ export default {
|
||||
this.listForm['id'] = item.id
|
||||
this.listForm.dataList = item.dataList
|
||||
this.dataList = item.dataList
|
||||
this.listForm.applyUpdUserId = item.applyUpdUserId
|
||||
this.listForm.jlUserId = item.jlUserId
|
||||
this.listForm.zrUserId = item.zrUserId
|
||||
})
|
||||
},
|
||||
//驳回事件
|
||||
@@ -344,12 +347,12 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
|
||||
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
|
||||
this.listForm.zrUserId = this.listForm.zrUserId;
|
||||
this.listForm.jlUserId = this.listForm.jlUserId;
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
|
||||
this.listForm.signflag = "";
|
||||
this.listForm.standId = this.listForm.standId;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
|
||||
@@ -633,15 +633,19 @@ export default {
|
||||
},
|
||||
pageChange(page) {
|
||||
this.page = page;
|
||||
this.getStandData()
|
||||
},
|
||||
pageSizeChange(pageSize) {
|
||||
this.pageSize = this.$store.getters.userInfo.configContent;
|
||||
this.getStandData()
|
||||
},
|
||||
pageChangeNo(page) {
|
||||
this.pageNO = page;
|
||||
this.getProductData()
|
||||
},
|
||||
pageSizeChangeNo(pageSize) {
|
||||
this.pageSizeNo = this.$store.getters.userInfo.configContent;
|
||||
this.getProductData()
|
||||
},
|
||||
//获取产品线数据
|
||||
getProductData() {
|
||||
@@ -659,11 +663,17 @@ export default {
|
||||
},
|
||||
//获取标准数据
|
||||
getStandData() {
|
||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
|
||||
console.log(this.page);
|
||||
console.log(this.pageSize);
|
||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
|
||||
page: this.page,
|
||||
pageSize: this.pageSize,
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
console.log(res.data);
|
||||
this.sarAccessListDatas = res.data.list;
|
||||
this.total = res.pageCount;
|
||||
this.total = res.data.count;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
|
||||
@@ -613,7 +613,7 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '4') {
|
||||
} else if (row.taskInfo === '责任人审核') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep4',
|
||||
query: {
|
||||
@@ -624,7 +624,7 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '5') {
|
||||
} else if (row.taskInfo === '工程师审核') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep5',
|
||||
query: {
|
||||
@@ -635,7 +635,7 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '6') {
|
||||
} else if (row.taskInfo === '部长审批') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep6',
|
||||
query: {
|
||||
|
||||
Reference in New Issue
Block a user