diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 1f8c0c162..6007a1d32 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -198,7 +198,7 @@ height="100%" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - @selection-change="selectThree" + @selection-change="selectedChange" > @@ -316,6 +316,9 @@ export default { ProcessFooter, ProcessTitle }, + mounted () { + this.getTree() + }, methods: { //点击新增事件 addList() { @@ -367,27 +370,15 @@ export default { //未符合项整合确定事件 OkDrawer() { if (this.selectedList.length !== 0) { - let deposit = new Map(); - this.unqualidiedData.forEach(item => { - deposit.set(item.id, item); - }); - let bringData = []; - for (let i = 0; i < this.selectedList.length; i++) { - bringData.push(deposit.get(this.selectedList[i])); - } - this.dataList.standId = bringData[0].standId - this.dataList.productName = bringData[0].productName; - this.dataList.itemsNum = bringData[0].itemsNum; - this.dataList.itemsName = bringData[0].itemsName; - this.dataList.planCloseTime = bringData[0].planCloseTime; - this.dataList.responsibleUnit = bringData[0].responsibleUnit; - this.dataList.dutyEngineer = bringData[0].dutyEngineer; + this.dataList = this.selectedList this.ListModel = false; } else { this.$message.warning("请选择至少一条数据进行带入"); } }, - selectThree() {}, + selectedChange(val) { + this.selectedList = val + }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index de7d8b846..1b615d619 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -16,18 +16,20 @@ - - + + + @click="getTableByPage"> 查询 @@ -104,7 +107,12 @@ @@ -429,6 +437,8 @@ export default { this.multipleSelection = [] this.$refs.multipleTable.clearSelection(); } + + if (this.type === 'dockUser') { this.roleForm.dockUser = this.roleRow.id this.roleForm.dockUserName = this.roleRow.name @@ -450,6 +460,7 @@ export default { }, //未整改项抽屉中的查询按钮 getTableByPage() { + this.getData() }, // 清空 查询条件 clearAllSearch (search = true) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index ea7b9bd79..52bbaa3b1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -15,16 +15,20 @@ - + - + @@ -35,6 +39,7 @@ :value="false" > - @@ -89,9 +93,21 @@ - + @@ -246,7 +262,8 @@ export default { itemsName: '1', planCloseTime: '1', responsibleUnit: '1', - dutyEngineer: '1' + dutyEngineer: '1', + dutyPeople: '13123' },{ standId: '', productName: '', @@ -254,12 +271,11 @@ export default { itemsName: '', planCloseTime: '', responsibleUnit: '', - dutyEngineer: '' + dutyEngineer: '', + dutyPeople: '' }], - // 当前页数 - pageNo: 1, - total: 0, - myLoading: false, + newDataList: [], + // 责任部门 zNodesSItem: [], unqualidiedData: [{ @@ -271,7 +287,7 @@ export default { responsibleUnit: '', dutyEngineer: '' }], - selectedList: [], //未整改项的选择框 + roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, @@ -294,26 +310,13 @@ export default { ProcessTitle }, created() { + this.getTree() }, methods: { - getList() { - this.myLoading.loadData = true - this.$http.get('sarStandUnqualified/sar-stand-unqualified', { - ...this.nonConformitySearch, - current: this.pageNo, - size: this.$store.getters.userInfo.configContent - }, { - _this: this - }, res => { - this.myLoading.loadData = false - this.nonList = res.data.records - this.total = res.data.total - }, e => { - this.myLoading.loadData = false - }) - }, - - selectPeople(row) { + // 选择责任人的按钮操作 + selectPeople(val) { + this.newDataList = val + this.nodeList = [] this.modalshowflag = true }, handleTabs(name) { @@ -350,6 +353,10 @@ export default { }, // 流程节点负责人抽屉保存按钮 saveUserInfo () { + // 选择责任人时input框内值 + this.newDataList.dutyPeople = this.roleRow.name + + if (this.type === 'dockUser') { this.roleForm.dockUser = this.roleRow.id this.roleForm.dockUserName = this.roleRow.name diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index c95f7e89c..8495e4b64 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -87,11 +87,27 @@ - + @@ -247,7 +263,8 @@ export default { itemsName: '1', planCloseTime: '1', responsibleUnit: '1', - dutyEngineer: '1' + dutyEngineer: '1', + dutyPeople: '13123' },{ standId: '', productName: '', @@ -255,24 +272,21 @@ export default { itemsName: '', planCloseTime: '', responsibleUnit: '', - dutyEngineer: '' + dutyEngineer: '', + dutyPeople: '13123' }], // 当前页数 pageNo: 1, total: 0, myLoading: false, + // 上传路径 + uploadPath: 'api/att/attFile/upload', + // 上传文件所储存的数组 + uploadFileList: [], // 责任部门 zNodesSItem: [], - unqualidiedData: [{ - standId: '', - productName: '', - itemsNum: '', - itemsName: '', - planCloseTime: '', - responsibleUnit: '', - dutyEngineer: '' - }], - selectedList: [], //未整改项的选择框 + + roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, @@ -297,29 +311,31 @@ export default { created() { }, methods: { - getList() { - this.myLoading.loadData = true - this.$http.get('sarStandUnqualified/sar-stand-unqualified', { - ...this.nonConformitySearch, - current: this.pageNo, - size: this.$store.getters.userInfo.configContent - }, { - _this: this - }, res => { - this.myLoading.loadData = false - this.nonList = res.data.records - this.total = res.data.total - }, e => { - this.myLoading.loadData = false - }) - }, - uploadText(row) { - }, + handleTabs(name) { this.active = name }, - + /************ 上传佐证材料 *****************/ + // 上传材料 + handleUpload() {}, + // 文件上传成功 + handleOnsuccess(res, file) { + this.$message.success('上传成功!') + console.log(file) + }, + // 文件上传失败后回调 + handleOnError(res, file) {}, + // 文件上传限制条件 + handleBeforeUpload() {}, + // 移除上传的文件 + handleBeforeRemove() {}, + handleOnRemove() {}, + // 文件超过限制数量提示 + handleExceed() { + this.$message.error(``) + }, + /************ ********* *****************/ // 保存按钮 handleSave() {}, // 提交按钮