Commit 8a4c8d85 by 史敦盼

按钮size统一

1 parent 696da117
......@@ -18,7 +18,13 @@
</template>
<!-- 中部操作按钮 -->
<template #operationWrap v-if="activeName == '1'">
<el-button type="primary" icon="el-icon-document-add" size="medium" plain @click="fnAdd" >新建</el-button >
<el-button
type="primary"
icon="el-icon-document-add"
plain
@click="fnAdd"
>新建</el-button
>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
......@@ -29,12 +35,22 @@
id-key="elementId"
>
<template #indexLevel="{ data }">
<el-button v-if="data.row.indexLevel" class="detailBtn" size="medium" @click="detailBtn( data.row)">指标清单</el-button >
<span v-else>{{data.row.indexLevel}}</span>
<el-button
v-if="data.row.indexLevel"
class="detailBtn"
@click="detailBtn(data.row)"
>指标清单</el-button
>
<span v-else>{{ data.row.indexLevel }}</span>
</template>
<template #supervName="{ data }">
<el-button v-if="data.row.supervName" class="detailBtn" size="medium" @click="supervNameDetailBtn( data.row)">{{data.row.supervName}}</el-button >
<span v-else>{{data.row.supervName}}</span>
<el-button
v-if="data.row.supervName"
class="detailBtn"
@click="supervNameDetailBtn(data.row)"
>{{ data.row.supervName }}</el-button
>
<span v-else>{{ data.row.supervName }}</span>
</template>
</table-config>
</template>
......@@ -46,8 +62,13 @@
:row-data="rowData"
:title="dialogTitle"
></Add>
<Detail ref="Detail" :prjCodeDetail='detailPrjCode' :title="detailTitle" :visible.sync="visibleDetail" @editClick='fnEdit'/>
<Detail
ref="Detail"
:prjCodeDetail="detailPrjCode"
:title="detailTitle"
:visible.sync="visibleDetail"
@editClick="fnEdit"
/>
</div>
</template>
......@@ -55,14 +76,17 @@
import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/views/collectDataConfiguration/TableConfig.vue'
import { architectureInspectionAnalysis, selectSupervAnalysis } from '@/api/architectureInspection'
import {
architectureInspectionAnalysis,
selectSupervAnalysis,
} from '@/api/architectureInspection'
import { stateCode } from '@/utils/architectureInspectionDis'
import Add from './Add.vue'
import Detail from './Detail.vue'
export default {
name: 'architectureInspectionAnalysis',
name: 'architectureInspectionAnalysis',
components: { ListPage, SearchForm, TableConfig, Add, Detail },
computed: {
formOptions() {
......@@ -75,7 +99,7 @@ name: 'architectureInspectionAnalysis',
placeholder: '请输入内容', // elementui组件属性
},
]
}else{
} else {
return [
{
label: '项目名称', // label文字
......@@ -87,20 +111,26 @@ name: 'architectureInspectionAnalysis',
}
},
columns() {
if(this.activeName === '1'){
if (this.activeName === '1') {
return [
{ label: '序号', type: 'index', width: '80px' },
{ label: '督查方案名称', prop: 'supervName', },
{ label: '督查编码', prop: 'supervCode', },
{ label: '指标名称', prop: 'indexName', },
{ label: '指标清单', prop: 'indexLevel', __slotName: 'indexLevel', },
{ label: '指标权重', prop: 'weight', },
{ label: '创建时间', prop: 'createTime', },
{ label: '状态', prop: 'state', width: '120px',
{ label: '督查方案名称', prop: 'supervName' },
{ label: '督查编码', prop: 'supervCode' },
{ label: '指标名称', prop: 'indexName' },
{ label: '指标清单', prop: 'indexLevel', __slotName: 'indexLevel' },
{ label: '指标权重', prop: 'weight' },
{ label: '创建时间', prop: 'createTime' },
{
label: '状态',
prop: 'state',
width: '120px',
collectionType: 'stateCode',
options: stateCode,},
options: stateCode,
},
{
label: '操作', type: 'operation', width: '200px',
label: '操作',
type: 'operation',
width: '200px',
actionButtons: [
{
title: '发布',
......@@ -125,23 +155,33 @@ name: 'architectureInspectionAnalysis',
},
},
]
}else{
} else {
return [
{ label: '序号', type: 'index', width: '80px' },
{ label: '项目编码', prop: 'prjCode', },
{ label: '项目名称', prop: 'prjName', },
{ label: '承建单位', prop: 'buildOrg', },
{ label: '督查编码', prop: 'supervId', },
{ label: '督查方案名称', prop: 'supervName', __slotName: 'supervName',},
{ label: '项目编码', prop: 'prjCode' },
{ label: '项目名称', prop: 'prjName' },
{ label: '承建单位', prop: 'buildOrg' },
{ label: '督查编码', prop: 'supervId' },
{
label: '督查方案名称',
prop: 'supervName',
__slotName: 'supervName',
},
// { label: '指标清单', prop: 'zhibiaoqingdan', __slotName: 'zhibiaoqingdan'},
{ label: '项目评分', prop: 'prjScore', },
{ label: '评审意见', prop: 'opinion', },
{ label: '评审时间', prop: 'opinionTime', },
{ label: '状态', prop: 'state', width: '120px',
{ label: '项目评分', prop: 'prjScore' },
{ label: '评审意见', prop: 'opinion' },
{ label: '评审时间', prop: 'opinionTime' },
{
label: '状态',
prop: 'state',
width: '120px',
collectionType: 'stateCode',
options: stateCode,},
options: stateCode,
},
{
label: '操作', type: 'operation', width: '200px',
label: '操作',
type: 'operation',
width: '200px',
actionButtons: [
{
title: '发布',
......@@ -169,14 +209,14 @@ name: 'architectureInspectionAnalysis',
}
},
},
data(){
data() {
return {
query: {
url: architectureInspectionAnalysis,
method: 'post',
queryParam: {
prjName: '',
indexLevel: "1"
indexLevel: '1',
},
},
rowData: {},
......@@ -190,7 +230,7 @@ name: 'architectureInspectionAnalysis',
detailTitle: '',
rowData: {},
detailPrjCode: '',
visibleDetail: false
visibleDetail: false,
}
},
methods: {
......@@ -199,9 +239,9 @@ name: 'architectureInspectionAnalysis',
...this.query.queryParam,
// ...data,
}
if(data){
if (data) {
this.$refs.searchTable.queryData()
}else{
} else {
this.$refs.Detail.search()
}
},
......@@ -230,8 +270,10 @@ name: 'architectureInspectionAnalysis',
type: 'warning',
})
.then(() => {
if(this.activeName == '1'){
this.$postRequest('/supervIndex/fb', {supervCode: row.supervCode}).then(res => {
if (this.activeName == '1') {
this.$postRequest('/supervIndex/fb', {
supervCode: row.supervCode,
}).then((res) => {
if (res.code === 200) {
this.$message.success('发布成功')
this.$refs.searchTable.queryData()
......@@ -239,8 +281,8 @@ name: 'architectureInspectionAnalysis',
this.$message.error(res.msg)
}
})
}else{
this.$postRequest('/supervAnalysis/fb', {...row}).then(res => {
} else {
this.$postRequest('/supervAnalysis/fb', { ...row }).then((res) => {
if (res.code === 200) {
this.$message.success('发布成功')
this.$refs.searchTable.queryData()
......@@ -259,7 +301,9 @@ name: 'architectureInspectionAnalysis',
type: 'warning',
})
.then(() => {
this.$postRequest('/supervIndex/del', {supervCode: row.supervCode}).then(res => {
this.$postRequest('/supervIndex/del', {
supervCode: row.supervCode,
}).then((res) => {
if (res.code === 200) {
this.$message.success('删除成功')
this.$refs.searchTable.queryData()
......@@ -271,9 +315,9 @@ name: 'architectureInspectionAnalysis',
.catch(() => {})
},
handleClick(tab, event) {
if(tab.name == '1'){
if (tab.name == '1') {
this.query.url = architectureInspectionAnalysis
}else{
} else {
this.query.url = selectSupervAnalysis
}
this.querySearch()
......@@ -287,34 +331,34 @@ name: 'architectureInspectionAnalysis',
fnEdit(row, detailtitle) {
this.rowData = row
this.visible = true
if(detailtitle == '指标清单'){
if (detailtitle == '指标清单') {
this.dialogTitle = '编辑督查指标'
this.rowData.tab = 'one'
}else{
} else {
this.dialogTitle = '编辑督查指标'
this.rowData.tab = 'two'
}
},
// 督查清单 详情
detailBtn(v){
detailBtn(v) {
this.detailTitle = ''
this.visibleDetail = true
this.detailTitle = '指标清单' // tab1
this.detailPrjCode = v.supervCode
},
// 督查名称 详情
supervNameDetailBtn(v){
supervNameDetailBtn(v) {
this.detailTitle = ''
this.visibleDetail = true
this.detailTitle = '督查名称' // tab2
this.detailPrjCode = v.supervId
}
}
},
},
}
</script>
<style lang="scss" scoped>
.detailBtn{
.detailBtn {
border: none;
background: none;
color: #0d867f;
......
......@@ -14,11 +14,21 @@
</template>
<!-- 查询表单插槽 -->
<template #formWrap>
<SearchForm ref="SearchForm" @onSearch="querySearch" :form-options="formOptions" />
<SearchForm
ref="SearchForm"
@onSearch="querySearch"
:form-options="formOptions"
/>
</template>
<!-- 中部操作按钮 -->
<template #operationWrap v-if="activeName == '1'">
<el-button type="primary" icon="el-icon-document-add" size="medium" plain @click="fnAdd" >添加</el-button >
<el-button
type="primary"
icon="el-icon-document-add"
plain
@click="fnAdd"
>添加</el-button
>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
......@@ -34,7 +44,8 @@
<AddTabelList
@querySearch="querySearch"
:visible.sync="visible"
:title="dialogTitle"/>
:title="dialogTitle"
/>
</div>
</template>
......@@ -56,7 +67,9 @@ export default {
method: 'post',
queryParam: {},
},
activeName: this.$route.query.activeName ? this.$route.query.activeName : '1',
activeName: this.$route.query.activeName
? this.$route.query.activeName
: '1',
tabOptions: [
{ label: '技术政策', name: '1' },
{ label: '审查', name: '2' },
......@@ -67,7 +80,7 @@ export default {
},
computed: {
formOptions() {
if(this.activeName == '2'){
if (this.activeName == '2') {
return [
{
label: '项目名称', // label文字
......@@ -76,7 +89,7 @@ export default {
placeholder: '请输入内容', // elementui组件属性
},
]
}else{
} else {
return [
{
label: '政策名称', // label文字
......@@ -88,7 +101,7 @@ export default {
}
},
columns() {
if(this.activeName == '2'){
if (this.activeName == '2') {
return [
{ label: '序号', type: 'index', width: '80px' },
{ label: '单位', prop: 'manageOrgId', width: '100px' },
......@@ -102,7 +115,9 @@ export default {
{ label: '创建人', prop: 'createMan', width: '100px' },
{ label: '创建时间', prop: 'createTime', width: '100px' },
{
label: '操作', type: 'operation', width: '200px',
label: '操作',
type: 'operation',
width: '200px',
actionButtons: [
{
title: '审查',
......@@ -117,19 +132,21 @@ export default {
},
},
]
}else{
} else {
return [
{ label: '序号', type: 'index', width: '80px' },
{ label: '政策名称', prop: 'policyName', width: '100px' },
{ label: '政策描述', prop: 'policyContent', },
{ label: '适用范围', prop: 'scope_', },
{ label: '发布部门', prop: 'deptName', },
{ label: '级别', prop: 'level_', },
{ label: '启用时间', prop: 'startTime', },
{ label: '创建人', prop: 'createMan', },
{ label: '创建时间', prop: 'createTime', },
{ label: '政策描述', prop: 'policyContent' },
{ label: '适用范围', prop: 'scope_' },
{ label: '发布部门', prop: 'deptName' },
{ label: '级别', prop: 'level_' },
{ label: '启用时间', prop: 'startTime' },
{ label: '创建人', prop: 'createMan' },
{ label: '创建时间', prop: 'createTime' },
{
label: '操作', type: 'operation', width: '200px',
label: '操作',
type: 'operation',
width: '200px',
actionButtons: [
{
title: '删除',
......@@ -149,15 +166,15 @@ export default {
},
methods: {
querySearch(data) {
if(this.activeName == '1'){
if (this.activeName == '1') {
this.query.url = artPolicyExamine
this.query.queryParam = {
policyName: undefined
policyName: undefined,
}
}else{
} else {
this.query.url = examineSearch
this.query.queryParam = {
prjName: undefined
prjName: undefined,
}
}
this.query.queryParam = {
......@@ -194,27 +211,29 @@ export default {
break
}
},
fnSubmit(row){
fnSubmit(row) {
this.$router.push('/main/examine')
},
fnDel(row){
fnDel(row) {
this.$confirm('是否确认删除?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
this.$postRequest('/klTechPolicyCheck/del/', {id: row.id}).then(res => {
this.$postRequest('/klTechPolicyCheck/del/', { id: row.id }).then(
(res) => {
if (res.code === 200) {
this.$message.success('删除成功')
this.$refs.searchTable.queryData()
} else {
this.$message.error(res.msg)
}
})
},
)
})
.catch(() => {})
}
},
},
}
</script>
......
......@@ -22,7 +22,10 @@
</div>
<div class="right_container" v-else-if="isRelationChild">
<!-- 资产关系分类页面 -->
<RelationChildPage :relationChildAssetRelaId="relationChildAssetRelaId" :relation-data="relationData" />
<RelationChildPage
:relationChildAssetRelaId="relationChildAssetRelaId"
:relation-data="relationData"
/>
</div>
<div class="right_container" v-else>
<div class="search_menu">
......@@ -108,21 +111,13 @@
<img class="btn_icon" src="@/assets/archi-ele-list/create.png" alt="" />
<p>新建</p>
</div> -->
<el-button
@click="addItem"
type="primary"
size="medium"
icon="el-icon-document-add"
<el-button @click="addItem" type="primary" icon="el-icon-document-add"
>新建</el-button
>
<el-button
type="primary"
size="medium"
icon="el-icon-delete"
@click="moreDelete"
<el-button type="primary" icon="el-icon-delete" @click="moreDelete"
>删除</el-button
>
<!-- <el-button type="primary" size="medium" icon="el-icon-plus">导入</el-button> -->
<!-- <el-button type="primary" icon="el-icon-plus">导入</el-button> -->
<div class="import_btn" @click="importFile">
<img
class="btn_icon"
......@@ -131,7 +126,7 @@
/>
<p>导入</p>
</div>
<!-- <el-button type="primary" size="medium" icon="el-icon-plus">导出</el-button> -->
<!-- <el-button type="primary" icon="el-icon-plus">导出</el-button> -->
<!-- <div class="import_btn" @click="exportFile" style="margin-left: 0;">
<img class="btn_icon" src="@/assets/tech-politics-fabric/export.png" alt="" />
<p>导出</p>
......@@ -361,7 +356,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="上级元素:" v-if="ruleForm.let3 && preArcList.length">
<el-form-item
label="上级元素:"
v-if="ruleForm.let3 && preArcList.length"
>
<el-select
@change="handlePreEleChange"
:disabled="is_add_edit == 'view' ? true : false"
......@@ -411,12 +409,15 @@
children: 'children',
label: 'assetName',
value: 'assetId',
checkStrictly: true
checkStrictly: true,
}"
@change="handleChange"></el-cascader>
@change="handleChange"
></el-cascader>
</el-form-item>
<div class="dialog_form_item3 m-b-20 flex-c">
<div class="dialog_form_item_title"><span style="color: #F56C6C;">*</span>图标设置:</div>
<div class="dialog_form_item_title">
<span style="color: #f56c6c">*</span>图标设置:
</div>
<div class="flex">
<img
:style="{
......@@ -435,7 +436,8 @@
>
<el-color-picker
v-model="ruleForm.color"
:predefine="predefineColors">
:predefine="predefineColors"
>
</el-color-picker>
</div>
</div>
......@@ -527,9 +529,10 @@
children: 'children',
label: 'assetName',
value: 'assetId',
checkStrictly: true
checkStrictly: true,
}"
@change="handleChange2"></el-cascader>
@change="handleChange2"
></el-cascader>
<!-- <el-select clearable placeholder="请选择" v-model="ruleForm2.let1">
<el-option :value="selectValue2" :label="selectLabel2">
<el-tree
......@@ -599,7 +602,7 @@ import {
importZhiChanJiaGou,
queryGuanLianZiChanSelect,
getPreArc,
getAssetCode
getAssetCode,
} from '@/api/index.js'
import { queryEleRelation } from '@/api/dataMapping'
import $ from 'jquery'
......@@ -611,7 +614,7 @@ export default {
components: {
ChooseSvg,
RelationPage,
RelationChildPage
RelationChildPage,
},
watch: {},
data() {
......@@ -638,11 +641,13 @@ export default {
dynamicForm_: [],
preArc: '',
assetNumber: '',
parentAsset: []
parentAsset: [],
},
rules: {
let1: [{ required: true, message: '请输入资产名称', trigger: 'blur' }],
assetNumber: [{ required: true, message: '请输入资产编号', trigger: 'blur' }],
assetNumber: [
{ required: true, message: '请输入资产编号', trigger: 'blur' },
],
let3: [
{ required: true, message: '请选择所属元素', trigger: 'change' },
],
......@@ -699,7 +704,7 @@ export default {
archiBelongId: null,
archiType: null,
// archiAssetTypeId: null,
treeSelectData: [{assetName: '无', assetId: '无'}],
treeSelectData: [{ assetName: '无', assetId: '无' }],
disabled1: false,
selectGraphSrc: '',
selectGraphShape: '',
......@@ -716,14 +721,14 @@ export default {
isRelation: false,
isRelationChild: false,
relationData: {},
relationChildAssetRelaId: null
relationChildAssetRelaId: null,
}
},
created() {
this.getDicts()
queryEleRelation().then(res => {
if(res.code === 200) {
this.treeData[1].subList = res.data.records.map(v => {
queryEleRelation().then((res) => {
if (res.code === 200) {
this.treeData[1].subList = res.data.records.map((v) => {
return {
...v,
viewId: v.assetRelaId + '_1',
......@@ -741,14 +746,15 @@ export default {
this.set_table_height()
},
methods: {
linkTo(data) {console.log('---', data)
linkTo(data) {
console.log('---', data)
this.$refs.tree.setCurrentKey(data.assetRelaId + '_1')
this.relationChildAssetRelaId = data.assetRelaId
this.isRelationChild = true
this.isRelation = false
},
changeRelationData(data) {
this.treeData[1].subList = data.map(v => {
this.treeData[1].subList = data.map((v) => {
return {
...v,
viewId: v.assetRelaId + '_1',
......@@ -760,7 +766,7 @@ export default {
return cellValue?.replace(/\]|\[|\/?]/g, '').replace('null', '')
},
// 所属元素下拉
getArchiEleList(){
getArchiEleList() {
this.getZuJianLeiXingSelect(null).then((res) => {
this.zuJianLeiXingSelect = res
})
......@@ -779,7 +785,7 @@ export default {
this.selectGraphShape = ''
this.addDialog = false
this.graphId = ''
this.treeSelectData = [{assetName: '无', assetId: '无'}]
this.treeSelectData = [{ assetName: '无', assetId: '无' }]
this.preArcList = []
},
getChooseSvg(svgInfo) {
......@@ -907,7 +913,7 @@ export default {
assetNumber: this.ruleForm.assetNumber,
graphId: this.graphId,
parentCode: this.selectedObject.assetCode,
parentAsset: this.ruleForm.parentAsset
parentAsset: this.ruleForm.parentAsset,
}
const requestParams =
this.is_add_edit == 'add'
......@@ -1026,7 +1032,7 @@ export default {
Number(svgTag.getAttribute('height').split('px')[0]) / 2
item['width'] = svgWidth + 'px'
item['height'] = svgHeight + 'px'
if(item.color) {
if (item.color) {
if (path) {
path.setAttribute('fill', item.color)
}
......@@ -1093,8 +1099,7 @@ export default {
this.selectLabel = ''
this.selectValue = ''
this.selectCode = ''
this.ruleForm.parentAsset = [],
this.ruleForm.color = ''
;(this.ruleForm.parentAsset = []), (this.ruleForm.color = '')
this.ruleForm.assetNumber = ''
this.ruleForm.preArc = ''
})
......@@ -1109,13 +1114,13 @@ export default {
this.ruleForm.let3 = row.archiEleId
this.ruleForm.preArc = row.parentElement?.replace(/\]|\[|\/?]/g, '')
this.getShangJiJieDianSelect(this.ruleForm.preArc)
if(row.parentAsset != null){
if (row.parentAsset != null) {
this.ruleForm.parentAsset = row.parentAsset.split(',')
}
this.ruleForm.assetNumber = row.assetNumber
this.getZuJianLeiXingSelect(null).then((res) => {
this.zuJianLeiXingSelect = res
if(this.ruleForm.let3) {
if (this.ruleForm.let3) {
this.zuJianLeiXingSelectChange(this.ruleForm.let3, true)
}
})
......@@ -1148,7 +1153,7 @@ export default {
if (fieldsValue && fieldsValue.length == 4) {
this.ruleForm.dynamicForm_ = []
} else {
if(!fieldsValue) return
if (!fieldsValue) return
let fieldsValue_ = JSON.parse(fieldsValue)
console.log(3)
fieldsValue_.map((item) => {
......@@ -1172,7 +1177,6 @@ export default {
this.getShangJiJieDianSelect(this.ruleForm.preArc)
this.ruleForm.parentAsset = row.parentAsset.split(', ')
this.ruleForm.assetNumber = row.assetNumber
this.ruleForm.let4 = row.sort
this.ruleForm.let5 = row.isShow == 0 ? '显示' : '隐藏'
......@@ -1191,7 +1195,7 @@ export default {
const currentItem = this.zuJianLeiXingSelect.find(
(item) => item.elementId == this.ruleForm.let3,
)
if(this.ruleForm.let3) {
if (this.ruleForm.let3) {
this.zuJianLeiXingSelectChange(this.ruleForm.let3, true)
}
if (currentItem && currentItem.eaLevel == 1) {
......@@ -1219,7 +1223,7 @@ export default {
if (fieldsValue && fieldsValue.length == 4) {
this.ruleForm.dynamicForm_ = []
} else {
if(!fieldsValue) return
if (!fieldsValue) return
let fieldsValue_ = JSON.parse(fieldsValue)
fieldsValue_.map((item) => {
if (item.dictKey) {
......@@ -1235,17 +1239,20 @@ export default {
handleChange(value) {
console.log('value', value)
this.selectedObject = {}
if(value[0] === '无') {
if (value[0] === '无') {
this.ruleForm.let2 = value[0]
return this.assetNumberDis = false
return (this.assetNumberDis = false)
}
this.assetNumberDis = true
// 当选中值变化时,更新绑定的对象
if (value && value.length) {
// 假设我们根据id来查询对象
this.selectedObject = this.findObjectById(this.treeSelectData, value[value.length - 1]);
this.selectedObject = this.findObjectById(
this.treeSelectData,
value[value.length - 1],
)
} else {
this.selectedObject = null;
this.selectedObject = null
}
// this.selectValue = selectedObject.assetId
// this.selectLabel = selectedObject.assetName
......@@ -1253,9 +1260,9 @@ export default {
this.ruleForm.let2 = this.selectedObject.assetName
getAssetCode({
archiType: this.archiType,
superiorAssetCode: this.selectedObject.assetNumber
}).then(res => {
if(res.code === 200) {
superiorAssetCode: this.selectedObject.assetNumber,
}).then((res) => {
if (res.code === 200) {
this.selectCode = res.msg
this.ruleForm.assetNumber = res.msg
this.$refs.form.clearValidate('let2')
......@@ -1266,16 +1273,16 @@ export default {
findObjectById(items, id) {
for (let i = 0; i < items.length; i++) {
if (items[i].assetId === id) {
return items[i];
return items[i]
}
if (items[i].children) {
const found = this.findObjectById(items[i].children, id);
const found = this.findObjectById(items[i].children, id)
if (found) {
return found;
return found
}
}
}
return null;
return null
},
handleCheckChange(data, tree) {
//上级节点下拉树的勾选
......@@ -1291,9 +1298,9 @@ export default {
let selectedObject = {}
if (value && value.length) {
// 假设我们根据id来查询对象
selectedObject = this.findObjectById(this.treeSelectData, value[0]);
selectedObject = this.findObjectById(this.treeSelectData, value[0])
} else {
selectedObject = null;
selectedObject = null
}
console.log('value', value, selectedObject)
this.selectValue2 = selectedObject.assetId
......@@ -1311,7 +1318,8 @@ export default {
this.$refs.treeSelect2.setCheckedKeys([]) // 删除所有选中节点
this.$refs.treeSelect2.setCheckedNodes([data])
},
loadTreeSelect(node, resolve) {console.log('node', node)
loadTreeSelect(node, resolve) {
console.log('node', node)
//加载上级节点
if (node.level === 0) {
resolve([])
......@@ -1333,13 +1341,13 @@ export default {
},
getShangJiJieDianSelect(eleName) {
this.treeSelectData = [{assetName: '无', assetId: '无'}]
this.treeSelectData = [{ assetName: '无', assetId: '无' }]
//上级节点下拉框值
const params = {
archiType: this.archiType,
archiAssetState: this.searchParams.archiAssetState,
archiStage: this.searchParams.archiStage,
eleName
eleName,
// parentAssetId: this.archiBelongId,
// archiAssetTypeId: this.archiAssetTypeId,
}
......@@ -1367,22 +1375,21 @@ export default {
},
// 获取上级元素
getPreArc(item) {
getPreArc({eleName: item?.elementName}).then(res => {
if(res.code === 200) {
getPreArc({ eleName: item?.elementName }).then((res) => {
if (res.code === 200) {
this.preArcList = res.data
if(!this.preArcList.length) {
if (!this.preArcList.length) {
this.getShangJiJieDianSelect(item?.elementName)
}
}
})
},
handlePreEleChange(data) {
this.getShangJiJieDianSelect(data)
},
zuJianLeiXingSelectChange(data, flag) {
this.preArcList = []
this.treeSelectData = [{assetName: '无', assetId: '无'}]
this.treeSelectData = [{ assetName: '无', assetId: '无' }]
//所属元素选择后
// console.log(data)
// console.log(this.zuJianLeiXingSelect)
......@@ -1396,7 +1403,8 @@ export default {
} else {
this.disabled1 = false
}
if (data && !flag) {console.log('------')
if (data && !flag) {
console.log('------')
const params = {
type: '1',
typeId: data,
......@@ -1419,7 +1427,7 @@ export default {
}
})
} else {
if(!flag) {
if (!flag) {
this.ruleForm.dynamicForm_ = []
}
}
......@@ -1531,7 +1539,8 @@ export default {
})
inpEle.click()
},
saveTemplateDialog() {console.log('this', this.ruleForm2)
saveTemplateDialog() {
console.log('this', this.ruleForm2)
//下载模版
this.$refs.form2.validate((valid) => {
if (valid) {
......@@ -1575,7 +1584,7 @@ export default {
state: 0,
archiType: this.archiType,
assetNumber: row.assetNumber,
archiBelongId: row.archiBelongId
archiBelongId: row.archiBelongId,
}
editZiChanJiaGouTable(params).then((res) => {
if (res.code == 200) {
......@@ -1680,10 +1689,11 @@ export default {
treeClick(data, node, self) {
console.log(data, node, self)
this.isRelationChild = false
if(data.viewId === 99) {
if (data.viewId === 99) {
this.isRelation = true
// this.isRelationChild = false
} else if(data.viewId !==0 && data.eleRelaId) { console.log('child', data)
} else if (data.viewId !== 0 && data.eleRelaId) {
console.log('child', data)
this.relationData = data
this.isRelation = false
this.$nextTick(() => {
......
......@@ -3,17 +3,33 @@
<list-page>
<!-- 查询表单插槽 -->
<template #formWrap>
<SearchForm @onSearch="querySearch" :form-options="formOptions"/>
<SearchForm @onSearch="querySearch" :form-options="formOptions" />
</template>
<!-- 中部操作按钮 -->
<template #operationWrap>
<el-button type="primary" icon="el-icon-document-add" size="medium" plain @click="fnAdd">新建</el-button>
<el-button
type="primary"
icon="el-icon-document-add"
plain
@click="fnAdd"
>新建</el-button
>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
<table-config ref="searchTable" :query="query" :columns="columns" id-key="elementId">
<table-config
ref="searchTable"
:query="query"
:columns="columns"
id-key="elementId"
>
<template #supervision="{ data }">
<el-button v-if="data.row.supervisionStr" class="detailBtn" size="medium" @click="detailBtn(data.row)">{{ data.row.supervisionStr }}</el-button>
<el-button
v-if="data.row.supervisionStr"
class="detailBtn"
@click="detailBtn(data.row)"
>{{ data.row.supervisionStr }}</el-button
>
<span v-else>{{ data.row.supervisionStr }}</span>
</template>
</table-config>
......@@ -25,11 +41,17 @@
:visible.sync="visible"
:row-data="rowData"
:title="dialogTitle"
@addList='addList'
:edit='isEdit'
@addList="addList"
:edit="isEdit"
></Add>
<!-- 详情 -->
<Detail ref="Detail" :prjCodeDetail='detailPrjCode' :visible.sync="visibleDetail" @selectTabel='selectTabel' :title="detailTitle"/>
<Detail
ref="Detail"
:prjCodeDetail="detailPrjCode"
:visible.sync="visibleDetail"
@selectTabel="selectTabel"
:title="detailTitle"
/>
</div>
</template>
......@@ -38,14 +60,14 @@ import AddTabelList from './AddTabelList.vue'
import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue'
import TableConfig from './TableConfig.vue'
import {collectDataSearch} from '@/api/architectureInspection'
import { collectDataSearch } from '@/api/architectureInspection'
import Add from './Add.vue'
import Detail from './Detail.vue'
import {materialTypeList, stateCode} from '@/utils/architectureInspectionDis'
import { materialTypeList, stateCode } from '@/utils/architectureInspectionDis'
export default {
name: 'collectDataConfiguration',
components: {ListPage, SearchForm, TableConfig, Add, AddTabelList, Detail},
components: { ListPage, SearchForm, TableConfig, Add, AddTabelList, Detail },
computed: {
formOptions() {
return [
......@@ -59,16 +81,17 @@ export default {
},
columns() {
return [
{label: '序号', type: 'index', width: '80px'},
{label: '督查方案名称', prop: 'supervName',},
{ label: '序号', type: 'index', width: '80px' },
{ label: '督查方案名称', prop: 'supervName' },
{
label: '材料类型', prop: 'materialType',
label: '材料类型',
prop: 'materialType',
collectionType: 'materialTypeList',
options: materialTypeList
options: materialTypeList,
},
{label: '督查清单', prop: 'supervision', __slotName: 'supervision',},
{label: '开始时间', prop: 'startTime', width: '120px'},
{label: '截止时间', prop: 'endTime', width: '120px'},
{ label: '督查清单', prop: 'supervision', __slotName: 'supervision' },
{ label: '开始时间', prop: 'startTime', width: '120px' },
{ label: '截止时间', prop: 'endTime', width: '120px' },
{
label: '状态',
prop: 'state',
......@@ -76,7 +99,7 @@ export default {
collectionType: 'stateCode',
options: stateCode,
},
{label: '备注', prop: 'notes', width: '100px'},
{ label: '备注', prop: 'notes', width: '100px' },
{
label: '操作',
type: 'operation',
......@@ -126,7 +149,7 @@ export default {
url: collectDataSearch,
method: 'post',
queryParam: {
supervName: ''
supervName: '',
},
},
visible: false,
......@@ -139,7 +162,7 @@ export default {
detailTitle: '详情',
visibleDetail: false,
detailPrjCode: '',
isEdit: false
isEdit: false,
}
},
......@@ -188,7 +211,7 @@ export default {
...row,
state: 2,
}
this.$postRequest('/collect/fb', {...row}).then(res => {
this.$postRequest('/collect/fb', { ...row }).then((res) => {
if (res.code === 200) {
this.$message.success('发布成功')
this.$refs.searchTable.queryData()
......@@ -197,8 +220,7 @@ export default {
}
})
})
.catch(() => {
})
.catch(() => {})
},
fnDel(row) {
this.$confirm('是否确认删除?', '提示', {
......@@ -211,17 +233,18 @@ export default {
...row,
delFlag: 1,
}
this.$postRequest('/collect/del', {supervId: row.supervId}).then(res => {
this.$postRequest('/collect/del', { supervId: row.supervId }).then(
(res) => {
if (res.code === 200) {
this.$message.success('删除成功')
this.$refs.searchTable.queryData()
} else {
this.$message.error('删除失败')
}
},
)
})
})
.catch(() => {
})
.catch(() => {})
},
fnEdit(row) {
this.dialogTitle = '收集资料配置'
......@@ -248,7 +271,7 @@ export default {
this.rowData.supervision = !!v ? Array.from(new Set(arr)).join(',') : id
// this.rowData.supervision = !!v ? v +','+id : id
},
}
},
}
</script>
......
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-03-21 20:58:31
* @LastEditors: pan
* @LastEditTime: 2024-03-27 10:50:41
* @LastEditTime: 2024-06-24 10:21:23
-->
<template>
<div class="searchTable">
......@@ -31,7 +31,6 @@
<el-button
type="primary"
icon="el-icon-document-add"
size="medium"
plain
@click="fnAdd()"
>新建</el-button
......@@ -39,7 +38,6 @@
<el-button
type="primary"
icon="el-icon-download"
size="medium"
plain
v-if="activeName === '1'"
>导出</el-button
......@@ -59,12 +57,22 @@
<span>{{ handleFileName(data) }}</span>
</template>
<template #orgName="{ data }">
<el-button v-if="data.row.orgName" class="detailBtn" size="medium" @click="fnEdit(data.row, true)">{{data.row.orgName}}</el-button >
<span v-else>{{data.row.orgName}}</span>
<el-button
v-if="data.row.orgName"
class="detailBtn"
@click="fnEdit(data.row, true)"
>{{ data.row.orgName }}</el-button
>
<span v-else>{{ data.row.orgName }}</span>
</template>
<template #matterName="{ data }">
<el-button v-if="data.row.matterName" class="detailBtn" size="medium" @click="fnEdit(data.row, true)">{{data.row.matterName}}</el-button >
<span v-else>{{data.row.matterName}}</span>
<el-button
v-if="data.row.matterName"
class="detailBtn"
@click="fnEdit(data.row, true)"
>{{ data.row.matterName }}</el-button
>
<span v-else>{{ data.row.matterName }}</span>
</template>
</table-config>
</template>
......
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-03-21 20:58:31
* @LastEditors: pan
* @LastEditTime: 2024-04-01 11:33:12
* @LastEditTime: 2024-06-24 10:22:42
-->
<template>
<div class="searchTable">
......@@ -60,16 +60,31 @@
<span> {{ handlePercent(data) }}</span>
</template>
<template #manageOrgName="{ data }">
<el-button v-if="data.row.manageOrgName" class="detailBtn" size="medium" @click="fnDetail(data.row)">{{data.row.manageOrgName}}</el-button >
<span v-else>{{data.row.manageOrgName}}</span>
<el-button
v-if="data.row.manageOrgName"
class="detailBtn"
@click="fnDetail(data.row)"
>{{ data.row.manageOrgName }}</el-button
>
<span v-else>{{ data.row.manageOrgName }}</span>
</template>
<template #batName="{ data }">
<el-button v-if="data.row.batName" class="detailBtn" size="medium" @click="fnDetail(data.row)">{{data.row.batName}}</el-button >
<span v-else>{{data.row.batName}}</span>
<el-button
v-if="data.row.batName"
class="detailBtn"
@click="fnDetail(data.row)"
>{{ data.row.batName }}</el-button
>
<span v-else>{{ data.row.batName }}</span>
</template>
<template #assetName="{ data }">
<el-button v-if="data.row.assetName" class="detailBtn" size="medium" @click="fnDetail(data.row)">{{data.row.assetName}}</el-button >
<span v-else>{{data.row.assetName}}</span>
<el-button
v-if="data.row.assetName"
class="detailBtn"
@click="fnDetail(data.row)"
>{{ data.row.assetName }}</el-button
>
<span v-else>{{ data.row.assetName }}</span>
</template>
</table-config>
</template>
......@@ -77,8 +92,8 @@
<Detail
:visible.sync="visible"
:row-data="rowData"
:activeName='activeName'
:activeName2_1='activeName2_1'
:activeName="activeName"
:activeName2_1="activeName2_1"
/>
</div>
</template>
......@@ -138,7 +153,7 @@ export default {
ListPage,
SearchForm,
TableConfig,
Detail
Detail,
},
computed: {
getCountType() {
......@@ -178,7 +193,11 @@ export default {
if (this.activeName2_1 === '1') {
arr = [
{ label: '序号', type: 'index', width: '80px' },
{ label: '单位名称', prop: 'manageOrgName', __slotName: 'manageOrgName', },
{
label: '单位名称',
prop: 'manageOrgName',
__slotName: 'manageOrgName',
},
{ label: '概设需求数(个)', prop: 'needCount' },
{ label: '概设材料通过数(个)', prop: 'reviewPassCount' },
{ label: '概设通过比(%)', __slotName: 'percent' },
......@@ -186,7 +205,7 @@ export default {
} else {
arr = [
{ label: '序号', type: 'index', width: '80px' },
{ label: '批次', prop: 'batName', __slotName: 'batName', },
{ label: '批次', prop: 'batName', __slotName: 'batName' },
{ label: '项目需求数(个)', prop: 'needCount' },
{ label: '项目通过数(个)', prop: 'reviewPassCount' },
{ label: '项目通过比(%)', __slotName: 'percent' },
......@@ -196,7 +215,7 @@ export default {
arr = [
{ type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' },
{ label: '资产名称', prop: 'assetName', __slotName: 'assetName', },
{ label: '资产名称', prop: 'assetName', __slotName: 'assetName' },
{ label: '资产类型(所属元素)', prop: 'eleName' },
{
label: '来源',
......@@ -233,7 +252,7 @@ export default {
this.getElementTreeData()
},
methods: {
fnDetail(row){
fnDetail(row) {
this.rowData = row
this.visible = true
},
......
......@@ -38,7 +38,6 @@
v-if="activeName === '1'"
icon="el-icon-document-add"
type="primary"
size="medium"
plain
@click="fnMaterialAnalysis()"
>材料解析</el-button
......@@ -47,7 +46,6 @@
<el-button
icon="el-icon-document-add"
type="primary"
size="medium"
plain
v-if="showBatchBtn"
@click="fnBatchExamine()"
......@@ -56,7 +54,6 @@
<el-button
icon="el-icon-download"
type="primary"
size="medium"
plain
v-if="activeName2 === '1'"
>导出报告</el-button
......@@ -64,7 +61,6 @@
<el-button
icon="el-icon-download"
type="primary"
size="medium"
plain
v-if="activeName2 === '4'"
>导出技术偏差分析表</el-button
......@@ -72,7 +68,6 @@
<el-button
icon="el-icon-download"
type="primary"
size="medium"
plain
v-if="activeName2 === '8'"
@click="handlExportRiskReport('重复建设风险报告', 1)"
......@@ -81,7 +76,6 @@
<el-button
icon="el-icon-download"
type="primary"
size="medium"
plain
v-if="activeName2 === '9'"
@click="handlExportRiskReport('重复录入风险报告', 2)"
......@@ -99,8 +93,13 @@
id-key="elementId"
>
<template #prjName="{ data }">
<el-button v-if="data.row.prjName" class="detailBtn" size="medium" @click="fnDetail(data.row)">{{data.row.prjName}}</el-button >
<span v-else>{{data.row.prjName}}</span>
<el-button
v-if="data.row.prjName"
class="detailBtn"
@click="fnDetail(data.row)"
>{{ data.row.prjName }}</el-button
>
<span v-else>{{ data.row.prjName }}</span>
</template>
</table-config>
</template>
......@@ -114,8 +113,8 @@
<Detail
:visible.sync="visible"
:row-data="rowData"
:activeName='activeName'
:activeName2='activeName2'
:activeName="activeName"
:activeName2="activeName2"
/>
</div>
</template>
......@@ -215,7 +214,7 @@ export default {
SearchForm,
TableConfig,
AnalysisContent,
Detail
Detail,
},
computed: {
formOptions() {
......@@ -465,7 +464,7 @@ export default {
},
mounted() {},
methods: {
fnDetail(row){
fnDetail(row) {
this.rowData = row
this.visible = true
},
......
......@@ -47,9 +47,7 @@
</div>
</div>
<div class="flex">
<el-button type="primary" size="medium" @click="fnSave()"
>保存结果</el-button
>
<el-button type="primary" @click="fnSave()">保存结果</el-button>
</div>
</div>
<el-input
......
......@@ -11,7 +11,6 @@
<el-button
icon="el-icon-download"
type="primary"
size="medium"
plain
v-if="item.requireName === '功能偏差'"
>导出技术偏差分析表</el-button
......@@ -19,7 +18,6 @@
<el-button
icon="el-icon-download"
type="primary"
size="medium"
plain
v-if="item.requireName === '功能重复风险'"
>导出重复建设风险报告</el-button
......@@ -27,7 +25,6 @@
<el-button
icon="el-icon-download"
type="primary"
size="medium"
plain
v-if="item.requireName === '数据重复录入风险'"
>导出重复录入风险报告</el-button
......
......@@ -38,15 +38,18 @@
:key="activeName"
>
<template #prjName="{ data }">
<el-button v-if="data.row.prjName" class="detailBtn" size="medium" @click="fnEdit(data.row, true)">{{data.row.prjName}}</el-button >
<span v-else>{{data.row.prjName}}</span>
<el-button
v-if="data.row.prjName"
class="detailBtn"
@click="fnEdit(data.row, true)"
>{{ data.row.prjName }}</el-button
>
<span v-else>{{ data.row.prjName }}</span>
</template>
</table-config>
</template>
</list-page>
<Detail
:visible.sync="detailVisible"
:row-data="rowData"/>
<Detail :visible.sync="detailVisible" :row-data="rowData" />
<!-- 新增弹窗 -->
<Add
@querySearch="querySearch"
......@@ -174,7 +177,7 @@ export default {
{ type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' },
{ label: '批次年度', prop: 'year' },
{ label: '批次名称', prop: 'batName', width: '200px', },
{ label: '批次名称', prop: 'batName', width: '200px' },
{
label: '项目名称',
prop: 'prjName',
......@@ -443,12 +446,12 @@ export default {
})
.catch(() => {})
},
fnEdit(row, isDetail=false) {
fnEdit(row, isDetail = false) {
this.rowData = row
if(this.activeName == '1'){
if (this.activeName == '1') {
this.dialogTitle = isDetail ? '详情' : '修改需求'
this.visible = true
}else{
} else {
this.detailVisible = true
}
},
......
......@@ -11,11 +11,21 @@
<list-page>
<!-- 查询表单插槽 -->
<template #formWrap>
<SearchForm ref="searchForm" @onSearch="querySearch" :form-options="formOptions" />
<SearchForm
ref="searchForm"
@onSearch="querySearch"
:form-options="formOptions"
/>
</template>
<!-- 中部操作按钮 -->
<template #operationWrap>
<el-button type="primary" icon="el-icon-document-add" size="medium" plain @click="fnAdd">新建</el-button >
<el-button
type="primary"
icon="el-icon-document-add"
plain
@click="fnAdd"
>新建</el-button
>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
......@@ -25,7 +35,7 @@
:query="query"
:columns="columns"
id-key="elementId"
:hasPagination='false'
:hasPagination="false"
>
</table-config>
</template>
......@@ -37,7 +47,7 @@
:visible.sync="addVisible"
:row-data="addRowData"
:title="dialogTitle"
:dictId='rowData.id'
:dictId="rowData.id"
/>
</div>
</template>
......@@ -87,12 +97,17 @@ export default {
columns() {
return [
{ label: '序号', type: 'index', width: '80px' },
{ label: '字典描述', prop: 'label'},
{ label: '字典值', prop: 'value', width: '150px',},
{ label: '字典描述', prop: 'label' },
{ label: '字典值', prop: 'value', width: '150px' },
{ label: '等级', prop: 'grade', width: '150px' },
{ label: '排序', prop: 'sort', width: '80px' },
{ label: '启用状态', prop: 'flag', width: '120px', collectionType: 'flag',
options: flag, },
{
label: '启用状态',
prop: 'flag',
width: '120px',
collectionType: 'flag',
options: flag,
},
{ label: '描述', prop: 'remark' },
{
label: '操作',
......@@ -145,7 +160,7 @@ export default {
},
},
},
data(){
data() {
return {
query: {
url: dictionaryMaintenanceSearch,
......@@ -191,14 +206,16 @@ export default {
type: 'warning',
})
.then(() => {
this.$postRequestShared('/dictDetail/phyDel', {id: row.id}).then(res => {
this.$postRequestShared('/dictDetail/phyDel', { id: row.id }).then(
(res) => {
if (res.code === 200) {
this.$message.success('删除成功')
this.$refs.searchTable.queryData()
} else {
this.$message.error(res.msg)
}
})
},
)
})
.catch(() => {})
},
......@@ -207,7 +224,7 @@ export default {
this.addRowData = row
this.addVisible = true
},
fnEnable(row){
fnEnable(row) {
let title = row.flag ? '启用' : '禁用'
this.$confirm('是否确认?' + title, '提示', {
confirmButtonText: '确认',
......@@ -215,14 +232,16 @@ export default {
type: 'warning',
})
.then(() => {
this.$postRequestShared('/dictDetail/delete', {id: row.id}).then(res => {
this.$postRequestShared('/dictDetail/delete', { id: row.id }).then(
(res) => {
if (res.code === 200) {
this.$message.success(title + '成功')
this.$refs.searchTable.queryData()
} else {
this.$message.error(title + '失败')
}
})
},
)
})
.catch(() => {})
},
......@@ -232,15 +251,15 @@ export default {
this.$refs.searchForm.onReset()
})
this.query.queryParam.dictId = this.rowData.id
}
}
},
},
}
</script>
<style lang="scss" scoped>
@import '@/styles/elementui.scss';
::v-deep .searchTable{
.tableConfig{
::v-deep .searchTable {
.tableConfig {
height: 32vh !important;
}
}
......
......@@ -7,7 +7,13 @@
</template>
<!-- 中部操作按钮 -->
<template #operationWrap>
<el-button type="primary" icon="el-icon-document-add" size="medium" plain @click="fnAdd">新建</el-button >
<el-button
type="primary"
icon="el-icon-document-add"
plain
@click="fnAdd"
>新建</el-button
>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
......@@ -27,7 +33,11 @@
:title="dialogTitle"
></Add>
<!-- <Detail ref="Detail" :prjCodeDetail='detailPrjCode' :visible.sync="visibleDetail" @selectTabel='selectTabel' :title="detailTitle"/> -->
<Maintenance :row-data="rowData" @querySearch="querySearch" :visible.sync="maintenanceVisible"/>
<Maintenance
:row-data="rowData"
@querySearch="querySearch"
:visible.sync="maintenanceVisible"
/>
</div>
</template>
......@@ -70,12 +80,17 @@ export default {
columns() {
return [
{ label: '序号', type: 'index', width: '80px' },
{ label: '字典名称', prop: 'name', minWidth: '150px',},
{ label: '字典标识', prop: 'typeValue', minWidth: '150px',},
{ label: '字典名称', prop: 'name', minWidth: '150px' },
{ label: '字典标识', prop: 'typeValue', minWidth: '150px' },
{ label: '描述', prop: 'remark', minWidth: '150px' },
{ label: '排序', prop: 'sort', width: '80px' },
{ label: '启用状态', prop: 'delFlag', width: '120px', collectionType: 'delFlag',
options: delFlag, },
{
label: '启用状态',
prop: 'delFlag',
width: '120px',
collectionType: 'delFlag',
options: delFlag,
},
{ label: '创建日期', prop: 'createTime', width: '120px' },
// { label: '创建人', prop: 'createMan', },
// { label: '最终修改时间', prop: 'lastUpdateTime', },
......@@ -130,12 +145,12 @@ export default {
]
},
},
data(){
data() {
return {
query: {
url: dictionarySearch,
method: 'post',
queryParam: { },
queryParam: {},
},
visible: false, // 新增 修改
rowData: {},
......@@ -180,14 +195,16 @@ export default {
type: 'warning',
})
.then(() => {
this.$postRequestShared('/dict/phyDel', {id: row.id}).then(res => {
this.$postRequestShared('/dict/phyDel', { id: row.id }).then(
(res) => {
if (res.code === 200) {
this.$message.success('删除成功')
this.$refs.searchTable.queryData()
} else {
this.$message.error(res.msg)
}
})
},
)
})
.catch(() => {})
},
......@@ -196,11 +213,11 @@ export default {
this.rowData = row
this.visible = true
},
fnMaintenance(row){
fnMaintenance(row) {
this.maintenanceVisible = true
this.rowData = row
},
fnDisabled(row){
fnDisabled(row) {
let title = row.delFlag == 1 ? '启用' : '禁用'
this.$confirm(`是否确认${title}?`, '提示', {
confirmButtonText: '确认',
......@@ -208,23 +225,21 @@ export default {
type: 'warning',
})
.then(() => {
this.$postRequestShared('/dict/delete', {id: row.id}).then(res => {
this.$postRequestShared('/dict/delete', { id: row.id }).then(
(res) => {
if (res.code === 200) {
this.$message.success( title + '成功')
this.$message.success(title + '成功')
this.$refs.searchTable.queryData()
} else {
this.$message.error(title + '失败')
}
})
},
)
})
.catch(() => {})
},
}
},
}
</script>
<style>
</style>
\ No newline at end of file
<style></style>
......@@ -30,7 +30,6 @@
<el-button
icon="el-icon-document-add"
type="primary"
size="medium"
plain
@click="fnAdd()"
>新建</el-button
......
......@@ -49,7 +49,6 @@
<div class="search_btn">
<el-button
type="primary"
size="medium"
icon="el-icon-document-add"
@click="operation('add', null)"
>新建</el-button
......@@ -423,8 +422,8 @@ export default {
},
methods: {
// 状态
getStateList(){
query_jia_gou_ceng_ci_new({"typeValue": "sys_state"}).then(res => {
getStateList() {
query_jia_gou_ceng_ci_new({ typeValue: 'sys_state' }).then((res) => {
if (res.code == 200) {
this.stateList = res.data
}
......
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-04-16 15:09:52
* @LastEditors: pan
* @LastEditTime: 2024-04-19 10:02:44
* @LastEditTime: 2024-06-24 10:24:52
-->
<template>
<div class="searchTable">
......@@ -24,7 +24,6 @@
<el-button
type="primary"
icon="el-icon-document-add"
size="medium"
plain
@click="fnTopOperation('新增')"
>新增</el-button
......@@ -32,7 +31,6 @@
<el-button
type="primary"
icon="el-icon-edit"
size="medium"
plain
@click="fnTopOperation('编辑')"
>编辑</el-button
......@@ -40,7 +38,6 @@
<el-button
type="danger"
icon="el-icon-delete"
size="medium"
plain
@click="fnTopOperation('删除')"
>删除</el-button
......@@ -254,13 +251,13 @@ export default {
})
.then(() => {
let [params, delApi] = [{}, null]
if(row) {
if (row) {
params = {
orgId: row.orgId,
}
delApi = delOrgTreeItem
} else {
params = this.selectRows.map(v => Number(v.orgId))
params = this.selectRows.map((v) => Number(v.orgId))
delApi = batchDeleteOrgTreeItem
}
delApi(params).then((res) => {
......
......@@ -5,7 +5,12 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">组织单位</span>
<el-select v-model="searchParams.let1" placeholder="请选择" class="search_item" filterable>
<el-select
v-model="searchParams.let1"
placeholder="请选择"
class="search_item"
filterable
>
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
......@@ -16,7 +21,12 @@
</div>
<div class="search_menu_item">
<span class="search_title">业务部门</span>
<el-select filterable v-model="searchParams.let2" placeholder="请选择" class="search_item">
<el-select
filterable
v-model="searchParams.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
......@@ -73,7 +83,6 @@
<div class="search_btn">
<el-button
type="primary"
size="medium"
icon="el-icon-document-add"
@click="operation('add', null)"
>新建项目
......@@ -147,23 +156,46 @@
<span v-else-if="scope.row.prjPlanClass == 2">续建</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="buildOrg" label="承建单位" width="280" align="center">
<el-table-column
:show-overflow-tooltip="true"
prop="buildOrg"
label="承建单位"
width="280"
align="center"
>
<template v-slot="scope">
<span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
</template>
</el-table-column>
<el-table-column prop="projAmount" label="项目金额(万元)" width="150" align="right">
<el-table-column
prop="projAmount"
label="项目金额(万元)"
width="150"
align="right"
>
<template v-slot="scope">
<span style="font-weight: bold">{{ scope.row.projAmount | formatMoney }}</span>
<span style="font-weight: bold">{{
scope.row.projAmount | formatMoney
}}</span>
</template>
</el-table-column>
<!--项目启动日期-->
<el-table-column prop="projectInitiationTime" label="项目启动日期" width="120" align="center">
<el-table-column
prop="projectInitiationTime"
label="项目启动日期"
width="120"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.projectInitiationTime }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="120" align="center"/>
<el-table-column
prop="createTime"
label="创建时间"
width="120"
align="center"
/>
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<div
......@@ -180,8 +212,7 @@
@click="operation('edit', scope.row)"
:disabled="scope.row.state == 1"
>编辑
</el-button
>
</el-button>
<el-button
class="shanChu_btn"
icon="el-icon-delete"
......@@ -189,8 +220,7 @@
@click="operation('delete', scope.row)"
:disabled="scope.row.state == 1"
>删除
</el-button
>
</el-button>
</div>
</template>
</el-table-column>
......@@ -250,7 +280,7 @@
v-model="ruleForm.let6"
maxlength="12"
placeholder="请输入金额"
@input="ruleForm.let6 = ruleForm.let6.replace(/[^\d.]/g,'')"
@input="ruleForm.let6 = ruleForm.let6.replace(/[^\d.]/g, '')"
></el-input>
</el-form-item>
<!--项目启动时间-->
......@@ -342,7 +372,12 @@
<div class="search_menu_item_container">
<div class="search_menu_item" style="width: auto">
<span class="search_title">组织单位</span>
<el-select filterable v-model="searchParams2.let1" placeholder="请选择" class="search_item">
<el-select
filterable
v-model="searchParams2.let1"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
......@@ -353,7 +388,12 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">业务部门</span>
<el-select filterable v-model="searchParams2.let2" placeholder="请选择" class="search_item">
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
......@@ -374,7 +414,11 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">建设类型</span>
<el-select v-model="searchParams2.let4" placeholder="请选择" class="search_item">
<el-select
v-model="searchParams2.let4"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in jianSheLeiXingSelect"
:key="item.value"
......@@ -491,7 +535,12 @@
<div class="search_menu_item_container">
<div class="search_menu_item" style="width: auto">
<span class="search_title">组织单位</span>
<el-select filterable v-model="searchParams3.let1" placeholder="请选择" class="search_item">
<el-select
filterable
v-model="searchParams3.let1"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
......@@ -502,7 +551,12 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">业务部门</span>
<el-select filterable v-model="searchParams2.let2" placeholder="请选择" class="search_item">
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
......@@ -607,7 +661,12 @@
<span v-else></span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="buildOrg" label="承建单位" align="center">
<el-table-column
:show-overflow-tooltip="true"
prop="buildOrg"
label="承建单位"
align="center"
>
<template v-slot="scope">
<span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
</template>
......@@ -688,15 +747,15 @@ import {
getOrgOption,
getPrjInfoDetail,
queryProjectInfoManageTable,
querysystemInfoManageTable
querysystemInfoManageTable,
} from '@/api/index.js'
import {Message, MessageBox} from 'element-ui'
import { Message, MessageBox } from 'element-ui'
import $ from 'jquery'
import {getDictTypeOptions} from '@/utils'
import { getDictTypeOptions } from '@/utils'
export default {
name: 'projectInfoManage',
components: {ProjectDetail},
components: { ProjectDetail },
data() {
return {
add_dialog2: false,
......@@ -712,10 +771,10 @@ export default {
let7: null,
},
rules: {
let1: [{required: true, message: '请选择关联系统', trigger: 'blur'}],
let2: [{required: true, message: '请输入项目名称', trigger: 'blur'}],
let1: [{ required: true, message: '请选择关联系统', trigger: 'blur' }],
let2: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
let3: [
{required: true, message: '请选择是否续建', trigger: 'change'},
{ required: true, message: '请选择是否续建', trigger: 'change' },
],
},
add_dialog: false,
......@@ -781,24 +840,27 @@ export default {
projectDetailVisible: false,
sysOrgOptions: [],
sysDeptOptions: [],
that: this
that: this,
}
},
created() {
},
created() {},
filters: {
formatMoney(value) {
if (!value && value !== 0) return '';
return new Intl.NumberFormat('zh-CN', {style: 'currency', currency: 'CNY', minimumFractionDigits: 2, maximumFractionDigits: 2}).format(value);
if (!value && value !== 0) return ''
return new Intl.NumberFormat('zh-CN', {
style: 'currency',
currency: 'CNY',
minimumFractionDigits: 2,
maximumFractionDigits: 2,
}).format(value)
},
orgNameFilter(orgId, that) {
const org = that.chengJianDeptSelect?.find(item => item.value == orgId);
return org ? org.label : "";
}
const org = that.chengJianDeptSelect?.find((item) => item.value == orgId)
return org ? org.label : ''
},
},
async mounted() {
this.chengJianDeptSelect = await this.getChengJianDeptSelect();
this.chengJianDeptSelect = await this.getChengJianDeptSelect()
window.addEventListener('resize', () => {
this.set_table_height()
})
......@@ -828,22 +890,22 @@ export default {
}
})
})
getDeptOption().then(res => {
getDeptOption().then((res) => {
if (res.code === 200) {
this.sysDeptOptions = res.data.map(v => {
this.sysDeptOptions = res.data.map((v) => {
return {
label: v.orgName,
value: v.orgId
value: v.orgId,
}
})
}
})
getOrgOption().then(res => {
getOrgOption().then((res) => {
if (res.code === 200) {
this.sysOrgOptions = res.data.map(v => {
this.sysOrgOptions = res.data.map((v) => {
return {
label: v.orgName,
value: v.orgId
value: v.orgId,
}
})
}
......@@ -953,9 +1015,10 @@ export default {
customClass: 'messageClass',
confirmButtonClass: 'confirmClass',
type: 'warning',
}).then(() => {
})
.then(() => {
const params = {
ids: [row.prjId]
ids: [row.prjId],
}
deleteProjectInfoManageTable(params).then((res) => {
if (res.code == 200) {
......@@ -971,7 +1034,8 @@ export default {
})
}
})
}).catch(() => {
})
.catch(() => {
Message({
type: 'info',
message: '已取消',
......@@ -1124,12 +1188,18 @@ export default {
queryProjectInfoManageTable(params).then((res) => {
if (res.code == 200) {
this.loading3 = false
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
res.data.records.map((item) => {
const resultItem1 = this.sysOrgOptions.filter(
(item2) => item2.value == item.manageOrgId,
)
const resultItem2 = this.sysDeptOptions.filter(
(item2) => item2.value == item.manageDeptId,
)
item.manageOrgId_ = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId_ = resultItem2.length > 0 ? resultItem2[0].label : null;
item.manageOrgId_ =
resultItem1.length > 0 ? resultItem1[0].label : null
item.manageDeptId_ =
resultItem2.length > 0 ? resultItem2[0].label : null
})
this.tableData3 = res.data.records
this.pager3.current = res.data.current
......@@ -1228,7 +1298,7 @@ export default {
const requestParams =
this.is_add_edit == 'add'
? params
: {...params, prjId: this.prjId}
: { ...params, prjId: this.prjId }
if (this.is_add_edit == 'add') {
addProjectManageTable(requestParams).then((res) => {
if (res.code == 200) {
......@@ -1308,11 +1378,17 @@ export default {
querysystemInfoManageTable(params).then((res) => {
if (res.code == 200) {
this.loading2 = false
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
item.manageOrgId_ = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId_ = resultItem2.length > 0 ? resultItem2[0].label : null;
res.data.records.map((item) => {
const resultItem1 = this.sysOrgOptions.filter(
(item2) => item2.value == item.manageOrgId,
)
const resultItem2 = this.sysDeptOptions.filter(
(item2) => item2.value == item.manageDeptId,
)
item.manageOrgId_ =
resultItem1.length > 0 ? resultItem1[0].label : null
item.manageDeptId_ =
resultItem2.length > 0 ? resultItem2[0].label : null
})
this.tableData2 = res.data.records
this.pager2.current = res.data.current
......
......@@ -63,18 +63,10 @@
</div>
</div>
<div class="search_btn">
<el-button
type="primary"
size="medium"
icon="el-icon-document-add"
@click="add"
<el-button type="primary" icon="el-icon-document-add" @click="add"
>新建</el-button
>
<el-button
type="primary"
size="medium"
icon="el-icon-delete"
@click="moreDelete"
<el-button type="primary" icon="el-icon-delete" @click="moreDelete"
>删除</el-button
>
</div>
......
......@@ -3,14 +3,13 @@
<list-page>
<!-- 查询表单插槽 -->
<template #formWrap>
<SearchForm @onSearch="querySearch" :form-options="formOptions"/>
<SearchForm @onSearch="querySearch" :form-options="formOptions" />
</template>
<!-- 中部操作按钮 -->
<template #operationWrap>
<el-button type="primary" size="medium" plain @click="toDetails"
<el-button type="primary" plain @click="toDetails"
>架构政策审查
</el-button
>
</el-button>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
......@@ -32,10 +31,10 @@ import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue'
import {queryAppArchiControlRequirements} from '@/api/interface'
import {getDeptOption, getOrgOption} from '@/api/index'
import {prjPlanClass} from '@/utils/dictionary'
import {getDictTypeOptions} from '@/utils'
import { queryAppArchiControlRequirements } from '@/api/interface'
import { getDeptOption, getOrgOption } from '@/api/index'
import { prjPlanClass } from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils'
export default {
name: 'batchPlanManagement',
......@@ -68,7 +67,7 @@ export default {
element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性
options: this.sysOrgOptions,
filterable: true
filterable: true,
},
{
label: '业务部门', // label文字
......@@ -76,7 +75,7 @@ export default {
element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性
options: this.sysDeptOptions,
filterable: true
filterable: true,
},
{
label: '系统名称', // label文字
......@@ -95,8 +94,8 @@ export default {
},
columns() {
return [
{type: 'selection', width: '55px'},
{label: '序号', type: 'index', width: '80px'},
{ type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' },
{
label: '建设单位',
prop: 'manageOrgName',
......@@ -107,14 +106,14 @@ export default {
prop: 'manageDeptName',
width: '300px',
},
{label: '系统名称', width: '280px', prop: 'appName'},
{ label: '系统名称', width: '280px', prop: 'appName' },
{
label: '建设类型',
prop: 'buildType',
options: this.buildTypeOptions,
collectionType: 'build_type',
},
{label: '项目名称', width: '295px', prop: 'prjName'},
{ label: '项目名称', width: '295px', prop: 'prjName' },
{
label: '是否续建',
prop: 'prjPlanClass',
......@@ -132,7 +131,7 @@ export default {
label: '运安符合性审查',
prop: 'version3',
type: 'operation',
actionButtons: [{title: '查看', type: 'text'}],
actionButtons: [{ title: '查看', type: 'text' }],
callback: (row, title) => {
this.fnToDetailsTab('1', row.prjId)
},
......@@ -141,7 +140,7 @@ export default {
label: '功能满足审查',
prop: 'version4',
type: 'operation',
actionButtons: [{title: '查看', type: 'text'}],
actionButtons: [{ title: '查看', type: 'text' }],
callback: (row, title) => {
this.fnToDetailsTab('2', row.prjId)
},
......@@ -150,7 +149,7 @@ export default {
label: '运行可靠性审查',
prop: 'version5',
type: 'operation',
actionButtons: [{title: '查看', type: 'text'}],
actionButtons: [{ title: '查看', type: 'text' }],
callback: (row, title) => {
this.fnToDetailsTab('3', row.prjId)
},
......@@ -159,7 +158,7 @@ export default {
label: '系统实用性审查',
prop: 'version6',
type: 'operation',
actionButtons: [{title: '查看', type: 'text'}],
actionButtons: [{ title: '查看', type: 'text' }],
callback: (row, title) => {
this.fnToDetailsTab('4', row.prjId)
},
......@@ -168,7 +167,7 @@ export default {
label: '系统安全性审查',
prop: 'version8',
type: 'operation',
actionButtons: [{title: '查看', type: 'text'}],
actionButtons: [{ title: '查看', type: 'text' }],
callback: (row, title) => {
this.fnToDetailsTab('5', row.prjId)
},
......@@ -177,7 +176,7 @@ export default {
label: '资源复用性审查',
prop: 'version7',
type: 'operation',
actionButtons: [{title: '查看', type: 'text'}],
actionButtons: [{ title: '查看', type: 'text' }],
callback: (row, title) => {
this.fnToDetailsTab('6', row.prjId)
},
......@@ -235,7 +234,7 @@ export default {
if (this.selectRows.length > 1) {
return this.$message.warning('只能选择一条数据')
}
const {name, prjId} = this.selectRows[0]
const { name, prjId } = this.selectRows[0]
this.$router.push({
path: '/main/reviewArchiPoliticeCheckDetails',
query: {
......
......@@ -3,19 +3,17 @@
<list-page>
<!-- 查询表单插槽 -->
<template #formWrap>
<SearchForm @onSearch="querySearch" :form-options="formOptions"/>
<SearchForm @onSearch="querySearch" :form-options="formOptions" />
</template>
<!-- 中部操作按钮 -->
<template #operationWrap>
<el-button
icon="el-icon-document-add"
type="primary"
size="medium"
plain
@click="toDetails()"
>评审情况(概要设计)
</el-button
>
</el-button>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
......@@ -36,10 +34,10 @@ import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue'
import {queryPrelDesInspecte} from '@/api/interface'
import {getDeptOption, getOrgOption} from '@/api/index'
import {completionStatus, prjPlanClass} from '@/utils/dictionary'
import {getDictTypeOptions} from '@/utils'
import { queryPrelDesInspecte } from '@/api/interface'
import { getDeptOption, getOrgOption } from '@/api/index'
import { completionStatus, prjPlanClass } from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils'
export default {
name: 'reviewSituation',
......@@ -71,7 +69,7 @@ export default {
element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性
options: this.sysOrgOptions,
filterable: true
filterable: true,
},
{
label: '业务部门', // label文字
......@@ -79,7 +77,7 @@ export default {
element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性
options: this.sysDeptOptions,
filterable: true
filterable: true,
},
{
label: '系统名称', // label文字
......@@ -100,8 +98,8 @@ export default {
},
columns() {
let arr = [
{type: 'selection', width: '55px'},
{label: '序号', type: 'index', width: '80px'},
{ type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' },
{
label: '建设单位',
prop: 'manageOrgName',
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!