diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 6f7caa83e..c8f93bc6b 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -50,7 +50,10 @@ + placeholder="请输入链接"> + diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 3f07616db..fd2a4796b 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -51,12 +51,20 @@ prop="showNumber" label="标准号/政策号" align="center"> + + { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 45ccf0b85..64ddfde94 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -45,23 +45,23 @@ v-model="form.modelName" clearable > - - - - - - - - - - - - - - - {{isFileUploadStr}} +
+ {{ form.modelName }} +
+
+ + 点击上传 - + + + + + +
@@ -175,7 +175,6 @@ - -
-

{{ listForm.modelName }} + + + + + + + + + + + + + + + + + + + + + + +

+

{{ item.name }} @@ -255,6 +277,7 @@ export default { selectList: [], //选择标准的选择框 bringData: [], commentText: "", //填写会签意见 + fileList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -356,6 +379,9 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + this.fileIds = item.fileId; + console.log(this.fileIds); + this.getFileInfo(); }); }, // 请求上传的文件信息 @@ -365,11 +391,15 @@ export default { }, { _this: this }, res => { - console.log(res); this.$nextTick(() => { res.data.map(item => { - this.listForm.modelName = item.oldFileName; - this.listForm.model = item.id; + // 赋值要回显的上传文件内容 + this.fileList.push({ + name: item.oldFileName, + uid: item.uid, + status: item.status, + id: item.id + }); }); }); }, e => { @@ -399,8 +429,27 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.approvalOpinion = "1"; - this.handleSubmit(); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.approvalOpinion = "1"; + this.saveLoading = true + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.saveLoading = false + }); + }/**/ }, //提交事件 handleSubmit() { @@ -480,6 +529,31 @@ export default { padding: 0 20px 0; } } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 32977c38e..b00082a3f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -810,7 +810,7 @@ - +

修订申请人

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index c59d0535d..81f1b0667 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -282,7 +282,7 @@ export default { }, // 点击查看 handlePreview(item) { - console.log(item) + console.log(item); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { @@ -304,14 +304,14 @@ export default { }, res => { this.standardData = res.data.list; this.standardData.forEach(item => { - if(item.attrInfoMap === null){ - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - }else{ + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); } - }) + }); this.totalNo = res.data.count; }, e => { }); @@ -354,7 +354,10 @@ export default { }, //提交事件 handleSubmit() { - this.isSubmit = true + if (!this.listForm.jgUser) { + this.$message.warning("请选择架构经理"); + } else { + this.isSubmit = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -368,9 +371,10 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }, e => { }); + } }, choiceZRR(scope, type, title, id) { if (scope != null) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 7bf689c06..7f30f2f5b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -108,12 +108,12 @@ > @@ -370,6 +370,7 @@ export default { if(this.peopleFlag === true){ this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + console.log(json) this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -430,6 +431,7 @@ export default { if (this.type === 1) { this.dataList[this.zrIndex].liablePeopleId = data[0].id this.dataList[this.zrIndex].liablePeople = data[0].name + this.$forceUpdate() } else if(this.type === 2) { this.dataList.forEach( item => { this.selectList.forEach( items => { @@ -437,6 +439,7 @@ export default { item.liablePeopleId = data[0].id item.liablePeople = data[0].name } + this.$forceUpdate() }) }) } @@ -451,6 +454,14 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, + watch: { + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } + }, mounted() { this.processTable(); this.getData(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 1f133c46f..eae3ab927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -315,6 +315,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 883ef6927..2d70086ad 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -119,13 +119,15 @@ - + 导出 - - - 高级查询 - - + 高级查询 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 确认 - -
- - - -
@@ -358,6 +266,101 @@
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 搜索 + 取消 +
+ + {{ $t("m.dataAcquisition") }} @@ -368,6 +371,7 @@ export default { name: "AccessStandardDetails", data() { return { + isAdvancedSearch: false, // 高级检索状态 showSelectBox: true, textStatusMap: {}, @@ -519,11 +523,6 @@ export default { // this.$router.push(this.$store.state.detailMap) // this.$store.commit('setDetailMap', '') }, - selectSuper() { - this.page = 1; - this.standardForm.page = 1; - this.selectInfoMore(); - }, // 搜索 selectProductBtn() { this.page = 1; @@ -535,11 +534,6 @@ export default { this.standardForm.zrbm = '' this.standardForm.standName = '' this.standardForm.responseUnit = '' - this.standardFormList.standName = '' - this.standardFormList.typeApplicable = '' - this.standardFormList.nylx = '' - this.standardFormList.zrbm = '' - this.standardFormList.sycpx = '' this.selectInfobyAccid() this.selectInfoMore() }, @@ -701,18 +695,31 @@ export default { * 高级检索 */ selectMoreBtn() { - this.showSelectBox = !this.showSelectBox + this.isAdvancedSearch = true + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' this.showTableFlag = false - if (!this.showSelectBox) { - // this.standardForm = {} - // this.standardForm.issueTime = '' - // this.standardForm.textStatus = '' - // this.standardForm.modifyTime = '' - } this.page = 1 this.standardForm.page = 1 this.selectInfoMore() }, + queryInfo() { + this.page = 1; + this.standardForm.page = 1; + this.selectInfoMore(); + this.isAdvancedSearch = false + }, + backInfo() { + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' + this.isAdvancedSearch = false + }, // 获取工作组信息下拉框信息 getGzzOption() { this.$http.get("lawss/sarGroupMenu/queryGroup", "", { @@ -927,10 +934,8 @@ export default { } } } - .labelBox { - /deep/ .el-form-item__label { - padding-right: 5px; - } + .labelForm { + margin-top: 20px; } /deep/ .relateClass { & > button { @@ -964,7 +969,7 @@ export default { } /deep/.showBox{ - width: 165px; + width: 300px; } .iconClass { width: 18px; @@ -989,7 +994,6 @@ export default { cursor: pointer } } - .relateClass { .el-dialog__body { max-height: 460px; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 42cb7de2a..cb8e18827 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -104,13 +104,15 @@ - + - + - +