diff --git a/src/assets/images/shangqi/img/logo4.png b/src/assets/images/shangqi/img/logo4.png new file mode 100644 index 000000000..735b23c00 Binary files /dev/null and b/src/assets/images/shangqi/img/logo4.png differ diff --git a/src/assets/images/shangqi/img/none-file.png b/src/assets/images/shangqi/img/none-file.png new file mode 100644 index 000000000..4964ad315 Binary files /dev/null and b/src/assets/images/shangqi/img/none-file.png differ diff --git a/src/assets/images/shangqi/img/tree-add.png b/src/assets/images/shangqi/img/tree-add.png new file mode 100644 index 000000000..d0aa3f83e Binary files /dev/null and b/src/assets/images/shangqi/img/tree-add.png differ diff --git a/src/assets/images/shangqi/img/tree-show.png b/src/assets/images/shangqi/img/tree-show.png new file mode 100644 index 000000000..20be364dc Binary files /dev/null and b/src/assets/images/shangqi/img/tree-show.png differ diff --git a/src/assets/images/shangqi/img/tree-sub.png b/src/assets/images/shangqi/img/tree-sub.png new file mode 100644 index 000000000..65cdf3989 Binary files /dev/null and b/src/assets/images/shangqi/img/tree-sub.png differ diff --git a/src/assets/images/shangqi/img/tree.png b/src/assets/images/shangqi/img/tree.png new file mode 100644 index 000000000..f79bba76b Binary files /dev/null and b/src/assets/images/shangqi/img/tree.png differ diff --git a/src/assets/images/shangqi/sideBar/newside-bar-bg1.png b/src/assets/images/shangqi/sideBar/newside-bar-bg1.png new file mode 100644 index 000000000..a66bc8bdf Binary files /dev/null and b/src/assets/images/shangqi/sideBar/newside-bar-bg1.png differ diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 0afef8433..3b9d5a974 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -361,7 +361,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'INLAND', + standType: 'ALL', quoteIdList: '', validFlag: '0' } diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 08d4408ee..303fce717 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -329,7 +329,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'FOREIGN', + standType: 'ALL', quoteIdList: '', validFlag: '0' } diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 2e85d241d..5f429c122 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -434,7 +434,7 @@ export default { }, computed: { logo () { - return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png') + return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png') }, ...mapGetters(['getDynamicTotal', 'isCollapse']) }, @@ -458,7 +458,7 @@ export default { overflow-y: auto; user-select: none; box-sizing: border-box; - background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat; + background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat; background-size: 100% 100%; &:not(.is-collapse) { width: 212px; diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index b8a892ea0..fcd07294a 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -6,6 +6,7 @@ :size="width" :append-to-body=true :before-close="cancelUserInfo" + :show-checkbox="showCheckBox" > + { + this.$http.delete('sarUrl/tsUrl/delete', { - id: row.id + id: row.id }, { - _this: this, - loading: 'Loading' + _this: this, + loading: 'Loading' }, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = [] - for (let a = 0; a < this.linkList.length; a++) { - if (this.linkList[a].id === row.id) { - this.linkList.splice(a, 1) - } - } - this.linkList.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - arr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) + if (res.ok) { + this.$message.success('删除成功') + let arr = [] + for (let a = 0; a < this.linkList.length; a++) { + if (this.linkList[a].id === row.id) { + this.linkList.splice(a, 1) + } } + this.linkList.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, //头部删除按钮 deleteAllLink() { @@ -196,28 +215,39 @@ this.$message.warning('请选择要删除的链接') } else { this.modalRole = true + this.$confirm('此操作将删除链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { this.$http.delete('sarUrl/tsUrl/deleteBatch', { - ids: this.ids + ids: this.ids }, {}, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = this.linkList.filter(items => { - if (!this.ids.includes(items.id)) return items; - }) - let newArr = [] - arr.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - newArr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) - } + if (res.ok) { + this.$message.success('删除成功') + let arr = this.linkList.filter(items => { + if (!this.ids.includes(items.id)) return items; + }) + let newArr = [] + arr.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + newArr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); } }, //弹窗关闭操作 diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index e3853293a..d30c6b433 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -147,7 +147,8 @@ }, sarStandardsInfoRules: { name: [ - { required: true, message: '请输入岗位名称', trigger: 'blur' } + { required: true, message: '请输入岗位名称', trigger: 'blur' }, + { min: 0, max: 100, message: '长度应不超过100个字符', trigger: 'blur' } ] }, modalRole: false, diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index ac24b9540..affcc92df 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -65,14 +65,14 @@ - 标准分解单 + + + + +

+

- 标准分解单 + + + + + + @@ -404,27 +498,23 @@ show-overflow-tooltip prop="itemsNum" label="条款号" - width="150" > @@ -433,28 +523,28 @@ + prop="XCXSSRQ" + label="新车型实施日期(文本)" + width="180"> + + + label="责任部门"> + label="责任工程师"> + label="符合性状态"> + label="合规性分析"> @@ -392,6 +397,7 @@ saveLoading: false, // 基础信息form表单 form: { + id: '', itemsNum: '', itemsName: '', standId: '', @@ -570,7 +576,7 @@ this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { - infoId: this.form.id, + infoId: this.form.standId, page: 1, pageSize: 9999 }, { @@ -621,46 +627,25 @@ }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, - saveUserInfo () { - if (this.type === 'deptUserId') { - this.roleForm.deptUserId = this.roleRow.id - this.roleForm.deptUserIdName = this.roleRow.name + saveUserInfo (data) { + if (this.type === 0) { + this.roleForm.deptUserId = data[0].id + this.roleForm.deptUserIdName = data[0].name + } else if (this.type === 1) { + this.itemList[this.zrIndex].zrUserId = data[0].id + this.itemList[this.zrIndex].zrUserIdName = data[0].name + } else { + this.itemList.forEach( item => { + this.zrIdList.forEach( items => { + if (item.id === items) { + item.zrUserId = data[0].id + item.zrUserIdName = data[0].name + } + }) + }) } this.modalshowflag = false }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - drawerCheck2 (data) { - var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree2.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree2.getCheckedNodes()[0] - } - }, handleSelectionChange (val) { this.zrIdList = [] val.forEach( item => { @@ -668,51 +653,30 @@ }) }, choiceZRRS (row, type, index) { + this.type = type if (type === 1) { - this.nodeList2 = [] - this.zrIndex= index + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.zrIndex = index this.zrType = type - this.nodeList2.push(row) - this.modalshowflag2 = true - } else { + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { // 批量 if (this.zrIdList.length > 0) { this.zrType = type - this.nodeList2 = [] - this.modalshowflag2 = true + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' } else { this.$message.warning('请选择要编辑的数据') } - } - }, - saveUserInfo2 () { - var idList = '' - var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { - if (nameList.length > 0) { - nameList += ',' - idList += ',' - } - idList += item.id - nameList += item.name - }) - if (this.zrType == 1) { - this.itemList[this.zrIndex].zrUserId = idList - this.itemList[this.zrIndex].zrUserIdName = nameList } else { - this.itemList.forEach( item => { - this.zrIdList.forEach( items => { - if (item.id === items) { - item.zrUserId = idList - item.zrUserIdName = nameList - } - }) - }) + this.nodeList = [] + this.nodeList.push(row) + this.drawerTitle = '选择标准法规部部长' + this.modalshowflag = true } - this.modalshowflag2 = false - }, - cancleUserInfo2 () { - this.modalshowflag2 = false }, handleTabs(name) { this.active = name @@ -766,7 +730,6 @@ } }, mounted () { - this.getTree() this.sarStandCompareHis() this.sarStandCompareHis2() this.tableHeight = $('.content').height() - 44 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index bc2aba78e..6d6626e98 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1,1456 +1,1431 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index c274edff0..4601f10bd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -49,26 +49,25 @@ > -
-

{{listForm.fileName}} +

+

+ {{ listForm.fileName }} + + + 点击上传 + +

-
- - - 点击上传 - - -
@@ -741,17 +740,13 @@ export default { }, roleForm: { startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.id, + startUser: this.$store.getters.userInfo.userId, dockUser: "", - responUserList: "", ministerUser: "", directorUser: "", - presidentUser: "", dockUserName: "", - responUserListName: "", ministerUserName: "", directorUserName: "", - presidentUserName: "" }, formRules: { listType: [ @@ -806,7 +801,7 @@ export default { modelName: "", standId: "", //选择的清单的id signFlag: "1", //是否会签 1为会签 2为不会签 - inforlist: "", //用来存放标准列表的标准id + inforlist: " ", //用来存放标准列表的标准id dataList: [{ code: "", //标准号 standName: "", //标准名称 @@ -850,9 +845,6 @@ export default { } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; - } else if (this.type === "presidentUser") { - this.roleForm.presidentUser = data[0].id; - this.roleForm.presidentUserName = data[0].name; } this.modalshowflag = false; }, @@ -1032,19 +1024,8 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - let json = this.listForm; - this.listForm.fileId = this.fileIds.join(","); - this.listForm.fileName = this.fileListName.join(","); - this.listForm.model = this.listForm.fileId; - this.listForm.modelName = this.listForm.fileName; - json.zrUserId = this.roleForm.dockUser; //会签人 - json.jlUserId = this.roleForm.directorUser; //业务经理 - json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 - json.approvalOpinion = ""; - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standName = this.listForm.listName; - json.standId = this.listForm.standId; + var json = Object.assign(this.listForm, this.roleForm) + console.log(json); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { @@ -1085,8 +1066,10 @@ export default { middle.push(item.name); files.push(item.response.data.id); }); - this.fileListName = middle; - this.fileIds = files; + this.listForm.fileName = middle.join(','); + this.listForm.fileId = files.join(','); + // this.fileListName = middle; + // this.fileIds = files; }, fileUpload() { this.fileMadel = true; @@ -1100,6 +1083,17 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); + if(this.listForm.fileName === null || this.listForm.fileName === undefined){ + this.listForm.fileName = this.fileListName.join(',') + } else { + this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); + } + if(this.listForm.fileId === null || this.listForm.fileId === undefined){ + this.listForm.fileId = this.fileIds.join(',') + }else { + this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') + } + console.log(this.listForm); this.$message.success("上传成功"); } else { this.$message.error(res.message); @@ -1202,6 +1196,7 @@ export default { if (this.standList.length < 1) { this.$message.warning("请选择需要添加进清单的数据"); } else { + let exits = [] this.standList.map(item => { let newStand = false; for (let itemKey of this.dataList) { @@ -1214,8 +1209,14 @@ export default { this.$message.warning("请勿重复添加数据"); } else { this.dataList.push(item); + exits.push(item.id) } }); + if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){ + this.listForm.inforlist = exits.join(',') + } else { + this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') + } this.standardData = []; this.standModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 976a14cda..b72ea854f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -369,14 +369,11 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; - this.listForm.zrUserId = this.listForm.zrUserId; - this.listForm.jlUserId = this.listForm.jlUserId; - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写会签意见') + } this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = ""; - this.listForm.standId = this.listForm.standId; this.listForm.signFlag = ""; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 18e8d27cd..df96a7531 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -527,14 +527,6 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; - this.listForm.zrUserId = this.listForm.zrUserId; - this.listForm.jlUserId = this.listForm.jlUserId; - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 92b722e01..0bb01ebaf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -376,14 +376,10 @@ }, //提交事件 handleSubmit() { - this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; - this.listForm.zrUserId = this.listForm.zrUserId; - this.listForm.jlUserId = this.listForm.jlUserId; - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; + if (this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + } this.listForm.commentText = this.commentText; - this.listForm.signflag = ""; - this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 0fff44a57..a752a4237 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -511,9 +511,11 @@ width = "800" :key="key1" :lazy=true - :multiple=false + :multiple=true + :check-Strictly="false" :modalShowFlag="modalShowFlag2" :drawerTitle="drawerTitle" + :show-checkBox="showCheckBox" :url="url" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" @@ -525,9 +527,11 @@ width = "800" :key="key2" :lazy=true - :multiple=false + :multiple=true + :check-Strictly="false" :modalShowFlag="modalShowFlag3" :drawerTitle="drawerTitle" + :show-checkBox="showCheckBox" :url="url" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" @@ -539,20 +543,20 @@ width = "800" :key="key3" :lazy=true - :multiple=false + :multiple=true + :check-Strictly="false" :modalShowFlag="modalShowFlag4" :drawerTitle="drawerTitle" :url="url" + :show-checkBox="showCheckBox" :urlChild="urlChild" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - + + + @@ -727,6 +731,13 @@ placeholder="请输入采标编号" clearable > + {{'手动查找'}} @@ -950,7 +961,13 @@ :visible.sync="modalShowFlag" :wrapperClosable="false" size="800px"> + + item.id).join(",") this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",") @@ -1666,6 +1695,7 @@ this.modalShowFlag = false }, cancelUserInfo () { + this.filterText = '' this.modalShowFlag = false }, drawerCheck (data) { @@ -1834,12 +1864,15 @@ this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') + // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = textArr.join(',') + this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = textArr.join(',') + this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'cbbh'){ + this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else { - this.form.byybj = textArr.join(',') + this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) this.$refs.selections.clearSelection() @@ -2065,8 +2098,6 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // 流程保存之后，应该流转至草稿页面 - this.$router.push({path:'/processCenter?tabsName=TaskDraft'}) // this.bpnId = res.result }).catch(e => { this.saveLoading = false @@ -2158,7 +2189,8 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.qcdwOption = res.data.QCDW // 体系类别 - this.setMap(this.standStateOptions) + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.setMap(this.standStateOptions) }) this.busVsFunc() this.modelFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 1a4702620..8119b4907 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -201,84 +201,84 @@
- - - -
- {{ form.xgdName }} -
-
- - - -
- - -
- {{ form.fbgbjbdName }} -
-
- - - -
- - -
- {{ form.zbjbdName }} -
-
- - - -
- - -
- {{ form.bpgName }} -
-
- - - -
- - -
- {{ form.ssgName }} -
-
- - - -
- - - - -
- {{ form.kwjName }} -
-
- - - -
- - -
- {{ form.zqyjgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
- - -
- {{ form.jdwjName }} -
-
- - - -
- - - + + + +
+ {{ form.xgdName }} +
+
+ - - +
+ + +
+ {{ form.fbgbjbdName }} +
+
+ - - +
+ + +
+ {{ form.zbjbdName }} +
+
+ - - +
+ + +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.ssgName }} +
+
+ - - +
+ + + + +
+ {{ form.kwjName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+ + +
+ {{ form.caName }} +
+
+ - - +
+ + +
+ {{ form.jdwjName }} +
+
+ - - +
+ + +
@@ -328,14 +328,11 @@ - - - + + + + + - -
- {{ form.glwjName }} -
-
- - - -
- + +
+ {{ form.glwjName }} +
+
+ - - +
+ @@ -685,6 +682,16 @@ name: "bzrkStep2", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', rules: { commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }] @@ -811,6 +818,7 @@ standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 + gkglbmOptions: [], // 归口管理部门 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 @@ -844,6 +852,29 @@ }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, getRule(){ if (this.formTongGuo.approvalOpinion !== '1') { this.$refs.formTongGuo.clearValidate('commentText') @@ -910,6 +941,16 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) } }).catch(e => { @@ -1027,6 +1068,7 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.key++ }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 254066498..195c686e1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -197,7 +197,7 @@ -
+
{{ form.xgdName }}
@@ -205,7 +205,7 @@
-
+
{{ form.fbgbjbdName }}
@@ -213,7 +213,7 @@
-
+
{{ form.zbjbdName }}
@@ -221,7 +221,7 @@
-
+
{{ form.bpgName }}
@@ -229,7 +229,7 @@
-
+
{{ form.ssgName }}
@@ -239,7 +239,7 @@ -
+
{{ form.kwjName }}
@@ -247,7 +247,7 @@
-
+
{{ form.zqyjgName }}
@@ -255,7 +255,7 @@
-
+
{{ form.caName }}
@@ -263,7 +263,7 @@
-
+
{{ form.jdwjName }}
@@ -322,12 +322,9 @@ - + + + @@ -461,7 +458,7 @@ -
+
{{ form.glwjName }}
@@ -666,6 +663,16 @@ export default { name: "bzrkStep3", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', activeName:'1', // 当前流程类型(1待办/2已办) processType: 1, @@ -785,6 +792,7 @@ export default { standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 + gkglbmOptions: [], // 归口管理部门 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 @@ -818,6 +826,29 @@ export default { }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, popoverHide (checkedIds, checkedData) { if(checkedData) { this.form.standSystem = checkedData.id @@ -879,6 +910,16 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) } }).catch(e => { @@ -1011,6 +1052,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.key++ }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index b98012836..72d26af15 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -534,11 +534,9 @@ :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - + + + @@ -709,7 +707,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('dtbjh'),config.attrName = '代替标准号'" + @click="selectLaws('yybj'),config.attrName = '引用标准'" >{{'手动查找'}} @@ -718,6 +716,13 @@ placeholder="请输入采标编号" clearable > + {{'手动查找'}} {{'手动查找'}} @@ -1218,6 +1223,7 @@ export default { modelOptions: [], // 模块体系架构 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 + gkglbmOptions: [], // 归口管理部门 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 wssmrOptions: [], // 我司署名人 @@ -1398,12 +1404,15 @@ export default { this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') + // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = textArr.join(',') + this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = textArr.join(',') - }else { - this.form.byybj = textArr.join(',') + this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'cbbh'){ + this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') + } else { + this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) this.$refs.selections.clearSelection() @@ -1605,6 +1614,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.commentText = processForm.commentText this.getFormFieldList(processForm) } }).catch(e => { @@ -1739,6 +1749,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.treeStatus = true this.key++ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index eb5a19493..cd985bbda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -42,13 +42,11 @@ - - + - + + + + + 文本信息
- - - -
- {{ form.xgd }} -
-
- - - -
- - -
- {{ form.fbgbjbd }} -
-
- - - -
- - -
- {{ form.zbjbd }} -
-
- - - -
- - -
- {{ form.bpg }} -
-
- - - -
- - -
- {{ form.ssg }} -
-
- - - -
- - - - -
- {{ form.kwj }} -
-
- - - -
- - -
- {{ form.zqyjg }} -
-
- - - -
- - -
- {{ form.ca }} -
-
- - - -
- - -
- {{ form.jdwj }} -
-
- - - -
- - - + + + +
+ {{ form.xgdName }} +
+
+ - - +
+ + +
+ {{ form.fbgbjbdName }} +
+
+ - - +
+ + +
+ {{ form.zbjbdName }} +
+
+ - - +
+ + +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.ssgName }} +
+
+ - - +
+ + + + +
+ {{ form.kwjName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+ + +
+ {{ form.caName }} +
+
+ - - +
+ + +
+ {{ form.jdwjName }} +
+
+ - - +
+ + +
@@ -317,39 +321,45 @@ - - - - + - - - - + - - - - - - - - - - + + + + + + + + + + + - - - - -
- {{ form.glwj }} -
-
- - - -
- + + + + + + + + + +
+ {{ form.glwjName }} +
+
+ - - +
+ + @@ -491,22 +502,22 @@ clearable > - - - - - - + + + + + + + + + + + + + + + +
@@ -670,6 +681,16 @@ name: "bzrkStep5", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', // 当前流程类型(1待办/2已办) processType: 1, detailData: [], @@ -760,12 +781,14 @@ standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 + gkglbmOptions: [], // 归口管理部门 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 txlbOptions: [], // 体系类别 + qcdwOption: [], // 起草单位 data: [], // 标准列表数据 ListForm: {}, // 新增数据 user1: '', @@ -790,6 +813,29 @@ }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, popoverHide (checkedIds, checkedData) { console.log(checkedIds); console.log(checkedData); @@ -816,6 +862,21 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd + this.form.standYear = processForm.standYear + this.form.standSystem = processForm.standSystem + this.form.kccvppsbm = processForm.kccvppsbm + this.form.cycvppsbm = processForm.cycvppsbm + this.form.dybxh = processForm.dybxh this.getFormFieldList(processForm) } }).catch(e => { @@ -914,6 +975,8 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOption = res.data.QCDW // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue new file mode 100644 index 000000000..06d10b06c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -0,0 +1,622 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index d7f0df38b..1f82da739 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -263,6 +263,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' +import { saveTaskFirst } from 'api/process' export default { name: "bzzqyjStep1", @@ -489,7 +490,26 @@ export default { handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '3') + _formData.append('json', JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 06eb9fd69..0804ddc82 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -135,7 +135,6 @@
{ }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 6ee42f0a7..e30b056fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -184,7 +184,6 @@
{ - this.taskID = res.data - }) - }, //点击新增事件 addList() { standUnqualified(this.queryUnqualidiedData).then(res => { @@ -383,15 +372,21 @@ export default { } else { this.$refs['roleForm'].validate((valid) => { if (valid) { - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskIds', this.taskID) - completeTask(params).then(res => { - if(res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } + const paramsInfo = { + type: '8' + } + startProcess(paramsInfo).then(res => { + this.taskID = res.data + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskIds', this.taskID) + completeTask(params).then(res => { + if(res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + }) }) } }) @@ -407,7 +402,7 @@ export default { this.modalshowflag = true }, drawerCheck (data) { - this.roleForm.dockUserName = data[0].id + this.roleForm.dockUser = data[0].id this.roleForm.dockUserName = data[0].name this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 599337f8c..d6d601ff7 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -193,7 +193,6 @@ export default { }, created() { this.getData() - this.getTree() }, methods: { getData() { @@ -293,8 +292,8 @@ export default { drawerCheck (data) { this.roleForm = data[0] // 选择责任人时input框内值 - this.newDataList.dutyPeople = this.roleRow.name - this.newDataList.dutyPeopleId = this.roleRow.id + this.newDataList.dutyPeople = this.roleForm.name + this.newDataList.dutyPeopleId = this.roleForm.id this.lastDataList = this.dataList this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 2fbc81167..7a6c84f02 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -94,7 +94,7 @@ @@ -187,9 +187,7 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - console.log(item) this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList - console.log(this.dataList) }) }, @@ -266,14 +264,8 @@ export default { this.getData() }, download(row) { - // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath) - var name = row.fileText; - var url = row.fileTextPath; - const a = document.createElement('a') - a.setAttribute('download', name) - a.setAttribute('target', '_blank') - a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url) - a.click() + let attId = row.fileTextId + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; }, // 分页事件 pageChange (page) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 81a044722..c1c65b777 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -28,16 +28,16 @@ @@ -93,13 +93,22 @@ + + + + + + + + + + @@ -113,7 +122,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

@@ -241,17 +250,26 @@ > + + + { - this.showColumn = true - }) + this.showColumn = true; + }); } this.modalshowflag = false; }, @@ -521,7 +540,7 @@ export default { this.active = name; }, typeChange(type) { - this.standardSearch.standType = type + this.standardSearch.standType = type; }, choiceShow() { this.ListModel = true; @@ -542,32 +561,32 @@ export default { //点击添加事件 addList() { this.standModel = true; - this.$refs.projectTable.clearSelection() + this.$refs.projectTable.clearSelection(); }, // 点击批量删除事件 deleteList() { - if(this.selectList.length < 1){ - this.$message.warning('请选择一条数据进行删除') - }else { - this.$confirm('您确认删除这些数据？', '提示', { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }). then(() => { - this.selectList.map(item => { - let index; - index = this.dataList.findIndex(items => { - return items.productLine = item - }) - if (index > -1) { - this.dataList.splice(index, 1); - } + if (this.selectList.length < 1) { + this.$message.warning("请选择一条数据进行删除"); + } else { + this.$confirm("您确认删除这些数据？", "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.selectList.map(item => { + let index; + index = this.dataList.findIndex(items => { + return items.productLine = item; }); - this.selectList = []; - }).catch(() => { - }) - } + if (index > -1) { + this.dataList.splice(index, 1); + } + }); + this.selectList = []; + }).catch(() => { + }); + } }, //取消添加事件 cancelStand() { @@ -576,21 +595,21 @@ export default { //确认添加事件 okStand() { let proData = []; - if(this.dataList.length >= 1){ - this.dataList.forEach(item => { - if(proData.length === 0){ - proData.push(item.productLine) - }else if(!proData.includes(item.productLine)){ - proData.push(item.productLine) - } - }) - this.standList.forEach(items => { - if(!proData.includes(items.productLine)){ - this.dataList.push(items) + if (this.dataList.length >= 1) { + this.dataList.forEach(item => { + if (proData.length === 0) { + proData.push(item.productLine); + } else if (!proData.includes(item.productLine)) { + proData.push(item.productLine); } - }) + }); + this.standList.forEach(items => { + if (!proData.includes(items.productLine)) { + this.dataList.push(items); + } + }); this.standModel = false; - }else{ + } else { if (this.standList.length >= 1) { this.dataList = this.standList; this.roleForm.directorUser = this.dataList[0].uname; @@ -607,7 +626,7 @@ export default { let _formData = new FormData(); _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.uName); - _formData.append("prcType", '5'); + _formData.append("prcType", "5"); _formData.append("json", JSON.stringify({ prcForm: this.prcForm, sarAccessInfoList: this.sarAccessInfoList, @@ -625,19 +644,17 @@ export default { }, //提交事件 handleSubmit() { + if (this.dataList.length < 1) { + this.$message.warning("请添加产品线信息"); + } this.dataList.forEach(item => { - if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){ - this.$message.warning('请选择分发责任人') + if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { + this.$message.warning("请选择分发责任人"); } else { - var json = Object.assign(this.listForm, this.roleForm) - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standId = this.listForm.standId; - json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj - json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj - this.$refs['listForm'].validate((valid) => { + var json = Object.assign(this.listForm, this.roleForm); + this.$refs["listForm"].validate((valid) => { if (valid) { - this.$refs['roleForm'].validate((valid) => { + this.$refs["roleForm"].validate((valid) => { if (valid) { this.$http.get("lawss/activiti/startProcess", { type: "5" }, { _this: this @@ -666,7 +683,7 @@ export default { } }); } - }) + }); }, //选择拆分标准取消事件 @@ -723,8 +740,8 @@ export default { selectThree(data) { this.standList = data; }, - choiceZRR(scope,type, title, id) { - if(scope!=null){ + choiceZRR(scope, type, title, id) { + if (scope != null) { this.dsadadadsada = scope.$index; } this.nodeList = []; @@ -740,19 +757,19 @@ export default { }, pageChange(page) { this.page = page; - this.getStandData() + this.getStandData(); }, pageSizeChange(pageSize) { this.pageSize = this.$store.getters.userInfo.configContent; - this.getStandData() + this.getStandData(); }, pageChangeNo(page) { this.pageNO = page; - this.getProductData() + this.getProductData(); }, pageSizeChangeNo(pageSize) { this.pageSizeNo = this.$store.getters.userInfo.configContent; - this.getProductData() + this.getProductData(); }, //获取产品线数据 getProductData() { @@ -769,27 +786,27 @@ export default { }); }, //获取标准数据 - getStandData(){ - this.$http.post('SarStandItems/sar-stand-items/findStand',{ + getStandData() { + this.$http.post("SarStandItems/sar-stand-items/findStand", { page: this.page, size: this.pageSize, - ...this.standardSearch, - },{ - _this: this, + ...this.standardSearch + }, { + _this: this }, res => { this.sarAccessListDatas = res.records; - this.total = res.total + this.total = res.total; }, e => { - }) + }); }, clearSearch() { this.standardSearch = { standName: "", - standType:"", + standType: "" }; this.getStandData(); - }, + } }, computed: {}, mounted() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 7c9ef4c0b..123463a43 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index fbe139e45..439803ab4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 420fd9107..97fe79a24 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index f5d42974e..8e59d2f47 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index eaa28bcd6..ea95b1152 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 467b93137..7540a8b3a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index b9053c236..517a91b42 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + bzFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,42 +358,50 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - 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"); - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.bzFlag = "2"; + 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"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - 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"); - } - }, e => { - }); - } + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.bzFlag = "1"; + 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"); + } + }, e => { + }); + } + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 5831d1333..f560b2da8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + bzFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,43 +358,52 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - 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"); - } - }, e => { - }); + if (this.commentText === null || this.commentText === undefined || this.commentText === '') { + this.$message.warning('请填写审批意见') + } else { + this.listForm.bzFlag = "2"; + 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"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - 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"); - } - }, e => { - }); - } + if (this.commentText === null || this.commentText === undefined || this.commentText === '') { + this.$message.warning('请填写审批意见') + } else { + this.listForm.bzFlag = "1"; + 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"); + } + }, e => { + }); + } + }, }, + computed: { listNoDataText() { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index f3aa290cc..800bc166b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + dlFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,42 +358,50 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - 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"); - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.dlFlag = "2"; + 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"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - 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"); - } - }, e => { - }); - } + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.dlFlag = "1"; + 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"); + } + }, e => { + }); + } + }, }, computed: { listNoDataText() { @@ -404,7 +411,7 @@ export default { 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 865bad1cd..8d4cf8c13 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -83,7 +83,8 @@ @@ -303,8 +304,6 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.dataList.forEach(item => { - if (item.workPeople !== undefined) { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -320,10 +319,6 @@ export default { } }, e => { }); - } else { - this.$message.warning("请选择分发负责人"); - } - }); }, //批量分发按钮 batchOperation(id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 05e761fd8..632d439fa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -72,7 +72,7 @@ > @@ -84,21 +84,21 @@ label="条款名称">