9e3cef1b by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 7a29dede f17469e2
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-12 09:54:01
* @LastEditTime: 2023-10-12 10:00:08
-->
<template>
<div class="rlPopup">
......@@ -87,7 +87,7 @@
// 缩略图
thumbnailImages: [],
showViewer: false,
initialIndex: undefined,
initialIndex: 0,
allLi: [],
}
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-08 08:35:11
* @LastEditTime: 2023-10-12 09:59:39
-->
<template>
<div class="clxx">
......@@ -281,6 +281,9 @@
this.previewImg.imgList = res.result ? res.result : []
})
this.previewImg.bsmSj = item?.bsmSj;
if (this.$refs.imageRef) {
this.$refs.imageRef.initialIndex = 0
}
},
/**
* @description: 小图片点击
......
......@@ -99,7 +99,69 @@ class data extends filter {
}
]
}
qlxxCol () {
return [
{
width: '60',
label: '序号',
type: 'index'
},
{
prop: 'nodecode',
width: '105',
label: '登记情形编码',
render: (h, scope) => {
return (
<el-input placeholder="登记情形编码" value={scope.row[scope.column.property]}
onInput={(val) => { scope.row[scope.column.property] = val; vm.orderNoChange() }} maxlength="8">
</el-input>
)
}
},
{
prop: 'nodename',
label: '登记情形名称',
render: (h, scope) => {
return (
<el-input placeholder="登记情形名称" value={scope.row[scope.column.property]}
onInput={(val) => { scope.row[scope.column.property] = val; vm.orderNoChange() }}>
</el-input>
)
}
},
{
prop: 'djywbm',
label: '登记业务编码',
width: '105',
render: (h, scope) => {
return (
<el-input placeholder="登记业务编码" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }}></el-input>
)
}
},
{
prop: 'djywmc',
label: '登记业务名称',
render: (h, scope) => {
return (
<el-input placeholder="登记业务名称" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }}></el-input>
)
}
},
{
label: '移动',
width: '100',
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.djlx.length} onClick={() => { vm.moveDown(scope.$index, scope.row, 'djqx') }}>下移</el-button >
</div>
)
}
}
]
}
clxxCol () {
return [
{
......@@ -188,7 +250,7 @@ class data extends filter {
},
{
prop: 'djqxbm',
label: '登记情形',
label: '登记情形名称',
width: '180',
render: (h, scope) => {
return (
......@@ -197,7 +259,126 @@ class data extends filter {
{
vm.form.djqx.map(option => {
return (
<el-option label={option.nodename} value={option.nodecode}></el-option>
<el-option label={option.nodename} value={option.bsmSqyw}></el-option>
)
})
}
</el-select>
)
}
},
{
label: '移动',
width: '90',
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 >
</div>
)
}
}
]
}
ybsqClxxCol () {
return [
{
width: '60',
renderHeader: (h, scope) => {
return <i class="el-icon-plus pointer" onClick={() => { vm.addClxx() }} style="color:#409EFF"></i>
},
render: (h, scope) => {
return (
<i class="el-icon-minus pointer" onClick={() => { vm.removeClxx(scope.$index, scope.row) }}></i>
)
}
},
{
width: '60',
label: '序号',
type: 'index'
},
{
label: '是否必填',
prop: 'isrequired',
width: '110',
render: (h, scope) => {
return (
<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>
)
}
},
{
prop: 'clbm',
label: '材料编码',
width: '100',
render: (h, scope) => {
return (
<el-input placeholder="材料编码" value={scope.row[scope.column.property]}
onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }} maxlength="8"></el-input>
)
}
},
{
prop: 'clmc',
label: '材料名称',
render: (h, scope) => {
return (
<el-input placeholder="材料名称" value={scope.row[scope.column.property]}
onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }}></el-input>
)
}
},
{
prop: 'cllx',
label: '材料类型',
width: '115',
render: (h, scope) => {
return (
<el-select value={scope.row[scope.column.property]}
onChange={(val) => { scope.row[scope.column.property] = val }} clearable>
{
store.getters.dictData['A40'].map(option => {
return (
<el-option label={option.dname} value={option.dcode}></el-option>
)
})
}
</el-select>
)
}
},
{
label: '是否公共材料',
prop: 'sfggcl',
width: '110',
render: (h, scope) => {
return (
<el-radio-group value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}>
<el-radio label={'1'}></el-radio>
<el-radio label={'0'}></el-radio>
</el-radio-group>
)
}
},
{
prop: 'djqxbm',
label: '业务名称',
width: '180',
render: (h, scope) => {
return (
<el-select disabled={scope.row.sfggcl == '1'} value={scope.row[scope.column.property]}
onChange={(val) => { scope.row[scope.column.property] = val }} clearable>
{
vm.form.ywmcList.map(option => {
return (
<el-option label={option.nodename} value={option.bsmSqyw}></el-option>
)
})
}
......@@ -219,7 +400,6 @@ class data extends filter {
}
]
}
}
let datas = new data()
export {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-17 15:26:20
* @LastEditTime: 2023-10-13 10:37:29
-->
<template>
<div>
......@@ -103,7 +103,7 @@
</el-form>
<el-collapse class="modifycollapse" accordion>
<el-collapse-item title="权利信息" name="0" v-if="form.sqdjyw.sqfl=='2'">
<lb-table :column="djqxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djlx">
<lb-table :column="qlxxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djlx">
</lb-table>
</el-collapse-item>
<el-collapse-item title="登记情形设置" name="1" v-if="form.sqdjyw.sqfl=='1'">
......@@ -111,11 +111,11 @@
</lb-table>
</el-collapse-item>
<el-collapse-item title="材料信息设置" name="2">
<lb-table :column="clxxCol" :heightNumSetting="true" :minHeight="160"
<lb-table :column="clxxList" :heightNumSetting="true" :minHeight="160"
:pagination="false" :data="form.clxx">
</lb-table>
</el-collapse-item>
<el-collapse-item title="选权利设置" name="3" v-if="form.sqdjyw && form.sqdjyw.sfsxql == '1'">
<el-collapse-item title="选权利设置" name="3" v-if="form.sqdjyw && form.sqdjyw.sfsxql == '1'">
<div class="dyztsd-title">
<b>请勾选需要查询的权利信息</b>
<div>
......@@ -153,9 +153,11 @@
</template>
<script>
import { uploadUrl } from '@/api/file'
import { getUuid } from "@/utils/operation.js"
import { datas, sendThis } from "./sqywDetail";
import { upward, down } from "@/utils/operation";
import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/sysSqdjyw.js";
import { datas, sendThis } from "./sqywDetail";
import store from '@/store/index.js'
export default {
name: "componentDialog",
......@@ -188,13 +190,26 @@
// clxx: []
},
djqxCol: datas.djqxCol(),
clxxList: [],
clxxCol: datas.clxxCol(),
ybsqClxxCol: datas.ybsqClxxCol(),
qlxxCol: datas.qlxxCol(),
};
},
mounted () {
sendThis(this)
this.init()
},
watch: {
'form.djlx': {
handler (newName, oldName) {
this.form.ywmcList = this.form.djlx.map(item => ({ nodename: item.djywmc + '+' + item.nodename, bsmSqyw: item.bsmSqyw }))
},
// 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法
immediate: true,
deep: true
}
},
methods: {
//页面初始化
/**
......@@ -205,7 +220,9 @@
this.tn = 0;
if (this.formData.sqfl == "2") {
this.getDetail(this.formData.bsmSqyw);
this.clxxList = this.ybsqClxxCol
} else {
this.clxxList = this.clxxCol
getDjlxInfo(this.formData.bsmSqyw).then((res) => {
let { result } = res;
this.djlxList = result ? result : [];
......@@ -262,17 +279,20 @@
this.tn = index;
this.getDetail(this.djlxList[index].bsmSqyw);
},
//获取业务具体明细内容
/**
* @description: 获取业务具体明细内容
* @param {*} bsmSqyw
* @author: renchao
*/
getDetail (bsmSqyw) {
let _this = this
let that = this
getSqdjywDetail(bsmSqyw).then((res) => {
if (res.code === 200) {
_this.form = res.result;
this.form = res.result;
console.log(this.form.clxx);
if (that.formData.sqfl == "2") {
that.form.ywmcList = that.form.djlx.map(item => ({ nodename: item.djywmc + '+' + item.nodename, bsmSqyw: item.bsmSqyw }))
}
// _this.form.bsmSqyw = res.result.bsmSqyw;
// _this.form.ywDetail = res.result.ywDetail;
// _this.$set(_this.form, 'djqx', res.result.djqx);
......@@ -303,8 +323,17 @@
});
this.$popupCacel()
}
}).catch(() => {
this.loading = false
})
},
// 筛选权利设置
handleSelectall () {
this.form.sxql.forEach(item => item.checked = true)
},
handleInvert () {
this.form.sxql.forEach(item => item.checked = false)
},
/**
* @description: 上移下移
* @param {*} index
......@@ -316,7 +345,7 @@
if (type == "clxx") {
upward(index, this.form.clxx);
} else {
upward(index, this.form.djqx);
upward(index, this.form.djlx);
}
},
/**
......@@ -330,7 +359,7 @@
if (type == "clxx") {
down(index, this.form.clxx);
} else {
down(index, this.form.djqx);
down(index, this.form.djlx);
}
},
/**
......@@ -339,6 +368,7 @@
*/
addDjqx () {
this.form.djqx.push({
bsmSqyw: getUuid(32),
nodecode: "",
nodename: "",
enabled: "1",
......
......@@ -80,7 +80,6 @@
};
},
methods: {
// 初始化数据
/**
* @description: 初始化数据
* @author: renchao
......@@ -98,7 +97,6 @@
}
);
},
// 修改
/**
* @description: 修改
* @param {*} row
......@@ -106,7 +104,6 @@
*/
editClick (row) {
this.sqqlRule = row;
// this.dialogVisible = true;
this.$popupDialog(row.nodename, "system/sqywgz/sqywDetail", this.sqqlRule, '80%')
}
}
......
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-09-22 10:12:37
* @LastEditTime: 2023-10-13 10:52:12
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -104,10 +104,11 @@
if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
that.unitClick(0)
if (that.showBatch) {
//满足批量查封/批量抵押按钮出现 即先展示批量表单
that.batchUnitClick();
} else {
that.unitClick(0)
}
}
}
......@@ -125,10 +126,11 @@
if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
that.unitClick(0)
if (that.showBatch) {
//满足批量查封/批量抵押按钮出现 即先展示批量表单
that.batchUnitClick();
} else {
that.unitClick(0)
}
}
}
......@@ -143,7 +145,7 @@
judgeBatchShow () {
this.showBatch = false;
if (this.unitData.length > 1) {
let qllx = this.$route.query?.sqywbm?.substring(0, 3);
let qllx = this.$route.query?.djywbm?.substring(0, 3);
switch (qllx) {
case 'A04':
this.showBatch = true;
......@@ -178,12 +180,10 @@
.then(() => {
var formdata = new FormData();
formdata.append("bsmSldyList", item.bsmSldy.split(","));
// formdata.append("bsmSlsq", this.bsmSlsq);
deleteSlbdcdy(formdata).then((res) => {
if (res.code == 200) {
this.$message.success("删除成功");
this.loadBdcdylist()
// this.$parent.updateDialog();
} else {
this.$message.error(res.message);
}
......
<!--
* @Description: workFrame左侧菜单列表-分割
* @Autor: renchao
* @LastEditTime: 2023-09-21 14:44:34
* @LastEditTime: 2023-10-12 17:12:42
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -159,7 +159,7 @@
judgeBatchShow () {
this.showBatch = false;
if (this.afterUnitData.length > 1) {
let qllx = this.$route.query?.sqywbm?.substring(0, 3);
let qllx = this.$route.query?.djywbm?.substring(0, 3);
switch (qllx) {
case 'B39':
this.showBatch = true;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-15 15:54:13
* @LastEditTime: 2023-10-12 09:58:32
-->
<template>
<div class="clxx">
......@@ -272,6 +272,9 @@
this.previewImg.imgList = res.result ? res.result : []
})
this.previewImg.bsmMaterial = item?.bsmMaterial;
if (this.$refs.imageRef) {
this.$refs.imageRef.initialIndex = 0
}
},
/**
* @description: 小图片点击
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-25 10:33:39
* @LastEditTime: 2023-10-12 17:05:40
-->
<template>
<div class="from-clues">
......@@ -315,7 +315,7 @@
} else {
const { href } = this.$router.resolve(
"/workFrame?bsmSlsq=" + item.bsmSlsq +
"&bestepid=" + item.bestepid +
"&bestepid=" + item.bestepid + "&djywbm=" + item.djywbm +
"&zbhj=" + item.zbhj
)
window.open(href, `workFrame${item.bsmSlsq}`)
......
......@@ -115,7 +115,7 @@
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw">
<el-select v-model="ruleForm.jsydsyq.jedw" :disabled="!viewEdit">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
......@@ -143,7 +143,7 @@
v-model="ruleForm.ygdj.jzmj"
:disabled="!viewEdit"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 68px">
<el-select :disabled="!viewEdit" v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -161,7 +161,6 @@
:disabled="!viewEdit"
maxlength="11"
v-model="ruleForm.ygdj.qdjg"
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.jedw"
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-21 14:59:02
* @LastEditTime: 2023-10-12 17:26:24
*/
import Router from '@/router'
export default {
methods: {
//点击行选中或取消复选框
/**
* @description: 点击行选中或取消复选框
* @param {*} row
......@@ -24,7 +23,7 @@ export default {
jump (data, type) {
const { href } = Router.resolve(
"/workFrame?bsmSlsq=" + data.bsmSlsq +
"&bestepid=" + data.bestepid + "&zbhj=受理"
"&bestepid=" + data.bestepid + "&djywbm=" + data.djywbm + "&zbhj=受理"
)
window.open(href, "_blank")
this.$popupCacel()
......