feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 改为测
This commit is contained in:
396572590@qq.com
@@ -2988,20 +2988,32 @@
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.submitLoading = false
|
||||
this.isSubmit = false
|
||||
if (this.$route.query.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
const planForm = {}
|
||||
planForm.reviseStatus = this.form.reviseStatus
|
||||
planForm.standCode = this.form.DTQBBHBUSS
|
||||
planForm.processType = "buss2";
|
||||
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
if (res.data === '操作成功') {
|
||||
this.submitLoading = false
|
||||
this.isSubmit = false
|
||||
if (this.$route.query.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else {
|
||||
}
|
||||
} else {
|
||||
this.$message.warning(res.data)
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
} else {
|
||||
this.$message.warning(res.data)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -2501,6 +2501,17 @@ return
|
||||
if (res.result === '操作成功' || res.ok) {
|
||||
// 自动匹配配置标准
|
||||
this.saveConfStand(res.data)
|
||||
const planForm = {}
|
||||
planForm.planStatus = '4'
|
||||
planForm.reviseStatus = this.form.reviseStatus
|
||||
planForm.standCode = this.form.DTQBBHBUSS
|
||||
planForm.processType = "buss2";
|
||||
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.submitLoading = false
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
})
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
this.isSubmit = false
|
||||
|
||||
@@ -2927,6 +2927,43 @@
|
||||
json.applyUpdUserId = this.form.applyUpdUserId
|
||||
json.prcCreateUser = this.form.prcCreateUser
|
||||
json.prcCreateUserName = this.form.prcCreateUserName
|
||||
|
||||
|
||||
|
||||
|
||||
const planForm = {}
|
||||
planForm.id = this.form.planId
|
||||
planForm.reviseStatus = this.form.reviseStatus
|
||||
planForm.standCode = this.form.DTQBBHBUSS
|
||||
planForm.processType = "buss1";
|
||||
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
if (res.data === '操作成功') {
|
||||
this.submitLoading = false
|
||||
this.isSubmit = false
|
||||
if (this.$route.query.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else {
|
||||
}
|
||||
} else {
|
||||
this.$message.warning(res.data)
|
||||
}
|
||||
})
|
||||
|
||||
return
|
||||
|
||||
|
||||
|
||||
|
||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.userName,
|
||||
@@ -2949,7 +2986,9 @@
|
||||
this.$message.success(res.message)
|
||||
const planForm = {}
|
||||
planForm.id = this.form.planId
|
||||
planForm.planStatus = '2'
|
||||
planForm.reviseStatus = this.form.reviseStatus
|
||||
planForm.standCode = this.form.DTQBBHBUSS
|
||||
planForm.processType = "buss1";
|
||||
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
|
||||
_this: this
|
||||
}, res => {
|
||||
|
||||
@@ -2554,17 +2554,12 @@
|
||||
const planForm = {}
|
||||
planForm.id = this.form.planId
|
||||
planForm.planStatus = '4'
|
||||
planForm.reviseStatus = this.form.reviseStatus
|
||||
planForm.standCode = this.form.DTQBBHBUSS
|
||||
planForm.processType = "buss1";
|
||||
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.submitLoading = false
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
})
|
||||
|
||||
@@ -2720,7 +2720,9 @@
|
||||
this.$message.success(res.message)
|
||||
const planForm = {}
|
||||
planForm.id = this.form.planId
|
||||
planForm.planStatus = '2'
|
||||
planForm.reviseStatus = this.form.reviseStatus
|
||||
planForm.standCode = this.form.DTQBBHBUSS
|
||||
planForm.processType = "buss1";
|
||||
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
|
||||
_this: this
|
||||
}, res => {
|
||||
|
||||
@@ -508,8 +508,12 @@ export default {
|
||||
handleSubmit(){
|
||||
this.isSubmit = true
|
||||
this.qbfsForm.bzfgbzFlag = '0'
|
||||
this.qbfsForm.planStatus = '未开始'
|
||||
this.qbfsForm.area = this.qbfsForm.area.join(',')
|
||||
this.qbfsForm.planStatus = '计划已确认'
|
||||
if(this.qbfsForm.area && this.qbfsForm.length > 0){
|
||||
this.qbfsForm.area = this.qbfsForm.area.join(',')
|
||||
}else {
|
||||
this.qbfsForm.area = ""
|
||||
}
|
||||
this.qbfsForm.commentText = this.commentText
|
||||
let json = JSON.stringify(this.qbfsForm);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
|
||||
@@ -951,7 +951,6 @@ export default {
|
||||
})
|
||||
},
|
||||
listSubmit (item) {
|
||||
console.log(item);
|
||||
return new Promise((resolve, reject) => {
|
||||
let newForm = Object.assign(this.roleForm, item,this.qblx_pageData);
|
||||
newForm.startUserName = this.$store.getters.userInfo.userName
|
||||
@@ -978,22 +977,16 @@ export default {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
const _formData = new FormData()
|
||||
_formData.append('infoJson', JSON.stringify(newForm))
|
||||
processCreatePlan(_formData).then(res => {
|
||||
if (res.result === '操作成功' || res.data === '入库成功') {
|
||||
resolve()
|
||||
this.$message.success(res.message);
|
||||
if (this.bpnId !== undefined && this.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
// return res
|
||||
})
|
||||
}
|
||||
}
|
||||
resolve()
|
||||
this.$message.success(res.message);
|
||||
if (this.bpnId !== undefined && this.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
// return res
|
||||
})
|
||||
}
|
||||
// this.$router.push("/processCenter");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -582,7 +582,7 @@ import ProcessTitle from "../../components/ProcessTitle";
|
||||
import MechanismTree from "@/components/mechanismTree";
|
||||
import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
|
||||
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
|
||||
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel } from "api/process";
|
||||
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel,processCreatePlan } from "api/process";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -816,46 +816,53 @@ export default {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.isSubmit = true;
|
||||
this.qbfsForm.type = '5'
|
||||
this.qbfsForm.commentText = this.commentText;
|
||||
let json = Object.assign(this.qbfsForm, this.roleForm);
|
||||
this.$http.post("lawss/activiti/startProcessRollBack", {
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.userName,
|
||||
type: '25',
|
||||
json: JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
qbfsForm: this.qbfsForm,
|
||||
commentText: this.commentText
|
||||
})
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: res.data,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
const _formData = new FormData()
|
||||
_formData.append('infoJson', JSON.stringify(this.qbfsForm))
|
||||
processCreatePlan(_formData).then(res => {
|
||||
this.qbfsForm.planId = res.data
|
||||
if (res.code === '200' || res.message === '入库成功'){
|
||||
this.isSubmit = true;
|
||||
this.qbfsForm.type = '5'
|
||||
this.qbfsForm.commentText = this.commentText;
|
||||
let json = Object.assign(this.qbfsForm, this.roleForm);
|
||||
this.$http.post("lawss/activiti/startProcessRollBack", {
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.userName,
|
||||
type: '25',
|
||||
json: JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
qbfsForm: this.qbfsForm,
|
||||
commentText: this.commentText
|
||||
})
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
if (this.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.bpnId
|
||||
if (res.ok) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: res.data,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success("企标制修订立项计划-立项已完成");
|
||||
if (this.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.isSubmit = false;
|
||||
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.isSubmit = false;
|
||||
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
|
||||
+20
-14
@@ -429,13 +429,13 @@
|
||||
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
|
||||
{{ filterReviseStatus(scope.row.reviseStatus) }}
|
||||
{{ filterReviseStatus(scope.row.revisionStatus) }}
|
||||
</span>
|
||||
<span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
|
||||
{{ filterReviseStatus(scope.row.reviseStatus) }}
|
||||
{{ filterReviseStatus(scope.row.revisionStatus) }}
|
||||
</span>
|
||||
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
|
||||
{{ filterReviseStatus(scope.row.reviseStatus) }}
|
||||
{{ filterReviseStatus(scope.row.revisionStatus) }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -1210,7 +1210,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="企标制修订状态" title="企标制修订状态" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="sarBussionessSearch.reviseStatus" title="请选择" filterable clearable @change="getStandInfoByReviseStatus">
|
||||
<el-select v-model="sarBussionessSearch.revisionStatus" title="请选择" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in opinionsStand"
|
||||
:key="item.value"
|
||||
@@ -1724,11 +1724,13 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
opinionsStand:[
|
||||
{value: 'buss1_1',label: '技术标准-制定'},
|
||||
{value: 'buss1_2',label: '技术标准-修订'},
|
||||
{value: 'buss2_1',label: '产品标准-制定'},
|
||||
{value: 'buss2_2',label: '产品标准-修订'},
|
||||
{value: 'buss2_3',label: '产品标准-修改'},
|
||||
{value: 'buss1_1',label: '技术标准-制定中'},
|
||||
{value: 'buss1_2',label: '技术标准-修订中'},
|
||||
{value: 'buss1_4',label: '技术标准-已完成'},
|
||||
{value: 'buss2_1',label: '产品标准-制定中'},
|
||||
{value: 'buss2_2',label: '产品标准-修订中'},
|
||||
{value: 'buss2_3',label: '产品标准-修改中'},
|
||||
{value: 'buss2_4',label: '产品标准-已完成'},
|
||||
],
|
||||
QCBFC: false, //C类标准展示备案日期
|
||||
replaceLawsNumModel: false,
|
||||
@@ -2490,19 +2492,23 @@ export default {
|
||||
if(data){
|
||||
if(data.indexOf("buss1_") !== -1){
|
||||
if(data === 'buss1_1'){
|
||||
return "制定"
|
||||
return "技术标准-制定中"
|
||||
}else if(data === 'buss1_2'){
|
||||
return "修订"
|
||||
return "技术标准-修订中"
|
||||
}else if(data === 'buss1_4'){
|
||||
return "技术标准-已完成"
|
||||
}else {
|
||||
return ""
|
||||
}
|
||||
}else if(data.indexOf("buss2_") !== -1){
|
||||
if(data === 'buss2_1'){
|
||||
return "制定"
|
||||
return "产品标准-制定中"
|
||||
}else if(data === 'buss2_2'){
|
||||
return "修订"
|
||||
return "产品标准-修订中"
|
||||
}else if(data === 'buss2_3'){
|
||||
return "修改"
|
||||
return "产品标准-修改中"
|
||||
}else if(data === 'buss2_4'){
|
||||
return "产品标准-已完成"
|
||||
}else {
|
||||
return ""
|
||||
}
|
||||
|
||||
@@ -242,11 +242,13 @@
|
||||
</el-form-item>
|
||||
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||
<el-select :disabled="DrawerType === 'see' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
|
||||
<el-option label="计划已确认" value="0"></el-option>
|
||||
<el-option label="未完成" value="0"></el-option>
|
||||
<el-option label="制定中" value="1"></el-option>
|
||||
<el-option label="修订中" value="2"></el-option>
|
||||
<el-option label="已取消" value="3"></el-option>
|
||||
<el-option label="已完成" value="4"></el-option>
|
||||
<el-option label="立项已完成" value="5"></el-option>
|
||||
<el-option label="计划已确认" value="6"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||
|
||||
Reference in New Issue
Block a user