24f41634 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 8e036188 e9692645
/*
* @Description: 材料信息
* @Autor: renchao
* @LastEditTime: 2023-09-18 16:03:16
* @LastEditTime: 2024-01-19 16:00:03
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-09 10:18:46
* @LastEditTime: 2024-01-19 16:30:06
-->
<template>
<div class="clxx">
......@@ -45,7 +45,7 @@
<script>
import store from '@/store/index.js'
import imagePreview from "./dialog/imagePreview.vue";
import { repairInitClml, getClmxList } from "@/api/clxx.js";
import { InitClml, repairInitClml, getClmxList } from "@/api/clxx.js";
export default {
components: { imagePreview },
props: {
......@@ -87,7 +87,7 @@
}
},
created () {
this.clmlInitList()
this.clmlInitList(1)
},
methods: {
/**
......@@ -148,26 +148,51 @@
clmlInitList (type) {
// 1:列表初始化 2:新增材料
return new Promise((resolve) => {
console.log(this.formData, 'this.formData');
repairInitClml(this.formData).then((res) => {
if (res.code == 200) {
resolve(res.code);
if (res.result && res.result.length > 0) {
this.tableData = res.result;
if (type == 1) {
this.treeClick(this.tableData[0], 0);
} else {
//新增材料后刷新列表焦点置于新增的对象上
this.treeClick(
this.tableData[this.tableData.length - 1],
this.tableData.length - 1
);
if (this.formData.sjlx == 2) {
repairInitClml(this.formData).then((res) => {
if (res.code == 200) {
resolve(res.code);
if (res.result && res.result.length > 0) {
this.tableData = res.result;
if (type == 1) {
this.treeClick(this.tableData[0], 0);
} else {
//新增材料后刷新列表焦点置于新增的对象上
this.treeClick(
this.tableData[this.tableData.length - 1],
this.tableData.length - 1
);
}
}
} else {
this.$message.error(res.message);
}
} else {
this.$message.error(res.message);
}
})
})
} else {
var formdata = new FormData();
formdata.append("bsmSlsq", this.formData.bsmSlsq);
formdata.append("bsmSldy", this.formData.bsmSldy);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code);
if (res.result && res.result.length > 0) {
this.tableData = res.result;
if (type == 1) {
this.treeClick(this.tableData[0], 0);
} else {
//新增材料后刷新列表焦点置于新增的对象上
this.treeClick(
this.tableData[this.tableData.length - 1],
this.tableData.length - 1
);
}
}
} else {
this.$message.error(res.message);
}
})
}
})
},
/**
......@@ -280,13 +305,11 @@
position: absolute;
.menu-tree {
width: 20%;
width: 26%;
min-width: 160px;
height: 100%;
margin-right: 10px;
margin-right: 5px;
border-right: 1px dotted #d9d9d9;
padding: 0 15px;
.item {
line-height: 30px;
padding-top: 5px;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-19 15:46:35
* @LastEditTime: 2024-01-19 16:10:10
-->
<template>
<div class="tableBox">
......@@ -260,19 +260,19 @@
if (sjlx == '系统数据') {
getXtParamsByYwh(ywh).then(res => {
let data = res.result
// that.$popup('材料信息', 'registerBook/components/clxx/index', {
// width: '60%',
// formData: data
// })
const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
window.open(href, `urlname${new Date().getTime()}`)
that.$popup('材料信息', 'registerBook/components/clxx/index', {
width: '70%',
formData: { ...data, sjlx: 1, bsmSldy: row.bsmSldy }
})
// const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
// window.open(href, `urlname${new Date().getTime()}`)
})
} else {
getBlParamsByYwh(ywh, bsmQlxx).then(res => {
let data = res.result
this.$popup('材料信息', 'registerBook/components/clxx/index', {
width: '60%',
formData: data
width: '70%',
formData: { ...data, sjlx: 2 }
})
})
}
......
<!--
* @Description:
* @Autor: miaofang
* @LastEditTime: 2024-01-19 15:46:23
* @LastEditTime: 2024-01-19 16:09:59
-->
<template>
<div class="djxxTable">
......@@ -307,19 +307,19 @@
if (sjlx == '系统数据') {
getXtParamsByYwh(ywh).then(res => {
let data = res.result
// that.$popup('材料信息', 'registerBook/components/clxx/index', {
// width: '60%',
// formData: data
// })
const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
window.open(href, `urlname${new Date().getTime()}`)
that.$popup('材料信息', 'registerBook/components/clxx/index', {
width: '70%',
formData: { ...data, sjlx: 1, bsmSldy: row.bsmSldy }
})
// const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
// window.open(href, `urlname${new Date().getTime()}`)
})
} else {
getBlParamsByYwh(ywh, bsmQlxx).then(res => {
let data = res.result
this.$popup('材料信息', 'registerBook/components/clxx/index', {
width: '60%',
formData: data
width: '70%',
formData: { ...data, sjlx: 2 }
})
})
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-17 14:17:17
* @LastEditTime: 2024-01-19 16:25:18
-->
<template>
<div class="from-clues">
......@@ -195,6 +195,7 @@
},
handleChange () {
let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
arr[0].bsm = arr[0].zdbsm
this.bdcdysz = arr
},
/**
......@@ -204,31 +205,12 @@
*/
handleRowClick (row) {
// 如果状态是1,那就是单选
// if (this.sqywInfo.sqywdylx == "1") {
// const bdcdysz = this.bdcdysz
// this.$refs.table.clearSelection()
// if (bdcdysz.length == 1) {
// bdcdysz.forEach(item => {
// // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
// if (item == row) {
// this.$refs.table.toggleRowSelection(row, false);
// }
// // 不然就让当前的一行勾选
// else {
// this.$refs.table.toggleRowSelection(row, true);
// }
// })
// }
// else {
// this.$refs.table.toggleRowSelection(row, true);
// }
// } else {
// this.$refs.table.toggleRowSelection(row);
// }
let refs = 'table';
if (this.sqywInfo.sqywdylx == "1") {
row.bsm = row.zdbsm
this.bdcdysz = [row]
this.radioVal = row.bdcdyid
} else {
this.$refs[refs].toggleRowSelection(row)
}
......