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

评估流程

Browse Source
This commit is contained in:
宋伟佳
2021-07-15 16:37:55 +08:00
parent 5c46f8a86b
commit 9190568fc8
8 changed files with 202 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+33 -20
View File
@@ -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;
});
}
};
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+2 -2
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
-1
View File
@@ -328,7 +328,6 @@ export default {
implementer: ""
},
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
user3: "",
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+6 -4
View File
@@ -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'
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+11 -11
View File
@@ -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',
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+74 -10
View File
@@ -208,6 +208,7 @@
<el-table-column
prop="code"
fixed="left"
align="center"
width="180px"
label="标准号">
<template slot-scope="scope">
@@ -218,22 +219,26 @@
<el-table-column
prop="standName"
label="标准名称"
align="center"
width="260px"
>
</el-table-column>
<el-table-column
prop="issueTime"
sortable
align="center"
label="发布日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
sortable
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="ZCCSSRQ"
align="center"
sortable
label="在产车实施日期">
</el-table-column>
@@ -241,6 +246,7 @@
show-overflow-tooltip
prop="textStatus"
width="120px"
align="center"
label="文本状态">
</el-table-column>
</el-table>
@@ -323,6 +329,7 @@
<el-table-column
width="180px"
fixed="left"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
@@ -331,31 +338,86 @@
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
width="260px"
label="中文名称"
align="center"
fixed="left"
width="180px"
>
</el-table-column>
<el-table-column
prop="issueTime"
sortable
label="发布日期">
align="center"
width="180px"
label="英文名称">
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="issueTime"
align="center"
width="180px"
label="适用车型">
</el-table-column>
<el-table-column
prop="issueTime"
align="center"
width="180px"
label="能源类型">
</el-table-column>
<el-table-column
prop="issueTime"
sortable
label="新车型实施日期">
align="center"
width="210px"
label="标准实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable
align="center"
width="210px"
label="新车型实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
width="210px"
align="center"
label="责任部门">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="120px"
label="文本状态">
width="180px"
align="center"
label="适用产品线">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column>
<template slot-scope="scope">
@@ -1174,6 +1236,7 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
console.log(res.data.list);
this.sarAccessInfoSearchList = res.data.list
}, e => {
@@ -1634,6 +1697,7 @@ export default {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
_this: this
}, res => {
console.log(res.data);
this.sarAccessInfoList = res.data
}, e => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+75 -19
View File
@@ -71,21 +71,21 @@
</el-popover>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
<el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="small">清空</el-button>
<el-button v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default" @click="resetSelect" size="small">清空</el-button>
</el-form-item>
<el-button class="common-button-default export-button"
v-btn-permission="'25859ea5afacb2ad49705f5daefe0d23'"
v-btn-permission="'c7165a1baa667140f97e792971c89a71'"
size="small" @click="exportStandard()"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
icon="export"
>导出
</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
<el-button type="primary" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
class="iconfont">&#xe7a5;</i>高级查询
</el-button>
</el-form>
@@ -111,42 +111,98 @@
align="center">
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
fixed="left"
width="180px"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.code }}</a>
<span v-else>{{ scope.row.code }}</span>
<a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
<span v-else>{{ scope.row.standNumber }}</span>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
width="260px"
label="中文名称"
align="center"
fixed="left"
width="180px"
>
</el-table-column>
<el-table-column
prop="isSubTime"
sortable
label="发布日期">
prop="issueTime"
align="center"
width="180px"
label="英文名称">
</el-table-column>
<el-table-column
prop="newPutTime"
prop="issueTime"
align="center"
width="180px"
label="适用车型">
</el-table-column>
<el-table-column
prop="issueTime"
align="center"
width="180px"
label="能源类型">
</el-table-column>
<el-table-column
prop="issueTime"
sortable
align="center"
width="210px"
label="标准实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
sortable
align="center"
width="210px"
label="新车型实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="prodPutTime"
sortable
label="在产车实施日期">
prop="zccssrq"
width="210px"
align="center"
label="责任部门">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="proEssessUser"
width="120px"
label="文本状态">
prop="textStatus"
width="180px"
align="center"
label="适用产品线">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
</el-table>
<pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
src/sysConfig/index.js
+1 -1
View File
@@ -7,7 +7,7 @@
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.248'
const devIp = '192.168.10.250'
const devIp = '192.168.10.252'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'