diff --git a/src/assets/images/shangqi/home/top-logo.png b/src/assets/images/shangqi/home/top-logo.png new file mode 100644 index 000000000..b914a3bac Binary files /dev/null and b/src/assets/images/shangqi/home/top-logo.png differ diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index 5f83570b1..20f6a0243 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -419,6 +419,28 @@ export default { this.qbfsForm.jgUserId = idList; this.qbfsForm.jgUser = nameList; }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 9efe35b31..5e132ed8a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -404,6 +404,28 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index bae052974..eeee1fbd4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -63,6 +63,16 @@ clearable > + + + + + + @@ -119,6 +129,8 @@ 暂无数据 + + @@ -126,23 +138,13 @@ - - - - - - - - - - {{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} + @@ -159,12 +161,12 @@ align="center"> + label="审核意见"> @@ -283,42 +285,42 @@ import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/proc export default { name: "qbfsStep4", - components:{ + components: { ProcessHeader, ProcessFooter, ProcessTitle }, data() { return { - active: '1', + active: "1", isTransfer: false, isSubmit: false, saveLoading: false, drawerModal: false, - drawerTitle: '', + drawerTitle: "", nodeList: [], fileList: [], - commentText: '', + commentText: "", dataList: [], detailData: [], loading: false, foldFormFlag: true, - qbfsForm:{ - entNumber: '', - cnName: '', - enName: '', - entCategory: '', - replaceNumber: '', - replacedNumber: '', - releaseDate: '', - implementDate: '', - reviewDate: '', - nextStatus: '', + qbfsForm: { + entNumber: "", + cnName: "", + enName: "", + entCategory: "", + replaceNumber: "", + replacedNumber: "", + releaseDate: "", + implementDate: "", + reviewDate: "", + nextStatus: "" }, formRules: { nextStatus: [ - {required: true, message: "请选择下一步状态", trigger: "change"} - ], + { required: true, message: "请选择下一步状态", trigger: "change" } + ] }, associationOptions: [{ value: "修订", @@ -330,13 +332,13 @@ export default { value: "有效", label: "有效" }] - } + }; }, mounted() { - this.processTable() - this.getData() + this.processTable(); + this.getData(); }, - methods:{ + methods: { processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -346,50 +348,81 @@ export default { loading: "loading", _this: this }, res => { - this.detailData = res + this.detailData = res; }, e => { - }) + }); }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, + pId: this.$route.query.prcId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - this.getFormFieldList(processForm) + const processForm = JSON.parse(res.mesg); + this.getFormFieldList(processForm); } }).catch(e => { - }) - }) + }); + }); }, /** * @description: 动态表单读取 */ - getFormFieldList (item) { - console.log(item); + getFormFieldList(item) { this.$nextTick(() => { - this.qbfsForm = JSON.parse(JSON.stringify(item)) - }) + this.qbfsForm = JSON.parse(JSON.stringify(item)); + let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; + res = res.split(","); + this.dataList = []; + res.forEach(item => { + this.dataList.push({ + opinion: item.split("-")[1], + people: item.split("-")[0] + }); + }); + let list = []; + this.dataList.forEach(item => { + list.push(item.opinion); + this.findMost(list); + }); + + }); + }, + findMost(arr) { + if (!arr.length) return; + if (arr.length === 1) return 1; + let res = {}; + let maxName, maxNum = 0; + // 遍历数组 + arr.forEach((item) => { + res[item] ? res[item] += 1 : res[item] = 1; + if (res[item] > maxNum) { + maxName = item; + maxNum = res[item]; + } + }); + this.qbfsForm.nextStatus = maxName + // return "出现次数最多的元素为:" + maxName + ", 出现次数为:" + maxNum; }, //流程提交 - handleSubmit(){ - this.isSubmit = true - this.qbfsForm.commentText = this.commentText + handleSubmit() { + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.dataList = this.dataList; let json = JSON.stringify(this.qbfsForm); - this.$http.post('lawss/activiti/completeTask', { + this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, - json: json, + json: json }, { _this: this }, res => { if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') + this.$message.success(res.message); + this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }, e => { }); }, @@ -401,52 +434,74 @@ export default { this.foldFormFlag = !this.foldFormFlag; }, //转办事件 - handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + handleTransfer() { + this.drawerModal = true; + this.drawerTitle = "转办处理人"; + this.selectPeople = row; }, //确认转办 - checkedRole (data) { - this.assigneeNewLoading = true + checkedRole(data) { + this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false + this.isTransfer = false; if (res.success) { - this.drawerModal = false - this.$message.success('调整成功') + this.drawerModal = false; + this.$message.success("调整成功"); this.$router.push("/processCenter"); - this.processNum() + this.processNum(); } else { - this.$message.warning(res.message) + this.$message.warning(res.message); } - }) + }); }, // 请求转换流程图 - processNum (row) { + processNum(row) { axios.request({ - url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), - responseType: 'blob', - method: 'get', + url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(), + responseType: "blob", + method: "get", params: { prcNum: this.$route.query.prcNum } }).then(res => { // let blob = new Blob([res.data], {type: 'image/jpg'}) // let url = window.URL.createObjectURL(res.data) - this.processStep = window.URL.createObjectURL(res.data) - }) + this.processStep = window.URL.createObjectURL(res.data); + }); }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + } }, computed: { listNoDataText() { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } - }, + } }; diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 4655f8afd..93f144a02 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -496,7 +496,7 @@ export default { this.getStandDataBtn() this.ListModel = true; }, - //企业标准查询this.standardSearch, + //企业标准查询 getStandDataBtn(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ standCode: this.standardSearch.standCode, @@ -570,7 +570,7 @@ export default { _formData.append('prcType', '23') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - qbfsForm: this.qbfsForm, + qbfsForm: this.standardSearch, commentText: this.commentText })) saveTaskFirst(_formData).then(res => { @@ -589,9 +589,9 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) + this.$http.get('lawss/activiti/startProcess', {type: '24'}, { _this: this }, res => { if (res.ok) { @@ -624,8 +624,8 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) this.$http.post('lawss/activiti/completeTask', { taskIds: res.data, userId : this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index 30c7c4a51..e4355ac77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -22,18 +22,18 @@ > - + - + @@ -309,11 +309,29 @@ export default { }, //流程驳回 beforeBack(){ - + this.isSubmit = true + this.qbfsForm.passFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, //流程提交 handleSubmit(){ this.isSubmit = true + this.qbfsForm.passFlag = '0' 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/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 5a771a8ee..7d09cb7ab 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -22,18 +22,18 @@ > - + - + @@ -191,14 +191,12 @@ @@ -250,8 +248,8 @@ export default { modalshowflag: false, // drawer开关 loading: false, qbfsForm:{ - entNumber: '', - cnName: '', + standCode: '', + standName: '', enName: '', entCategory: '', replaceNumber: '', @@ -325,6 +323,8 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.commentText = this.commentText + this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName + this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue new file mode 100644 index 000000000..7cf58a79f --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -0,0 +1,622 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 7647615c3..4efa8606f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1570,6 +1570,43 @@ export default { }) } break + case '24': + if (row.taskInfo === '标准法规部部长审核') { + this.$router.push({ + name: 'qbfzStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '会签并填写意见') { + this.$router.push({ + name: 'qbfzStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + // else if(row.taskInfo === '工作组组长审批') { + // this.$router.push({ + // name: 'qbfsStep4', + // query:{ + // taskIds: row.taskIds, + // prcId: row.prcId, + // prcNum: row.prcNum, + // prcName: row.prcName, + // prcType: row.prcType + // } + // }) + // } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 31c81689c..dee7151d1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -79,22 +79,23 @@ export default { } } }); - if(this.country === true){ - this.tabValue = "listOfCountries" - return; - }else if(this.project === true){ - this.tabValue = "listProject" - return; - }else if(this.tracking === true){ - this.tabValue = "listTracking" - return; - }else if(this.other === true){ - this.tabValue = "listOther" - return; - }else if(this.library === true){ - this.tabValue = "localProductsOrProjectLibrary" - return; - } + this.tabValue = this.country ? 'listOfCountries' : (this.project ? 'listProject' : (this.tracking ? 'listTracking' : (this.other ? 'listOther' : (this.library ? 'localProductsOrProjectLibrary' : '')))) + // if(this.country){ + // this.tabValue = "listOfCountries" + // return; + // }else if(this.project){ + // this.tabValue = "listProject" + // return; + // }else if(this.tracking){ + // this.tabValue = "listTracking" + // return; + // }else if(this.other){ + // this.tabValue = "listOther" + // return; + // }else if(this.library){ + // this.tabValue = "localProductsOrProjectLibrary" + // return; + // } }, beforeRouteLeave(to, from, next) { const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"]; diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue index cb117b7a3..1995d18cd 100644 --- a/src/pages/regulatoryRepository/dataStatis/index.vue +++ b/src/pages/regulatoryRepository/dataStatis/index.vue @@ -1,88 +1,50 @@