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:
宋伟佳
2022-04-02 17:30:42 +08:00
parent a11ad03768 b0650c45a4
commit b59128b600
3 changed files with 26 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+4 -3
View File
@@ -346,7 +346,7 @@
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="投稿人" prop="TGRLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.TGRLAWS" placeholder="请选择责任部门" multiple>
<el-select :popper-append-to-body="false" v-model="form.TGRLAWS" placeholder="请选择投稿人" multiple>
<el-option
v-for="item in TGRLAWSOptions"
placeholder="请选择"
@@ -991,7 +991,7 @@
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
loadSarStandard: false,
verifySarStandard: true,
verifySarStandard: false,
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
@@ -1422,7 +1422,6 @@
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
this.verifySarStandard = this.$route.query.verifySarStandard
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
@@ -2214,6 +2213,7 @@
if (valid) {
this.fileInfoHandle()
this.isSubmit = true
this.saveLoading = true
this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId
@@ -2236,6 +2236,7 @@
if (res.success) {
this.$message.success(res.message)
this.isSubmit = false
this.saveLoading = false
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
+11 -38
View File
@@ -28,7 +28,6 @@
<el-select v-model="form.lawsType" filterable clearable disabled>
<el-option
v-for="item in lawsTypeOptions"
placeholder="请选择政策分类"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -38,7 +37,6 @@
<el-form-item label="中文名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsName" disabled
placeholder="请输入中文名称"
clearable
></el-input>
</el-form-item>
@@ -46,7 +44,6 @@
<el-date-picker
v-model="form.issueTime" disabled
type="date"
placeholder="请选择发文日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -62,10 +59,9 @@
</el-date-picker>
</el-form-item>
<el-form-item label="文本状态" prop="lawsTextState" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsTextState" disabled placeholder="请选择文本状态">
<el-select :popper-append-to-body="false" v-model="form.lawsTextState" disabled>
<el-option
v-for="item in lawsTextStateOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -73,10 +69,9 @@
</el-select>
</el-form-item>
<el-form-item label="适用区域" prop="lawsSyqy" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple placeholder="请选择适用区域">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple>
<el-option
v-for="item in lawsSyqyOptions"
placeholder="请选择适用区域"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -86,21 +81,18 @@
<el-form-item label="政策文号" prop="lawsNo" class="add-form-item form-item-disabled">
<el-input
v-model.number="form.lawsNo" disabled
placeholder="请输入政策文号"
clearable
></el-input>
</el-form-item>
<el-form-item label="信息简报" prop="lawsBulletin" class="add-form-item form-item-disabled">
<el-input
v-model.number="form.lawsBulletin" disabled
placeholder="请输入信息简报"
clearable
></el-input>
</el-form-item>
<el-form-item label="备注" prop="lawsRemark" class="add-form-item form-item-disabled">
<el-input
v-model.number="form.lawsRemark" disabled
placeholder="请输入备注"
clearable
></el-input>
</el-form-item>
@@ -120,14 +112,12 @@
<el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsNumber" disabled
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="lawsEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsEnName" disabled
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
@@ -142,7 +132,6 @@
<el-form-item label="发文单位" prop="issueCompany" class="add-form-item form-item-disabled">
<el-input
v-model="form.issueCompany" disabled
placeholder="请输入发文单位"
clearable
></el-input>
</el-form-item>
@@ -156,7 +145,6 @@
<el-select v-model="form.lawsYear" filterable clearable disabled>
<el-option
v-for="item in lawsYearOptions"
placeholder="请选择年度"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -164,10 +152,9 @@
</el-select>
</el-form-item>
<el-form-item label="适用车型" prop="lawsSyqy" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple placeholder="请选择适用车型">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple>
<el-option
v-for="item in lawsSyqyOptions"
placeholder="请选择适用车型"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -177,15 +164,13 @@
<el-form-item label="福田转发通知文号" prop="lawsNotisyncNum" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsNotisyncNum" disabled
placeholder="请输入福田转发通知文号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标签" prop="lawsLabel" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsLabel" disabled multiple placeholder="请选择标签">
<el-select :popper-append-to-body="false" v-model="form.lawsLabel" disabled multiple>
<el-option
v-for="item in lawsLabelOptions"
placeholder="请选择标签"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -205,7 +190,6 @@
<el-date-picker disabled
v-model="form.SSRQLAWS"
type="date"
placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -213,7 +197,6 @@
<el-date-picker disabled
v-model="form.ZCXSSRQLAWS"
type="date"
placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -223,7 +206,6 @@
<el-date-picker disabled
v-model="form.XCXSSRQLAWS"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -297,10 +279,9 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="投稿人" prop="TGRLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.TGRLAWS" disabled placeholder="请选择责任部门" multiple>
<el-select :popper-append-to-body="false" v-model="form.TGRLAWS" disabled multiple>
<el-option
v-for="item in TGRLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -308,10 +289,9 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="NYLXLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.NYLXLAWS" disabled placeholder="请选择能源类型" multiple>
<el-select :popper-append-to-body="false" v-model="form.NYLXLAWS" disabled multiple>
<el-option
v-for="item in NYLXLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -319,10 +299,9 @@
</el-select>
</el-form-item>
<el-form-item label="责任部门" prop="ZRBMLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.ZRBMLAWS" disabled placeholder="请选择责任部门" multiple>
<el-select :popper-append-to-body="false" v-model="form.ZRBMLAWS" disabled multiple>
<el-option
v-for="item in ZRBMLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -330,10 +309,9 @@
</el-select>
</el-form-item>
<el-form-item label="我司参与深度" prop="CYSDLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.CYSDLAWS" disabled placeholder="请选择我司参与深度">
<el-select :popper-append-to-body="false" v-model="form.CYSDLAWS" disabled>
<el-option
v-for="item in CYSDLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -343,10 +321,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="投稿单位" prop="TGDWLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.TGDWLAWS" disabled placeholder="请选择投稿单位" multiple>
<el-select :popper-append-to-body="false" v-model="form.TGDWLAWS" disabled multiple>
<el-option
v-for="item in TGDWLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -354,10 +331,9 @@
</el-select>
</el-form-item>
<el-form-item label="适用认证" prop="YYRZLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.YYRZLAWS" disabled placeholder="请选择适用认证" multiple>
<el-select :popper-append-to-body="false" v-model="form.YYRZLAWS" disabled multiple>
<el-option
v-for="item in YYRZLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -365,10 +341,9 @@
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="ZRGCSLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.ZRGCSLAWS" disabled placeholder="请选择责任工程师" multiple>
<el-select :popper-append-to-body="false" v-model="form.ZRGCSLAWS" disabled multiple>
<el-option
v-for="item in ZRGCSLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -387,7 +362,6 @@
<el-form-item label="代替文件号" prop="DTWJHLAWS" class="add-form-item form-item-disabled">
<el-input
v-model="form.DTWJHLAWS" disabled
placeholder="请输入代替标准号"
clearable
></el-input>
<!-- <el-button-->
@@ -401,7 +375,6 @@
<el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
<el-input
v-model="form.YYBZZCLAWS" disabled
placeholder="请输入引用标准&政策"
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
+11 -38
View File
@@ -28,7 +28,6 @@
<el-select v-model="form.lawsType" filterable clearable disabled>
<el-option
v-for="item in lawsTypeOptions"
placeholder="请选择政策分类"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -38,7 +37,6 @@
<el-form-item label="中文名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsName" disabled
placeholder="请输入中文名称"
clearable
></el-input>
</el-form-item>
@@ -46,7 +44,6 @@
<el-date-picker
v-model="form.issueTime" disabled
type="date"
placeholder="请选择发文日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -62,10 +59,9 @@
</el-date-picker>
</el-form-item>
<el-form-item label="文本状态" prop="lawsTextState" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsTextState" disabled placeholder="请选择文本状态">
<el-select :popper-append-to-body="false" v-model="form.lawsTextState" disabled>
<el-option
v-for="item in lawsTextStateOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -73,10 +69,9 @@
</el-select>
</el-form-item>
<el-form-item label="适用区域" prop="lawsSyqy" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple placeholder="请选择适用区域">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple>
<el-option
v-for="item in lawsSyqyOptions"
placeholder="请选择适用区域"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -86,21 +81,18 @@
<el-form-item label="政策文号" prop="lawsNo" class="add-form-item form-item-disabled">
<el-input
v-model.number="form.lawsNo" disabled
placeholder="请输入政策文号"
clearable
></el-input>
</el-form-item>
<el-form-item label="信息简报" prop="lawsBulletin" class="add-form-item form-item-disabled">
<el-input
v-model.number="form.lawsBulletin" disabled
placeholder="请输入信息简报"
clearable
></el-input>
</el-form-item>
<el-form-item label="备注" prop="lawsRemark" class="add-form-item form-item-disabled">
<el-input
v-model.number="form.lawsRemark" disabled
placeholder="请输入备注"
clearable
></el-input>
</el-form-item>
@@ -120,14 +112,12 @@
<el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsNumber" disabled
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="lawsEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsEnName" disabled
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
@@ -142,7 +132,6 @@
<el-form-item label="发文单位" prop="issueCompany" class="add-form-item form-item-disabled">
<el-input
v-model="form.issueCompany" disabled
placeholder="请输入发文单位"
clearable
></el-input>
</el-form-item>
@@ -156,7 +145,6 @@
<el-select v-model="form.lawsYear" filterable clearable disabled>
<el-option
v-for="item in lawsYearOptions"
placeholder="请选择年度"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -164,10 +152,9 @@
</el-select>
</el-form-item>
<el-form-item label="适用车型" prop="lawsSyqy" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple placeholder="请选择适用车型">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" disabled multiple>
<el-option
v-for="item in lawsSyqyOptions"
placeholder="请选择适用车型"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -177,15 +164,13 @@
<el-form-item label="福田转发通知文号" prop="lawsNotisyncNum" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsNotisyncNum" disabled
placeholder="请输入福田转发通知文号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标签" prop="lawsLabel" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsLabel" disabled multiple placeholder="请选择标签">
<el-select :popper-append-to-body="false" v-model="form.lawsLabel" disabled multiple >
<el-option
v-for="item in lawsLabelOptions"
placeholder="请选择标签"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -205,7 +190,6 @@
<el-date-picker disabled
v-model="form.SSRQLAWS"
type="date"
placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -213,7 +197,6 @@
<el-date-picker disabled
v-model="form.ZCXSSRQLAWS"
type="date"
placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -223,7 +206,6 @@
<el-date-picker disabled
v-model="form.XCXSSRQLAWS"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -303,10 +285,9 @@
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="投稿人" prop="TGRLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.TGRLAWS" disabled placeholder="请选择责任部门" multiple>
<el-select :popper-append-to-body="false" v-model="form.TGRLAWS" disabled multiple>
<el-option
v-for="item in TGRLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -314,10 +295,9 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="NYLXLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.NYLXLAWS" disabled placeholder="请选择能源类型" multiple>
<el-select :popper-append-to-body="false" v-model="form.NYLXLAWS" disabled multiple>
<el-option
v-for="item in NYLXLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -325,10 +305,9 @@
</el-select>
</el-form-item>
<el-form-item label="责任部门" prop="ZRBMLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.ZRBMLAWS" disabled placeholder="请选择责任部门" multiple>
<el-select :popper-append-to-body="false" v-model="form.ZRBMLAWS" disabled multiple>
<el-option
v-for="item in ZRBMLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -336,10 +315,9 @@
</el-select>
</el-form-item>
<el-form-item label="我司参与深度" prop="CYSDLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.CYSDLAWS" disabled placeholder="请选择我司参与深度">
<el-select :popper-append-to-body="false" v-model="form.CYSDLAWS" disabled>
<el-option
v-for="item in CYSDLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -349,10 +327,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="投稿单位" prop="TGDWLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.TGDWLAWS" disabled placeholder="请选择投稿单位" multiple>
<el-select :popper-append-to-body="false" v-model="form.TGDWLAWS" disabled multiple>
<el-option
v-for="item in TGDWLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -360,10 +337,9 @@
</el-select>
</el-form-item>
<el-form-item label="适用认证" prop="YYRZLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.YYRZLAWS" disabled placeholder="请选择适用认证" multiple>
<el-select :popper-append-to-body="false" v-model="form.YYRZLAWS" disabled multiple>
<el-option
v-for="item in YYRZLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -371,10 +347,9 @@
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="ZRGCSLAWS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.ZRGCSLAWS" disabled placeholder="请选择责任工程师" multiple>
<el-select :popper-append-to-body="false" v-model="form.ZRGCSLAWS" disabled multiple>
<el-option
v-for="item in ZRGCSLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -393,7 +368,6 @@
<el-form-item label="代替文件号" prop="DTWJHLAWS" class="add-form-item form-item-disabled">
<el-input
v-model="form.DTWJHLAWS" disabled
placeholder="请输入代替标准号"
clearable
></el-input>
<!-- <el-button-->
@@ -407,7 +381,6 @@
<el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
<el-input
v-model="form.YYBZZCLAWS" disabled
placeholder="请输入引用标准&政策"
clearable
></el-input>
</el-form-item>