2b361a80 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents adc177b0 9c80a7c9
......@@ -25,6 +25,7 @@
"nprogress": "0.2.0",
"print-js": "^1.6.0",
"qrcode": "^1.5.3",
"sortablejs": "^1.15.0",
"vue": "2.6.10",
"vue-json-editor": "^1.4.3",
"vue-print-nb": "^1.7.5",
......
/*
* @Description: 材料信息
* @Autor: renchao
* @LastEditTime: 2023-09-08 13:41:46
* @LastEditTime: 2023-09-13 11:09:48
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -49,9 +49,9 @@ export function saveClml (data) {
* @param {*} data
* @author: renchao
*/
export function updateClml (data) {
export function updateClml (data, bsmSldy) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml',
url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy,
method: 'post',
data
})
......
/*
* @Description: 楼盘表查询
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:00:43
* @LastEditTime: 2023-09-12 10:25:47
*/
import request from "@/utils/request";
let SERVER = window.config
......@@ -26,10 +26,14 @@ export function getLpZrz (data) {
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpb (zrzbsm) {
export function getLpb (zrzbsm,lx) {
return request({
url: "service-lpb/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm,
url: "service-lpb/rest/zhcx/lpcx/getLpb",
method: "get",
params: {
zrzbsm:zrzbsm,
scyclx:lx,
},
});
}
/**
......

8 MB | W: | H:

1.42 MB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-12 13:58:04
* @LastEditTime: 2023-09-13 09:10:29
-->
<template>
<div class="rlPopup">
......@@ -273,9 +273,12 @@
}
formData.append("bsmSj", this.previewImg.bsmSj);
formData.append("bsmSlsq", this.previewImg.bsmSlsq);
if (this.previewImg.imgList.length > 0) {
formData.append("index", this.previewImg.imgList[this.previewImg.index].sxh);
}
uploadBatch(formData).then((res) => {
if (res.code == 200) {
this.$emit('updateList', res.result)
this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
this.$message({
message: '上传成功!',
type: 'success'
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-01 09:18:29
* @LastEditTime: 2023-09-12 16:55:35
-->
<template>
<div class="edit">
......@@ -20,8 +20,10 @@
<lpbContent
ref="lpbContent"
:zrzbsm="formData.bsm"
:scyclx="formData.scyclx"
:onlyShow="formData.onlyShow"
:unitData="formData.unitData"
:sqywInfo="formData"
:key="time"></lpbContent>
</div>
<!-- 右侧图例 -->
......
......@@ -12,13 +12,14 @@
<ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
</div>
<!-- 自然幢名称 -->
<p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}">
<el-checkbox @change="zdySelectAll($event)" v-if="!onlyShow">{{
<!-- <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> -->
<p class="lpb-xmmc" :style="{ 'border-bottom':'1px solid #e6e6e6'}">
<el-checkbox @change="zdySelectAll($event)">{{
lpbData.xmmc
}}</el-checkbox>
<span v-else>{{lpbData.xmmc}}</span>
</p>
<el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button>
<el-button type="primary" class="save-btn" v-else @click="submitForm" :loading="loading">发起申请</el-button>
<!-- 右键菜单 -->
<ul
v-show="lpbChVisible"
......@@ -35,6 +36,7 @@ import { getLpb } from "@/api/lpcx.js";
import chCpn from "./ch.vue";
import zdyCpn from "./zdys.vue";
import ljzsCpn from "./ljzs.vue";
import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
export default {
provide() {
return {
......@@ -63,7 +65,15 @@ export default {
onlyShow:{
type: Boolean,
default: true,
}
},
scyclx: {
type: Number,
default: 0,
},
sqywInfo: {
type: Object,
default: () => { }
},
},
data() {
return {
......@@ -87,11 +97,12 @@ export default {
color:''
},
// 选中户bsm合集
bsmList:[]
bsmList:[],
loading: false,
};
},
mounted() {
this.getLpb(this.zrzbsm);
this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm);
window.lpbContent = this;
},
methods: {
......@@ -151,13 +162,15 @@ export default {
getLpb(zrzbsm, scyclx, actual) {
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
if(scyclx){
if(res.result.syclx == "1") {
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
// this.$nextTick(() => {
// //渲染楼盘表
// this.dataChange();
// });
console.log(this.lpbData, "this.lpbData");
}
}else{
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
}
} else {
this.$message({
message: res.message,
......@@ -207,10 +220,52 @@ export default {
return value1 - value2;
};
},
/**
* @description: submitForm
* @author: renchao
*/
submitForm () {
if (this.bsmList.length == 0) {
this.$message.error("请至少选择一条数据");
return;
}
this.loading = true
this.bsmList.forEach(item=>{
item['bdcdyid'] = item.dyhbsm
})
startBusinessFlow({
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bsmList,
}).then((res) => {
this.loading = false
if (res.code == 200) {
this.$message({
showClose: true,
message: '发起申请成功',
type: 'success'
})
if (!this.isJump) {
this.jump(res.result, this.sqywInfo.djywbm)
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
} else {
if (res.result && res.result.length > 0) {
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
} else {
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
}
}
}).catch(() => {
this.loading = false
})
},
},
computed:{
lpbContentHeight(){
return this.onlyShow ? 36 : 76
// return this.onlyShow ? 36 : 76
return 76
}
},
watch: {
......
......@@ -72,7 +72,9 @@ export default {
},
render: {
handler(newValue, oldValue) {
if(newValue){
this.loadData();
}
},
},
immediate: true,
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-09-01 10:39:03
* @LastEditors: yangwei
* @LastEditTime: 2023-09-11 15:48:03
* @LastEditTime: 2023-09-12 15:12:09
* @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\gbmhlgxsjgx.vue
* @Description:
*
......@@ -85,11 +85,12 @@
:style="{
backgroundColor: 'rgba(' + item.bgColor + ',0.12)',
border: '1px solid ' + 'rgba(' + item.bgColor + ',0.3)',
'--hover-color': 'rgba(' + item.bgColor + ',1)'
}"
>
<img :src="item.svg" alt="" />
</div>
<p>{{ item.name }}</p>
<p>{{ item.interfaceDescription }}</p>
</div>
</div>
<el-dialog
......@@ -200,6 +201,12 @@ export default {
comp: "zgfbm",
svg: require("./images/zgfbm.svg"),
},
{
name: "未知",
bgColor: "109, 114, 120",
comp: "",
svg: require("./images/unknow.svg"),
},
],
dialogVisible: false,
dialogTitle: "",
......@@ -210,10 +217,19 @@ export default {
mounted() {
getSysInterfaceList({ interfaceType: "4",pageSize:100 }).then((res) => {
if (res.code == 200) {
this.searchType.forEach(item=>{
let a = res.result.records.filter(i => i.interfaceService == item.name)
res.result.records.forEach(i=>{
let a = this.searchType.filter(item => i.interfaceService == item.name)
if (a.length) {
i.bgColor = a[0].bgColor
i.svg = a[0].svg
i.comp = a[0].comp
}else{
i.bgColor = '109, 114, 120'
i.svg = require("./images/unknow.svg")
i.comp = ''
}
})
this.searchType = res.result.records
}
});
},
......@@ -225,10 +241,10 @@ export default {
* @author: renchao
*/
openDialog(item) {
this.dialogTitle = item.name;
this.dialogVisible = true;
this.dialogTitle = item.interfaceDescription;
this.dialogComp = (r) =>
require.ensure([], () => r(require(`./components/${item.comp}.vue`)));
item.comp && (this.dialogVisible = true);
},
},
computed: {
......@@ -254,6 +270,9 @@ export default {
border-radius: 4px;
margin: 0 auto;
cursor: pointer;
&:hover{
border-color: var(--hover-color)!important;
}
i {
text-align: center;
line-height: 60px;
......
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694481575357" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3080" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M908.91 937.6c0 17.67-14.33 32-32 32H147.09c-17.67 0-32-14.33-32-32V116.19c0-23.52 19.07-42.59 42.59-42.59h544.3l206.93 206.93V937.6z" fill="#B5B5B5" p-id="3081"></path><path d="M495.53 620.39c-37.63 0-44.43 6.79-44.43 43.38 0 37.63 6.8 43.91 44.43 43.91 37.11 0 44.43-6.27 44.43-43.91 0-36.59-7.32-43.38-44.43-43.38zM490.83 335.53c-31.36 0-59.58 3.66-78.92 9.41v64.82c18.29-5.76 42.33-8.89 63.77-8.89 42.33 0 55.4 6.79 55.4 38.15 0 21.95-4.7 31.88-27.7 50.18-30.84 26.65-40.25 42.85-40.25 72.64v23.52h63.77v-12.03c0-17.76 6.28-27.69 38.16-51.22 35.54-26.65 47.04-45.48 47.04-94.08-0.01-73.17-35.55-92.5-121.27-92.5zM700.91 73.6v173.92c0 17.47 14.05 31.7 31.52 31.91l176.48 2.18-208-208.01z" fill="#FFFFFF" p-id="3082"></path></svg>
\ No newline at end of file
......@@ -102,7 +102,7 @@
</el-row>
</el-form>
<el-collapse class="modifycollapse" accordion>
<el-collapse-item title="登记类型" name="0" v-if="form.sqdjyw.sqfl=='2'">
<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>
</el-collapse-item>
......@@ -203,9 +203,9 @@
*/
init () {
this.tn = 0;
if(this.formData.sqfl=="2"){
if (this.formData.sqfl == "2") {
this.getDetail(this.formData.bsmSqyw);
}else{
} else {
getDjlxInfo(this.formData.bsmSqyw).then((res) => {
let { result } = res;
this.djlxList = result ? result : [];
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-08 14:18:42
* @LastEditTime: 2023-09-13 11:26:39
-->
<template>
<div class="clxx">
......@@ -173,7 +173,6 @@
formdata.append("bsmSldy", this.$parent.bsmRepair);
formdata.append("clfl", 3);
} else {
//formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("bsmSldy", this.$parent.currentSelectProps.bsmSldy);
formdata.append("clfl", 2);
}
......@@ -235,7 +234,7 @@
this.previewImg.imgList = [];
this.tableData.forEach((item, index) => {
if (this.treeCheckId == item.bsmSj) {
item.children = [];
item.ys = 0;
that.treeCheckIndex = index;
}
});
......@@ -309,24 +308,6 @@
this.showImg = item;
this.titleYs = index + 1;
},
/**
* @description: 字典
* @param {*} val
* @param {*} code
* @author: renchao
*/
dicStatus (val, code) {
let data = this.$store.getters.dictData[code],
name = "暂无";
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname;
}
});
return name;
}
},
//查看明细
viewDetail () {
this.$store.dispatch("user/reWorkFresh", false);
......@@ -335,6 +316,7 @@
"workflow/components/dialog/clxxDetailDialog",
{
data: this.tableData,
bsmSldy: this.$parent.currentSelectProps.bsmSldy,
unitData: this.$parent.unitData,
ableOperation: this.$parent.ableOperation,
bsmRepair: this.$parent.bsmRepair
......
......@@ -16,8 +16,8 @@
<el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header">
<el-tab-pane label="基本信息" name="1"></el-tab-pane>
<el-tab-pane label="企业信息" name="2"></el-tab-pane>
<el-tab-pane label="银行机构" name="3"></el-tab-pane>
<el-tab-pane label="企业信息" v-if="showButton" name="2"></el-tab-pane>
<el-tab-pane label="银行机构" v-if="showButton" name="3"></el-tab-pane>
</el-tabs>
<el-form
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-12 14:48:12
* @LastEditTime: 2023-09-13 13:48:47
-->
<template>
<div class="clmlmx-box">
<lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
<lb-table :column="column" :key="key" row-key="bsmSj" ref="listTable" :heightNumSetting="true" :calcHeight="600"
:pagination="false" :data="tableData">
</lb-table>
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
......@@ -15,8 +16,9 @@
</template>
<script>
import Vue from 'vue'
import Sortable from 'sortablejs'
import store from '@/store/index.js'
import { InitClml, updateClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { InitClml, updateClml } from "@/api/clxx.js";
export default {
props: {
formData: {
......@@ -29,27 +31,9 @@
data () {
return {
loading: false,
sortable: null,
column: [
{
width: '50',
renderHeader: (h, scope) => {
return <div> {
!this.formData.ableOperation ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
}
</div>
},
render: (h, scope) => {
return (
<div>
{
!this.formData.ableOperation ? <span>{scope.$index + 1}</span> :
<i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i>
}
</div>
)
}
},
{
prop: "isrequired",
label: "是否必选",
width: "80",
......@@ -74,7 +58,7 @@
label: "材料名称",
render: (h, scope) => {
return (
(this.formData.ableOperation && scope.row.isrequired != '1') ?
(this.formData.ableOperation && scope.row.sfxjcl == '1') ?
<el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
)
}
......@@ -100,53 +84,56 @@
},
{
prop: "sjsl",
label: "份数",
width: "50",
label: "收件数量",
width: "80",
render: (h, scope) => {
return (
(this.formData.ableOperation && scope.row.isrequired != '1') ?
(this.formData.ableOperation) ?
<el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
scope.row.sjsl ?
<span>{scope.row.sjsl}</span> : 1
scope.row.sjsl
}</span>
)
}
},
{
prop: "smzt",
label: "扫描状态",
width: "80",
label: "扫描时间",
width: "140",
render: (h, scope) => {
return (
<span>{scope.row.sjsj}</span>
)
}
},
{
label: "页数",
width: "60",
render: (h, scope) => {
if (scope.row.children && scope.row.children.length > 0) {
if (scope.row.ys && scope.row.ys > 0) {
return (
<div>
<span>已扫描</span>
<span>{scope.row.ys}</span>
</div>
);
} else {
return (
<div>
<span>未扫描</span>
<span>0</span>
</div>
);
}
},
},
{
label: "扫描页数",
label: "是否新建材料",
width: "80",
render: (h, scope) => {
if (scope.row.children && scope.row.children.length > 0) {
if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
return (
<div>
<span>{scope.row.children.length}</span>
</div>
<span></span>
);
} else {
return (
<div>
<span>0</span>
</div>
<span></span>
);
}
},
......@@ -156,27 +143,16 @@
width: "100",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
disabled={scope.$index == 0 || !this.formData.ableOperation}
onClick={() => {
this.moveUpward(scope.$index, scope.row);
}}
>
上移
</el-button>
<el-button
type="text"
disabled={scope.$index + 1 == this.tableData.length || !this.formData.ableOperation}
icon="el-icon-delete"
disabled={!(scope.row.ys == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
onClick={() => {
this.moveDown(scope.$index, scope.row);
this.handleDelete(scope.$index, scope.row);
}}
>
下移
删除
</el-button>
</div >
)
}
}
......@@ -194,14 +170,19 @@
deep: true
}
},
mounted () {
this.initSort()
},
beforeDestroy () {
if (this.sortable) {
this.sortable.destroy();
}
},
methods: {
/**
* @description: handleSubmit
* @author: renchao
*/
handleSubmit () {
this.loading = true
updateClml(this.tableData).then(res => {
store.dispatch('user/reWorkFresh', false)
updateClml(this.tableData, this.formData.bsmSldy).then(res => {
this.loading = false
if (res.code == 200) {
this.$message({
......@@ -246,87 +227,18 @@
})
},
/**
* @description: 上移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveUpward (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "UP",
};
// 接口待调
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '上移成功',
type: 'success'
})
}
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 下移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveDown (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "DOWN",
}
// 接口待调
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '下移成功',
type: 'success'
})
}
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 材料目录删除
* @param {*} index
* @param {*} row
* @author: renchao
*/
handleDelete (index, row) {
if (row.children.length > 0) {
this.$message.error('页数存在不可删除');
return
}
let that = this
this.$confirm('此操作将永久删除该 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => {
if (res.code == 200) {
let res = await that.clmlInitList()
if (res == 200) {
that.$message({
message: "删除成功",
type: "success"
})
}
}
})
this.tableData.splice(index, 1);
}).catch(() => {
this.$message({
type: 'info',
......@@ -334,23 +246,18 @@
})
})
},
/**
* @description: 字典
* @param {*} val
* @param {*} code
* @author: renchao
*/
dicStatus (val, code) {
let data = store.getters.dictData[code],
name = "暂无";
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname;
}
});
return name;
initSort () {
const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
this.sortable = Sortable.create(el, {
ghostClass: 'sortable-ghost',
setData: function (dataTransfer) {
dataTransfer.setData('Text', '')
},
onEnd: evt => {
const targetRow = this.tableData.splice(evt.oldIndex, 1)[0];
this.tableData.splice(evt.newIndex, 0, targetRow);
}
})
}
}
}
......
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-09-12 13:29:54
* @LastEditTime: 2023-09-13 13:51:33
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 13:55:25
* @LastEditTime: 2023-09-13 14:00:22
-->
<template>
<div class="container">
......@@ -181,12 +181,7 @@
window.removeEventListener("unload", (e) => this.unloadHandler(e));
},
methods: {
/**
* @description: openPrint
* @author:miaofang
*/
openPrint () {
// 获取打印回执数据
var formdata = new FormData();
formdata.append("bsmSldy", this.currentSelectProps.bsmSldy);
......@@ -199,15 +194,9 @@
setTimeout(() => {
this.prinsss()
}, 100)
}
})
},
/**
* @description: prinsss
* @author: miaofang
*/
prinsss () {
printJS({
printable: "boxaaa", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
......@@ -268,6 +257,9 @@
} else {
this.tabName = res.result[0].value;
}
if (sessionStorage.getItem('activeName') == this.tabName) {
this.fresh++;
}
this.ableOperation = this.tabList[0].ableOperation;
//批量操作无分屏按钮
if (index != null) {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-12 15:18:52
* @LastEditTime: 2023-09-13 13:46:03
-->
<template>
<div class="clmlmx-box">
<lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="500" :pagination="false" :data="tableData">
<lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false"
:data="tableData">
</lb-table>
<div class="text-center">
<el-button @click="handleCancel">取消</el-button>
......@@ -30,24 +31,28 @@
data () {
return {
loading: false,
sortable: null,
column: [
{
width: '50',
renderHeader: (h, scope) => {
return <div> {
<i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
}
</div>
},
prop: "isrequired",
label: "是否必选",
width: "80",
render: (h, scope) => {
if (scope.row.isrequired === "1") {
return (
<div>
{
<i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i>
<span>必选</span>
</div>
);
}
else {
return (
<div>
<span>可选</span>
</div>
)
}
}
},
{
label: "材料名称",
......@@ -85,40 +90,44 @@
}
},
{
prop: "smzt",
label: "扫描状态",
label: "扫描时间",
width: "140",
render: (h, scope) => {
return (
<span>{scope.row.sjsj}</span>
)
}
},
{
label: "页数",
width: "80",
render: (h, scope) => {
if (scope.row.children && scope.row.children.length > 0) {
if (scope.row.count && scope.row.count > 0) {
return (
<div>
<span>已扫描</span>
<span>{scope.row.count}</span>
</div>
);
} else {
return (
<div>
<span>未扫描</span>
<span>0</span>
</div>
);
}
},
},
{
label: "扫描页数",
label: "是否新建材料",
width: "80",
render: (h, scope) => {
if (scope.row.count && scope.row.count > 0) {
if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
return (
<div>
<span>{scope.row.count}</span>
</div>
<span></span>
);
} else {
return (
<div>
<span>0</span>
</div>
<span></span>
);
}
},
......@@ -128,26 +137,16 @@
width: "100",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
disabled={scope.$index == 0}
icon="el-icon-delete"
disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
onClick={() => {
this.moveUpward(scope.$index, scope.row);
this.handleDelete(scope.$index, scope.row);
}}
>
上移
删除
</el-button>
<el-button
type="text"
disabled={scope.$index + 1 == this.tableData.length}
onClick={() => {
this.moveDown(scope.$index, scope.row);
}}
>
下移
</el-button>
</div >
)
}
}
......@@ -156,6 +155,14 @@
tableData: []
}
},
mounted () {
this.initSort()
},
beforeDestroy () {
if (this.sortable) {
this.sortable.destroy();
}
},
watch: {
'formData.data': {
handler: function (val, oldVal) {
......@@ -180,6 +187,7 @@
},
handleSubmit () {
this.loading = true
store.dispatch('user/reWorkFresh', false)
updateClml(this.tableData).then(res => {
this.loading = false
if (res.code == 200) {
......@@ -218,60 +226,6 @@
})
},
/**
* @description: 上移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveUpward (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "UP",
};
// 接口待调
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '上移成功',
type: 'success'
})
}
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 下移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveDown (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "DOWN",
}
// 接口待调
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '下移成功',
type: 'success'
})
}
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 材料目录删除
* @param {*} index
* @param {*} row
......@@ -301,6 +255,19 @@
message: '已取消删除'
})
})
},
initSort () {
const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
this.sortable = Sortable.create(el, {
ghostClass: 'sortable-ghost',
setData: function (dataTransfer) {
dataTransfer.setData('Text', '')
},
onEnd: evt => {
const targetRow = this.tableData.splice(evt.oldIndex, 1)[0];
this.tableData.splice(evt.newIndex, 0, targetRow);
}
})
}
}
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-18 14:01:00
* @LastEditTime: 2023-09-13 14:00:51
-->
<template>
<div class="from-clues">
......@@ -61,7 +61,7 @@
</el-form>
</div>
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
<lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange" @select="select"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
:data="zrztableData.data">
......@@ -303,14 +303,11 @@
* @author: renchao
*/
handleLpbClick (item) {
this.$popup('楼盘表', 'lpb/index', {
width: '85%',
formData: {
ywPopupDialog('楼盘表', 'lpb/index', {
bsm: item.bsm,
bsmSqyw:this.sqywInfo.bsmSqyw
}
})
bsmSqyw:this.sqywInfo.bsmSqyw,
scyclx:1
}, '85%', true,false)
},
/**
* @description: select
......@@ -335,26 +332,27 @@
*/
handleRowClick (row) {
// 自然幢多选,多幢单选
let refs = 'table1';
if (this.activeName == 'dz') {
refs = 'table';
this.$refs[refs].clearSelection()
} else {
}
const bdcdysz = this.bdcdysz
this.$refs.table.clearSelection()
if (bdcdysz.length == 1) {
if (bdcdysz.length > 0) {
bdcdysz.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item == row) {
this.$refs.table.toggleRowSelection(row, false);
this.$nextTick(()=>{this.$refs[refs].toggleRowSelection(row, false);})
}
// 不然就让当前的一行勾选
else {
this.$refs.table.toggleRowSelection(row, true);
this.$refs[refs].toggleRowSelection(row, true);
}
})
}
else {
this.$refs.table.toggleRowSelection(row, true);
}
} else {
this.$refs.table.toggleRowSelection(row);
this.$refs[refs].toggleRowSelection(row, true);
}
},
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-01 09:18:46
* @LastEditTime: 2023-09-13 10:01:27
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -45,14 +45,14 @@
</lb-table>
</div>
<div class="submit_button" style="text-align:center">
<el-button @click="$popupCacel">取消</el-button>
<el-button @click="close">取消</el-button>
<el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
</div>
</div>
</template>
<script>
import store from '@/store/index.js'
import { ywPopupDialog } from "@/utils/popup.js";
import { ywPopupDialog,ywPopupCacel } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selectAllHInfo.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
......@@ -125,12 +125,12 @@
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
this.close()
} else {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
}
}
}).catch(() => {
......@@ -138,6 +138,14 @@
})
},
/**
* @description: close
* @param {*} val
* @author: renchao
*/
close(){
ywPopupCacel()
},
/**
* @description: handleSelectionChange
* @param {*} val
* @author: renchao
......