基础管理

This commit is contained in:
wcy 2024-10-16 18:03:28 +08:00
parent 3ffdfc5fe6
commit 022af39f52
4 changed files with 196 additions and 154 deletions

View File

@ -33,6 +33,17 @@ export function delProject(proId) {
})
}
// 工程项目
export function getProjectUserList(query) {
return request({
url: '/material/bm_unit_person/getDeptUserTree',
method: 'get',
params: {
query,
isTree: 1 // 添加 isTree 参数
}
});
}
// 标段工程-列表
export function ProjectLotList(query) {
return request({
@ -224,7 +235,7 @@ export function delUnitType(typeIds) {
// 资产属性管理-列表
export function propInfoList(query) {
return request({
url: '/material/bmAssetAttributes/list',
url: '/material/bm_asset_attributes/list',
method: 'get',
params: query
})
@ -232,7 +243,7 @@ export function propInfoList(query) {
//资产属性管理--新增
export function addPropInfo(data) {
return request({
url: '/material/bmAssetAttributes',
url: '/material/bm_asset_attributes',
method: 'post',
data: data
})
@ -241,7 +252,7 @@ export function addPropInfo(data) {
// 资产属性管理--修改
export function updatePropInfo(data) {
return request({
url: '/material/bmAssetAttributes',
url: '/material/bm_asset_attributes',
method: 'put',
data: data
})
@ -249,7 +260,7 @@ export function updatePropInfo(data) {
//资产属性管理--删除
export function delPropInfo(id) {
return request({
url: `/material/bmAssetAttributes/${id}`,
url: `/material/bm_asset_attributes/${id}`,
method: 'delete'
})
}
@ -257,7 +268,7 @@ export function delPropInfo(id) {
// 资产属性管理-详情
export function PropDetail(id) {
return request({
url: `/material/bm_unit_type/${id}`,
url: `/material/bm_asset_attributes/${id}`,
method: 'get',
})
}

View File

@ -252,8 +252,8 @@
</template>
<script>
// import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
// import { unitTypeListAll } from '@/api/base/base'
import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
import { unitTypeListAll } from '@/api/base/base'
import { deptTreeSelect } from '@/api/system/user'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@ -299,6 +299,7 @@ export default {
dictType: undefined,
status: undefined,
dataCondition: [],
typeId:undefined
},
//
form: {},
@ -339,9 +340,6 @@ export default {
unitTypeListAll({}).then((response) => {
this.typeList = response.data.rows
})
console.log(11111111111)
console.log(this.typeList)
console.log(11111111111)
},
selecType(typeId) {
this.typeList.forEach((item) => {
@ -479,7 +477,7 @@ export default {
})
.then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
},

View File

@ -159,7 +159,7 @@
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<template slot-scope="scope" v-if="scope.row.isBind === 1">
<el-button
size="mini"
type="text"
@ -538,8 +538,8 @@ export default {
},
//
handleNodeClick(data) {
console.log(data)
this.chosenUserId = data.userId;
console.log('data',data)
this.chosenUserId = data.id;
this.queryParams.userId = data.userId;
// this.getList()
// this.queryParams.deptId = data.id;
@ -591,10 +591,21 @@ export default {
handleSave() {
console.log(this.chosenUserId, 'chosenUserId')
console.log(this.ids, 'ids')
if(this.chosenUserId){
let param = {
if( this.ids.length < 1) {
this.$modal.msgError('请勾选需要绑定的单位!')
return
}
if(!this.chosenUserId) {
this.$modal.msgError("请先选择配置人员!")
return
}
let param = {
userId: this.chosenUserId,
unitId: this.ids[0]
unitIdList: this.ids
}
unitPersonAll(param).then(response => {
if (response.code == 200) {
@ -604,11 +615,7 @@ export default {
})
this.getList();
}
});
}else{
this.$modal.msgError("请先选择配置人员!");
}
})
},
/** 修改按钮操作 */

View File

@ -180,138 +180,161 @@
<!-- 添加或修改参数配置对话框 -->
<el-dialog
:title="title"
title="新建工程"
:visible.sync="open"
width="600px"
width="700px"
append-to-body
:close-on-click-modal="false"
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="120px"
<el-row :gutter="20">
<el-col :span="12">
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="120px"
>
<el-form-item label="工程名称" prop="proName">
<el-input
v-model="form.proName"
placeholder="请输入工程名称"
maxlength="50"
/>
</el-form-item>
<el-form-item label="实施单位" prop="projectStatus">
<el-select
v-model="form.projectStatus"
filterable
placeholder="请选择实施单位"
style="width: 100%"
>
<el-form-item label="工程名称" prop="proName">
<el-input
v-model="form.proName"
placeholder="请输入单位类型名称"
maxlength="50"
/>
</el-form-item>
<el-form-item label="实施单位" prop="typeId">
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
<el-select
v-model="form.typeId"
filterable
placeholder="请选择工程类型"
style="width: 100%"
@change="selecType"
>
<el-option
v-for="item in typeList"
:key="item.id"
:label="item.name"
:value="item.id"
v-if="item.status != '1'"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程状态" prop="typeId">
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
<el-select
v-model="form.typeId"
filterable
placeholder="请选择工程状态"
style="width: 100%"
@change="selecType"
>
<el-option
v-for="item in typeList"
:key="item.id"
:label="item.name"
:value="item.id"
v-if="item.status != '1'"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="项目经理" prop="proName">
<el-input
v-model="form.proName"
maxlength="50"
/>
</el-form-item>
<el-form-item label="合同主体单位" prop="proName">
<el-input
v-model="form.proName"
maxlength="50"
/>
</el-form-item>
<el-form-item label="i8工程ID" prop="proName">
<el-input
v-model="form.proName"
maxlength="50"
/>
</el-form-item>
<el-form-item label="工程类型" prop="typeId">
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
<el-select
v-model="form.typeId"
filterable
placeholder="请选择工程类型"
style="width: 100%"
@change="selecType"
>
<el-option
v-for="item in typeList"
:key="item.id"
:label="item.name"
:value="item.id"
v-if="item.status != '1'"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属上级" prop="deptId">
<treeselect
v-model="form.deptId"
:options="deptOptions"
noChildrenText="没有数据了"
noOptionsText="没有数据"
noResultsText="没有搜索结果"
placeholder="请选择所属上级"
@select="select"
/>
</el-form-item> -->
<el-form-item label="联系人" prop="linkMan">
<el-input
v-model="form.linkMan"
placeholder="请输入联系人"
maxlength="20"
/>
</el-form-item>
<el-form-item label="联系电话" prop="telphone">
<el-input
v-model="form.telphone"
placeholder="请输入联系电话"
maxlength="11"
onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
@click="submitForm"
:loading="isLoading"
> </el-button
>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<el-option
v-for="status in unitList"
:key="status.value"
:label="status.label"
:value="status.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程状态" prop="projectStatus">
<el-select
v-model="form.projectStatus"
filterable
placeholder="请选择工程状态"
style="width: 100%"
>
<el-option
v-for="status in projectStatuses"
:key="status.value"
:label="status.label"
:value="status.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="项目经理" prop="projectManager">
<el-input
v-model="form.projectManager"
placeholder="请输入项目经理姓名"
maxlength="20"
/>
</el-form-item>
<el-form-item label="合同主体单位" prop="contractingEntity">
<el-input
v-model="form.contractingEntity"
placeholder="请输入合同主体单位"
maxlength="50"
/>
</el-form-item>
<el-form-item label="i8工程ID" prop="i8ProjectId">
<el-input
v-model="form.i8ProjectId"
placeholder="请输入i8工程ID"
maxlength="50"
/>
</el-form-item>
<el-form-item label="备注" prop="i8ProjectId">
<el-input
type="textarea"
placeholder="请输入内容"
v-model="textarea"
maxlength="100"
show-word-limit
>
</el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="12">
<el-form
label-width="120px"
>
<el-form-item label="工程编号" prop="projectNo">
<el-input
v-model="form.projectNo"
placeholder="请输入工程编号"
maxlength="50"
/>
</el-form-item>
<el-form-item label="工程类型" prop="projectStatus">
<el-select
v-model="form.projectStatus"
filterable
placeholder="请选择工程状态"
style="width: 100%"
>
<el-option
v-for="status in projectStatuses"
:key="status.value"
:label="status.label"
:value="status.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程性质" prop="projectNature">
<el-select
v-model="form.projectNature"
filterable
placeholder="请选择工程性质"
style="width: 100%"
>
<el-option
v-for="nature in projectNatures"
:key="nature.value"
:label="nature.label"
:value="nature.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="联系电话" prop="telephone">
<el-input
v-model="form.telephone"
placeholder="请输入联系电话"
maxlength="11"
onkeyup="this.value = this.value.replace(/[^\d]/g, '')"
/>
</el-form-item>
<el-form-item label="所属项目中心" prop="projectCenter">
<el-input
v-model="form.projectCenter"
placeholder="请输入所属项目中心"
maxlength="50"
/>
</el-form-item>
<el-form-item label="关联i8工程" prop="relatedI8Project">
<el-input
v-model="form.relatedI8Project"
placeholder="输入搜索关键词"
/>
</el-form-item>
</el-form>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :loading="isLoading"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -321,6 +344,7 @@ import {
delProject,
getProjectList,
updateProject,
getProjectUserList,
} from '@/api/base/base'
// import { unitTypeList } from '@/api/base/base'
// import { deptTreeSelect } from '@/api/system/user'
@ -332,6 +356,7 @@ export default {
// components: { Treeselect },
data() {
return {
textarea: '',
isLoading: false,
//
loading: true,
@ -349,6 +374,7 @@ export default {
projectList: [],
//
typeList: [],
unitList:[],
//
deptOptions: undefined,
//
@ -412,11 +438,11 @@ export default {
// });
},
/** 查询部门下拉树结构 */
// getDeptTree() {
// deptTreeSelect().then((response) => {
// this.deptOptions = response.data
// })
// },
getDeptTree() {
deptTreeSelect().then((response) => {
this.deptOptions = response.data
})
},
select(row) {
// console.log(row.label)
// this.form.deptName = row.label;