diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 42041d108..2b52174d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -197,7 +197,8 @@ align="center" label="联络人"> - +

总院技术委员会主任

@@ -407,6 +408,13 @@ :nodeList="nodeList" @checkedRole="drawerCheck" /> +
@@ -517,8 +525,10 @@ export default { }, roleShowflag: false, roleShowflagOne: false, + telShowflag: false, nodeList: [], nodeListOne: [], + nodeListTel: [], isSubmit: false, saveLoading: false, @@ -724,6 +734,21 @@ export default { this.deleteDataList = val }, + // 列表选人 + choiceTel(type, title, val,id) { + this.choiceTelList = val + this.nodeListTel = [] + this.nodeListTel.push(id) + this.type = type + this.telShowflag = true + }, + drawerCheckTel(data) { + if(data.length > 0) { + this.choiceTelList.tel_nameId = data[0].id + this.choiceTelList.tel_name = data[0].name + } + this.telShowflag = false + }, // 流程阶段负责人选择 choiceZRR(type, title, id) { this.nodeList = [] @@ -749,8 +774,8 @@ export default { } else { this.roleForm.dockUser = idList this.roleForm.dockUserName = nameList - this.rh_pageData.comityInRole = nameList - this.rh_pageData.comityInRoleId = idList + // this.rh_pageData.comityInRole = nameList + // this.rh_pageData.comityInRoleId = idList } this.roleShowflag = false }, @@ -774,7 +799,7 @@ export default { } else if (this.type === 'engineerUser') { this.roleForm.engineerUser = data[0].name this.roleForm.engineerUserId = data[0].id - } else { + }else { this.roleForm.directorUserName = data[0].name this.roleForm.directorUserId = data[0].id } @@ -810,7 +835,7 @@ export default { roleList: this.roleForm, rh_pageData: this.rh_pageData, commentText: this.commentText, - directorList: this.rh_pageData.comityInRoleId, + directorList: this.roleForm.dockUser, } this.$refs['rh_pageData'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index b3d7f0df8..b49d22b79 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -112,10 +112,11 @@ + @@ -380,7 +381,7 @@ export default { }, /** 选择入会人员 */ - choiceRole(id) { + choiceRole(type,title,id) { this.nodeList = [] this.nodeList.push(id) this.roleShowflag = true diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index d47554dbc..c44e9d1f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -431,7 +431,7 @@ export default { this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName this.rh_pageData.fillTel = this.$store.getters.userInfo.phone - this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')' if (this.rh_pageData.fillFile !== undefined) { this.fillFileList = this.rh_pageData.fillFile } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index e6f16403b..633899635 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -138,11 +138,16 @@
+ + 新增 + + @click="del_partForm"> 批量删除
@@ -156,18 +161,53 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '20px'}"> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -256,6 +296,88 @@ 流程列表加载中 + +
+ + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + + +
+
+ 取消 + 确认 +
+ + + + + +
+ +

点击或拖拽上传文件

+
+ + + @@ -333,7 +462,25 @@ export default { deleteDataList: [], infoSourcesLength: '', - commentText: '' + commentText: '', + + editFlag: false, + editForm: { + fillPeople: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + }, + + // 上传文件储存 + reData: [], + upDialog: false, + actionPath: 'api/att/attFile/upload', + acceptShow: false, + roleShowflag: false, + nodeList: [], } }, computed: { @@ -382,8 +529,123 @@ export default { // this.rh_pageData.comityFileNum = this.fileTextList }) }, + /** 我司参与人员新增 */ + add_partForm() { + var list = { + fillPeople: this.fillPeople, + fillUnit: this.fillUnit, + fillDept: this.fillDept, + fillPost: this.fillPost, + fillTel: this.fillTel, + fillMail: this.fillMail, + fillFile: this.fillFile = [] + } + this.rh_pageData.myPartRole.push(list) + }, + + fillFile_up(row) { + this.fileListData = row + this.reData = this.fileListData.fillFile + this.upDialog = true + }, + // 文件上传成功 + handleOnsuccess(res, file, fileList) { + if (res.ok) { + if (this.reData !== undefined) { + this.newDataList = this.reData + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } + + this.fileListData.fillFile = this.newDataList + this.$message({ + showClose: true, + message: res.message, + type: 'success' + }) + this.newDataList = [] + this.fileMadel = false + } + }, + // 文件上传限制条件 + handleBeforeUpload(file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + // 移除上传的文件 + handleBeforeRemove(file, fileList) { + this.reData.forEach((item, index) => { + if (item.name === file.name || item.id === file.id) { + this.reData.splice(index, 1) + } + }) + this.fileListData.fillFile = this.reData + }, + + handleClose() { + this.upDialog = false + }, + // 编辑按钮 + edit_partForm(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.reData = this.fileListData.fillFile + this.editForm = row + this.editFlag = true + }, + // 编辑框确认按钮 + OkDrawer() { + this.editFlag = false + }, + falseDrawer() { + let item = JSON.parse(localStorage.getItem('obj')) + this.editForm = item + this.editFlag = false + }, + // 编辑框选人 + choiceRole(type, title,id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.roleShowflag = true + }, + drawerCheck(data) { + if(data.length > 0) { + this.fileListData.fillPeopleId = data[0].id + this.fileListData.fillPeople = data[0].name + } + this.roleShowflag = false + }, /** 批量删除 */ - del_paryForm() { + del_partForm() { if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index c351aff6b..e32405d1f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -84,7 +84,7 @@
- + 批量编辑
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 5efe18811..9c2a0a4c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -85,7 +85,7 @@
- + 批量编辑
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 3cfe97df7..ee3227eb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -66,7 +66,7 @@
- 批量编辑 + 批量编辑
拆分信息
- 批量编辑 + 批量编辑
- -
-

{{ listForm.modelName }} + +

+

{{ item.name }} @@ -204,6 +205,15 @@ 流程列表加载中

+ + + @@ -211,7 +221,8 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail } from "api/process"; + export default { name: "bzqdfbStep1-4", components: { @@ -221,6 +232,11 @@ export default { }, data() { return { + nodeList:[], + isTransfer: false, + drawerTitle:'', + // 调整处理人抽屉状态 + drawerModal: false, detailData: [], // 当前流程类型(1待办/2已办) processType: 1, @@ -236,10 +252,12 @@ export default { selectList: [], //选择标准的选择框 bringData: [], commentText: "", //填写会签意见 + fileList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { + fileIds: '', listType: "", //区分是哪个清单 listName: "", //清单名称 descriptionList: "", //清单说明 @@ -274,6 +292,47 @@ export default { }; }, methods: { + //确认转办 + 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 + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + }, + // 请求转换流程图 + processNum (row) { + axios.request({ + 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) + }) + }, + //转办事件 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -337,6 +396,15 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + let filesId = [] + item.fileName.forEach(itemIds =>{ + filesId.push(itemIds.id) + }) + this.listForm.fileId = filesId.join(',') + item.fileName.forEach(itemId => { + this.fileIds = itemId.id + this.getFileInfo(); + }) }); }, // 请求上传的文件信息 @@ -346,11 +414,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 => { @@ -378,18 +450,13 @@ export default { } } }, - //驳回事件 + // 驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写审批意见"); - } else { + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.listForm.approvalOpinion = "1"; - this.handleSubmit(); - } - }, - //提交事件 - handleSubmit() { - this.isSubmit = true + this.saveLoading = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -403,8 +470,29 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.saveLoading = false }); + }/**/ + }, + //提交事件 + handleSubmit() { + this.isSubmit = true; + this.listForm.approvalOpinion = "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"); + } + this.isSubmit = false + }); }, //选择标准取消事件 closeDrawer() { @@ -465,6 +553,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 ef95d81fa..0eeb55339 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1159,19 +1159,19 @@ :maxlength="100"> - + - - - + + + + + + +
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+ :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 61751a987..779be09ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -10,7 +10,7 @@
人员信息
-
+
@@ -149,76 +149,77 @@ - - - -
-
- 添加 - 批量删除 -
-
- - - - - - - - - - - - - - - - - - - +
-
-
+ + + +
+
+ 添加 + 批量删除 +
+
+ + + + + + + + + + + + + + + + + + +
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 31429b97f..fecc071a4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -11,7 +11,7 @@
审批历史
-
+
@@ -132,143 +132,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 4e537e0a6..a9b8e2959 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -10,7 +10,7 @@
人员信息
-
+
@@ -163,50 +163,49 @@ - - - -
-
- 添加 - 批量删除 -
-
- - - - - - - - - - - +
-
-
+ + + +
+
+ 添加 + 批量删除 +
+
+ + + + + + + + + + +
@@ -221,6 +220,8 @@
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index ee767fa04..64aaa2992 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,55 +131,55 @@ - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index cb4584e91..84d1538ad 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -15,7 +15,7 @@ -
+
- - - -
-
- 添加 - - 批量删除 - - - 批量分发落实人 - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + +
+
+ 添加 + + 批量删除 + + + 批量分发落实人 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -341,7 +342,7 @@ type="primary" class="common-button-primary" size="small" - @click="getProject"> + @click="getProjectBtn"> 查询 @@ -360,7 +361,7 @@ style="width: 100%" border ref="table" - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectThree" @@ -679,6 +680,10 @@ export default { } }, + getProjectBtn(){ + this.pageNo = 1, + this.getProject() + }, getProject() { this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", { productLine: this.projectLineId, @@ -967,16 +972,14 @@ export default { padding: 0 20px 0; } } - + position: relative; + height: 100%; .choiceBtn { .el-button--primary { width: 150px; } } - position: relative; - height: 100%; - .headerTabs { height: 52px; display: flex; @@ -1035,6 +1038,10 @@ export default { .demo-drawer-content { margin-top: 10px; } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index d53e467ad..ad6f211cc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,201 +131,201 @@ - - - -
-
- 批量编辑 - -
+
+ + + +
+
+ 批量编辑 +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
+ + +
+ + +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 913ab3266..47848c7d6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index a8c69fcbc..3452a93fc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index af28d33af..9b38a0e3c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 6179964e5..a3a4344c8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -191,7 +191,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" @@ -499,7 +499,6 @@ export default { }, res => { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; - this.page = 1; }, e => { }); @@ -840,6 +839,10 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index ab4dd630f..44c57ab17 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -59,6 +59,7 @@ 选择清单 { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; - this.page = 1; }, e => { }); @@ -834,6 +839,10 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue index 042cae413..43db410b6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue @@ -137,7 +137,7 @@
- +
- - + + -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -328,27 +314,20 @@ v-model="form.GCWBLAWSName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -468,12 +447,28 @@ - + +
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -484,50 +479,34 @@ - - - - - - - - - - - + -
- - - - 查看已上传文件 - - -
-
- - - 点击上传 - -
+ {{'手动查找'}} + + + + + + + + + + + + + +
@@ -651,7 +630,7 @@ @@ -694,12 +673,11 @@ + size="mini" + style="margin-left: 5px" + @click="handleSearchStandard"> + 查询 + size="mini" + @click="handleResetSearch"> + 清空 +
@@ -927,6 +907,7 @@