Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
30a7ac05 by 田浩浩
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents 45237d97 77398a35
Inline Side-by-side
Showing 13 changed files with 131 additions and 139 deletions
......@@ -155,3 +155,12 @@ export function stopTask (data) {
data
})
}
// 获取用户任务权限
export function judgeUserTaskPermission (params) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/judgeUserTaskPermission',
method: 'get',
params
})
}
......
......@@ -16,7 +16,7 @@
:data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
<el-table-column width="45" align="center" v-if="isRadio">
<template slot-scope="scope">
<el-radio v-model="selected" :label="scope.$index"></el-radio>
<el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio>
</template>
</el-table-column>
......@@ -31,7 +31,7 @@
<el-table-column width="45" align="center" v-if="isRadio">
<template slot-scope="scope">
<el-radio v-model="selected" :label="scope.$index"></el-radio>
<el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio>
</template>
</el-table-column>
<lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item">
......@@ -222,7 +222,13 @@ export default {
padding-right: 3px;
}
/deep/.el-radio__label {
display: none;
.table-radio {
/deep/.el-radio__label {
display: none;
}
}
/deep/.el-radio {
margin-right: 5px !important;
}
</style>
......
......@@ -16,7 +16,7 @@
:data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
<el-table-column width="45" align="center" v-if="isRadio">
<template slot-scope="scope">
<el-radio v-model="selected" :label="scope.$index"></el-radio>
<el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio>
</template>
</el-table-column>
......@@ -31,7 +31,7 @@
<el-table-column width="45" align="center" v-if="isRadio">
<template slot-scope="scope">
<el-radio v-model="selected" :label="scope.$index"></el-radio>
<el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio>
</template>
</el-table-column>
<lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item">
......@@ -222,7 +222,13 @@ export default {
padding-right: 3px;
}
/deep/.el-radio__label {
display: none;
.table-radio {
/deep/.el-radio__label {
display: none;
}
}
/deep/.el-radio {
margin-right: 5px !important;
}
</style>
......
......@@ -7,8 +7,8 @@ const sendThis = (_this) => {
class data extends filter {
constructor() {
super()
}
djqxCol (){
}
djqxCol () {
return [
{
width: '60',
......@@ -97,8 +97,8 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
<el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row,'djqx') }}>上移</el-button>
<el-button type='text' disabled={(scope.$index + 1) == vm.form.djqx.length} onClick={() => { vm.moveDown(scope.$index, scope.row,'djqx') }}>下移</el-button >
<el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row, 'djqx') }}>上移</el-button>
<el-button type='text' disabled={(scope.$index + 1) == vm.form.djqx.length} onClick={() => { vm.moveDown(scope.$index, scope.row, 'djqx') }}>下移</el-button >
</div>
)
}
......@@ -106,7 +106,7 @@ class data extends filter {
]
}
clxxCol(){
clxxCol () {
return [
{
width: '60',
......@@ -126,12 +126,15 @@ class data extends filter {
},
{
label: '是否必填',
width: '100',
prop: 'isrequired',
width: '110',
render: (h, scope) => {
return (
<el-radio-group v-model={scope.row.isrequired} onChange={(val) => { scope.row[scope.column.property] = val }}>
<el-radio label={'1'}>是</el-radio>
<el-radio-group value={scope.row[scope.column.property]} onInput={(val) => {
scope.row[scope.column.property] = val
}}>
<el-radio label={'0'}>否</el-radio>
<el-radio label={'1'}>是</el-radio>
</el-radio-group>
)
}
......@@ -213,8 +216,8 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
<el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row,'clxx') }}>上移</el-button>
<el-button type='text' disabled={(scope.$index + 1) == vm.form.clxx.length} onClick={() => { vm.moveDown(scope.$index, scope.row,'clxx') }}>下移</el-button >
<el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row, 'clxx') }}>上移</el-button>
<el-button type='text' disabled={(scope.$index + 1) == vm.form.clxx.length} onClick={() => { vm.moveDown(scope.$index, scope.row, 'clxx') }}>下移</el-button >
</div>
)
}
......
<template>
<el-dialog
:title="sqqlRule.nodename"
custom-class="dialogBox contentCenter"
width="80%"
top="0"
:visible.sync="dialogVisible"
:before-close="cancelDialog"
>
<el-dialog :title="sqqlRule.nodename" custom-class="dialogBox contentCenter" width="80%" top="0"
:visible.sync="dialogVisible" :before-close="cancelDialog">
<ul class="edit-title-list" v-if="djlxList.length > 0">
<li
v-for="(item, index) in djlxList"
@click="handleTitleSelct(item, index)"
:key="index"
:class="{ active: index == tn }"
>
<li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index"
:class="{ active: index == tn }">
{{ item.nodename }}
</li>
</ul>
......@@ -22,18 +12,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="申请分类">
<el-select
v-model="form.ywDetail.sqfl"
disabled
placeholder="请选择"
class="width100"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-select v-model="form.ywDetail.sqfl" disabled placeholder="请选择" class="width100">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
......@@ -52,18 +32,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="发起业务单元类型">
<el-select
v-model="form.ywDetail.fqywdylx"
disabled
placeholder="请选择"
class="width100"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-select v-model="form.ywDetail.fqywdylx" disabled placeholder="请选择" class="width100">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
......@@ -94,42 +64,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="登记情形及材料">
<el-input
v-model="form.ywDetail.djqxcl"
placeholder="仅支持execl文件导入"
></el-input>
<el-input v-model="form.ywDetail.djqxcl" placeholder="仅支持execl文件导入"></el-input>
</el-form-item>
</el-col>
<el-col :span="1">
<el-upload
ref="upload"
:action="imgUploadUrl"
:limit="1"
accept=".xls, .xlsx"
:show-file-list="false"
:disabled="requested"
:file-list="fileList"
:before-upload="uploadRecord"
:on-success="handleSuccess"
>
<el-button
type="primary"
icon="el-icon-upload"
:loading="requested"
>上传材料</el-button
>
<el-upload ref="upload" :action="imgUploadUrl" :limit="1" accept=".xls, .xlsx" :show-file-list="false"
:disabled="requested" :file-list="fileList" :before-upload="uploadRecord" :on-success="handleSuccess">
<el-button type="primary" icon="el-icon-upload" :loading="requested">上传材料</el-button>
</el-upload>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="登记原因模板" prop="djyy">
<el-input
type="textarea"
:rows="4"
placeholder="请输入内容"
v-model="form.ywDetail.djyy"
>
<el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.ywDetail.djyy">
</el-input>
</el-form-item>
</el-col>
......@@ -137,35 +85,18 @@
</el-form>
<el-collapse accordion>
<el-collapse-item title="登记情形设置" name="1">
<lb-table
:column="djqxCol"
border
:pagination="false"
heightNumSetting
:data="form.djqx"
>
<lb-table :column="djqxCol" border :pagination="false" heightNumSetting :data="form.djqx">
</lb-table>
</el-collapse-item>
<el-collapse-item title="材料信息设置" name="2">
<lb-table
:column="clxxCol"
border
heightNumSetting
:pagination="false"
:data="form.clxx"
>
<lb-table :column="clxxCol" border heightNumSetting :pagination="false" :data="form.clxx">
</lb-table>
</el-collapse-item>
<el-collapse-item
title="刷选权利设置"
name="3"
v-if="form.ywDetail.sfsxql == '1'"
>
<el-collapse-item title="刷选权利设置" name="3" v-if="form.ywDetail.sfsxql == '1'">
<div class="dyztsd-title">
<b>请勾选需要查询的权利信息</b>
<div>
<el-button type="text" @click="handleSelectall"
>选择全部
<el-button type="text" @click="handleSelectall">选择全部
</el-button>
<el-button type="text" @click="handleInvert">清除全部</el-button>
</div>
......@@ -174,7 +105,7 @@
<ul class="qlxx-list">
<li v-for="(item, index) in form.sxql" :key="index">
<el-checkbox v-model="item.checked">{{
item.sxzdmc
item.sxzdmc
}}</el-checkbox>
</li>
</ul>
......@@ -224,7 +155,7 @@ export default {
},
components: {},
name: "componentDialog",
data() {
data () {
return {
tn: 0,
n: 0,
......@@ -239,12 +170,12 @@ export default {
computed: {
...mapGetters(["dictData"]),
},
mounted() {
mounted () {
sendThis(this);
},
methods: {
//页面初始化
init() {
init () {
this.tn = 0;
getDjlxInfo(this.sqqlRule.bsmSqyw).then((res) => {
let { result } = res;
......@@ -258,13 +189,13 @@ export default {
//}
},
//tab选项卡事件
handleTitleSelct(obj, index) {
handleTitleSelct (obj, index) {
this.n = 0;
this.tn = index;
this.getDetail(this.djlxList[index].bsmSqyw);
},
//获取业务具体明细内容
getDetail(bsmSqyw) {
getDetail (bsmSqyw) {
getSqdjywDetail(bsmSqyw).then((res) => {
if (res.code === 200) {
this.form = res.result;
......@@ -274,7 +205,7 @@ export default {
});
},
//提交保存数据
submit() {
submit () {
let that = this;
saveSqdjyw(this.form).then((res) => {
if (res.code == 200) {
......@@ -287,22 +218,22 @@ export default {
});
},
//修改父组件传过来的值
cancelDialog() {
cancelDialog () {
this.$emit("update:dialogVisible", false);
},
// 上移下移
moveUpward (index, row,type) {
if(type=="clxx"){
// 上移下移
moveUpward (index, row, type) {
if (type == "clxx") {
upward(index, this.form.clxx)
}else{
} else {
upward(index, this.form.djqx)
}
},
moveDown (index, row,type) {
if(type=="clxx"){
moveDown (index, row, type) {
if (type == "clxx") {
down(index, this.form.clxx)
}else{
} else {
down(index, this.form.djqx)
}
},
......
......@@ -6,6 +6,8 @@
</div>
<div class="invalid-reson">终止原因：</div>
<el-input v-model="stopMessage" placeholder="请输入终止原因" type="textarea" :rows="4"></el-input>
<el-button style="float:right">取消</el-button>
<el-button type="primary" @click="onSubmit" style="float:right">退件</el-button>
</div>
</template>
......@@ -24,7 +26,7 @@ export default {
}
},
methods: {
childFn () {
onSubmit () {
stopTask({
bsmSlsq: this.formData.bsmSlsq,
bestepid: this.formData.bestepid,
......@@ -32,8 +34,7 @@ export default {
}).then(res => {
this.$message.success('终止成功')
setTimeout(() => {
window.opener = null;
window.open("about:blank", "_self");
window.opener.location.reload(); //刷新父窗口
window.close();
this.$emit('input', false)
}, 1000);
......
......@@ -15,6 +15,10 @@
<el-form-item label="退回意见:">
<el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
</el-form-item>
<el-form-item>
<el-button style="float:right">取消</el-button>
<el-button type="primary" @click="onSubmit" style="float:right">退回</el-button>
</el-form-item>
</el-form>
</div>
</div>
......@@ -41,7 +45,7 @@ export default {
this.getBackNode();
},
methods: {
childFn () {
onSubmit () {
this.selectItem.outstepopinion = this.outstepopinion;
sendBackTask({
bsmSlsq: this.formData.bsmSlsq,
......@@ -49,8 +53,7 @@ export default {
}).then(res => {
this.$message.success('退回成功')
setTimeout(() => {
window.opener = null;
window.open("about:blank", "_self");
window.opener.location.reload(); //刷新父窗口
window.close();
this.$emit('input', false)
}, 1000);
......
......@@ -138,7 +138,7 @@ export default {
popupDialog("退回", "workflow/components/th", {
bsmSlsq: this.bsmSlsq,
bestepid: this.bestepid
}, '30%', "200px", true)
}, '800px')
break;
case "transfer": //转件按钮
getNextLinkInfo({
......@@ -158,7 +158,7 @@ export default {
popupDialog("终止", "workflow/components/stop", {
bsmSlsq: this.bsmSlsq,
bestepid: this.bestepid,
}, '30%', "330px", true)
}, '600px')
break;
case "signout":
window.close();
......
......@@ -20,7 +20,15 @@ export default {
},
//切换选项卡内容组件
getFromRouter (tabname) {
console.log(tabname);
//根据tabname获取选中的表单
for(let item of this.tabList){
if(item.value === tabname){
this.currentSelectTab = item
break;
}
}
console.log(this.currentSelectTab);
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
}
}
......
......@@ -100,6 +100,8 @@ export default {
bestepid: this.$route.query.bestepid,
//设置那个表单选中
tabName: "",
//设置那个表单选择
currentSelectTab: {},
//表单集合
tabList: [],
//选择加载哪一个组件
......
......@@ -74,6 +74,7 @@ import table from "@/utils/mixin/table"
import searchMin from "../components/mixin/index"
import { datas, sendThis } from "./dbxdata"
import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl"
import { judgeUserTaskPermission } from "@/api/fqsq"
export default {
name: "dbx",
components: { searchBox },
......@@ -169,11 +170,29 @@ export default {
})
},
ywhClick (item) {
// const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
const { href } = this.$router.resolve('/workFramecs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
window.open(href, '_blank');
//从待办箱进入的调取任务领取接口
claimTask(item.bsmSlsq, item.bestepid)
//判断用户是否拥有该任务的权限，若有则跳转，无权限则给予提示并刷新页面
judgeUserTaskPermission({
bsmSlsq: item.bsmSlsq,
bestepid: item.bestepid
}).then(res => {
if(res.code == 200){
if(res.result){
//有任务权限
// const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
const { href } = this.$router.resolve('/workFramecs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
window.open(href, '_blank');
//从待办箱进入的调取任务领取接口
claimTask(item.bsmSlsq, item.bestepid)
}else{
//无任务权限
this.$message.error("无该任务操作权限，或已被他人抢办，请重新操作")
//刷新页面
this.queryClick();
}
}else{
this.$message.error("用户任务权限判断失败，请联系管理员")
}
})
}
}
}
......
......@@ -213,7 +213,7 @@
抵押人信息
<div class="triangle"></div>
</div>
<InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
<qlrCommonTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
:viewtype="$route.query.viewtype" />
<div class="slxx_title title-block">
......
......@@ -165,7 +165,7 @@
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj">
<el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype == 1"></el-input>
<el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -176,7 +176,7 @@
<el-row :gutter="10">
<el-col :span="14">
<el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
<el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
<el-radio-group v-model="ruleForm.slywxx.gyfs" :disabled="$route.query.viewtype">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -216,14 +216,14 @@
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
<el-input class="textArea" type="textarea" :disabled="$route.query.viewtype"
v-model="ruleForm.nydsyq.djyy">
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item :class="flag ? 'marginBot0' : ''">
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -238,6 +238,7 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
import JtcyTable from "@/views/workflow/components/JtcyTable"
export default {
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
......@@ -261,10 +262,13 @@ export default {
data () {
return {
disabled: true,
//持证人选项
czrOptions: [],
ruleForm: {},
//传递参数
propsParam: {},
//表单是否可操作
ableOperation: true,
rules: {}
}
},
......