Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -10,7 +10,7 @@
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</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"
|
||||
@@ -49,6 +49,52 @@
|
||||
</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"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.zrUserId" style="display: none;"/>
|
||||
<el-input v-model="scope.row.zrUserIdName" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 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;">
|
||||
@@ -82,21 +128,6 @@
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="对接部门责任人" placement="top" :color="roleForm.zrUserId ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="zrUserId" style="margin-bottom: 0">
|
||||
<h4>对接部门责任人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.zrUserId" style="display: none;"/>
|
||||
<el-input
|
||||
v-model="roleForm.zrUserIdName"
|
||||
placeholder="选择责任部门对接人"
|
||||
@click.native="choiceZRRS">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="批准解读流程" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="deptUserId" style="margin-bottom: 0">
|
||||
@@ -126,7 +157,7 @@
|
||||
>
|
||||
</ProcessFooter>
|
||||
<el-drawer
|
||||
title="标准征求意见数据库"
|
||||
title="标准拆分数据库"
|
||||
:visible.sync="listModel"
|
||||
size="900px"
|
||||
custom-class="demo-drawer"
|
||||
@@ -234,14 +265,15 @@
|
||||
size="800px">
|
||||
<el-tree
|
||||
v-if="modalshowflag2"
|
||||
style="height: 100%; overflow: auto;"
|
||||
node-key="id"
|
||||
style="height: 100%; overflow: auto;"
|
||||
class="filter-tree"
|
||||
:data="treeData"
|
||||
:props="defaultProps"
|
||||
:default-checked-keys="nodeList2"
|
||||
highlight-current
|
||||
check-strictly
|
||||
@check="drawerCheck2"
|
||||
default-expand-all
|
||||
:expand-on-click-node="false"
|
||||
show-checkbox
|
||||
@@ -265,6 +297,7 @@
|
||||
name: "bzjdStep1",
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
standId: '',
|
||||
commentText: '',
|
||||
textarea: '', // 意见
|
||||
@@ -303,8 +336,6 @@
|
||||
roleForm: {
|
||||
applyUserIdName: this.$store.getters.userInfo.userName,
|
||||
applyUserId: this.$store.getters.userInfo.userId,
|
||||
zrUserId: '',
|
||||
zrUserIdName: '',
|
||||
deptUserId: '',
|
||||
deptUserIdName: ''
|
||||
},
|
||||
@@ -328,7 +359,10 @@
|
||||
label: 'name'
|
||||
},
|
||||
roleRow: {},
|
||||
itemList: []
|
||||
itemList: [],
|
||||
zrType: '',
|
||||
zrIndex: '',
|
||||
zrIdList: []
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -401,6 +435,7 @@
|
||||
},
|
||||
enterDrawer() {
|
||||
if (this.selectedList.length === 1) {
|
||||
this.loading = true
|
||||
let deposit = new Map();
|
||||
this.standInfoList.forEach(item => {
|
||||
deposit.set(item.id, item);
|
||||
@@ -427,9 +462,13 @@
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
res.data.list.forEach(item => {
|
||||
item.zrUserId = ''
|
||||
item.zrUserIdName= ''
|
||||
})
|
||||
this.itemList = res.data.list
|
||||
console.log(res);
|
||||
}
|
||||
this.loading = false
|
||||
})
|
||||
} else if (this.selectedList.length > 1) {
|
||||
this.$message.warning("只能选择一条数据进行带入");
|
||||
@@ -470,12 +509,37 @@
|
||||
this.roleRow = this.$refs.tree.getCheckedNodes()[0]
|
||||
}
|
||||
},
|
||||
choiceZRRS () {
|
||||
this.nodeList2 = []
|
||||
if ( this.roleForm.zrUserId.length > 0) {
|
||||
this.nodeList2 = this.roleForm.zrUserId.split(',')
|
||||
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]
|
||||
}
|
||||
},
|
||||
handleSelectionChange (val) {
|
||||
this.zrIdList = []
|
||||
val.forEach( item => {
|
||||
this.zrIdList.push(item.id)
|
||||
})
|
||||
},
|
||||
choiceZRRS (row, type, index) {
|
||||
if (type === 1) {
|
||||
this.zrIndex= index
|
||||
this.zrType = type
|
||||
this.nodeList2.push(row)
|
||||
this.modalshowflag2 = true
|
||||
} else {
|
||||
// 批量
|
||||
if (this.zrIdList.length > 0) {
|
||||
this.zrType = type
|
||||
this.nodeList2 = []
|
||||
this.modalshowflag2 = true
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
}
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
saveUserInfo2 () {
|
||||
var idList = ''
|
||||
@@ -488,8 +552,19 @@
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
this.roleForm.zrUserId = idList
|
||||
this.roleForm.zrUserIdName = nameList
|
||||
if (this.zrType == 1) {
|
||||
this.itemList[this.zrIndex].zrUserId = idList
|
||||
this.itemList[this.zrIndex].zrUserIdName = nameList
|
||||
} else {
|
||||
this.itemList.forEach( item => {
|
||||
this.zrIdList.forEach( items => {
|
||||
if (item.id === items) {
|
||||
item.zrUserId = idList
|
||||
item.zrUserIdName = nameList
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
this.modalshowflag2 = false
|
||||
},
|
||||
cancleUserInfo2 () {
|
||||
@@ -504,28 +579,38 @@
|
||||
if (valid) {
|
||||
this.$refs['Form'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$http.get('lawss/activiti/startProcess', {
|
||||
type: '9'
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
var json = Object.assign(this.form, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.standInData = this.standId
|
||||
json.itemList = this.itemList
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: res.data,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('流程发起成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('流程启动失败')
|
||||
let b = 0
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
if (!this.itemList[a].zrUserId) {
|
||||
b++
|
||||
}
|
||||
})
|
||||
}
|
||||
if (b > 0) {
|
||||
this.$message.warning('请选择责任人')
|
||||
} else {
|
||||
this.$http.get('lawss/activiti/startProcess', {
|
||||
type: '9'
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
var json = Object.assign(this.form, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.standInData = this.standId
|
||||
json.itemList = this.itemList
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: res.data,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('流程发起成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('流程启动失败')
|
||||
}
|
||||
})
|
||||
}
|
||||
} else {
|
||||
return this.$message.warning('请完善人员信息')
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
<template>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "step4"
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -0,0 +1,13 @@
|
||||
<template>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "step5"
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -0,0 +1,13 @@
|
||||
<template>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "step6"
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -40,11 +40,25 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="listForm.applyRegion"-->
|
||||
<!-- placeholder="请输入适用区域"-->
|
||||
<!-- clearable-->
|
||||
<!-- ></el-input>-->
|
||||
<el-select
|
||||
width="120"
|
||||
v-model="listForm.applyRegion"
|
||||
placeholder="请输入适用区域"
|
||||
clearable
|
||||
></el-input>
|
||||
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="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
@@ -163,7 +177,7 @@
|
||||
<h4>标准/政策法规工程师</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.startUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
|
||||
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
@@ -627,21 +641,21 @@ export default {
|
||||
},
|
||||
formRules: {
|
||||
listType: [
|
||||
{ required: true, message: "请选择清单类型", trigger: "blur" }
|
||||
{ required: true, message: "请选择清单类型", trigger: "change" }
|
||||
],
|
||||
listName: [
|
||||
{ required: true, message: "请填写清单名称", trigger: "change" }
|
||||
]
|
||||
},
|
||||
roleFormRules: {
|
||||
// dockUserName: [
|
||||
// { required: true, message: "请选择会签责任人", trigger: "blur" }
|
||||
// ],
|
||||
dockUserName: [
|
||||
{ required: true, message: "请选择会签责任人", trigger: "change" }
|
||||
],
|
||||
ministerUserName: [
|
||||
{ required: true, message: "请选择修订责任人", trigger: "blur" }
|
||||
{ required: true, message: "请选择修订责任人", trigger: "change" }
|
||||
],
|
||||
directorUserName: [
|
||||
{ required: true, message: "请选择审批责任人", trigger: "blur" }
|
||||
{ required: true, message: "请选择审批责任人", trigger: "change" }
|
||||
]
|
||||
},
|
||||
dataList: [],//清单里的标准数据
|
||||
@@ -842,7 +856,8 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
let json = this.listForm;
|
||||
// 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;
|
||||
// (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
|
||||
@@ -958,7 +973,6 @@ export default {
|
||||
res.data=[]
|
||||
}
|
||||
this.dataList = res.data;
|
||||
console.log(res.data);
|
||||
this.listForm.dataList = res.data;
|
||||
let formId = []
|
||||
this.dataList.map(item => {
|
||||
@@ -979,7 +993,6 @@ export default {
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.selectedList.push(data[i].id);
|
||||
}
|
||||
console.log(this.selectedList);
|
||||
},
|
||||
//标准表格选择框改变
|
||||
selectStandChange(data) {
|
||||
@@ -1024,18 +1037,18 @@ export default {
|
||||
},
|
||||
computed: {},
|
||||
mounted() {
|
||||
//从数据库中查询下拉框数据
|
||||
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.countryOptions = res.data.COUNTRY;
|
||||
});
|
||||
this.selectionList();
|
||||
this.selectSign();
|
||||
this.getTree();
|
||||
for (let i = 0; i < this.dataList.length; i++) {
|
||||
this.standMap.set(this.dataList[i].id, this.dataList[i]);
|
||||
}
|
||||
//从数据查询下拉框数据
|
||||
this.$http.get("sys/dictype/getDicTypeListCode", "", {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.countryOptions = res.data.COUNTRY;
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
|
||||
</div>
|
||||
<div class="content" v-if="active === '1'">
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
@@ -50,7 +50,7 @@
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</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-form
|
||||
@@ -378,6 +378,7 @@ export default {
|
||||
this.$message.warning("请选择至少一条数据进行带入");
|
||||
}
|
||||
},
|
||||
// 勾选事件
|
||||
selectedChange(val) {
|
||||
this.selectedList = val
|
||||
},
|
||||
@@ -433,7 +434,7 @@ export default {
|
||||
this.modalshowflag = true
|
||||
},
|
||||
drawerCheck (data) {
|
||||
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
|
||||
let getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
|
||||
if(getlist.length == 1) {
|
||||
this.roleRow = getlist[0]
|
||||
}else {
|
||||
|
||||
@@ -364,7 +364,7 @@ export default {
|
||||
this.modalshowflag = false
|
||||
},
|
||||
//查询按钮
|
||||
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
|
||||
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
|
||||
this.realList = this.dataList.filter(item => {
|
||||
let matchId = true; // 标准号 筛选
|
||||
let matchName = true; // 项目名称 筛选
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<el-form :modal="dataList" inline class="label-input-form">
|
||||
<el-form :modal="nonSearch" inline class="label-input-form">
|
||||
<el-form-item label="标准号/标准名称" class="search-item">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="dataList.standId"
|
||||
v-model="nonSearch.standId"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
@@ -24,13 +24,13 @@
|
||||
<el-form-item label="项目名称" class="search-item">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="dataList.productName"
|
||||
v-model="nonSearch.productName"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任部门" class="search-item">
|
||||
<el-input v-model="dataList.responsibleUnit" v-show="false" />
|
||||
<el-input v-model="nonSearch.responsibleUnit" v-show="false" />
|
||||
<el-popover
|
||||
placement="bottom"
|
||||
popper-class="user-dept-popper"
|
||||
@@ -40,7 +40,7 @@
|
||||
<el-input
|
||||
size="small"
|
||||
slot="reference"
|
||||
v-model="dataList.responseUnitShow"
|
||||
v-model="nonSearch.responseUnitShow"
|
||||
placeholder="根据责任部门查找"
|
||||
readonly
|
||||
clearable
|
||||
@@ -64,7 +64,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
|
||||
@click="getTableByPage('dataList')">
|
||||
@click="getTableByPage(nonSearch)">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
@@ -120,7 +120,7 @@
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="textarea">
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
@@ -129,8 +129,10 @@
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
show-back
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@back="handleSubmitNo"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
@@ -174,10 +176,10 @@ export default {
|
||||
name: "wfhxzgStep3",
|
||||
data() {
|
||||
return {
|
||||
textarea: '', // 意见
|
||||
commentText: '', // 意见
|
||||
title: '', // 新增编辑抽屉标题
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
nonConformitySearch: {
|
||||
nonSearch: {
|
||||
standId: '', // 标准号/名称
|
||||
productName: '', // 项目名称
|
||||
responsibleUnit: '' // 责任部门
|
||||
@@ -243,6 +245,25 @@ export default {
|
||||
this.active = name
|
||||
},
|
||||
|
||||
handleSubmitNo() {
|
||||
if (this.commentText) {
|
||||
var json = this.json
|
||||
json.actionFlag = 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')
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
},
|
||||
// 保存按钮
|
||||
handleSave() {},
|
||||
// 提交按钮
|
||||
@@ -317,11 +338,32 @@ export default {
|
||||
this.modalshowflag = false
|
||||
},
|
||||
//查询按钮
|
||||
getTableByPage() {
|
||||
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
|
||||
this.realList = this.dataList.filter(item => {
|
||||
let matchId = true; // 标准号 筛选
|
||||
let matchName = true; // 项目名称 筛选
|
||||
let matchUnit = true; // 部门 筛选
|
||||
|
||||
if (standId) {
|
||||
const keysId = standId
|
||||
.toUpperCase() // 转大写
|
||||
.replace(' ', '') // 删掉空格
|
||||
.split('') // 切割成 单个字
|
||||
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
|
||||
}
|
||||
if (productName) {
|
||||
matchName = item.productName === productName;
|
||||
}
|
||||
if (responsibleUnit) {
|
||||
matchUnit = item.responsibleUnit === responsibleUnit;
|
||||
}
|
||||
return matchId && matchName && matchUnit;
|
||||
})
|
||||
this.dataList = this.realList
|
||||
},
|
||||
// 清空 查询条件
|
||||
clearAllSearch (search = true) {
|
||||
this.nonConformitySearch = {
|
||||
this.nonSearch = {
|
||||
standId: '',
|
||||
productName: '',
|
||||
responsibleUnit: ''
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<el-form :modal="dataList" inline class="label-input-form">
|
||||
<el-form :modal="nonSearch" inline class="label-input-form">
|
||||
<el-form-item label="标准号/标准名称" class="search-item">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="dataList.standId"
|
||||
v-model="nonSearch.standId"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
@@ -24,13 +24,13 @@
|
||||
<el-form-item label="项目名称" class="search-item">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="dataList.productName"
|
||||
v-model="nonSearch.productName"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任部门" class="search-item">
|
||||
<el-input v-model="dataList.responsibleUnit" v-show="false" />
|
||||
<el-input v-model="nonSearch.responsibleUnit" v-show="false" />
|
||||
<el-popover
|
||||
placement="bottom"
|
||||
popper-class="user-dept-popper"
|
||||
@@ -40,7 +40,7 @@
|
||||
<el-input
|
||||
size="small"
|
||||
slot="reference"
|
||||
v-model="dataList.responseUnitShow"
|
||||
v-model="nonSearch.responseUnitShow"
|
||||
placeholder="根据责任部门查找"
|
||||
readonly
|
||||
clearable
|
||||
@@ -64,7 +64,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
|
||||
@click="getTableByPage('dataList')">
|
||||
@click="getTableByPage(nonSearch)">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
@@ -177,7 +177,7 @@ export default {
|
||||
textarea: '', // 意见
|
||||
title: '', // 新增编辑抽屉标题
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
nonConformitySearch: {
|
||||
nonSearch: {
|
||||
standId: '', // 标准号/名称
|
||||
productName: '', // 项目名称
|
||||
responsibleUnit: '' // 责任部门
|
||||
@@ -323,16 +323,37 @@ export default {
|
||||
},
|
||||
|
||||
//未整改项抽屉中的查询按钮
|
||||
getTableByPage() {
|
||||
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
|
||||
this.realList = this.dataList.filter(item => {
|
||||
let matchId = true; // 标准号 筛选
|
||||
let matchName = true; // 项目名称 筛选
|
||||
let matchUnit = true; // 部门 筛选
|
||||
|
||||
if (standId) {
|
||||
const keysId = standId
|
||||
.toUpperCase() // 转大写
|
||||
.replace(' ', '') // 删掉空格
|
||||
.split('') // 切割成 单个字
|
||||
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
|
||||
}
|
||||
if (productName) {
|
||||
matchName = item.productName === productName;
|
||||
}
|
||||
if (responsibleUnit) {
|
||||
matchUnit = item.responsibleUnit === responsibleUnit;
|
||||
}
|
||||
return matchId && matchName && matchUnit;
|
||||
})
|
||||
this.dataList = this.realList
|
||||
},
|
||||
// 清空 查询条件
|
||||
clearAllSearch (search = true) {
|
||||
this.nonConformitySearch = {
|
||||
clearAllSearch () {
|
||||
this.nonSearch = {
|
||||
standId: '',
|
||||
productName: '',
|
||||
responsibleUnit: ''
|
||||
}
|
||||
this.getTableByPage()
|
||||
this.getData()
|
||||
},
|
||||
// 分页事件
|
||||
pageChange (page) {
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<el-form :modal="dataList" inline class="label-input-form">
|
||||
<el-form :modal="nonSearch" inline class="label-input-form">
|
||||
<el-form-item label="标准号/标准名称" class="search-item">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="dataList.standId"
|
||||
v-model="nonSearch.standId"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
@@ -24,13 +24,13 @@
|
||||
<el-form-item label="项目名称" class="search-item">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="dataList.productName"
|
||||
v-model="nonSearch.productName"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任部门" class="search-item">
|
||||
<el-input v-model="dataList.responsibleUnit" v-show="false" />
|
||||
<el-input v-model="nonSearch.responsibleUnit" v-show="false" />
|
||||
<el-popover
|
||||
placement="bottom"
|
||||
popper-class="user-dept-popper"
|
||||
@@ -40,7 +40,7 @@
|
||||
<el-input
|
||||
size="small"
|
||||
slot="reference"
|
||||
v-model="dataList.responseUnitShow"
|
||||
v-model="nonSearch.responseUnitShow"
|
||||
placeholder="根据责任部门查找"
|
||||
readonly
|
||||
clearable
|
||||
@@ -64,7 +64,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
|
||||
@click="getTableByPage('dataList')">
|
||||
@click="getTableByPage(nonSearch)">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
@@ -141,7 +141,7 @@ export default {
|
||||
title: '', // 新增编辑抽屉标题
|
||||
saveLoading: false,
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
nonConformitySearch: {
|
||||
nonSearch: {
|
||||
standId: '', // 标准号/名称
|
||||
productName: '', // 项目名称
|
||||
responsibleUnit: '' // 责任部门
|
||||
@@ -231,16 +231,37 @@ export default {
|
||||
}
|
||||
},
|
||||
//未整改项抽屉中的查询按钮
|
||||
getTableByPage() {
|
||||
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
|
||||
this.realList = this.dataList.filter(item => {
|
||||
let matchId = true; // 标准号 筛选
|
||||
let matchName = true; // 项目名称 筛选
|
||||
let matchUnit = true; // 部门 筛选
|
||||
|
||||
if (standId) {
|
||||
const keysId = standId
|
||||
.toUpperCase() // 转大写
|
||||
.replace(' ', '') // 删掉空格
|
||||
.split('') // 切割成 单个字
|
||||
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
|
||||
}
|
||||
if (productName) {
|
||||
matchName = item.productName === productName;
|
||||
}
|
||||
if (responsibleUnit) {
|
||||
matchUnit = item.responsibleUnit === responsibleUnit;
|
||||
}
|
||||
return matchId && matchName && matchUnit;
|
||||
})
|
||||
this.dataList = this.realList
|
||||
},
|
||||
// 清空 查询条件
|
||||
clearAllSearch (search = true) {
|
||||
this.nonConformitySearch = {
|
||||
this.nonSearch = {
|
||||
standId: '',
|
||||
productName: '',
|
||||
responsibleUnit: ''
|
||||
}
|
||||
this.getTableByPage()
|
||||
this.getData()
|
||||
},
|
||||
// 分页事件
|
||||
pageChange (page) {
|
||||
|
||||
@@ -113,13 +113,13 @@
|
||||
:model="roleForm"
|
||||
:rules="roleFormRules"
|
||||
class="label-input-form">
|
||||
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
|
||||
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="startUserName" style="margin-bottom: 0">
|
||||
<h4>标准法规工程师</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.startUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
|
||||
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
|
||||
@@ -328,7 +328,6 @@ export default {
|
||||
implementer: ""
|
||||
},
|
||||
choiceForm: {}, //选择标准清单列表
|
||||
countryOptions: [], //适用区域下拉框数据
|
||||
user1: "",
|
||||
user2: "",
|
||||
user3: "",
|
||||
|
||||
@@ -428,17 +428,19 @@ export default {
|
||||
* @description: 动态表单读取
|
||||
*/
|
||||
getFormFieldList (item) {
|
||||
console.log(item.dataList);
|
||||
console.log(item);
|
||||
this.$nextTick(() => {
|
||||
this.listForm = JSON.parse(JSON.stringify(item))
|
||||
this.listForm.prcNum = this.prcNum
|
||||
this.listForm.prcName = this.prcName
|
||||
this.listForm['id'] = item.id
|
||||
this.dataList = item.dataList
|
||||
this.dataList = item.step3DTOS
|
||||
this.listForm.standName = item.step3DTOS[0].standName
|
||||
this.listForm.standNumber = item.step3DTOS[0].standNumber
|
||||
this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
|
||||
this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
//驳回事件
|
||||
beforeBack () {
|
||||
this.listForm.fenFlag = '2'
|
||||
|
||||
@@ -518,17 +518,17 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
// }else if(row.taskInfo === '标准法规部领导审核'){
|
||||
// this.$router.push({
|
||||
// name: 'xmpgStep6',
|
||||
// query: {
|
||||
// taskIds: row.taskIds,
|
||||
// prcId: row.prcId,
|
||||
// prcNum: row.prcNum,
|
||||
// prcName: row.prcName,
|
||||
// prcType: row.prcType
|
||||
// }
|
||||
// })
|
||||
}else if(row.taskInfo === '汇总审核'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '标准法规部领导审核'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep7',
|
||||
@@ -613,6 +613,39 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '4') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '5') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '6') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user