diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 76c787d13..678e004a8 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -408,12 +408,14 @@

标准分解单 + @@ -519,6 +521,7 @@
{ this.sarStandardsInfoEO = res.data || {} + this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList; + console.log("hllo",this.sarStandardsInfoEO); if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') { this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0] } @@ -2348,13 +2356,18 @@ export default { }.bind(this) }) }, + sort(column){ + this.order=column.order; + this.orderBy=column.prop; + this.selectSarStandItems(); + }, // 分解单----查看标准条款相关 selectSarStandItems(id, flag) { this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { ...this.standItemSearch, - pageSize: this.pageSize7, page: this.page7, + pageSize: this.pageSize7, page: this.page7,order:this.order,orderBy:this.orderBy }, {}, res => { this.selectedItemList = [] if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 97069d856..a7974a795 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -154,9 +154,17 @@ :submitLoading="isSubmit" :saveLoading="saveLoading" @save="handleSave" + show-transfer + @transfer="handleTransfer" @submit="handleSubmit" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index c43e7f9f6..573bbe5b5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -181,10 +181,18 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + show-transfer + @transfer="handleTransfer" @save="handleSave" @submit="handleSubmit" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index d1e942968..330f6ecde 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -181,10 +181,18 @@ @submit="handleSubmit" show-back @back="handleSubmitNo" + show-transfer + @transfer="handleTransfer" approval submitBTNText="同意" > +
@@ -192,12 +200,14 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail} from 'api/process' + import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process' + import axios from "axios"; export default { name: "bzdyStep4", data() { return { + drawerModal: false, foldFormFlag: false, histortData: [], commentText: '', @@ -234,6 +244,39 @@ ProcessTitle }, methods: { + handleTransfer() { + this.drawerModal = true + }, + checkedRole (data) { + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 5b8b83f88..3a5c40337 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -181,10 +181,18 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + show-transfer + @transfer="handleTransfer" @save="handleSave" @submit="handleSubmit" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 37bc0fe66..a358b5730 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -178,10 +178,18 @@ @back="handleSubmitNo" :submitLoading="isSubmit" :saveLoading="saveLoading" + show-transfer + @transfer="handleTransfer" @submit="handleSubmit" submitBTNText="同意" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 425a57a14..8eab163dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -178,10 +178,18 @@ @back="handleSubmitNo" :submitLoading="isSubmit" :saveLoading="saveLoading" + show-transfer + @transfer="handleTransfer" @submit="handleSubmit" submitBTNText="同意" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 42d73606b..d846bed34 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -178,10 +178,18 @@ :saveLoading="saveLoading" @submit="handleSubmit" show-back + show-transfer + @transfer="handleTransfer" @back="handleSubmitNo" submitBTNText="同意" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 40188ff62..c8b978be7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -178,10 +178,18 @@ @back="handleSubmitNo" :submitLoading="isSubmit" :saveLoading="saveLoading" + show-transfer + @transfer="handleTransfer" @submit="handleSubmit" submitBTNText="同意" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index fda339a9b..57bba8b32 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -258,10 +258,18 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + show-transfer + @transfer="handleTransfer" @save="handleSave" @submit="handleSubmit" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index a4c271a0b..78a652431 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -344,10 +344,18 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + show-transfer + @transfer="handleTransfer" @save="handleSave" @submit="handleSubmit" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index f93a932a5..47f1c8eb5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -318,9 +318,17 @@ @submit="handleSubmit" show-back @back="handleSubmitNo" + show-transfer + @transfer="handleTransfer" submitBTNText="同意" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 3975423c0..b4cccc98a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -315,11 +315,19 @@ :saveLoading="saveLoading" @save="handleSave" @submit="handleSubmit" + show-transfer + @transfer="handleTransfer" show-back @back="handleSubmitNo" submitBTNText="同意" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 58c400199..02f61090d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -316,9 +316,17 @@ :saveLoading="saveLoading" @save="handleSave" @submit="handleSubmit" + show-transfer + @transfer="handleTransfer" submitBTNText="同意" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 45aec4d1a..d7be2fb68 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -141,8 +141,16 @@ :saveLoading="saveLoading" @save="handleSave" @submit="handleSubmit" + show-transfer + @transfer="handleTransfer" > + { + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } 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 => { + this.processStep = window.URL.createObjectURL(res.data) + }) + }, updataFj (item) { let id let type = item.fileName.split('.') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 7896be230..cf51dbcd4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -79,159 +79,169 @@ class="drag-table" :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - @selection-change="handleSelectionChange"> - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-
-
+ @selection-change="handleSelectionChange"> + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + +
+ + + -
- - - - - - - - - - - - - - - - - - -
- - -