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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
fanlin
2021-07-22 15:39:15 +08:00
parent 0805939802 fbe1d5d698
commit 675659267b
5 changed files with 381 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+22 -22
View File
@@ -39,27 +39,27 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select"> <!-- <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">-->
<!-- <el-input--> <!--&lt;!&ndash; <el-input&ndash;&gt;-->
<!--&lt;!&ndash; v-model="listForm.applyRegion"&ndash;&gt;-->
<!--&lt;!&ndash; placeholder="请输入适用区域"&ndash;&gt;-->
<!--&lt;!&ndash; clearable&ndash;&gt;-->
<!--&lt;!&ndash; ></el-input>&ndash;&gt;-->
<!-- <el-select-->
<!-- width="120"-->
<!-- v-model="listForm.applyRegion"--> <!-- v-model="listForm.applyRegion"-->
<!-- placeholder="请输入适用区域"--> <!-- placeholder="请选择适用区域"-->
<!-- clearable--> <!-- filterable-->
<!-- ></el-input>--> <!-- >-->
<el-select <!-- <el-option-->
width="120" <!-- v-for="item in countryOptions"-->
v-model="listForm.applyRegion" <!-- :value="item.value"-->
placeholder="请选择适用区域" <!-- :key="item.value"-->
filterable <!-- :label="item.label"-->
> <!-- >-->
<el-option <!-- </el-option>-->
v-for="item in countryOptions" <!-- </el-select>-->
:value="item.value" <!-- </el-form-item>-->
: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-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.descriptionList" v-model="listForm.descriptionList"
@@ -856,7 +856,7 @@ export default {
listForm: { listForm: {
listType: "", //区分是哪个清单 listType: "", //区分是哪个清单
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域 // applyRegion: "", //适用区域
descriptionList: "", //清单说明 descriptionList: "", //清单说明
fileId:'', fileId:'',
model: '', // 上传模板 model: '', // 上传模板
@@ -875,7 +875,7 @@ export default {
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据 // countryOptions: [], //适用区域下拉框数据
standardTypeOptions: [ standardTypeOptions: [
{ {
value: 'INLAND', value: 'INLAND',
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+10 -10
View File
@@ -37,14 +37,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="listForm.applyRegion" <!-- v-model="listForm.applyRegion"-->
placeholder="请输入适用区域" <!-- placeholder="请输入适用区域"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled"> <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -250,7 +250,7 @@ export default {
listForm: { listForm: {
listType: "", //区分是哪个清单 listType: "", //区分是哪个清单
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域 // applyRegion: "", //适用区域
descriptionList: "", //清单说明 descriptionList: "", //清单说明
enclosure: "", //附件 enclosure: "", //附件
inforlist: "",//用来存放标准的id inforlist: "",//用来存放标准的id
@@ -267,7 +267,7 @@ export default {
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据 // countryOptions: [], //适用区域下拉框数据
user1: "", user1: "",
user2: "", user2: "",
user3: "", user3: "",
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+9 -9
View File
@@ -37,13 +37,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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">-->
<el-input <!-- <el-input-->
v-model="listForm.applyRegion" <!-- v-model="listForm.applyRegion"-->
placeholder="请输入适用区域" <!-- placeholder="请输入适用区域"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled"> <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.descriptionList" v-model="listForm.descriptionList"
@@ -340,7 +340,7 @@ export default {
pageSizeNo: this.$store.getters.userInfo.configContent, pageSizeNo: this.$store.getters.userInfo.configContent,
listForm: { listForm: {
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域 // applyRegion: "", //适用区域
descriptionList: "", //清单说明 descriptionList: "", //清单说明
enclosure: "", //附件 enclosure: "", //附件
signFlag: "1", //是否会签 1为会签 2为不会签 signFlag: "1", //是否会签 1为会签 2为不会签
@@ -357,7 +357,7 @@ export default {
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据 // countryOptions: [], //适用区域下拉框数据
user1: "", user1: "",
user2: "", user2: "",
user3: "", user3: "",
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+10 -10
View File
@@ -37,14 +37,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="listForm.applyRegion" <!-- v-model="listForm.applyRegion"-->
placeholder="请输入适用区域" <!-- placeholder="请输入适用区域"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled"> <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -253,7 +253,7 @@ export default {
listForm: { listForm: {
listType: "", //区分是哪个清单 listType: "", //区分是哪个清单
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域 // applyRegion: "", //适用区域
descriptionList: "", //清单说明 descriptionList: "", //清单说明
enclosure: "", //附件 enclosure: "", //附件
signFlag: "1", //是否会签 1为会签 2为不会签 signFlag: "1", //是否会签 1为会签 2为不会签
@@ -271,7 +271,7 @@ export default {
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据 // countryOptions: [], //适用区域下拉框数据
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+330 -236
View File
@@ -17,7 +17,7 @@
class="label-input-form" class="label-input-form"
label-width="210px" label-width="210px"
> >
<div style="flex: auto; overflow: auto;" v-show="active === '1'"> <div style="flex: auto; overflow: auto;" v-show="active === '1'">
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
@@ -122,12 +122,17 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" 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 <el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key" :key="key"
width = "340" :multiple=false
:lazy=false
:modalShowFlag="modalShowFlag1"
:drawerTitle="drawerTitle"
width = "800"
:data="standSystemOptions" :data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select> :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" 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 <el-input
@@ -501,28 +506,46 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<tree-select <el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
width = "340" <tree-select-new
width = "800"
:key="key1" :key="key1"
:data="busVppsOptions" :lazy=true
:multiple=false
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select> :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<tree-select <el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
width = "340" <tree-select-new
width = "800"
:key="key2" :key="key2"
:data="busVppsOptions" :lazy=true
:multiple=false
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select> :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled"> <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<tree-select <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
<tree-select-new
width = "800"
:key="key3" :key="key3"
width = "340" :lazy=true
:data="modelOptions" :multiple=false
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select> :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -532,15 +555,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple> <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option <el-option
v-for="item in qcdwOption" v-for="item in qcdwOption"
placeholder="请选择" placeholder="请选择"
:key="item.value" :key="item.value"
:value="item.value" :value="item.value"
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -655,13 +678,13 @@
<el-option label="采标程度2" value="2"></el-option> <el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.xglc"--> <!-- v-model="form.xglc"-->
<!-- placeholder="请输入相关流程"--> <!-- placeholder="请输入相关流程"-->
<!-- clearable--> <!-- clearable-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -684,31 +707,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">-->
<el-input
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('yybj'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-input
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.byybj"--> <!-- v-model="form.yybj"-->
<!-- placeholder="请输入被引用标准"--> <!-- placeholder="请输入引用标准"-->
<!-- clearable--> <!-- clearable-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- <el-button--> <!-- <el-button-->
@@ -716,67 +718,88 @@
<!-- class="common-button-primary"--> <!-- class="common-button-primary"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"--> <!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('byybj'),config.attrName = '被引用标准'"--> <!-- @click="selectLaws('yybj'),config.attrName = '引用标准'"-->
<!-- >{{'手动查找'}}</el-button>--> <!-- >{{'手动查找'}}</el-button>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">--> <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<!-- <el-input--> <el-input
<!-- v-model="form.chjl"--> v-model="form.cbbh"
<!-- placeholder="请输入参会记录"--> placeholder="请输入采标编号"
<!-- clearable--> clearable
<!-- ></el-input>--> ></el-input>
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
<el-input
v-model="form.byybj"
placeholder="请输入被引用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('byybj'),config.attrName = '被引用标准'"
>{{'手动查找'}}</el-button>
</el-form-item>
<!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.chjl"-->
<!-- placeholder="请输入参会记录"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="block" style="padding-top: 20px;" v-show="active === '2'"> <div class="block" style="padding-top: 20px;" v-show="active === '2'">
<el-timeline> <el-timeline>
<el-form <el-form
ref="userForm" ref="userForm"
:model="roleForm" :model="roleForm"
:rules="roleRules" :rules="roleRules"
class="label-input-form"> class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="prcCreateUserName" style="margin-bottom: 0"> <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
<h4>流程发起人</h4> <h4>流程发起人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.prcCreateUserName" placeholder="流程发起人"></el-input> <el-input disabled v-model="roleForm.prcCreateUserName" placeholder="流程发起人"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="选择会签责任人" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="选择会签责任人" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="zrUserName" style="margin-bottom: 0"> <el-form-item prop="zrUserName" style="margin-bottom: 0">
<h4>会签责任人</h4> <h4>会签责任人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRR('zrUserId', '选择责任人', form.zrUserId)"> <el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRR('zrUserId', '选择责任人', form.zrUserId)">
</el-input></div> </el-input></div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="修订申请人" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="修订申请人" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="applyUpdUserName" style="margin-bottom: 0"> <el-form-item prop="applyUpdUserName" style="margin-bottom: 0">
<h4>修订申请人</h4> <h4>修订申请人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.applyUpdUserName" placeholder="修订申请人"></el-input> <el-input disabled v-model="roleForm.applyUpdUserName" placeholder="修订申请人"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="选择标准法规业务经理" prop="jlUserName" placement="top" :color="roleForm.jlUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="选择标准法规业务经理" prop="jlUserName" placement="top" :color="roleForm.jlUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="jlUserName" style="margin-bottom: 0"> <el-form-item prop="jlUserName" style="margin-bottom: 0">
<h4>标准法规业务经理</h4> <h4>标准法规业务经理</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.jlUserName" placeholder="标准法规业务经理" @click.native="choiceZRR('jlUserId', '选择标准法规业务经理', form.jlUserId)"></el-input> <el-input v-model="roleForm.jlUserName" placeholder="标准法规业务经理" @click.native="choiceZRR('jlUserId', '选择标准法规业务经理', form.jlUserId)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
</el-form> </el-form>
</el-timeline> </el-timeline>
</div> </div>
@@ -1104,15 +1127,23 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst} from "api/process"; import {saveTaskFirst} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
export default { export default {
name: "bzrkStep1", name: "bzrkStep1",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect,
TreeSelectNew
},
data () { data () {
return { return {
standardDrawer: false, standardDrawer: false,
loadSarStandard: false, loadSarStandard: false,
verifySarStandard: false, verifySarStandard: false,
standardSearchForm: { standardSearchForm: {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
@@ -1133,9 +1164,9 @@
}, },
selectedList: [], selectedList: [],
standardCheckedList: [], standardCheckedList: [],
activeName:'1', activeName:'1',
roleRow: {}, roleRow: {},
commentText: '', // 意见 commentText: '', // 意见
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
config: { config: {
attrName : '', attrName : '',
@@ -1191,6 +1222,12 @@
key3:4, key3:4,
treeData: [], // 人员数据 treeData: [], // 人员数据
modalShowFlag: false, // drawer开关 modalShowFlag: false, // drawer开关
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
url:'',
urlChild:'',
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
nodeKey: 'id', nodeKey: 'id',
defaultCheckedKeys: [], defaultCheckedKeys: [],
@@ -1248,15 +1285,15 @@
// 适用范围 // 适用范围
txlb: '', // 体系类别 txlb: '', // 体系类别
gkdw: '', // 归口管理部门 gkdw: '', // 归口管理部门
qcdw: '', // 起草单位 qcdw: [], // 起草单位
wssmr: '', // 我司署名人 wssmr: [], // 我司署名人
cysd: '', // 我司参与深度 cysd: '', // 我司参与深度
cllx: '', // 适用车型 cllx: [], // 适用车型
nylx: '',// 能源类型 nylx: [],// 能源类型
sycpx: '',// 适用产品线 sycpx: [],// 适用产品线
syrz: '', // 适用认证 syrz: [], // 适用认证
zrbm: '', // 责任部门 zrbm: [], // 责任部门
zrgcs: '', // 责任工程师 zrgcs: [], // 责任工程师
cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppsbm: '', // 关联模块--乘用车VPPS编码
cycvppscn: '', // 关联模块--乘用车vpps中文名称 cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码 kccvppsbm: '', // 关联模块--卡车VPPS编码
@@ -1330,7 +1367,9 @@
standStateOptions: [], // 文本状态 standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
busVppsOptions: [], // 车系体系架构 busVppsOptions: [], // 车系体系架构
busVppsChildOptions: [], // 车系体系架构子集合
modelOptions: [], // 模块体系架构 modelOptions: [], // 模块体系架构
modelChildOptions: [], // 模块体系架构子集合
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
@@ -1398,84 +1437,78 @@
}, },
}, },
}, },
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect
},
methods: { methods: {
clearFormData(data){ clearFormData(data){
this.form = { this.form = {
// 基础信息 // 基础信息
textStatus: '', // 文本状态 textStatus: '', // 文本状态
standYear: '', // 标准年份 standYear: '', // 标准年份
standInData: data.standInData ? data.standInData : '0', // 标准类型 standInData: data.standInData ? data.standInData : '0', // 标准类型
standSort: data.standSort ? data.standSort : '', // 标准类别 standSort: data.standSort ? data.standSort : '', // 标准类别
standNumber: data.standNumber ? data.standNumber : '', // 标准编号 standNumber: data.standNumber ? data.standNumber : '', // 标准编号
standNature: data.standNature ? data.standNature : '', // 标准性质 standNature: data.standNature ? data.standNature : '', // 标准性质
standEnName: data.standEnName ? data.standEnName : '', // 英文名称 standEnName: data.standEnName ? data.standEnName : '', // 英文名称
standName: data.standName ? data.standName : '', // 中文名称 standName: data.standName ? data.standName : '', // 中文名称
signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
issueTime: '', // 发布时间 issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单 isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系 standSystem: '',// 标准体系
standSystemName: '',// 标准体系名称 standSystemName: '',// 标准体系名称
gxhbq: '', // 标签 gxhbq: '', // 标签
// 实施日期 // 实施日期
ssrq: '', // 实施日期(标准文本) ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本) xcxssrq: '', // 新车型实施日期(标准文本)
zccssrq: '', // 在产车实施日期(标准文本) zccssrq: '', // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际) ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际) xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际) zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息 // 文本信息
ca: '', // 草案 ca: '', // 草案
fbgbjbd: '', // 发布稿 fbgbjbd: '', // 发布稿
xgd: '', // 修改单 xgd: '', // 修改单
bpg: '', // 报批稿 bpg: '', // 报批稿
ssg: '', // 送审稿 ssg: '', // 送审稿
zqyjg: '', // 征求意见稿 zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件 jdwj: '', // 解读文件
zbjbd: '', // 增补件 zbjbd: '', // 增补件
kwj: '', // 勘误件 kwj: '', // 勘误件
caName: '', // 草案 caName: '', // 草案
fbgbjbdName: '', // 发布稿 fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单 xgdName: '', // 修改单
bpgName: '', // 报批稿 bpgName: '', // 报批稿
ssgName: '', // 送审稿 ssgName: '', // 送审稿
zqyjgName: '', // 征求意见稿 zqyjgName: '', // 征求意见稿
jdwjName: '', // 解读文件 jdwjName: '', // 解读文件
zbjbdName: '', // 增补件 zbjbdName: '', // 增补件
kwjName: '', // 勘误件 kwjName: '', // 勘误件
glwjName: '', // 关联文件 glwjName: '', // 关联文件
// 适用范围 // 适用范围
txlb: '', // 体系类别 txlb: '', // 体系类别
gkdw: '', // 归口管理部门 gkdw: '', // 归口管理部门
qcdw: '', // 起草单位 qcdw: [], // 起草单位
wssmr: '', // 我司署名人 wssmr: [], // 我司署名人
cysd: '', // 我司参与深度 cysd: '', // 我司参与深度
cllx: '', // 适用车型 cllx: [], // 适用车型
nylx: '',// 能源类型 nylx: [],// 能源类型
sycpx: '',// 适用产品线 sycpx: [],// 适用产品线
syrz: '', // 适用认证 syrz: [], // 适用认证
zrbm: '', // 责任部门 zrbm: [], // 责任部门
zrgcs: '', // 责任工程师 zrgcs: [], // 责任工程师
cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppsbm: '', // 关联模块--乘用车VPPS编码
cycvppscn: '', // 关联模块--乘用车vpps中文名称 cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码 kccvppsbm: '', // 关联模块--卡车VPPS编码
kccvppscn: '', // 关联模块--卡车vpps中文名称 kccvppscn: '', // 关联模块--卡车vpps中文名称
dybxh: '', // 模块结构单元变型号 dybxh: '', // 模块结构单元变型号
dymc: '', // 模块结构单元名称 dymc: '', // 模块结构单元名称
// 关联信息 // 关联信息
dtbjh: '', // 代替标准号 dtbjh: '', // 代替标准号
cbbh: '', // 采标编号 cbbh: '', // 采标编号
cbcd: '', // 采标程度 cbcd: '', // 采标程度
yybj: '', // 引用标准 yybj: '', // 引用标准
byybj: '', // 被引用标准 byybj: '', // 被引用标准
glwj: '', // 关联文件 glwj: '', // 关联文件
xglc: '', // 相关流程 xglc: '', // 相关流程
chjl: '', // 参会记录 chjl: '', // 参会记录
} // 标准信息 } // 标准信息
}, },
handleProcessStandardNext(status) { handleProcessStandardNext(status) {
@@ -1628,7 +1661,6 @@
this.zrUserIds.push(data) this.zrUserIds.push(data)
} }
console.log(this.zrUserIds)
}else { }else {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if(getlist.length == 1) { if(getlist.length == 1) {
@@ -1646,6 +1678,38 @@
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag = true this.modalShowFlag = true
}, },
choiceZRR1 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
this.key++
},
choiceZRR2 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag2 = true
this.url = ''
this.urlChild = ''
this.url="sarVppsTree/list"
this.urlChild="sarVppsTree/childByList"
this.key1++
},
choiceZRR3 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag3 = true
this.url = ''
this.urlChild = ''
this.url="sarVppsTree/list"
this.urlChild="sarVppsTree/childByList"
this.key2++
},
choiceZRR4 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
this.key3++
},
getTree () { getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data this.treeData = res.data
@@ -1889,29 +1953,51 @@
this.fileMadel = true this.fileMadel = true
this.fileType = type; this.fileType = type;
}, },
popoverHide (checkedIds, checkedData) { popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) { if(checkedData) {
this.form.standSystem = checkedData.id if(checkedData.length > 0){
this.form.standSystemName = checkedData.menuName this.form.standSystem = checkedData.map(item => item.menuName).join(",")
}else {
this.form.standSystem = checkedData.menuName
}
} }
this.modalShowFlag1 = false
}, },
popoverHideBusVs (checkedIds, checkedData) { popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData){ if(checkedData) {
this.form.cycvppsbm = checkedData.code if(checkedData.length > 0){
this.form.cycvppscn = checkedData.chineseName this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
}else {
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
} }
this.modalShowFlag2 = false
}, },
popoverHideCarVs (checkedIds, checkedData) { popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData){ if(checkedData) {
this.form.kccvppsbm = checkedData.code if(checkedData.length > 0){
this.form.kccvppscn = checkedData.chineseName this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
}else {
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
} }
this.modalShowFlag3 = false
}, },
popoverHideModel (checkedIds, checkedData) { popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData){ if(checkedData) {
this.form.dybxh = checkedData.model if(checkedData.length > 0){
this.form.dymc = checkedData.name this.form.dybxh = checkedData.map(item => item.model).join(",")
this.form.dymc = checkedData.map(item => item.name).join(",")
}else {
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
} }
this.modalShowFlag4 = false
}, },
closeDrawer() { closeDrawer() {
this.ListModel = false this.ListModel = false
@@ -1930,31 +2016,31 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
//保存 //保存
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', this.$route.query.type) _formData.append('prcType', this.$route.query.type)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
prcForm: this.prcForm, prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList, sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm, bzqdForm: this.bzqdForm,
listInfo: this.listInfo, listInfo: this.listInfo,
id: this.id id: this.id
})) }))
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
// 流程保存之后，应该流转至草稿页面 // 流程保存之后，应该流转至草稿页面
this.$router.push({path:'/processCenter?tabsName=TaskDraft'}) this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
// this.bpnId = res.result // this.bpnId = res.result
}).catch(e => { }).catch(e => {
this.saveLoading = false this.saveLoading = false
}) })
}, },
handleSubmit() { handleSubmit() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
@@ -1983,7 +2069,7 @@
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
this.isSubmit = false this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} }
}) })
@@ -1993,7 +2079,7 @@
this.$message.warning('请检查人员信息表单是否填写完整') this.$message.warning('请检查人员信息表单是否填写完整')
} }
}) })
} else { } else {
this.$message.warning('请检查基础信息表单是否填写完整') this.$message.warning('请检查基础信息表单是否填写完整')
} }
}) })
@@ -2006,6 +2092,14 @@
this.busVppsOptions = res.data this.busVppsOptions = res.data
}) })
}, },
busVsChildFunc(id){
this.$http.get('sarVppsTree/childByList', {id:id}, {
_this: this
}, res => {
this.busVppsChildOptions = []
this.busVppsChildOptions = res.data
})
},
modelFunc(){ modelFunc(){
this.$http.get('sarModelTree/list', '', { this.$http.get('sarModelTree/list', '', {
_this: this _this: this