Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -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;
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
@@ -24,27 +24,16 @@
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="form.standInData">
|
||||
<el-radio label="0">国内标准入库</el-radio>
|
||||
<el-radio label="1">海外标准入库</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.standSort" placeholder="请选择标准类别">
|
||||
<el-option
|
||||
v-for="item in standSortOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model.number="form.standYear"
|
||||
placeholder="请输入标准标准年份"
|
||||
v-model="form.standNumber"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
@@ -55,28 +44,51 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.standEnName"
|
||||
placeholder="请输入标准英文名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="form.signFlag">
|
||||
<el-radio label="1">是</el-radio>
|
||||
<el-radio label="2">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
|
||||
<el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.standNumber"
|
||||
placeholder="请输入标准编号"
|
||||
v-model.number="form.standYear"
|
||||
placeholder="请输入标准标准年份"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.textStatus" placeholder="请选择文本状态">
|
||||
<el-option
|
||||
v-for="item in standStateOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
v-model="form.issueTime"
|
||||
type="date"
|
||||
placeholder="请选择标准发布日期"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.standSort" placeholder="请选择标准类别">
|
||||
<el-option
|
||||
v-for="item in standSortOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.standNature" placeholder="请选择标准性质">
|
||||
<el-option
|
||||
@@ -88,39 +100,35 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.textStatus" placeholder="请选择文本状态">
|
||||
<el-option
|
||||
v-for="item in standStateOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.standEnName"
|
||||
placeholder="请输入标准英文名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
v-model="form.issueTime"
|
||||
type="date"
|
||||
placeholder="请选择标准发布日期"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
<el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
|
||||
<el-button
|
||||
type="primary"
|
||||
:loading="loadSarStandard"
|
||||
@click="handleSearchStandard">
|
||||
根据类别、编号、中英文名称查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
|
||||
<el-form-item v-show="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="form.isRelateAccess">
|
||||
<el-radio label="1">是</el-radio>
|
||||
<el-radio label="2">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<tree-select
|
||||
width = "340"
|
||||
:data="standSystemOptions"
|
||||
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
|
||||
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.gxhbq"
|
||||
placeholder="请输入标签"
|
||||
@@ -130,10 +138,10 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<ProcessTitle v-show="verifySarStandard">
|
||||
<template slot="title">实施日期</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<div class="prc-content-border" v-show="verifySarStandard" >
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
|
||||
@@ -189,10 +197,10 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<ProcessTitle v-show="verifySarStandard">
|
||||
<template slot="title">文本信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<div class="prc-content-border" v-show="verifySarStandard">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
|
||||
@@ -223,7 +231,7 @@
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
style="display: none;"
|
||||
@@ -452,10 +460,10 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<ProcessTitle v-show="verifySarStandard">
|
||||
<template slot="title">适用范围</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<div class="prc-content-border" v-show="verifySarStandard">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
|
||||
@@ -492,22 +500,25 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple>
|
||||
<el-option label="乘用车VPPS编码1" value="1"></el-option>
|
||||
<el-option label="乘用车VPPS编码2" value="2"></el-option>
|
||||
</el-select>
|
||||
<tree-select
|
||||
width = "340"
|
||||
:data="busVppsOptions"
|
||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHideBusVs"></tree-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple>
|
||||
<el-option label="卡车VPPS编码1" value="1"></el-option>
|
||||
<el-option label="卡车VPPS编码2" value="2"></el-option>
|
||||
</el-select>
|
||||
<tree-select
|
||||
width = "340"
|
||||
:data="busVppsOptions"
|
||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHideCarVs"></tree-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple>
|
||||
<el-option label="模块结构单元变型号1" value="1"></el-option>
|
||||
<el-option label="模块结构单元变型号2" value="2"></el-option>
|
||||
</el-select>
|
||||
<tree-select
|
||||
width = "340"
|
||||
:data="modelOptions"
|
||||
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHideModel"></tree-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
@@ -518,7 +529,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.fbjg"
|
||||
v-model="form.qcdw"
|
||||
placeholder="请选择起草单位"
|
||||
clearable
|
||||
></el-input>
|
||||
@@ -610,10 +621,10 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<ProcessTitle v-show="verifySarStandard">
|
||||
<template slot="title">关联信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<div class="prc-content-border" v-show="verifySarStandard">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
|
||||
@@ -762,7 +773,7 @@
|
||||
</el-timeline>
|
||||
</div>
|
||||
</el-form>
|
||||
<el-collapse v-model="activeName" accordion>
|
||||
<el-collapse v-show="verifySarStandard" v-model="activeName" accordion>
|
||||
<el-collapse-item title="意见填写" name="1">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
@@ -777,6 +788,7 @@
|
||||
</el-collapse>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
v-show="verifySarStandard"
|
||||
show-save
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
@@ -927,6 +939,154 @@
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!-- 选择标准的弹框 -->
|
||||
<el-drawer
|
||||
ref="standard"
|
||||
title="查询结果"
|
||||
size="1300px"
|
||||
:visible.sync="standardDrawer"
|
||||
direction="rtl"
|
||||
:before-close="handleReviseDrawerClose">
|
||||
<div class="standard-content">
|
||||
<div class="content">
|
||||
<div class="standard-table-search">
|
||||
<el-form :model="standardSearchForm" inline class="label-input-form search-area">
|
||||
<el-formItem label="标准来源" prop="standType" class="search-item" >
|
||||
<el-select
|
||||
v-model="standardSearchForm.standType"
|
||||
placeholder="请选择标准来源">
|
||||
<el-option value="INLAND" label="国内标准库"></el-option>
|
||||
<el-option value="FOREIGN" label="国外标准库"></el-option>
|
||||
</el-select>
|
||||
</el-formItem>
|
||||
<el-form-item label="标准类别" prop="standSort" class="search-item" >
|
||||
<el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in standSortOptions"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准编号" prop="standNumber" class="search-item" >
|
||||
<el-input
|
||||
v-model="standardSearchForm.standNumber"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="中文名称" prop="standName" class="search-item" >
|
||||
<el-input v-model="standardSearchForm.standName"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
:maxlength="500"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="英文名称" prop="standEnName" class="search-item">
|
||||
<el-input
|
||||
v-model="standardSearchForm.standEnName"
|
||||
maxlength="1000"
|
||||
placeholder="请输入英文名称"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
icon="el-icon-search"
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
@click="handleSearchStandard"
|
||||
round>
|
||||
</el-button>
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="handleResetSearch"
|
||||
round></el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="standard-table-wrap">
|
||||
<el-table
|
||||
ref="reviseDrawerTable"
|
||||
:data="tableData.standardData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
:height="tableHeight.standardTableHeight"
|
||||
border
|
||||
class="drag-table"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
@selection-change="standSelectChange">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="80"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="标准号"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a v-if="scope.row.standYear" @click="handlePreview(scope.row)">
|
||||
{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
|
||||
<a v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
label="标准名称"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standStateShow"
|
||||
label="标准状态"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
class="opera-btn"
|
||||
size="mini"
|
||||
type="primary"
|
||||
@click="handlePreview(scope.row)">查看
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<pagination
|
||||
:page="standardSearchForm.page"
|
||||
:total="standardSearchForm.total"
|
||||
@pageChange="handleStandardPageChange"
|
||||
@pageSizeChange="handleStandardPageSizeChange"></pagination>
|
||||
<loading :loading="loadSarStandard">数据获取中</loading>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button
|
||||
round
|
||||
class="common-button-primary"
|
||||
icon="el-icon-check"
|
||||
type="primary"
|
||||
@click="handleProcessStandardNext(1)">新增</el-button>
|
||||
<el-button
|
||||
round
|
||||
class="common-button-primary"
|
||||
icon="el-icon-check"
|
||||
type="primary"
|
||||
@click="handleProcessStandardNext(2)">带入</el-button>
|
||||
<el-button
|
||||
round
|
||||
class="common-button-default"
|
||||
icon="el-icon-close"
|
||||
@click="handleProcessStandardNext(3)">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -941,8 +1101,32 @@
|
||||
name: "bzrkStep1",
|
||||
data () {
|
||||
return {
|
||||
standardDrawer: false,
|
||||
loadSarStandard: false,
|
||||
verifySarStandard: false,
|
||||
standardSearchForm: {
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
total: 0,
|
||||
standType: 'INLAND',
|
||||
standSort: '',
|
||||
standName: '',
|
||||
standEnName: '',
|
||||
standNumber: ''
|
||||
},
|
||||
tableData: {
|
||||
// 标准表格数据
|
||||
standardData: [],
|
||||
// 任务分解单数据
|
||||
taskTableData: []
|
||||
},
|
||||
tableHeight: {
|
||||
standardTableHeight: null
|
||||
},
|
||||
selectedList: [],
|
||||
standardCheckedList: [],
|
||||
activeName:'1',
|
||||
roleRow: {},
|
||||
roleRow: {},
|
||||
commentText: '', // 意见
|
||||
title: '', // 新增编辑抽屉标题
|
||||
config: {
|
||||
@@ -979,6 +1163,14 @@
|
||||
children: 'children',
|
||||
label: 'menuName'
|
||||
},
|
||||
defaultCodeProps: {
|
||||
children: 'children',
|
||||
label: 'code'
|
||||
},
|
||||
defaultModelProps: {
|
||||
children: 'children',
|
||||
label: 'model'
|
||||
},
|
||||
nodeList: [],
|
||||
type: '',
|
||||
defaultUserProps: {
|
||||
@@ -1018,7 +1210,7 @@
|
||||
zccssrqgj: '', // 在产车实施日期(国际)
|
||||
// 文本信息
|
||||
ca: '', // 草案
|
||||
fbgbjbd: '', // 发布稿
|
||||
FBGBJBD: '', // 发布稿
|
||||
xgd: '', // 修改单
|
||||
bpg: '', // 报批稿
|
||||
ssg: '', // 送审稿
|
||||
@@ -1120,6 +1312,8 @@
|
||||
standNatureOptions: [], // 标准性质
|
||||
standStateOptions: [], // 文本状态
|
||||
standSystemOptions: [], // 标准体系
|
||||
busVppsOptions: [], // 车系体系架构
|
||||
modelOptions: [], // 模块体系架构
|
||||
applyArcticOptions: [], // 适用车型
|
||||
categoryOptions: [], // 能源类型
|
||||
applyAuthOptions: [], // 适用认证
|
||||
@@ -1132,6 +1326,59 @@
|
||||
ListForm: {}, // 新增数据
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
'form.standInData': {
|
||||
handler: function() {
|
||||
this.verifySarStandard = false
|
||||
this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
|
||||
},
|
||||
},
|
||||
'standardSearchForm.standType': {
|
||||
handler: function() {
|
||||
this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1'
|
||||
},
|
||||
},
|
||||
'form.standNumber': {
|
||||
handler: function() {
|
||||
this.standardSearchForm.standNumber = this.form.standNumber
|
||||
},
|
||||
},
|
||||
'standardSearchForm.standNumber': {
|
||||
handler: function() {
|
||||
this.form.standNumber = this.standardSearchForm.standNumber
|
||||
},
|
||||
},
|
||||
'form.standSort': {
|
||||
handler: function() {
|
||||
this.standardSearchForm.standSort = this.form.standSort
|
||||
},
|
||||
},
|
||||
'standardSearchForm.standSort': {
|
||||
handler: function() {
|
||||
this.form.standSort = this.standardSearchForm.standSort
|
||||
},
|
||||
},
|
||||
'form.standName': {
|
||||
handler: function() {
|
||||
this.standardSearchForm.standName = this.form.standName
|
||||
},
|
||||
},
|
||||
'standardSearchForm.standName': {
|
||||
handler: function() {
|
||||
this.form.standName = this.standardSearchForm.standName
|
||||
},
|
||||
},
|
||||
'form.standEnName': {
|
||||
handler: function() {
|
||||
this.standardSearchForm.standEnName = this.form.standEnName
|
||||
},
|
||||
},
|
||||
'standardSearchForm.standEnName': {
|
||||
handler: function() {
|
||||
this.form.standEnName = this.standardSearchForm.standEnName
|
||||
},
|
||||
},
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
@@ -1139,6 +1386,179 @@
|
||||
TreeSelect
|
||||
},
|
||||
methods: {
|
||||
clearFormData(data){
|
||||
this.form = {
|
||||
// 基础信息
|
||||
textStatus: '', // 文本状态
|
||||
standYear: '', // 标准年份
|
||||
standInData: data.standInData ? data.standInData : '0', // 标准类型
|
||||
standSort: data.standSort ? data.standSort : '', // 标准类别
|
||||
standNumber: data.standNumber ? data.standNumber : '', // 标准编号
|
||||
standNature: data.standNature ? data.standNature : '', // 标准性质
|
||||
standEnName: data.standEnName ? data.standEnName : '', // 英文名称
|
||||
standName: data.standName ? data.standName : '', // 中文名称
|
||||
signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
|
||||
issueTime: '', // 发布时间
|
||||
isRelateAccess: '', // 是否纳入认证清单
|
||||
standSystem: '',// 标准体系
|
||||
standSystemName: '',// 标准体系名称
|
||||
gxhbq: '', // 标签
|
||||
// 实施日期
|
||||
ssrq: '', // 实施日期(标准文本)
|
||||
xcxssrq: '', // 新车型实施日期(标准文本)
|
||||
zccssrq: '', // 在产车实施日期(标准文本)
|
||||
ssrqgj: '', // 实施日期(国际)
|
||||
xcxssrqgj: '', // 新车型实施日期(国际)
|
||||
zccssrqgj: '', // 在产车实施日期(国际)
|
||||
// 文本信息
|
||||
ca: '', // 草案
|
||||
fbgbjbd: '', // 发布稿
|
||||
xgd: '', // 修改单
|
||||
bpg: '', // 报批稿
|
||||
ssg: '', // 送审稿
|
||||
zqyjg: '', // 征求意见稿
|
||||
jdwj: '', // 解读文件
|
||||
zbjbd: '', // 增补件
|
||||
kwj: '', // 勘误件
|
||||
caName: '', // 草案
|
||||
fbgbjbdName: '', // 发布稿
|
||||
xgdName: '', // 修改单
|
||||
bpgName: '', // 报批稿
|
||||
ssgName: '', // 送审稿
|
||||
zqyjgName: '', // 征求意见稿
|
||||
jdwjName: '', // 解读文件
|
||||
zbjbdName: '', // 增补件
|
||||
kwjName: '', // 勘误件
|
||||
glwjName: '', // 关联文件
|
||||
// 适用范围
|
||||
txlb: '', // 体系类别
|
||||
gkdw: '', // 归口管理部门
|
||||
qcdw: '', // 起草单位
|
||||
wssmr: '', // 我司署名人
|
||||
cysd: '', // 我司参与深度
|
||||
cllx: '', // 适用车型
|
||||
nylx: '',// 能源类型
|
||||
sycpx: '',// 适用产品线
|
||||
syrz: '', // 适用认证
|
||||
zrbm: '', // 责任部门
|
||||
zrgcs: '', // 责任工程师
|
||||
cycvppsbm: '', // 关联模块--乘用车VPPS编码
|
||||
cycvppscn: '', // 关联模块--乘用车vpps中文名称
|
||||
kccvppsbm: '', // 关联模块--卡车VPPS编码
|
||||
kccvppscn: '', // 关联模块--卡车vpps中文名称
|
||||
dybxh: '', // 模块结构单元变型号
|
||||
dymc: '', // 模块结构单元名称
|
||||
// 关联信息
|
||||
dtbjh: '', // 代替标准号
|
||||
cbbh: '', // 采标编号
|
||||
cbcd: '', // 采标程度
|
||||
yybj: '', // 引用标准
|
||||
byybj: '', // 被引用标准
|
||||
glwj: '', // 关联文件
|
||||
xglc: '', // 相关流程
|
||||
chjl: '', // 参会记录
|
||||
} // 标准信息
|
||||
},
|
||||
handleProcessStandardNext(status) {
|
||||
switch (status) {
|
||||
// 新增
|
||||
case 1:
|
||||
this.selectedList = []
|
||||
this.standardCheckedList = []
|
||||
this.standardDrawer = false
|
||||
this.verifySarStandard = true
|
||||
this.clearFormData(this.form)
|
||||
break
|
||||
// 带入
|
||||
case 2:
|
||||
if (this.standardCheckedList.length === 1) {
|
||||
const bringData = this.standardCheckedList[0]
|
||||
bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
|
||||
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
|
||||
console.log(bringData)
|
||||
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
|
||||
this.form = JSON.parse(JSON.stringify(json))
|
||||
this.defaultCheckedKeys = [this.form.standSystem];
|
||||
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
|
||||
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
|
||||
this.form.prcNum = this.prcNum
|
||||
this.form.prcName = this.prcName
|
||||
this.form['id'] = bringData.id
|
||||
this.standardDrawer = false
|
||||
this.verifySarStandard = true
|
||||
} else if (this.standardCheckedList.length > 1) {
|
||||
this.$message.warning('最多可以带入一条标准信息')
|
||||
} else {
|
||||
this.$message.warning('请选择要带入的标准信息')
|
||||
}
|
||||
break
|
||||
// 取消
|
||||
case 3:
|
||||
this.selectedList = []
|
||||
this.standardCheckedList = []
|
||||
this.standardDrawer = false
|
||||
break
|
||||
}
|
||||
},
|
||||
handleStandardPageChange (page) {
|
||||
this.standardSearchForm.page = page
|
||||
this.handleSearchStandard()
|
||||
},
|
||||
handleStandardPageSizeChange (pageSize) {
|
||||
this.standardSearchForm.pageSize = pageSize
|
||||
this.handleSearchStandard()
|
||||
},
|
||||
standSelectChange (data) {
|
||||
this.selectedList = []
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.selectedList.push(data[i].id)
|
||||
}
|
||||
this.standardCheckedList = data
|
||||
},
|
||||
handleResetSearch() {
|
||||
this.standardSearchForm.standType = 'INLAND'
|
||||
this.standardSearchForm.standNumber = ''
|
||||
this.standardSearchForm.standSort = ''
|
||||
this.standardSearchForm.standName = ''
|
||||
this.standardSearchForm.standEnName = ''
|
||||
setTimeout(() => {
|
||||
this.handleSearchStandard()
|
||||
}, 100)
|
||||
},
|
||||
/**
|
||||
* 关闭修订 Drawer 的监听
|
||||
* @param done
|
||||
*/
|
||||
handleReviseDrawerClose (done) {
|
||||
done()
|
||||
},
|
||||
getDomesticStandardTable () {
|
||||
this.loadSarStandard = true
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.standardSearchForm, {}, res => {
|
||||
this.loadSarStandard = false
|
||||
if (res.ok) {
|
||||
this.tableData.standardData = res.data.list
|
||||
this.standardSearchForm.total = res.data.count
|
||||
}
|
||||
}, e => {
|
||||
this.loadSarStandard = false
|
||||
})
|
||||
},
|
||||
handleSearchStandard () {
|
||||
if (this.form.standType === '') {
|
||||
this.$message.warning('请选择标准来源')
|
||||
} else {
|
||||
this.standardDrawer = true
|
||||
this.$nextTick(() => {
|
||||
// 动态设置表格高度
|
||||
this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
|
||||
window.onresize = () => {
|
||||
this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
|
||||
}
|
||||
})
|
||||
this.getDomesticStandardTable()
|
||||
}
|
||||
},
|
||||
saveUserInfo () {
|
||||
if (this.userType === 'zrUserId') {
|
||||
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
|
||||
@@ -1436,6 +1856,27 @@
|
||||
this.form.standSystemName = checkedData.menuName
|
||||
console.log(this.sarStandardsInfoEO.standSystem);
|
||||
},
|
||||
popoverHideBusVs (checkedIds, checkedData) {
|
||||
console.log(checkedIds);
|
||||
console.log(checkedData);
|
||||
this.form.cycvppsbm = checkedData.code
|
||||
this.form.cycvppscn = checkedData.chineseName
|
||||
console.log(this.sarStandardsInfoEO.standSystem);
|
||||
},
|
||||
popoverHideCarVs (checkedIds, checkedData) {
|
||||
console.log(checkedIds);
|
||||
console.log(checkedData);
|
||||
this.form.kccvppsbm = checkedData.code
|
||||
this.form.kccvppscn = checkedData.chineseName
|
||||
console.log(this.sarStandardsInfoEO.standSystem);
|
||||
},
|
||||
popoverHideModel (checkedIds, checkedData) {
|
||||
console.log(checkedIds);
|
||||
console.log(checkedData);
|
||||
this.form.dybxh = checkedData.model
|
||||
this.form.dymc = checkedData.name
|
||||
console.log(this.sarStandardsInfoEO.standSystem);
|
||||
},
|
||||
closeDrawer() {
|
||||
this.ListModel = false
|
||||
},
|
||||
@@ -1515,7 +1956,21 @@
|
||||
this.$message.warning('请检查基础信息表单是否填写完整')
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
busVsFunc(){
|
||||
this.$http.get('sarVppsTree/list', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.busVppsOptions = res.data
|
||||
})
|
||||
},
|
||||
modelFunc(){
|
||||
this.$http.get('sarModelTree/list', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.modelOptions = res.data
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getTree()
|
||||
@@ -1535,6 +1990,8 @@
|
||||
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
|
||||
this.txlbOptions = res.data.TXLBCLASS // 体系类别
|
||||
})
|
||||
this.busVsFunc()
|
||||
this.modelFunc()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -1591,4 +2048,24 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.standard-content {
|
||||
height: 100%;
|
||||
padding: 10px 0 0;
|
||||
.content {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 0 10px;
|
||||
.standard-table-wrap {
|
||||
flex: auto;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.pagination {
|
||||
position: static;
|
||||
/deep/ .pagination-slot {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="form.standInData" disabled>
|
||||
<el-radio label="0">国内标准入库</el-radio>
|
||||
<el-radio label="1">海外标准入库</el-radio>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="form.standInData" disabled>
|
||||
<el-radio label="0">国内标准入库</el-radio>
|
||||
<el-radio label="1">海外标准入库</el-radio>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="form.standInData">
|
||||
<el-radio label="0">国内标准入库</el-radio>
|
||||
<el-radio label="1">海外标准入库</el-radio>
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user