diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 2a6ee0d94..97e82af5c 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -254,7 +254,7 @@ export default { this.quoteIdList1 = [] this.replaceLawsNumForm.quoteIdList = '' } - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index fca2173aa..935bac6b1 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -112,6 +112,7 @@ export default { }, saveUserInfo() { let arr = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + this.filterText = '' this.isVisible2 = false this.$emit('checkedRole', arr) }, diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue index 66c24d901..798ac4b3a 100644 --- a/src/components/phoneHistortTable/index.vue +++ b/src/components/phoneHistortTable/index.vue @@ -88,6 +88,8 @@ } - diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index c21e09c28..7650873aa 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -1,11 +1,11 @@ @@ -343,7 +343,7 @@ @@ -397,7 +397,7 @@ > @@ -466,7 +466,7 @@

{{ item }} + class="span-line" :title="item">{{ item }}

- @@ -497,7 +497,7 @@ @@ -651,7 +651,7 @@

{{ item }} + class="span-line" :title="item">{{ item }}

- @@ -679,7 +679,7 @@ - + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue similarity index 90% rename from src/pages/processCenter/pages/phone/xmpg/step6.vue rename to src/pages/processCenter/pages/phone/bzpg/step6.vue index b58f8d2e4..88d2b3f31 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step6.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue @@ -136,29 +136,35 @@ style="width: 100%" border @selection-change="selectStandChange" - height="55%" + height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> + type="selection" + width="55" + align="center"> + + @@ -170,34 +176,41 @@ label="条款名称"> + + + - - - - - + width="180" + label="评估人" + /> @@ -294,7 +300,7 @@ import axios from "axios"; import ProcessHeader from "process/components/ProcessHeader"; export default { - name: "phoneXmpgStep6", + name: "phoneBzpgStep6", components: { ProcessHeader, ProcessFooter, @@ -498,40 +504,56 @@ export default { /** * @description: 动态表单读取 */ - getFormFieldList (item) { + getFormFieldList(item) { + console.log(item); this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.dataList = item.dataList - this.listForm.id = item.step3DTOS[0].id - this.listForm.standName = item.step3DTOS[0].standName - this.listForm.standNumber = item.step3DTOS[0].standNumber - this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName - this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName - }) + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + this.fileType = item.fileType + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.dataList = item.dataList + } else { + this.listForm = item.form; + this.dataList = item.form.dataList; + } + + }); }, //驳回事件 beforeBack () { if(!this.commentText){ - this.$message.warning('请填写审批意见') - } else { - this.listForm.fenFlag = '2' - this.handleSubmit() - } + this.$message.warning('请填写审批意见') + }else{ + this.listForm.dataList = this.dataList + this.listForm.passFlag = '1' + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.isSubmit = true + 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 + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList + this.listForm.passFlag = '0' + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -545,9 +567,7 @@ export default { } this.isSubmit = false }, e => { - }); - }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue similarity index 89% rename from src/pages/processCenter/pages/phone/xmpg/step7.vue rename to src/pages/processCenter/pages/phone/bzpg/step7.vue index 582c84325..a4a689296 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -129,36 +129,51 @@ + + + + + type="selection" + width="55" + align="center"> + + @@ -170,34 +185,41 @@ label="条款名称"> + + + - - - - - + width="180" + label="评估人" + /> @@ -264,14 +279,12 @@
@@ -294,7 +307,7 @@ import axios from "axios"; import ProcessHeader from "process/components/ProcessHeader"; export default { - name: "phoneXmpgStep7", + name: "phoneBzpgStep7", components: { ProcessHeader, ProcessFooter, @@ -304,7 +317,9 @@ export default { data() { return { phoneshowflag: false, + activeName: '', phoneRoleList: [], + projectTabName: [], phoneDrawerTitle: '', //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, @@ -388,6 +403,9 @@ export default { }; }, methods: { + handleClick(tab) { + this.projectName = tab.name + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -498,36 +516,34 @@ export default { /** * @description: 动态表单读取 */ - getFormFieldList (item) { + getFormFieldList(item) { this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.listForm.id = item.id - this.dataList = item.dataList - }) - }, - //驳回事件 - beforeBack () { - if(!this.commentText){ - this.$message.warning('请填写审批意见') - } else { - this.listForm.fenFlag = '2' - this.handleSubmit() - } + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + this.fileType = item.fileType + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.dataList = item.dataList + item.dataList.forEach(item => { + if(!this.projectTabName.includes(item.projectName)){ + this.projectTabName.push(item.projectName) + } + }) + this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]] + } else { + this.listForm = item.form; + this.dataList = item.form.dataList; + } + + }); }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -541,7 +557,6 @@ export default { } this.isSubmit = false }, e => { - }); }, diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue similarity index 78% rename from src/pages/processCenter/pages/phone/xmpg/step2.vue rename to src/pages/processCenter/pages/phone/bzpg/step8.vue index 2ee9bbc26..241b7d293 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step2.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue @@ -1,8 +1,8 @@ + + { - if(item.workPeople !== ''){ - this.dataList.push(item) + this.dataList = item.dataList; + this.dataList.forEach(item =>{ + if(item.children){ + item.children.forEach(items =>{ + dataChildren.push(items) + }) } - item.children.forEach(items=> { - if(items.key === item.standId){ + }) + this.dataList.forEach(item => { + dataChildren.forEach(items =>{ + if (items.key === item.standId) { this.$set(items, "standName", item.standName); this.$set(items, "standEnName", item.standEnName); this.$set(items, "standYear", item.standYear); this.$set(items, "standSort", item.standSort); this.$set(items, "standNumber", item.standNumber); - this.$set(items, "zccssrq", item.zccssrq); - this.$set(items, "xcxssrq", item.xcxssrq); - this.$set(items, "ssrq", item.ssrq); } }) }) - this.listForm.dataList.forEach(item => { - dataChildren.push(item.children) + dataChildren.forEach((item, index) => { + dataListChildren = dataListChildren.concat(item); + }); + dataListChildren = this.dataList.concat(dataListChildren); + let index = dataListChildren.findIndex(item => { + return item.people }) - dataChildren.forEach((item,index) => { - dataListChildren = dataListChildren.concat(item) - }) - dataListChildren = this.dataList.concat(dataListChildren) - this.dataList = dataListChildren + if(index > -1){ + dataListChildren.splice(index, 1) + } + this.dataList = dataListChildren; this.total = this.dataList.length; }); }, diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue index b37064283..a2410475e 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step5.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -1,8 +1,8 @@