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

feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 改为测

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-29 15:37:42 +08:00
parent 37b5b5349d
commit ec5aa1f481
10 changed files with 161 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+25 -13
View File
@@ -2988,20 +2988,32 @@
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.submitLoading = false const planForm = {}
this.isSubmit = false planForm.reviseStatus = this.form.reviseStatus
if (this.$route.query.bpnId !== '') { planForm.standCode = this.form.DTQBBHBUSS
let taskId = { planForm.processType = "buss2";
id: this.$route.query.bpnId 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)
} }
}) })
} }
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+11
View File
@@ -2501,6 +2501,17 @@ return
if (res.result === '操作成功' || res.ok) { if (res.result === '操作成功' || res.ok) {
// 自动匹配配置标准 // 自动匹配配置标准
this.saveConfStand(res.data) 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 { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
this.isSubmit = false this.isSubmit = false
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+40 -1
View File
@@ -2927,6 +2927,43 @@
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName 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', { this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
@@ -2949,7 +2986,9 @@
this.$message.success(res.message) this.$message.success(res.message)
const planForm = {} const planForm = {}
planForm.id = this.form.planId 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.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+3 -8
View File
@@ -2554,17 +2554,12 @@
const planForm = {} const planForm = {}
planForm.id = this.form.planId planForm.id = this.form.planId
planForm.planStatus = '4' 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.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
_this: this _this: this
}, res => { }, 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.submitLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}) })
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+3 -1
View File
@@ -2720,7 +2720,9 @@
this.$message.success(res.message) this.$message.success(res.message)
const planForm = {} const planForm = {}
planForm.id = this.form.planId 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.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+6 -2
View File
@@ -508,8 +508,12 @@ export default {
handleSubmit(){ handleSubmit(){
this.isSubmit = true this.isSubmit = true
this.qbfsForm.bzfgbzFlag = '0' this.qbfsForm.bzfgbzFlag = '0'
this.qbfsForm.planStatus = '未开始' this.qbfsForm.planStatus = '计划已确认'
this.qbfsForm.area = this.qbfsForm.area.join(',') if(this.qbfsForm.area && this.qbfsForm.length > 0){
this.qbfsForm.area = this.qbfsForm.area.join(',')
}else {
this.qbfsForm.area = ""
}
this.qbfsForm.commentText = this.commentText this.qbfsForm.commentText = this.commentText
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+9 -16
View File
@@ -951,7 +951,6 @@ export default {
}) })
}, },
listSubmit (item) { listSubmit (item) {
console.log(item);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let newForm = Object.assign(this.roleForm, item,this.qblx_pageData); let newForm = Object.assign(this.roleForm, item,this.qblx_pageData);
newForm.startUserName = this.$store.getters.userInfo.userName newForm.startUserName = this.$store.getters.userInfo.userName
@@ -978,22 +977,16 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
const _formData = new FormData() resolve()
_formData.append('infoJson', JSON.stringify(newForm)) this.$message.success(res.message);
processCreatePlan(_formData).then(res => { if (this.bpnId !== undefined && this.bpnId !== '') {
if (res.result === '操作成功' || res.data === '入库成功') { let taskId = {
resolve() id: this.bpnId
this.$message.success(res.message); }
if (this.bpnId !== undefined && this.bpnId !== '') { taskDel(taskId).then(res=>{
let taskId = { // return res
id: this.bpnId
}
taskDel(taskId).then(res=>{
// return res
})
}
}
}) })
}
// this.$router.push("/processCenter"); // this.$router.push("/processCenter");
} }
}); });
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+41 -34
View File
@@ -582,7 +582,7 @@ import ProcessTitle from "../../components/ProcessTitle";
import MechanismTree from "@/components/mechanismTree"; import MechanismTree from "@/components/mechanismTree";
import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards' import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2' 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 { export default {
@@ -816,46 +816,53 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.isSubmit = true; const _formData = new FormData()
this.qbfsForm.type = '5' _formData.append('infoJson', JSON.stringify(this.qbfsForm))
this.qbfsForm.commentText = this.commentText; processCreatePlan(_formData).then(res => {
let json = Object.assign(this.qbfsForm, this.roleForm); this.qbfsForm.planId = res.data
this.$http.post("lawss/activiti/startProcessRollBack", { if (res.code === '200' || res.message === '入库成功'){
createUser: this.$store.getters.userInfo.userId, this.isSubmit = true;
createUserName: this.$store.getters.userInfo.userName, this.qbfsForm.type = '5'
type: '25', this.qbfsForm.commentText = this.commentText;
json: JSON.stringify({ let json = Object.assign(this.qbfsForm, this.roleForm);
roleForm: this.roleForm, this.$http.post("lawss/activiti/startProcessRollBack", {
qbfsForm: this.qbfsForm, createUser: this.$store.getters.userInfo.userId,
commentText: this.commentText createUserName: this.$store.getters.userInfo.userName,
}) type: '25',
}, { json: JSON.stringify({
_this: this roleForm: this.roleForm,
}, res => { qbfsForm: this.qbfsForm,
if (res.ok) { commentText: this.commentText
this.$http.post("lawss/activiti/completeTask", { })
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.ok) {
this.$message.success(res.message); this.$http.post("lawss/activiti/completeTask", {
if (this.bpnId !== '') { taskIds: res.data,
let taskId = { userId: this.$store.getters.userInfo.userId,
id: this.bpnId 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 this.isSubmit = false
}, e => { }, e => {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+20 -14
View File
@@ -429,13 +429,13 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C"> <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
{{ filterReviseStatus(scope.row.reviseStatus) }} {{ filterReviseStatus(scope.row.revisionStatus) }}
</span> </span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165"> <span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
{{ filterReviseStatus(scope.row.reviseStatus) }} {{ filterReviseStatus(scope.row.revisionStatus) }}
</span> </span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'"> <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
{{ filterReviseStatus(scope.row.reviseStatus) }} {{ filterReviseStatus(scope.row.revisionStatus) }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
@@ -1210,7 +1210,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="企标制修订状态" title="企标制修订状态" class="add-form-item form-item-disabled"> <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 <el-option
v-for="item in opinionsStand" v-for="item in opinionsStand"
:key="item.value" :key="item.value"
@@ -1724,11 +1724,13 @@ export default {
data() { data() {
return { return {
opinionsStand:[ opinionsStand:[
{value: 'buss1_1',label: '技术标准-制定'}, {value: 'buss1_1',label: '技术标准-制定中'},
{value: 'buss1_2',label: '技术标准-修订'}, {value: 'buss1_2',label: '技术标准-修订中'},
{value: 'buss2_1',label: '产品标准-制定'}, {value: 'buss1_4',label: '技术标准-已完成'},
{value: 'buss2_2',label: '产品标准-修订'}, {value: 'buss2_1',label: '产品标准-制定中'},
{value: 'buss2_3',label: '产品标准-修改'}, {value: 'buss2_2',label: '产品标准-修订中'},
{value: 'buss2_3',label: '产品标准-修改中'},
{value: 'buss2_4',label: '产品标准-已完成'},
], ],
QCBFC: false, //C类标准展示备案日期 QCBFC: false, //C类标准展示备案日期
replaceLawsNumModel: false, replaceLawsNumModel: false,
@@ -2490,19 +2492,23 @@ export default {
if(data){ if(data){
if(data.indexOf("buss1_") !== -1){ if(data.indexOf("buss1_") !== -1){
if(data === 'buss1_1'){ if(data === 'buss1_1'){
return "制定" return "技术标准-制定中"
}else if(data === 'buss1_2'){ }else if(data === 'buss1_2'){
return "修订" return "技术标准-修订中"
}else if(data === 'buss1_4'){
return "技术标准-已完成"
}else { }else {
return "" return ""
} }
}else if(data.indexOf("buss2_") !== -1){ }else if(data.indexOf("buss2_") !== -1){
if(data === 'buss2_1'){ if(data === 'buss2_1'){
return "制定" return "产品标准-制定中"
}else if(data === 'buss2_2'){ }else if(data === 'buss2_2'){
return "修订" return "产品标准-修订中"
}else if(data === 'buss2_3'){ }else if(data === 'buss2_3'){
return "修改" return "产品标准-修改中"
}else if(data === 'buss2_4'){
return "产品标准-已完成"
}else { }else {
return "" return ""
} }
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+3 -1
View File
@@ -242,11 +242,13 @@
</el-form-item> </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-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-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="1"></el-option>
<el-option label="修订中" value="2"></el-option> <el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option> <el-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></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-select>
</el-form-item> </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' : ''"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">