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:
zhaokaiyao@91isoft.com
2021-10-13 18:42:33 +08:00
parent a686c7f0d6 e5da6e0b27
commit 70dd56ec58
15 changed files with 265 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/newStyle.less
+3
View File
@@ -445,6 +445,9 @@ tr.el-table__row{
.el-table th>.cell {
font-size: 14px;
}
.el-table td>.cell {
font-size: 12px;
}
.el-table th.gutter{
display: table-cell !important;
}
src/pages/processCenter/pages/components/ProcessFooter.vue
+13
View File
@@ -102,6 +102,15 @@
:loading="submitLoading"
v-if="showConfirm"
>接收待办</el-button>
<el-button
type="primary"
size="small"
class="common-button-primary"
icon="el-icon-check"
@click="handleSubmit"
:loading="submitLoading"
v-if="showAffirm"
>确认</el-button>
</div>
<!-- 组织机构树 -->
@@ -179,6 +188,10 @@ export default {
type: Boolean,
default: false
},
showAffirm: {
type: Boolean,
default: false
},
showConfirm: {
type: Boolean,
default: false
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+4
View File
@@ -436,6 +436,8 @@ export default {
message: response.message,
type: 'success'
})
} else {
this.$message.error('程序异常，上传失败')
}
},
importFileSuccess2 (response, file) {
@@ -456,6 +458,8 @@ export default {
message: response.message,
type: 'success'
})
} else {
this.$message.error('程序异常，上传失败')
}
},
fileUpload () {
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+31 -1
View File
@@ -84,6 +84,7 @@
<div v-else>
<el-button
type="primary"
:disabled="acceptShow"
class="common-button-primary"
@click="fileUpload"
size="mini">
@@ -94,6 +95,7 @@
<el-form-item label="回执说明" prop="dyhz" class="add-form-item form-item-disabled">
<el-input
v-model="form.dyhz"
:disabled="acceptShow"
style="height: 150px"
type="textarea"
:autosize="{ minRows: 1, maxRows: 5}"
@@ -185,10 +187,13 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:show-submit="submitShow"
:show-confirm="acceptShow"
show-transfer
@transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
@accept="handleAccept"
>
</ProcessFooter>
<Role-tree
@@ -223,7 +228,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,execTask} from 'api/process'
import axios from "axios";
export default {
@@ -239,6 +244,9 @@
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
form: {
dyhz: '',
title: '', // 调研标题
@@ -374,6 +382,19 @@
this.saveLoading = false
})
},
// 接受按钮
handleAccept(){
this.isSubmit = true
execTask({
todoId: this.todoId // 当前节点ID
}).then(res => {
if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
@@ -406,6 +427,15 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
}else {
this.acceptShow = false
this.submitShow = true
}
this.todoId = res.id
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+12
View File
@@ -73,6 +73,14 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -471,6 +479,7 @@ export default {
id: '',
itemsNum: '',
itemsName: '',
endTime: '',
standId: '',
statusId: '',
itemsNum1: '',
@@ -484,6 +493,9 @@ export default {
itemsName: [
{required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
],
endTime: [
{required: true, message: '请输入截止时间', trigger: 'change'},
],
},
// 标准征求意见数据可库
standCommonlySearch: {
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+40 -9
View File
@@ -128,7 +128,7 @@
<template slot="title">拆分信息</template>
</ProcessTitle>
<div class="action-bar">
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
<el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
</div>
<el-table border
ref="selection"
@@ -177,6 +177,7 @@
</template>
</el-table-column>
<el-table-column
:disabled="acceptShow"
prop="changePoint"
width="150"
v-if="form.itemsNum1"
@@ -184,7 +185,7 @@
align="center">
<template slot-scope="scope">
<div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
<input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
</div>
</template>
</el-table-column>
@@ -196,7 +197,7 @@
align="center">
<template slot-scope="scope">
<div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
<input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
</div>
</template>
</el-table-column>
@@ -206,7 +207,7 @@
label="符合项状态"
align="center">
<template slot-scope="scope">
<My-select v-model="scope.row.complianceRequir" :options="fhList"></My-select>
<My-select :disabled="acceptShow" v-model="scope.row.complianceRequir" :options="fhList"></My-select>
</template>
</el-table-column>
<el-table-column
@@ -216,7 +217,7 @@
align="center">
<template slot-scope="scope">
<div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
<input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
</div>
</template>
</el-table-column>
@@ -227,6 +228,7 @@
align="center">
<template slot-scope="scope">
<el-date-picker
:disabled="acceptShow"
v-model.lazy="scope.row.newData"
type="date"
placeholder="选择新车型实施日期">
@@ -240,6 +242,7 @@
align="center">
<template slot-scope="scope">
<el-date-picker
:disabled="acceptShow"
v-model.lazy="scope.row.onlineData"
type="date"
placeholder="选择新车型实施日期">
@@ -252,7 +255,7 @@
label="适用车型"
align="center">
<template slot-scope="scope">
<My-select v-model="scope.row.applyArctic" :options="cxList"></My-select>
<My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>
</template>
</el-table-column>
<el-table-column
@@ -342,14 +345,17 @@
</el-table>
</div>
<ProcessFooter
show-save
:show-save="submitShow"
show-submit
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
show-transfer
:show-transfer="submitShow"
@transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
@accept="handleAccept"
>
</ProcessFooter>
<Role-tree
@@ -444,7 +450,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,execTask} from 'api/process'
import axios from "axios";
export default {
@@ -488,6 +494,9 @@
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
form: {
itemsNum: '',
itemsName: '',
@@ -614,6 +623,19 @@
this.saveLoading = false
})
},
// 接受按钮
handleAccept(){
this.isSubmit = true
execTask({
todoId: this.todoId // 当前节点ID
}).then(res => {
if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
@@ -691,6 +713,15 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
}else {
this.acceptShow = false
this.submitShow = true
}
this.todoId = res.id
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
if (data.form) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+2 -1
View File
@@ -222,10 +222,11 @@
:show-confirm="acceptShow"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:show-save="submitShow"
:show-transfer="submitShow"
@save="handleSave"
@submit="handleSubmit"
@accept="handleAccept"
show-transfer
@transfer="handleTransfer"
>
</ProcessFooter>
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+31 -1
View File
@@ -110,6 +110,7 @@
<el-table-column label="佐证材料" align="center" width="150">
<template slot-scope="scope">
<el-upload
:disabled="acceptShow"
multiple
ref="uploadFile"
:action="uploadPath"
@@ -122,6 +123,7 @@
:on-success="handleOnsuccess"
>
<el-button
:disabled="acceptShow"
type="primary"
class="common-button-primary"
@click="uploadFile(scope.row)"
@@ -218,12 +220,15 @@
show-save
show-submit
show-transfer
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:transferLoading="turnLoading"
@transfer="handleTurnTo"
@save="handleSave"
@submit="handleSubmit"
@accept="handleAccept"
>
</ProcessFooter>
<Role-tree
@@ -240,7 +245,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew} from "@/api/process"
import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew,execTask} from "@/api/process"
export default {
name: "wfhxzgStep4",
@@ -262,6 +267,9 @@ export default {
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
turnLoading: false,
dataList: [],
taskIds: this.$route.query.taskIds,
@@ -316,6 +324,15 @@ export default {
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
}else {
this.acceptShow = false
this.submitShow = true
}
this.todoId = res.id
this.getFormFieldList(processForm)
})
},
@@ -481,6 +498,19 @@ export default {
this.saveLoading = false
})
},
// 接受按钮
handleAccept(){
this.isSubmit = true
execTask({
todoId: this.todoId // 当前节点ID
}).then(res => {
if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+12
View File
@@ -61,6 +61,14 @@
placeholder="请输入标准名称"
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
@@ -521,6 +529,9 @@ export default {
standNumber: [
{ required: true, message: "请填写标准编号", trigger: "change" }
],
endTime: [
{required: true, message: '请输入截止时间', trigger: 'change'},
],
qualityEngineer: [
{ required: true, message: "请选择质量工程师", trigger: "change" }
],
@@ -554,6 +565,7 @@ export default {
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
endTime:'',
standType: "", //标准类型
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+31 -3
View File
@@ -493,15 +493,18 @@
</div>
<ProcessFooter
show-save
show-transfer
:show-save="submitShow"
:show-transfer="submitShow"
show-submit
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
@save="handleSave"
@transfer="handleTransfer"
@submit="handleSubmit"
@accept="handleAccept"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
@@ -520,7 +523,7 @@ import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import Moment from 'moment';
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
export default {
name: "xmpgStep4",
@@ -551,6 +554,9 @@ export default {
listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
@@ -689,6 +695,15 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
}else {
this.acceptShow = false
this.submitShow = true
}
this.todoId = res.id
this.getFormFieldList(processForm);
}
}).catch(e => {
@@ -758,6 +773,19 @@ export default {
this.saveLoading = false;
});
},
// 接受按钮
handleAccept(){
this.isSubmit = true
execTask({
todoId: this.todoId // 当前节点ID
}).then(res => {
if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
//提交事件
handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<ProcessHeader toggle>
<template slot="proName">项目合规评估流程</template>
<template slot="proNode">标准法规部领导审批</template>
</ProcessHeader>xmpgStep7
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+13 -1
View File
@@ -42,6 +42,14 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -374,6 +382,7 @@ export default {
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
endTime: '',
dataList: [], //项目下的标准数据
breakdownList: [] //标准下的分解单数据
},
@@ -386,7 +395,10 @@ export default {
],
projectName: [
{ required: true, message: "请填写项目名称", trigger: "change" }
]
],
endTime: [
{required: true, message: '请输入截止时间', trigger: 'change'},
],
},
//选人的验证
roleFormRules: {
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+29 -1
View File
@@ -425,12 +425,15 @@
show-save
show-submit
show-transfer
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
@save="handleSave"
@transfer="handleTransfer"
@submit="handleSubmit"
@accept="handleAccept"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
@@ -518,7 +521,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "api/process";
import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew, execTask} from "api/process";
export default {
name: "xmpg2Step6",
@@ -564,6 +567,9 @@ export default {
processType: 1,
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
@@ -785,6 +791,15 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
}else {
this.acceptShow = false
this.submitShow = true
}
this.todoId = res.id
this.getFormFieldList(processForm);
}
}).catch(e => {
@@ -840,6 +855,19 @@ export default {
this.saveLoading = false;
});
},
// 接受按钮
handleAccept(){
this.isSubmit = true
execTask({
todoId: this.todoId // 当前节点ID
}).then(res => {
if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
//提交事件
handleSubmit() {
this.isSubmit = true;
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+14 -2
View File
@@ -57,6 +57,14 @@
></el-input>
</el-form-item>
<el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -424,7 +432,8 @@ export default {
qdform: {
projectNumber: "",
projectName: "",
detailedListName: ""
detailedListName: "",
endTime:'',
},
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
@@ -444,7 +453,10 @@ export default {
],
detailedListName: [
{ required: true, message: "请输入清单名称", trigger: "change" }
]
],
endTime: [
{required: true, message: '请输入截止时间', trigger: 'change'},
],
},
// 角色验证
roleFormRules: {
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+29
View File
@@ -384,13 +384,17 @@
<ProcessFooter
show-save
show-transfer
show-affirm
show-confirm
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
@submit="handleSubmit"
@transfer="handleTransfer"
@save="handleSave"
@accept="handleAccept"
:approval="true"
>
</ProcessFooter>
@@ -431,6 +435,9 @@ export default {
processType: 1,
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
projectId: "",
detailedId: "",
standModel: false,
@@ -568,6 +575,15 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
}else {
this.acceptShow = false
this.submitShow = true
}
this.todoId = res.id
this.getFormFieldList(processForm);
}
}).catch(e => {
@@ -617,6 +633,19 @@ export default {
// });
// });
// },
// 接受按钮
handleAccept(){
this.isSubmit = true
execTask({
todoId: this.todoId // 当前节点ID
}).then(res => {
if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
//保存事件
handleSave() {
this.saveLoading = true;