diff --git a/src/api/process.js b/src/api/process.js index 79874460a..ed2cf8171 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -93,6 +93,14 @@ export function processCreateBuss (data) { }) } +export function processCreatePlan (data) { + return axios({ + url: '/api/lawss/actSarItemsPlan/processCreatePlan', + method: 'post', + data + }) +} + export function processCreateFsBuss (data) { return axios({ url: '/api/lawss/actSarItemsBuss/processCreateFsBuss', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index cb7e6bce9..a6be96fce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1630,6 +1630,8 @@ map.set('2','修订中') map.set('3','已取消') map.set('4','已完成') + map.set('5','立项已完成') + map.set('6','计划已确认') return map.get(item) }, modelProp(row,index){ @@ -2097,7 +2099,7 @@ this.standardSearchForm.page = 1 this.standardSearchForm.unit = '' this.standardSearchForm.esName = '' - this.standardSearchForm.planStatus = '0,3' + this.standardSearchForm.planStatus = '0,3,6' this.standardSearchForm.reviseStatus = '' setTimeout(() => { this.handleSearchStandard() diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index e7bc44a9c..f33243c47 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -23,7 +23,7 @@ @@ -424,6 +424,25 @@ export default { }, props: ['message'], data(){ + const standNameVerify = (rule, value, callback) => { + if(value === '' || value === null){ + return callback(new Error('请输入企标名称')) + }else { + this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', { + bussSort: this.qbfsForm.bussSort, + esName: this.qbfsForm.esName, + }, { + _this: this, + }, res => { + if (res.data && res.data > 0) { + return callback(new Error('企标名称重复')) + }else { + callback() + } + }, e => { + }) + } + }; return { workModel: false, workSearch: { @@ -473,7 +492,7 @@ export default { unit: "", // 单位 unitName: "", esName: "", // 企标名称 - planStatus: "0", // 计划状态 + planStatus: "6", // 计划状态 reviseStatus: "", // 制修订类型 area: "", //适用车型 isRelate: "", //采用何种标准 @@ -500,7 +519,7 @@ export default { { required: true, message: "请选择企标类别", trigger: "blur" } ], esName: [ - { required: true, message: "请输入企标名称", trigger: "blur" } + { required: true, validator: standNameVerify, trigger: "blur" } ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 2995bc6b1..13187006c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -156,7 +156,7 @@ @@ -368,7 +368,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import MechanismTree from "@/components/mechanismTree"; -import { queryTaskFirst, saveTaskFirst, taskDel, downloadStatus } from "@/api/process.js"; +import { queryTaskFirst, saveTaskFirst, taskDel, downloadStatus,processCreatePlan} from "@/api/process.js"; export default { components: { @@ -379,6 +379,25 @@ export default { }, name: "qbzxdlxStep1", data() { + const standNameVerify = (rule, value, callback) => { + if(value === '' || value === null){ + return callback(new Error('请输入企标名称')) + }else { + this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', { + bussSort: this.addQblxData.bussSort, + esName: this.addQblxData.esName, + }, { + _this: this, + }, res => { + if (res.data && res.data > 0) { + return callback(new Error('企标名称重复')) + }else { + callback() + } + }, e => { + }) + } + }; return { tableLoading: false, importModalshowflag: false, //导入弹窗 @@ -445,15 +464,15 @@ export default { // unit: [ // { required: true, message: "请选择起草单位", trigger: "change" } // ], - // bussSort: [ - // { required: true, message: "请选择企标类别", trigger: "blur" } - // ], - // esName: [ - // { required: true, message: "请输入企标名称", trigger: "blur" } - // ], - // reviseStatus: [ - // { required: true, message: "请选择制修订类型", trigger: "blur" } - // ], + bussSort: [ + { required: true, message: "请选择企标类别", trigger: "blur" } + ], + esName: [ + { required: true, validator: standNameVerify, trigger: "blur" } + ], + reviseStatus: [ + { required: true, message: "请选择制修订类型", trigger: "blur" } + ], // resPersonName: [ // { required: true, message: "请输入评审责任人", trigger: "blur" } // ], @@ -959,16 +978,22 @@ export default { _this: this }, res => { if (res.success) { - resolve() - this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - // return res + 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 + }) + } + } }) - } // this.$router.push("/processCenter"); } }); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index cc61b2324..7e5d9bd36 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -13,7 +13,7 @@ - @@ -596,6 +596,25 @@ export default { CustomInputForAllStandards2 }, data(){ + const standNameVerify = (rule, value, callback) => { + if(value === '' || value === null){ + return callback(new Error('请输入企标名称')) + }else { + this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', { + bussSort: this.qbfsForm.bussSort, + esName: this.qbfsForm.esName, + }, { + _this: this, + }, res => { + if (res.data && res.data > 0) { + return callback(new Error('企标名称重复')) + }else { + callback() + } + }, e => { + }) + } + }; return { active: '1', commentText: '', @@ -704,39 +723,39 @@ export default { examineName: "" }, qbfsFormRules: { - unit: [ - { required: true, message: "请选择起草单位", trigger: "change" } - ], + // unit: [ + // { required: true, message: "请选择起草单位", trigger: "change" } + // ], bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } ], esName: [ - { required: true, message: "请输入企标名称", trigger: "blur" } + { required: true, validator: standNameVerify, trigger: "blur" } ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } ], - resPersonName: [ - { required: true, message: "请输入评审责任人", trigger: "blur" } - ], - wgLeaderName: [ - { required: true, message: "请输入工作组组长", trigger: "blur" } - ], - unitName: [ - { required: true, message: "请选择起草责任单位", trigger: "blur" } - ], - draftTime: [ - { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" } - ], - releaseTime: [ - {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, - ], + // resPersonName: [ + // { required: true, message: "请输入评审责任人", trigger: "blur" } + // ], + // wgLeaderName: [ + // { required: true, message: "请输入工作组组长", trigger: "blur" } + // ], + // unitName: [ + // { required: true, message: "请选择起草责任单位", trigger: "blur" } + // ], + // draftTime: [ + // { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" } + // ], + // releaseTime: [ + // {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, + // ], drafterName: [ {required: true, message: '请选择起草人', trigger: 'change'}, ], - newReason: [ - {required: true, message: '请输入立项原因', trigger: 'blur'}, - ], + // newReason: [ + // {required: true, message: '请输入立项原因', trigger: 'blur'}, + // ], }, } @@ -745,6 +764,19 @@ export default { this.getWorkData() this.processTable() this.getData() + + this.$http.get('/lawss/activiti/saveEditFile', { + model: 'model_lx' + },{ + _this: this + }, res => { + console.log(res) + if(res){ + this.qbfsForm.LXD = res.id + this.qbfsForm.LXDName = '立项单' + this.LXDList=this.assemble(res.id,'立项单'); + } + }) //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this @@ -918,7 +950,6 @@ export default { this.getFileInfo(); }); this.type = item.type - this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); }) }, // 请求上传的文件信息 diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 7dd20272b..db9788536 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -11,6 +11,8 @@ + + @@ -240,7 +242,7 @@ - + @@ -911,6 +913,8 @@ map.set('2','修订中') map.set('3','已取消') map.set('4','已完成') + map.set('5','立项已完成') + map.set('6','计划已确认') return map.get(item) }, TXJGcloseDrawer () {