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/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index ff7bece28..278d37d52 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -53,7 +53,7 @@ multiple drag - :show-file-list="showUploadlist" + :show-file-list="!showModifyName && showUploadlist" :on-success="uploadSuccess" :before-upload="beforeUpload" :on-remove="removeOneFile" @@ -68,6 +68,43 @@
{{ tips }}
+ + + + + + +
+ 提交 + 取消 +
@@ -87,7 +124,13 @@ export default { uploadPath: 'api/att/attFile/uploadNew', defaultFileList: [], // 默认显示 showFileList: [], - importModalshowflagtemp: false + importModalshowflagtemp: false, + modifyFile: { + fileName: '', + fileId: '' + }, + openModifyFileNameDialog: false, + modifyFileNameLoading: false } }, props: { @@ -150,6 +193,10 @@ export default { }, showUploadBtn: { type: Boolean + }, + showModifyName: { + type: Boolean, + default: false } }, watch: { @@ -204,6 +251,37 @@ export default { } }, methods: { + // 删除 + handleRemoveFile(file){ + const index = this.$refs.importFileAboutStand.uploadFiles.findIndex(e => e.response.data.id === file.response.data.id); + this.$refs.importFileAboutStand.uploadFiles.splice(index, 1); + this.showFileList.splice(index, 1) + }, + // 修改 + handleModifyName(file) { + this.modifyFile.fileName = file.name + this.modifyFile.fileId = file.response.data.id + this.openModifyFileNameDialog = true + }, + // 修改dialog-确认 + handleModifyNameSubmite(){ + this.modifyFileNameLoading = true + this.$http.get('att/attFile/updateFileName', this.modifyFile, { + _this: this + }, res => { + if(res.ok){ + this.modifyFileNameLoading = false + this.openModifyFileNameDialog = false + this.showFileList.forEach(item=>{ + if(item.response.data.id === this.modifyFile.fileId){ + item.name = this.modifyFile.fileName + } + }) + } + }, e => { + this.modifyFileNameLoading = false + }) + }, handleExceed(files, fileList) { if (this.exceed) { this.$message.warning(this.exceed) @@ -491,4 +569,12 @@ export default { color: rgba(64, 158, 255, 1); } } + .el-upload-list__item .el-icon-edit{ + position: absolute; + top: 5px; + right: 25px; + cursor: pointer; + opacity: .75; + color: #606266; + } diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 441f7146a..e24339956 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1673,17 +1673,31 @@ export default { queBtn(){ this.fileList = [] // 清空提问 - const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand) - this.standType = selectedStand.classification - this.questionForm = { - pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 - classification: selectedStand.classification, //标准类型 - problemDescription: '', //问题 - questioner: this.$store.getters.userInfo.userId, //提问人 - standardEncdoing: selectedStand.standardEncdoing, //标准编号 - standardName: selectedStand.standardName, //标准名称 - standardId: selectedStand.standardId, //标准id - fileList: '', + if(this.standList.length === 0){ + this.standType = !this.activeType ? 'INLAND' : this.activeType + this.questionForm = { + pubQue : '',//公共问题 + classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型 + problemDescription: '', //问题 + questioner: this.$store.getters.userInfo.userId, //提问人 + standardEncdoing: '', //标准编号 + standardName: '', //标准名称 + standardId:'', //标准id + fileList: '', + } + }else{ + const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand) + this.standType = selectedStand.classification + this.questionForm = { + pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 + classification: selectedStand.classification, //标准类型 + problemDescription: '', //问题 + questioner: this.$store.getters.userInfo.userId, //提问人 + standardEncdoing: selectedStand.standardEncdoing, //标准编号 + standardName: selectedStand.standardName, //标准名称 + standardId: selectedStand.standardId, //标准id + fileList: '', + } } this.dialogVisible = true }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 2f265bf1c..8cdd2205c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -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 && 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) + }) } }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 6b488757d..028384d5e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -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 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index cb7e6bce9..531523a04 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() @@ -2947,7 +2949,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 => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1297948fb..b84238721 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -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'}) }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index c1f0c13b9..a355675ef 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -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 => { 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/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 9569bdd37..4586db6f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -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', { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 2995bc6b1..b807dce55 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" } // ], @@ -932,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 @@ -961,7 +979,7 @@ export default { if (res.success) { resolve() this.$message.success(res.message); - if (this.bpnId !== '') { + if (this.bpnId !== undefined && this.bpnId !== '') { let taskId = { id: this.bpnId } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index cc61b2324..b21ed321d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -13,7 +13,7 @@ - @@ -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 { @@ -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 @@ -784,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 => { @@ -918,7 +957,6 @@ export default { this.getFileInfo(); }); this.type = item.type - this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); }) }, // 请求上传的文件信息 diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue index 88f533b92..34e278ec2 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -127,6 +127,7 @@ export default { type: '', commentText: '', qbfsForm: {}, + LXDList:[], isTransfer: false, isSubmit: false, saveLoading: false, @@ -220,13 +221,14 @@ export default { }) }, assemble(ids,names){ - let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i 0){ + this.qbfsForm.area = this.qbfsForm.area.join(',') + } this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 65c40907c..2e5c41fcb 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -749,6 +749,7 @@ :config="field" v-model="sarStandardsInfoEO[field.attrField]" :disabled="formdisableflag" + :show-modify-name="true" @fileSuccess="fileSuccess" > diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9b78b021f..ee5d345af 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -429,13 +429,13 @@ @@ -823,6 +823,7 @@ :config="field" v-model="sarBussionessStandEO[field.attrField]" :disabled="formdisableflag" + :show-modify-name="true" > diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 573318d95..1c0fe93f9 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -1047,9 +1047,22 @@ export default { //提问按钮 queBtn(){ this.fileList = [] - const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand) - this.standType = selectedStand.classification - this.questionForm = { + if(this.standList.length === 0){ + this.standType = !this.activeType ? 'INLAND' : this.activeType + this.questionForm = { + pubQue : '',//公共问题 + classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型 + problemDescription: '', //问题 + questioner: this.$store.getters.userInfo.userId, //提问人 + standardEncdoing: '', //标准编号 + standardName: '', //标准名称 + standardId:'', //标准id + fileList: '', + } + }else{ + const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand) + this.standType = selectedStand.classification + this.questionForm = { pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 classification: selectedStand.classification, //标准类型 problemDescription: '', //问题 @@ -1058,6 +1071,7 @@ export default { standardName: selectedStand.standardName, //标准名称 standardId: selectedStand.standardId, //标准id fileList: '', + } } this.dialogVisible = true },