Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
This commit is contained in:
super_liu
@@ -165,6 +165,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
v-if="!form.itemsNum1"
|
||||||
prop="technicalRequir"
|
prop="technicalRequir"
|
||||||
width="150"
|
width="150"
|
||||||
label="核心技术要求"
|
label="核心技术要求"
|
||||||
@@ -178,6 +179,7 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="changePoint"
|
prop="changePoint"
|
||||||
width="150"
|
width="150"
|
||||||
|
v-if="form.itemsNum1"
|
||||||
label="基于上一版本差异"
|
label="基于上一版本差异"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -187,7 +189,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
v-if="sarType === 'FOREIGN'"
|
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
||||||
prop="changePoint"
|
prop="changePoint"
|
||||||
width="150"
|
width="150"
|
||||||
label="相对于国行标差异点"
|
label="相对于国行标差异点"
|
||||||
@@ -363,21 +365,21 @@
|
|||||||
size="800px">
|
size="800px">
|
||||||
<div class="demo-drawer-content">
|
<div class="demo-drawer-content">
|
||||||
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
|
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
|
||||||
<el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" >
|
<el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="plForm.technicalRequir"
|
v-model="plForm.technicalRequir"
|
||||||
placeholder="请输入核心技术要求"
|
placeholder="请输入核心技术要求"
|
||||||
maxlength="500"
|
maxlength="500"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-formItem>
|
</el-formItem>
|
||||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'">
|
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="plForm.changePoint"
|
v-model="plForm.changePoint"
|
||||||
placeholder="请输入国内标准的差异点"
|
placeholder="请输入国内标准的差异点"
|
||||||
maxlength="500"
|
maxlength="500"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'">
|
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="plForm.changePoint"
|
v-model="plForm.changePoint"
|
||||||
placeholder="请输入上一版本差异点"
|
placeholder="请输入上一版本差异点"
|
||||||
@@ -636,7 +638,7 @@
|
|||||||
num6++
|
num6++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this.form.itemsNum1) {
|
if (!this.form.itemsNum1) {
|
||||||
if (num1 > 0) {
|
if (num1 > 0) {
|
||||||
this.$message.warning('请输入核心技术要求')
|
this.$message.warning('请输入核心技术要求')
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -668,6 +668,625 @@
|
|||||||
@submit2="handle2"
|
@submit2="handle2"
|
||||||
@over2="handle1"
|
@over2="handle1"
|
||||||
>
|
>
|
||||||
|
</ProcessFooter>
|
||||||
|
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
|
||||||
|
<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-input
|
||||||
|
disabled
|
||||||
|
v-model.number="form.standYear"
|
||||||
|
placeholder="请输入标准标准年份"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.standName"
|
||||||
|
placeholder="请输入标准中文名称"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
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" disabled>
|
||||||
|
<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-input
|
||||||
|
disabled
|
||||||
|
v-model="form.standNumber"
|
||||||
|
placeholder="请输入标准编号"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in standNatureOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></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="请选择文本状态" disabled>
|
||||||
|
<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 label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
|
||||||
|
<el-date-picker
|
||||||
|
disabled
|
||||||
|
v-model="form.issueTime"
|
||||||
|
type="date"
|
||||||
|
placeholder="请选择标准发布日期"
|
||||||
|
value-format="yyyy-MM-dd">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
|
||||||
|
<el-radio-group v-model="form.isRelateAccess" disabled>
|
||||||
|
<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-input v-model="form.standSystem" disabled></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.gxhbq"
|
||||||
|
placeholder="请输入标签"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
<ProcessTitle>
|
||||||
|
<template slot="title">实施日期</template>
|
||||||
|
</ProcessTitle>
|
||||||
|
<div class="prc-content-border">
|
||||||
|
<el-row :gutter="24">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
|
||||||
|
<el-date-picker
|
||||||
|
disabled
|
||||||
|
v-model="form.ssrq"
|
||||||
|
type="date"
|
||||||
|
placeholder="请选择标准实施日期(标准文本)"
|
||||||
|
value-format="yyyy-MM-dd">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
|
||||||
|
<el-date-picker
|
||||||
|
disabled
|
||||||
|
v-model="form.zccssrq"
|
||||||
|
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="xcxssrq" class="add-form-item form-item-disabled">
|
||||||
|
<el-date-picker
|
||||||
|
disabled
|
||||||
|
v-model="form.xcxssrq"
|
||||||
|
type="date"
|
||||||
|
placeholder="请选择新车型实施日期(标准文本"
|
||||||
|
value-format="yyyy-MM-dd">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
|
||||||
|
<!-- <el-date-picker-->
|
||||||
|
<!-- disabled-->
|
||||||
|
<!-- v-model="form.ssrqgj"-->
|
||||||
|
<!-- type="date"-->
|
||||||
|
<!-- placeholder="请选择实施日期(国际)"-->
|
||||||
|
<!-- value-format="yyyy-MM-dd">-->
|
||||||
|
<!-- </el-date-picker>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
|
||||||
|
<!-- <el-date-picker-->
|
||||||
|
<!-- disabled-->
|
||||||
|
<!-- v-model="form.xcxssrqgj"-->
|
||||||
|
<!-- type="date"-->
|
||||||
|
<!-- placeholder="请选择新车型实施日期(国家)"-->
|
||||||
|
<!-- value-format="yyyy-MM-dd">-->
|
||||||
|
<!-- </el-date-picker>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
|
||||||
|
<!-- <el-date-picker-->
|
||||||
|
<!-- disabled-->
|
||||||
|
<!-- v-model="form.zccssrqgj"-->
|
||||||
|
<!-- type="date"-->
|
||||||
|
<!-- placeholder="请选择在产车实施日期(国家)"-->
|
||||||
|
<!-- value-format="yyyy-MM-dd">-->
|
||||||
|
<!-- </el-date-picker>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
<ProcessTitle>
|
||||||
|
<template slot="title">文本信息</template>
|
||||||
|
</ProcessTitle>
|
||||||
|
<div class="prc-content-border">
|
||||||
|
<el-row :gutter="24">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
|
||||||
|
<div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
|
||||||
|
{{ form.xgdName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
|
||||||
|
<div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
|
||||||
|
{{ form.fbgbjbdName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
|
||||||
|
{{ form.zbjbdName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
|
||||||
|
{{ form.ssgName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
|
||||||
|
{{ form.caName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
|
||||||
|
{{ form.kwjName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
|
||||||
|
{{ form.jdwjName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
|
||||||
|
{{ form.bpgName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
|
||||||
|
{{ form.zqyjgName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
<ProcessTitle>
|
||||||
|
<template slot="title">适用范围</template>
|
||||||
|
</ProcessTitle>
|
||||||
|
<div class="prc-content-border">
|
||||||
|
<el-row :gutter="24">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in zrbmOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in applyArcticOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in categoryOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
|
||||||
|
<el-input v-model="form.cycvppsbm" disabled></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
|
||||||
|
<el-input v-model="form.kccvppsbm" disabled></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
|
||||||
|
<el-input v-model="form.dybxh" disabled></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
|
||||||
|
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
|
||||||
|
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<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 disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in qcdwOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<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 disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in txlbOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in sycpxOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in applyAuthOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in zrgcsOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
v-model="form.cycvppscn"
|
||||||
|
disabled
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
v-model="form.kccvppscn"
|
||||||
|
disabled
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
v-model="form.dymc"
|
||||||
|
disabled
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in wssmrOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
|
||||||
|
<el-option
|
||||||
|
v-for="item in cysdOptions"
|
||||||
|
placeholder="请选择"
|
||||||
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
<ProcessTitle>
|
||||||
|
<template slot="title">关联信息</template>
|
||||||
|
</ProcessTitle>
|
||||||
|
<div class="prc-content-border">
|
||||||
|
<el-row :gutter="24">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.dtbjh"
|
||||||
|
placeholder="请输入代替标准号"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
|
||||||
|
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
|
||||||
|
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
|
||||||
|
<div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
|
||||||
|
{{ form.glwjName }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
- -
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.bfbdtbzh"
|
||||||
|
placeholder="请输入部分代替标准号"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.cbbh"
|
||||||
|
placeholder="请输入采标编号"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.yybj"
|
||||||
|
placeholder="请输入引用标准"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<el-collapse accordion v-model="activeName">
|
||||||
|
<el-collapse-item title="意见填写" name="1">
|
||||||
|
<div style="margin: 10px 0;">
|
||||||
|
<el-form
|
||||||
|
ref="formTongGuo"
|
||||||
|
:model="formTongGuo"
|
||||||
|
:rules="rules">
|
||||||
|
<el-form-item
|
||||||
|
prop="commentText"
|
||||||
|
>
|
||||||
|
<el-input
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
resize="none"
|
||||||
|
placeholder="请输入意见"
|
||||||
|
v-model="formTongGuo.commentText">
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
</el-collapse-item>
|
||||||
|
</el-collapse>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="content" v-if="active === '2'">
|
||||||
|
<div class="block" style="padding-top: 20px;">
|
||||||
|
<el-timeline>
|
||||||
|
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<h4>流程发起人</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="user1" placeholder="流程发起人"></el-input>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="选择责任人" placement="top" :color="user2 ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<h4>责任人</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="user2" placeholder="选择责任人">
|
||||||
|
</el-input>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<h4>责任人</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="user3" placeholder="责任人"></el-input>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="意见汇总并发起会签" placement="top" :color="user4 ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<h4>标准法规工程师</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="user4" placeholder="标准法规工程师"></el-input>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<h4>责任对接人，标准法规部部门负责人</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="user5" placeholder="责任对接人，标准法规部部门负责人"></el-input>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
</el-timeline>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="content" v-if="active === '3'">
|
||||||
|
<div class="flow-list">
|
||||||
|
<el-table
|
||||||
|
height="100%"
|
||||||
|
ref="selection"
|
||||||
|
:data="detailData"
|
||||||
|
tooltip-effect="dark"
|
||||||
|
style="width: 100%"
|
||||||
|
border
|
||||||
|
row-key="id"
|
||||||
|
:no-data-text="listNoDataText"
|
||||||
|
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||||
|
>
|
||||||
|
<el-table-column
|
||||||
|
type="selection"
|
||||||
|
width="55"
|
||||||
|
align="center">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="name"
|
||||||
|
label="任务步骤"
|
||||||
|
align="center"
|
||||||
|
sortable="custom"
|
||||||
|
>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="assignee"
|
||||||
|
label="任务受理人"
|
||||||
|
align="center"
|
||||||
|
sortable="custom"
|
||||||
|
>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="createTime"
|
||||||
|
label="创建时间"
|
||||||
|
sortable="custom"
|
||||||
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="endTime"
|
||||||
|
label="完成时间"
|
||||||
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="comment"
|
||||||
|
label="审批意见"
|
||||||
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.commentText }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="completeFlag"
|
||||||
|
label="状态"
|
||||||
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<loading :loading="loading">流程列表加载中</loading>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- 提交-->
|
||||||
|
<ProcessFooter
|
||||||
|
:show-save="false"
|
||||||
|
show-submit
|
||||||
|
show-transfer
|
||||||
|
show-back
|
||||||
|
:submitLoading="isSubmit"
|
||||||
|
:saveLoading="saveLoading"
|
||||||
|
@transfer="handleTransfer"
|
||||||
|
@save="handleSave"
|
||||||
|
@back="handleSubmitNo"
|
||||||
|
@submit="handleSubmit"
|
||||||
|
>
|
||||||
</ProcessFooter>
|
</ProcessFooter>
|
||||||
|
|
||||||
<!-- 福田全公司选人解决方案 -->
|
<!-- 福田全公司选人解决方案 -->
|
||||||
@@ -687,6 +1306,7 @@
|
|||||||
import ProcessTitle from '../../components/ProcessTitle'
|
import ProcessTitle from '../../components/ProcessTitle'
|
||||||
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
|
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
|
||||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
||||||
|
import {completeTask} from "@/api/process";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "bzrkStep2",
|
name: "bzrkStep2",
|
||||||
@@ -978,7 +1598,8 @@
|
|||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
this.detailData = res
|
this.detailData = res
|
||||||
}, e => {})
|
}, e => {
|
||||||
|
})
|
||||||
},
|
},
|
||||||
getData() {
|
getData() {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
@@ -1096,6 +1717,119 @@
|
|||||||
})
|
})
|
||||||
}})
|
}})
|
||||||
},
|
},
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* @description: 动态表单读取
|
||||||
|
*/
|
||||||
|
getFormFieldList(item) {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.form = JSON.parse(JSON.stringify(item))
|
||||||
|
this.defaultCheckedKeys = [this.form.standSystem]
|
||||||
|
console.log(this.defaultCheckedKeys)
|
||||||
|
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
|
||||||
|
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
|
||||||
|
this.defaultCheckedKeys3 = [this.form.dybxh]
|
||||||
|
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
|
||||||
|
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
|
||||||
|
if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
|
||||||
|
this.form.country = this.form.country.split(",");
|
||||||
|
}
|
||||||
|
this.form.prcNum = this.prcNum
|
||||||
|
this.form.prcName = this.prcName
|
||||||
|
this.form['id'] = item.id
|
||||||
|
})
|
||||||
|
},
|
||||||
|
closeDrawer() {
|
||||||
|
this.ListModel = false
|
||||||
|
},
|
||||||
|
OkDrawer() {
|
||||||
|
this.ListModel = false
|
||||||
|
var item = {
|
||||||
|
remarks: '123'
|
||||||
|
}
|
||||||
|
this.data.push(item)
|
||||||
|
},
|
||||||
|
addList() {
|
||||||
|
this.title = '新增标准'
|
||||||
|
this.ListModel = true
|
||||||
|
},
|
||||||
|
handleTabs(name) {
|
||||||
|
this.active = name
|
||||||
|
},
|
||||||
|
handleTransfer() {
|
||||||
|
this.drawerModal = true
|
||||||
|
this.drawerTitle = '转办处理人'
|
||||||
|
},
|
||||||
|
handleSave() {
|
||||||
|
},
|
||||||
|
// 退回按钮
|
||||||
|
handleSubmitNo() {
|
||||||
|
const val = this.form.country;
|
||||||
|
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
|
||||||
|
if (val instanceof Array) {
|
||||||
|
this.form.country = val.join(",");
|
||||||
|
} else {
|
||||||
|
this.form.country = val
|
||||||
|
}
|
||||||
|
} else if (val === '') {
|
||||||
|
this.form.country = []
|
||||||
|
}
|
||||||
|
this.$refs['formTongGuo'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.form.commentText = this.formTongGuo.commentText
|
||||||
|
this.form.approvalOpinion = '1'
|
||||||
|
const json = JSON.stringify(this.form);
|
||||||
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
|
taskIds: this.taskIds,
|
||||||
|
userId: this.userId,
|
||||||
|
json: json
|
||||||
|
}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
if (res.success) {
|
||||||
|
this.$message.warning("驳回成功")
|
||||||
|
// 流程提交之后，应该流转至待办任务页面
|
||||||
|
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleSubmit() {
|
||||||
|
const val = this.form.country;
|
||||||
|
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
|
||||||
|
if (val instanceof Array) {
|
||||||
|
this.form.country = val.join(",");
|
||||||
|
} else {
|
||||||
|
this.form.country = val
|
||||||
|
}
|
||||||
|
} else if (val === '') {
|
||||||
|
this.form.country = []
|
||||||
|
}
|
||||||
|
this.$refs['formTongGuo'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.isSubmit = true
|
||||||
|
this.form.commentText = this.formTongGuo.commentText
|
||||||
|
this.form.approvalOpinion = '0'
|
||||||
|
const json = JSON.stringify(this.form);
|
||||||
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
|
taskIds: this.taskIds,
|
||||||
|
userId: this.userId,
|
||||||
|
json: json
|
||||||
|
}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
if (res.success) {
|
||||||
|
this.processCreateStand(json)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description: 流程入库
|
* @description: 流程入库
|
||||||
@@ -1156,6 +1890,7 @@
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzrkStep2 {
|
.bzrkStep2 {
|
||||||
/deep/ .el-drawer__container {
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
@@ -1163,8 +1898,10 @@
|
|||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -1172,6 +1909,7 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -1179,18 +1917,21 @@
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -1198,6 +1939,7 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
|||||||
@@ -67,7 +67,7 @@
|
|||||||
<el-button type="primary"
|
<el-button type="primary"
|
||||||
class="common-button-primary add-button"
|
class="common-button-primary add-button"
|
||||||
@click="upload(oldData, '征求意见搞.xls')"
|
@click="upload(oldData, '征求意见搞.xls')"
|
||||||
size="mini">导出征求意见搞
|
size="mini">导出征求意见稿
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<el-table
|
||||||
|
|||||||
Reference in New Issue
Block a user