FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2021-12-22 21:37:35 +08:00
parent 8151b4dc93 37a216fba3
commit e6f365531b
25 changed files with 546 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/hwh5-cloudonline.js
+7
View File
File diff suppressed because one or more lines are too long
src/main.js
+2 -2
View File
@@ -53,6 +53,7 @@ import router from './router'
import Re from 'path-to-regexp'
import { get_verify_by_instance,loginIdm,getMenu,loginMobile } from 'api/process'
import { hwh5 } from '/api/hwh5-cloudonline.js';
import { ssoLoginUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
@@ -108,8 +109,7 @@ router.beforeEach(function (to, from, next) {
/** 判断是不是在手机端操作 */
if (isMobile()) {
if(toName === 'processCenter'){
window.location.href="about:blank";
window.close();
hwh5.close();
}else {
if ((token === null || token === '' ) && toName !== 'Login') {
if(toName !== 'phoneIndex'){
src/pages/blankPage/index.vue
+2 -2
View File
@@ -9,6 +9,7 @@
<script>
import Vue from 'vue';
import { Icon } from 'vant';
import { hwh5 } from '../../api/hwh5-cloudonline.js';
Vue.use(Icon);
export default {
@@ -18,8 +19,7 @@ export default {
},
methods: {
closeWindow(){
window.location.href="about:blank";
window.close();
hwh5.close()
}
}
}
src/pages/details/otherStandardDetails/index.vue
+128 -29
View File
@@ -875,8 +875,9 @@
type="dates"
value-format="yyyy-MM-dd"
style="width: 45%"
prefix-icon="none"
v-model="resolveListForm.xccssrq"
placeholder="选择一个或多个日期">
placeholder="请选择新车型实施日期">
</el-date-picker>
<!-- <el-input-->
<!-- style="width: 45%"-->
@@ -891,9 +892,10 @@
<el-date-picker
type="dates"
value-format="yyyy-MM-dd"
prefix-icon="none"
style="width: 45%"
v-model="resolveListForm.zccssrq"
placeholder="选择一个或多个日期">
placeholder="请选择在产车实施日期">
</el-date-picker>
<!-- <el-input-->
<!-- style="width: 45%"-->
@@ -901,26 +903,38 @@
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="适用车型"
class="add-form-item"
>
<el-input
style="width: 45%"
<!--适用车型-->
<template>
<custom-select-array
:key="applyArcticOptions.options"
:config="applyArcticOptions"
v-model="resolveListForm.applyArctic"
clearable
/>
</el-form-item>
<el-form-item
label="责任工程师"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.dutyEngineer"
clearable
/>
</el-form-item>
></custom-select-array>
</template>
<!-- 责任工程师-->
<template>
<el-form-item
prop="ZRGCSUser"
label-width="150px"
class="add-form-item"
>
<template slot="label">责任工程师</template>
<el-input v-model="resolveListForm.dutyEngineer" placeholder="请选择责任工程师" clearable
@click.native="choiceZRRS('zrgcs', '查询责任工程师', resolveListForm.dutyEngineer)">
</el-input>
</el-form-item>
</template>
<!-- <el-form-item-->
<!-- label="责任工程师"-->
<!-- class="add-form-item"-->
<!-- >-->
<!-- <el-input-->
<!-- style="width: 45%"-->
<!-- v-model="resolveListForm.dutyEngineer"-->
<!-- clearable-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item
label="符合性状态"
class="add-form-item"
@@ -946,7 +960,7 @@
/>
</el-form-item>
</el-form>
<div id="roleFormButton" class="demo-drawer-footer">
<div id="roleFormButton" class="demo-drawer-footer" style="margin-top: 8%">
<el-button
type="primary"
class="common-button-primary"
@@ -965,6 +979,18 @@
>
</div>
</el-drawer>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Mechanism-tree
is-title="选择部门信息"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<!--新增标准条款-->
<el-drawer
:title="itemModalTitle"
@@ -1566,6 +1592,7 @@
<script>
import PutQuestionButton from '@/components/PutQuestionButton'
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
import CustomOrg from '@/components/CustomFormComponents/OrgTree'
import {dateFormat} from '@/common/date'
import RelatedTermsSelect from './components/RelatedTermsSelect'
@@ -1577,6 +1604,7 @@ export default {
components: {
PutQuestionButton,
CustomSVPPS,
CustomSelectArray,
CustomOrg,
RelatedTermsSelect
},
@@ -1760,7 +1788,17 @@ export default {
ZRBM: '',
FO: ''
},
applyArcticOptions: [], // 适用车辆类型下拉框
applyArcticOptions: {
attrName: '适用车型',
options:[]
}, // 适用车辆类型下拉框
modalshowflagZRBM: false,
nodeListZRBM: [],
nodeList2:[],
nodeList:[],
userType:'',
drawerTitle:'',
modalShowRoleFlag:false,
emergyKindOptions: [], // 能源种类下拉框
requestOptions: [],
BZFGGXOUIUJ: [], // 企标覆盖关系
@@ -2497,6 +2535,51 @@ export default {
})
this.modalItemaddShowflag = false
},
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
data.forEach(item => {
// if (item.hasChild === '0' && item.children === null) {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
// }
})
if (this.drawerTitle === '责任部门'){
this.sarStandardsInfoEO.ZRBMId = idList;
this.sarStandardsInfoEO['ZRBM'] = nameList;
}else if (this.drawerTitle === '查询责任部门'){
this.advanceSearchMapping['ZRBM'] = nameList
}
},
choiceZRRS (type, title, id) {
console.log('2077',type, title, id)
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
checkedRole2 (data) {
console.log('1712',this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if (this.drawerTitle === '查询责任工程师'){
this.resolveListForm.dutyEngineer = nameList
}
},
select(selection, row) {
// 清除 所有勾选项
this.$refs.multipleTable.clearSelection()
@@ -2515,17 +2598,27 @@ export default {
if (this.selectedItemList.length>0){
this.editResolveListShowflag = true
let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
console.log('2518',editItem)
this.resolveListForm = editItem
this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):''
// this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.split(',')
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.split(',')
}else {
this.$message.warning('请选择一条数据')
}
},
saveEditInfo(){
console.log('2530',this.resolveListForm)
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',')
console.log('2530',typeof this.resolveListForm.xccssrq)
if (typeof this.resolveListForm.xccssrq !== 'string'){
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
}
if (typeof this.resolveListForm.zccssrq !== 'string'){
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',')
}
if (typeof this.resolveListForm.applyArctic !== 'string'){
this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',')
}
this.$http.putData(
'SarStandItems/sar-stand-items/updateSarItemAndInterpretation',
this.resolveListForm,
@@ -3358,7 +3451,7 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车辆类型”
this.applyArcticOptions.options = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车辆类型”
this.emergyKindOptions = res.data.ENERGYTYPES
this.requestOptions = res.data.REQUESTTYPE
this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
@@ -3526,10 +3619,16 @@ export default {
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/.el-icon-circle-close:before{
margin-left: 300px;
margin-left: 250px;
}
/deep/.el-tag.el-tag--info {
margin-left: 30px;
}
/deep/.el-radio {
margin-left: 30px;
}
/deep/.label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 650px;
width: 600px;
margin-left: 20px;
}
/deep/.label-input-form .add-form-item .el-form-item__label{
src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
+1
View File
@@ -233,6 +233,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
+1
View File
@@ -233,6 +233,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
+1
View File
@@ -231,6 +231,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
+1
View File
@@ -231,6 +231,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
src/pages/processCenter/pages/phone/wbsm/step3.vue
+1
View File
@@ -135,6 +135,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
src/pages/processCenter/pages/phone/wbsm/step4.vue
+1
View File
@@ -135,6 +135,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
src/pages/processCenter/pages/phone/wbsm/step5.vue
+1
View File
@@ -135,6 +135,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
src/pages/processCenter/pages/phone/xmpg/step2.vue
+35 -4
View File
@@ -239,6 +239,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
@@ -250,6 +251,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -272,6 +279,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
nodeList:[],
@@ -393,11 +403,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/phone/xmpg/step5.vue
+35 -4
View File
@@ -321,6 +321,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
@@ -332,6 +333,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -354,6 +361,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
nodeList:[],
@@ -475,11 +485,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/phone/xmpg/step6.vue
+35 -4
View File
@@ -321,6 +321,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
@@ -332,6 +333,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -354,6 +361,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
nodeList:[],
@@ -475,11 +485,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/phone/xmpg/step7.vue
+35 -4
View File
@@ -321,6 +321,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
@@ -332,6 +333,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -354,6 +361,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
nodeList:[],
@@ -475,11 +485,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/phone/xmpg2/step10.vue
+35 -4
View File
@@ -253,6 +253,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -262,6 +263,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -283,6 +290,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
tableIndex: 0,
itemLists: [],
foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/phone/xmpg2/step11.vue
+35 -5
View File
@@ -252,15 +252,21 @@
</div>
<ProcessFooter
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -282,6 +288,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
tableIndex: 0,
itemLists: [],
foldFormFlag: false,
@@ -365,11 +374,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/phone/xmpg2/step12.vue
+35 -4
View File
@@ -253,6 +253,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -262,6 +263,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -283,6 +290,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
tableIndex: 0,
itemLists: [],
foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/phone/xmpg2/step2.vue
+35 -4
View File
@@ -222,6 +222,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -231,6 +232,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -252,6 +259,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
nodeList:[],
@@ -321,11 +331,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
src/pages/processCenter/pages/phone/xmpg2/step7.vue
+35 -4
View File
@@ -253,6 +253,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -262,6 +263,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -283,6 +290,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
tableIndex: 0,
itemLists: [],
foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/phone/xmpg2/step8.vue
+35 -4
View File
@@ -253,6 +253,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -262,6 +263,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -283,6 +290,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
tableIndex: 0,
itemLists: [],
foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/phone/xmpg2/step9.vue
+34 -4
View File
@@ -262,6 +262,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -283,6 +289,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
tableIndex: 0,
itemLists: [],
foldFormFlag: false,
@@ -366,11 +375,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = 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 =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/phone/xmqdqr/step5.vue
+1
View File
@@ -251,6 +251,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:transfer-loading="isTransfer"
src/pages/processedPage/index.vue
+3 -2
View File
@@ -9,6 +9,8 @@
<script>
import Vue from 'vue';
import { Icon } from 'vant';
import { hwh5 } from '../../api/hwh5-cloudonline.js';
Vue.use(Icon);
export default {
@@ -18,8 +20,7 @@ export default {
},
methods: {
closeWindow(){
window.location.href="about:blank";
window.close();
hwh5.close();
}
}
}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+12 -12
View File
@@ -324,18 +324,18 @@
<a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standEnName"
label="英文名称"
min-width="300"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
<a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
<a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- show-overflow-tooltip-->
<!-- prop="standEnName"-->
<!-- label="英文名称"-->
<!-- min-width="300"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
<!-- <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
<!-- <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
prop="issueTime"
label="发布日期"