diff --git a/src/main.js b/src/main.js index 128868042..c7e1e4eea 100644 --- a/src/main.js +++ b/src/main.js @@ -212,7 +212,16 @@ router.beforeEach(function (to, from, next) { next() }else if (toName.slice(0,5) !== 'phone') { if(toName === 'LoginVerify'){ - next('/blankPage') + if(toName === 'phoneHome'){ + // 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852 + localStorage.removeItem('token') + token = localStorage.getItem("token") + window.sessionStorage.clear() + localStorage.setItem("routerName","phoneHome") + next('/loginVerifyPhone') + }else{ + next('/blankPage') + } }else { if(toName === 'blankPage' || toName === 'processedPage') { next() @@ -223,7 +232,16 @@ router.beforeEach(function (to, from, next) { }else { if(toName !== 'blankPage'){ if(to.matched.length === 0){ - next('/blankPage') + if(toName === 'phoneHome'){ + // 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852 + localStorage.removeItem('token') + token = localStorage.getItem("token") + window.sessionStorage.clear() + localStorage.setItem("routerName","phoneHome") + next('/loginVerifyPhone') + }else{ + next('/blankPage') + } }else { next() } diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index deddf29b2..7dc5e94ff 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -880,6 +880,9 @@ label="适用车型" width="90" > + @@ -2096,6 +2099,14 @@ export default { props: {}, watch: {}, methods: { + filterApplyArctic(row){ + console.log(row) + if(row.applyArctic){ + return row.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') + }else { + return "" + } + }, handleChangeList(data){ this.handleList = data }, @@ -3139,28 +3150,19 @@ export default { }, // 分解单----查看标准条款相关 selectSarStandItems(id, flag) { + this.tableLoading = true this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType + console.log("---------------------------------------------") this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { ...this.standItemSearch, pageSize: this.pageSize7, page: this.page7, order: this.order, orderBy: this.orderBy }, {}, res => { this.selectedItemList = [] - if (res.ok) { - res.data.list.forEach(item => { - let k = (item.applyArctic || "").split(',') - for (let i in this.applyArcticOptions.options) { - for (let m = 0; m < k.length; m++) { - if (this.applyArcticOptions.options[i].value === k[m]) { - k[m] = this.applyArcticOptions.options[i].label - } - item.applyArctic = k.join(',') - } - } - item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') - }) + if (res.data) { this.standItemList = res.data.list; this.total7 = res.data.count // 分页需要 + this.tableLoading = false } }, e => { }) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 34e2c6c0c..b1ff66376 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -1051,8 +1051,10 @@ export default { batchDelete () { if (this.selectedList.length === 0) { this.$message.error('请选择要删除的数据') + return } if(this.selectedList.length > 10){ this.$message.error('批量删除仅支持10条以内') + return } else { this.$confirm('确认删除选择数据?', '确认删除', { confirmButtonText: '确定', diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index e6ef68362..edf2f57ed 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1506,13 +1506,15 @@ export default { }, { _this: this }, res => { - if (res.data) { - this.batchDeleteItem() - } else if(this.selectedList === null){ - this.$message.warning('请确认选择条款是否有子节点,若有,则此次删除将全部删除。') - } else { - this.deleteItemsModal = true - } + // 接口判断作甚? COPY SQ 逻辑 + this.batchDeleteItem() + // if (res.data) { + // this.batchDeleteItem() + // } else if(this.selectedList === null){ + // this.$message.warning('请确认选择条款是否有子节点,若有,则此次删除将全部删除。') + // } else { + // this.deleteItemsModal = true + // } }, e => { }) } else { diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue index 408da7b5c..2db8bdde9 100644 --- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue +++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue @@ -12,7 +12,7 @@
附件: -
+
{{ item.name }}
@@ -43,6 +43,10 @@ export default { type: Object, required: false }, + fileList: { + type: Array, + required: false + }, questionerForm: { type: Object, required: false @@ -58,6 +62,9 @@ export default { } }, methods:{ + fileListSetFunc(){ + return this.assemble(this.answer.appendixId,this.answer.appendixName) + }, archiveVerify(){ return !!(this.questionerForm && this.questionerForm.questioner && this.questionerForm.questioner !== this.answererNowUserName && this.institutionId === '30001273'); @@ -83,7 +90,6 @@ export default { answerChang(){} }, mounted () { - this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName) }, watch:{ answer: { diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 25d27956b..12fa53888 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -68,6 +68,7 @@
- +
@@ -126,6 +127,7 @@
- +
@@ -184,6 +186,7 @@
- +
@@ -242,6 +245,7 @@
- +
@@ -311,7 +315,7 @@
-
@@ -374,7 +379,7 @@
-
@@ -437,7 +443,7 @@
-
@@ -500,7 +507,7 @@
-
@@ -577,7 +585,7 @@
-
- +
@@ -635,7 +643,7 @@
-
- +
@@ -693,7 +701,7 @@
-
- +
@@ -751,7 +759,7 @@
-
- +
@@ -846,7 +854,7 @@
取 消 - 提 交 + 提 交 @@ -1253,6 +1261,7 @@ export default { }, data(){ return{ + tagsLoading: false, submitBtnLoading: false, aiKey:1, qiiKey:1, @@ -1326,7 +1335,6 @@ export default { } }, mounted(){ - console.log(this.$store.getters.userInfo) this.standSearch() // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { @@ -1621,9 +1629,11 @@ export default { this.subSearch() }, standClick(){ + this.tagsLoading = true this.queSearch() }, standClick2(){ + this.tagsLoading = true this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{ standardId: this.activestand, answerer: this.$store.getters.userInfo.userId, @@ -1631,11 +1641,13 @@ export default { _this: this }, res => { this.questionsList = res.data + this.tagsLoading = false }, e =>{ }) }, standClick3(){ + this.tagsLoading = true this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{ standardId: this.activestand, answerer: this.$store.getters.userInfo.userId, @@ -1643,6 +1655,7 @@ export default { _this: this }, res => { this.questionsList = res.data + this.tagsLoading = false }, e =>{ }) @@ -1668,14 +1681,31 @@ export default { }) } this.answerList = res.data + this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName) }else{ this.answerList = res.data + this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName) } this.qiiKey++ this.dataLoading = false + this.tagsLoading = false }, e => { }) }, + fileListSetFunc(item){ + return this.assemble(item.appendixId,item.appendixName) + }, + assemble(ids,names){ + let list= []; + if(ids && ids !== '' && names && names !== ''){ + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i { this.questionsList = res.data + this.tagsLoading = false }) }, //查询回答标准 @@ -1805,7 +1836,6 @@ export default { }, //文件上传前 beforeUploadTheme(file){ - console.log(file); var filename = file.name; var index1 = filename.lastIndexOf('.') var index2 = filename.length diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 578fbad19..2bde97c30 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -126,6 +126,7 @@ - 计划内 - 计划外 + 计划内 + 计划外 @@ -190,7 +191,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

@@ -201,7 +202,7 @@
- +

分委会主任/部门中心主任

@@ -213,7 +214,7 @@
- +

责任工程师

@@ -225,7 +226,7 @@
- +

参会人员所在部门中心主任

@@ -237,7 +238,7 @@
- +

标准法规部人员

@@ -285,7 +286,7 @@
- +

院长

@@ -519,9 +520,9 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes) - this.ch_pageData = mes.ch_pageData - this.commentInfo = mes.commentInfo - this.roleForm = mes.roleForm + this.ch_pageData = mes.json.ch_pageData + this.commentInfo = mes.json.commentInfo + this.roleForm = mes.json.roleForm }); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index b2f0db364..e74f9da10 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -226,133 +226,134 @@ size="900px" custom-class="demo-drawer" > -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - - - - 清空 - - - -
+
+
+ +

如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。

+ type="selection" + width="55" + align="center"> + type="index" + width="55" + label="序号" + align="center"> + align="center" + prop="projectName" + label="项目名称"/> + align="center" + width="120" + prop="projectStatus" + label="项目状态"/> + align="center" + prop="currentNode" + label="当前节点"/> + align="center" + prop="projectGroup" + label="项目群"/> + align="center" + prop="uname" + label="项目经理"/>
+ {{$t('m.dataAcquisition')}}
@@ -410,6 +411,7 @@ export default { return { active: "1", //折叠的标志,true为折叠,false为不折叠 + replaceLoading: false, foldFormFlag: false, drawerModal: false, loading: false, @@ -565,6 +567,9 @@ export default { }, //查询项目群下的项目 getProductData() { + this.replaceLoading = true + // 已维护 状态 1 , 为维护 状态 0 + this.projectSearch.flag = '1' this.$http.get("sarStandProjectLibrary/queryProjects", { projectGroup: this.projectGroup, current: this.pageNo, @@ -575,6 +580,7 @@ export default { }, res => { this.productData = res.data.records; this.totalNo = res.data.total; + this.replaceLoading = false }); }, //查询项目按钮 @@ -916,6 +922,26 @@ export default { overflow-y: hidden; } } + .standard-content { + height: 100%; + padding: 10px 0 0; + .content { + height: 100%; + display: flex; + flex-direction: column; + padding: 0 10px; + .standard-table-wrap { + flex: auto; + overflow-y: auto; + } + .pagination { + position: static; + /deep/ .pagination-slot { + padding: 0; + } + } + } + } .demo-drawer-content { margin-top: 10px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 6ba476e28..d8774ab0a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1110,7 +1110,7 @@
- @import '~@/assets/styles/style'; - +/deep/ .el-drawer__body{ + height: 100%; + display: flex; + flex-direction: column; + overflow-y: auto !important; +} .bzrkStep1 { /deep/ .el-button--mini.is-circle { padding: 2px; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 8e90c9433..77456fca8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -381,6 +381,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data) this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey this.commentText2 = data.commentText2 || '' this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 1add623d4..05a24a848 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -614,6 +614,7 @@ json.info = [] json.form = this.form json.department = this.$store.getters.userInfo.orgName + console.log(json) this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 902ef7e52..4a41fa35d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -627,13 +627,15 @@ export default { json.onlyKey = this.onlyKey json.spId = this.form.spId json.spName = this.form.spName + json.form.info = this.data + json.form.onlyKey = this.onlyKey + json.form.spId = this.form.spId + json.form.spName = this.form.spName + json.commentText4 = this.commentText4 _formData.append("id", this.bpnId || ""); _formData.append("prcType", "3"); _formData.append("taskIds", this.taskIds); - _formData.append("json", JSON.stringify({ - form: json, - commentText4: this.commentText4 - })); + _formData.append("json", JSON.stringify(json)); console.log(json); saveTaskForPub(_formData).then(res => { this.saveLoading = false; @@ -654,6 +656,7 @@ export default { json.info = this.data json.onlyKey = this.onlyKey json.spName = this.form.spName + console.log(json) this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -718,7 +721,21 @@ export default { this.form.endTime = data.endTime || data.form.endTime this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.json = data.form ? data.form : data + if(data.form){ + data.modelList = data.form.modelList?data.form.modelList: data.modelList + data.startUserName = data.form.startUserName? data.form.startUserName: data.startUserName + data.presidentUser = data.form.presidentUser ? data.form.presidentUser :data.presidentUser + data.presidentUserName = data.form.presidentUserName ? data.form.presidentUserName : data.presidentUserName + data.fjList = data.form.fjList ? data.form.fjList:data.fjList + data.spId = data.form.spId ? data.form.spId : '' + data.spName = data.form.spName ? data.form.spName : '' + data.startUser = data.form.startUser ? data.form.startUser : data.startUser + data.cid = data.form.cid?data.form.cid:data.cid + data.endTime = data.form.endTime? data.form.endTime:data.endTime + data.textType =data.form.textType? data.form.textType:data.textType + } + this.json = data + console.log(this.json) this.standId = data.standId this.getItemList(data.standId,data.textType) this.data = data.info || data.form.info diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 301facbcf..66230545b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -541,8 +541,19 @@ this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '') - this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '') + if(data.form){ + let user7Id = data.form.user7 + if(user7Id){ + this.form.user7 =user7Id + this.form.user7Name =data.form.user7Name + }else{ + this.form.user7 = data.user7 ? data.user7 : data.spId + this.form.user7Name = data.user7Name ? data.user7Name : data.spName + } + }else{ + this.form.user7 = data.user7 ? data.user7 : data.spId + this.form.user7Name = data.user7Name ? data.user7Name : data.spName + } let newArr = data.info ? data.info : data.form.data this.oldData = JSON.parse(JSON.stringify(newArr)) let arr = [] diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index f72cdae74..2fd742551 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1003,6 +1003,7 @@ {validator: validateStandNumber, trigger: 'change'} ], + standNumNotRule: [], standYear: [ { required: true, message: '请输入标准年份'}, ], @@ -2494,6 +2495,10 @@ // } else if (val === '') { // this.form.country = [] // } + if(this.form.standStatus !== '1'){ + this.rules.standNum[0].required = false; + } + this.fileInfoHandle() this.$refs['form'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 7e61bc13f..15b32174e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -324,6 +324,7 @@ 带入
+ 数据加载中...
@@ -338,6 +339,7 @@ export default { props: ['message'], data(){ return{ + formLoading: false, disabledXX:!!this.$route.query.disabledXX, formRules: { bussSort: [ @@ -390,9 +392,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 4a24b253c..eeb1fcd78 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -340,6 +340,7 @@ 带入 + 数据加载中... @@ -354,6 +355,7 @@ export default { props: ['message'], data(){ return{ + formLoading:false, disabledXX:!!this.$route.query.disabledXX, BZList: [], cbcdOptions: [], @@ -412,9 +414,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 239930b36..8c07b88aa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -410,6 +410,7 @@ :nodeList="nodeListZRBM" @checkedRole="drawerCheckZRBM" /> + 数据加载中... @@ -443,6 +444,7 @@ export default { }; return { disabledXX:!!this.$route.query.disabledXX, + formLoading:false, workModel: false, workSearch: { workGroupName: "", @@ -572,9 +574,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //适用车型 // this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 51a26c8ba..763437848 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -226,8 +226,9 @@
- - + + + @@ -323,6 +324,7 @@ label="起草责任单位"> + {{$t('m.dataAcquisition')}} + 数据加载中... @@ -582,6 +585,8 @@ export default { data(){ return { disabledXX:!!this.$route.query.disabledXX, + replaceLoading:false, + formLoading:false, workModel: false, workSearch: { workGroupName: "", @@ -721,9 +726,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //适用车型 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 @@ -1070,6 +1077,7 @@ export default { }, //企业标准查询 getStandDataBtn(){ + this.replaceLoading = true this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, @@ -1087,6 +1095,7 @@ export default { } }) this.total = this.standinfoList.length + this.replaceLoading = false }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 4a2982a74..901b0228e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -331,6 +331,7 @@ 带入 + 数据加载中... @@ -346,6 +347,7 @@ export default { data(){ return{ disabledXX:!!this.$route.query.disabledXX, + formLoading:false, formRules: { bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } @@ -399,9 +401,11 @@ export default { // if(this.qbfsForm.passFlag){ // this.qbfsForm = {} // } + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 942bc57f8..be8ba25dc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -409,6 +409,24 @@ export default { break } this.qbfsForm = item.qbfsForm || item; + if (this.qbfsForm.bussSort) { + if(this.qbfsForm.bussSort instanceof Array){ + this.qbfsForm.bussSort = this.qbfsForm.bussSort[0] + }else { + let val = this.qbfsForm.bussSort.replace('//',"").replace('["',"").replace('"]',"").toString() + if (val !== '' && val !== null && typeof (val) !== 'undefined') { + if (val instanceof Array) { + this.qbfsForm.bussSort = this.form.bussSort.join(",")[0]; + } else { + this.qbfsForm.bussSort = val + } + } else if (val === '') { + this.qbfsForm.bussSort = "" + } + } + } else { + this.qbfsForm.bussSort = "" + } this.formLoading = false; this.commentText = item.commentText this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index bcc6ae5a0..8016bfce5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -249,88 +249,164 @@ size="900px" custom-class="demo-drawer" > -
-
-
-
- - - - - - - - - - 查询 - - - - 清空 - - - -
+
+
+ +
+ type="selection" + width="55" + align="center" /> + + + + + + {{$t('m.dataAcquisition')}}
@@ -348,6 +424,7 @@ import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import { saveTaskFirst, taskDel,queryTaskFirst } from "api/process"; import file from "@/pages/knowledgeGraph/components/file"; +import {solostarData} from "@/api/unqualProcess"; export default { name: "xmpg2Step1", @@ -359,6 +436,12 @@ export default { data() { return { disabledXX:!!this.$route.query.disabledXX, + replaceLoading: false, + // 项目分类数组 + notProjectData: [], + projectStatus: [], + projectData: [], + notProjectStatus: [], active: "1", //当前选中的type isSubmit: false, saveLoading: false, @@ -421,8 +504,13 @@ export default { //项目检索条件 projectSearch: { projectNumber: "", - projectName: "" + projectName: "", + managementHostName: "", + developmentHostName: "", + categoryName: "", + projectGroup: "", }, + xmztOptions: [], //项目数据 ProjectDatas: [], page: 1, @@ -478,9 +566,10 @@ export default { }, //获取项目数据 getProjectData() { + this.replaceLoading = true this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", { - page: this.page, - pageSize: this.pageSize, + Page: this.page, + PageSize: this.pageSize, ...this.projectSearch }, { _this: this @@ -492,6 +581,7 @@ export default { this.ProjectDatas = res.data.Maintenance.records; this.total = res.data.Maintenance.total; } + this.replaceLoading = false }); }, @@ -718,11 +808,41 @@ export default { this.commentText = mes.commentText }) }, + selectSort() { + solostarData().then(res => { + res.data.MaintenanceProjectClassification.forEach((item, index) => { + this.projectData.push({ + label: item, + value: index + }) + }) + res.data.MaintenanceProjectStatus.forEach((item, index) => { + this.projectStatus.push({ + label: item, + value: index + }) + this.xmztOptions = this.projectStatus + }) + res.data.notMaintenanceProjectClassification.forEach((item, index) => { + this.notProjectData.push({ + label: item, + value: index + }) + }) + res.data.notMaintenanceProjectStatus.forEach((item, index) => { + this.notProjectStatus.push({ + label: item, + value: index + }) + }) + }) + } }, mounted() { if(this.$route.query.bpnId){ this.getTaskId() } + this.selectSort() this.getProjectData(); // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { @@ -755,6 +875,16 @@ export default {