diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index af0081727..b6b2b8062 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -84,6 +84,7 @@
@@ -94,6 +95,7 @@
{
+ 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
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index f5ec2deec..5162d65bd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -73,6 +73,14 @@
clearable
>
+
+
+
+
@@ -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: {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 132576657..c894744e2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -128,7 +128,7 @@
拆分信息
- 批量编辑
+ 批量编辑
-
+
@@ -196,7 +197,7 @@
align="center">
-
+
@@ -206,7 +207,7 @@
label="符合项状态"
align="center">
-
+
-
+
@@ -227,6 +228,7 @@
align="center">
@@ -240,6 +242,7 @@
align="center">
@@ -252,7 +255,7 @@
label="适用车型"
align="center">
-
+
{
+ 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) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index a5b3ba248..78047915f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -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"
>
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index e02370b85..ea5dd8b7a 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -110,6 +110,7 @@
{
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
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 3a1247028..7b021f767 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -61,6 +61,14 @@
placeholder="请输入标准名称"
>
+
+
+
+
@@ -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;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 3c4418f75..cc1d1fc09 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -42,6 +42,14 @@
clearable
>
+
+
+
+
@@ -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: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index dcbf97305..174852e93 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -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"
>
@@ -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;
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index 764650ba8..8b0ca992d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -57,6 +57,14 @@
>
选择清单
+
+
+
+
@@ -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: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 18d6126a9..2e5163b72 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -385,12 +385,15 @@
show-save
show-transfer
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"
>
@@ -431,6 +434,9 @@ export default {
processType: 1,
isSubmit: false,
saveLoading: false,
+ submitShow: false,
+ acceptShow: false,
+ todoId: '',
projectId: "",
detailedId: "",
standModel: false,
@@ -568,6 +574,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 +632,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;