若干模块增删改查调试-相关字段修改

This commit is contained in:
FrancisHu 2024-08-10 17:58:31 +08:00
parent 87f2cd2fff
commit 8117affa71
19 changed files with 337 additions and 186 deletions

View File

@ -5,7 +5,7 @@ import request from '@/utils/request'
/** 新增协议 */
export const addProtocolApi = (data) => {
return request.post('/xxx/xx', data)
return request.post('/base/agreement/add', data)
}
/** 删除协议 */
export const deleteProtocolApi = (id) => {
@ -13,9 +13,11 @@ export const deleteProtocolApi = (id) => {
}
/** 修改协议 */
export const editProtocolApi = (data) => {
return request.post('/xxx/xx', data)
return request.put('/base/agreement/update', data)
}
/** 协议列表查询 */
export const queryProtocolListApi = (data) => {
return request.post('/xxx/xx', data)
}
return request.get('/base/agreement/getAgreementList', {
params: data
})
}

View File

@ -5,7 +5,7 @@ import request from '@/utils/request'
/** 新增往来单位 */
export const addContactUnitsApi = (data) => {
return request.post('/xxx/xx', data)
return request.post('/base/customer/add', data)
}
/** 删除往来单位 */
export const deleteContactUnitsApi = (id) => {
@ -13,9 +13,11 @@ export const deleteContactUnitsApi = (id) => {
}
/** 修改往来单位 */
export const editContactUnitsApi = (data) => {
return request.post('/xxx/xx', data)
return request.put('/base/customer/update', data)
}
/** 往来单位列表查询 */
export const queryContactUnitsListApi = (data) => {
return request.post('/xxx/xx', data)
}
return request.get('/base/customer/getList', {
params: data
})
}

View File

@ -9,13 +9,15 @@ export const addProjectApi = (data) => {
}
/** 删除工程 */
export const deleteProjectApi = (id) => {
return request.delete('/base/project/deleteProById', id)
return request.delete(`/base/project?${id}`, )
}
/** 修改工程 */
export const editProjectApi = (data) => {
return request.post('/xxx/xx', data)
return request.put('/base/project/update', data)
}
/** 工程列表查询 */
export const queryProjectListApi = (data) => {
return request.post('/xxx/xx', data)
}
return request.get('/base/project/getProjectList', {
params: data
})
}

View File

@ -5,7 +5,7 @@ import request from '@/utils/request'
/** 新增单位类型*/
export const addUnitTypeApi = (data) => {
return request.post('/xxx/xx', data)
return request.post('/base/unittype/add', data)
}
/** 删除单位类型*/
export const deleteUnitTypeApi = (id) => {
@ -13,11 +13,11 @@ export const deleteUnitTypeApi = (id) => {
}
/** 修改单位类型*/
export const editUnitTypeApi = (data) => {
return request.post('/base/unittype/update', data)
return request.put('/base/unittype/update', data)
}
/** 单位类型列表查询 */
export const queryUnitTypeListApi = (data) => {
return request.get('/base/unittype/getUnitTypeList', {
params: {}
params: data
})
}
}

View File

@ -200,14 +200,10 @@ export default {
//
queryParams: {
pageNum: 1,
pageSize: 20,
pageSize: 10,
},
//
tableList: [
{ scrapNum: '测试' },
{ scrapNum: '123' },
{ scrapNum: '测试' },
],
tableList: [],
//
total: 0,
//
@ -245,6 +241,7 @@ export default {
async getTableList() {
const res = await this.requestApi(this.queryParams)
console.log(res, '列表数据')
if(res.code === 200) this.tableList = res.rows
},
/** 查询按钮 */
handleQuery() {

View File

@ -11,7 +11,8 @@ NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/register']
router.beforeEach((to, from, next) => {
NProgress.start()
// next()
NProgress.start()
if (getToken()) {
console.log(getToken())
to.meta.title && store.dispatch('settings/setTitle', to.meta.title)

View File

@ -72,30 +72,30 @@ export const constantRoutes = [
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
},
// {
// path: 'ProjectManage',
// component: () => import('@/views/base/project'),
// name: 'ProjectManage',
// meta: { title: '工程管理', icon: 'dashboard', affix: true }
// },
// {
// path: 'ContactUnits',
// component: () => import('@/views/base/contun'),
// name: 'ContactUnits',
// meta: { title: '往来单位', icon: 'dashboard', affix: true }
// },
// {
// path: 'UnitType',
// component: () => import('@/views/base/unitType'),
// name: 'UnitType',
// meta: { title: '单位类型', icon: 'dashboard', affix: true }
// },
// {
// path: 'ProtocolManage',
// component: () => import('@/views/base/agreement'),
// name: 'ProtocolManage',
// meta: { title: '协议管理', icon: 'dashboard', affix: true }
// }
{
path: 'ProjectManage',
component: () => import('@/views/base/project'),
name: 'ProjectManage',
meta: { title: '工程管理', icon: 'dashboard', affix: true }
},
{
path: 'ContactUnits',
component: () => import('@/views/base/customer'),
name: 'ContactUnits',
meta: { title: '往来单位', icon: 'dashboard', affix: true }
},
{
path: 'UnitType',
component: () => import('@/views/base/unitType'),
name: 'UnitType',
meta: { title: '单位类型', icon: 'dashboard', affix: true }
},
{
path: 'ProtocolManage',
component: () => import('@/views/base/agreement'),
name: 'ProtocolManage',
meta: { title: '协议管理', icon: 'dashboard', affix: true }
}
]
},
{

View File

@ -10,69 +10,67 @@
>
<el-row type="flex" justify="space-between" :gutter="24">
<el-col :span="12">
<el-form-item label="租赁单位" prop="scrapNum">
<el-input v-model="protocolParams.scrapNum" />
<el-form-item label="租赁单位" prop="customer">
<el-input v-model="protocolParams.customer" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="授权人" prop="pro_unit">
<el-input v-model="protocolParams.pro_unit" />
<el-form-item label="授权人" prop="authorizingPerson">
<el-input v-model="protocolParams.authorizingPerson" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="租赁工程" prop="pro_type_of">
<el-form-item label="租赁工程" prop="project">
<el-select
v-model="protocolParams.pro_type_of"
v-model="protocolParams.project"
></el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="pro_type">
<el-select
v-model="protocolParams.pro_type"
></el-select>
<el-form-item label="联系电话" prop="authorizingPhone">
<el-input v-model="protocolParams.authorizingPhone" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="合同编号" prop="pro_type">
<el-form-item label="合同编号" prop="contractNumber">
<el-select
v-model="protocolParams.pro_type"
v-model="protocolParams.contractNumber"
></el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="租赁期限" prop="pro_nature">
<el-select
v-model="protocolParams.pro_nature"
></el-select>
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="开始日期" prop="startTime">
<el-input v-model="protocolParams.startTime" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="开始日期" prop="pro_user">
<el-input v-model="protocolParams.pro_user" />
<el-form-item label="备注" prop="remark">
<el-input v-model="protocolParams.remark" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="pro_phone">
<el-input v-model="protocolParams.pro_phone" />
</el-form-item>
<el-form-item label="合同附件" prop="url">
<el-input v-model="protocolParams.url" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="合同附件">
<el-input />
</el-form-item>
</el-col>
<!-- <el-row :gutter="24">
<el-col :span="12"> </el-col>
</el-row>
</el-row>-->
<el-form-item>
<el-button type="success" @click="onSubmit">确认</el-button>
@ -90,6 +88,11 @@
</template>
<script>
import {
addProtocolApi,
editProtocolApi
} from '@/api/base/agreement'
import { addProjectApi, editProjectApi } from '@/api/base/project'
export default {
name: 'FormProtocol',
props: {
@ -101,23 +104,27 @@ export default {
mounted() {
if (this.editParams) {
Object.assign(this.protocolParams, this.editParams)
this.subSort = 2
} else {
this.subSort = 1
}
},
data() {
return {
subSort: '', // 1 / 2
protocolParams: {
scrapNum: '',
pro_code: '',
pro_unit: '',
pro_type_of: '',
pro_type: '',
pro_nature: '',
pro_user: '',
pro_phone: '',
customer: '', //
authorizingPerson: '', //
project: '', //
authorizingPhone: '', //
contractNumber: '', //
startTime: '', //
remark: '', //
url: '', //
},
//
protocolParamsRules: {
scrapNum: [
/* scrapNum: [
{
required: true,
message: '请选择租赁单位',
@ -144,7 +151,7 @@ export default {
message: '请输入联系电话',
trigger: 'blur',
},
],
], */
},
}
},
@ -153,8 +160,27 @@ export default {
onSubmit() {
this.$refs.protocolParamsRef.validate((valid) => {
if (valid) {
console.log('校验通过')
console.log('校验通过', this.protocolParams, this.subSort)
// 1. Api
if(this.subSort === 1) {
addProtocolApi(this.protocolParams).then(res => {
console.log(res)
// 2.
this.$emit('closeDialog')
history.go(0)
}).catch(err => {
console.log(err)
})
} else if(this.subSort === 2) {
editProtocolApi(this.protocolParams).then(res => {
console.log(res)
// 2.
this.$emit('closeDialog')
history.go(0)
}).catch(err => {
console.log(err)
})
}
// 2.
this.$emit('closeDialog')
}

View File

@ -5,18 +5,18 @@ export const formLabel = [
{ f_label: '状态', f_model: 'keywords', f_type: 'sel' },
]
export const columnsList = [
{ t_props: 'scrapNum', t_label: '协议签订时间', },
{ t_props: '', t_label: '协议编号' },
{ t_props: 'repairNum', t_label: '合同编号' },
{ t_props: 'unitName', t_label: '租赁单位', },
{ t_props: 'projectName', t_label: '租赁工程', },
{ t_props: 'itemType', t_label: '开始日期', },
{ t_props: 'itemType', t_label: '租赁期限(天)', },
{ t_props: 'itemType', t_label: '授权人', },
{ t_props: 'itemType', t_label: '授权人电话', },
{ t_props: 'itemType', t_label: '租赁单位类型', },
{ t_props: 'itemType', t_label: '附件图片', },
{ t_props: 'itemType', t_label: '备注', },
{ t_props: 'signDate', t_label: '协议签订时间', },
{ t_props: 'code', t_label: '协议编号' },
{ t_props: 'contractNumber', t_label: '合同编号' },
{ t_props: 'customer', t_label: '租赁单位', },
{ t_props: 'project', t_label: '租赁工程', },
{ t_props: 'startTime', t_label: '开始日期', },
// { t_props: 'itemType', t_label: '租赁期限(天)', },
{ t_props: 'authorizingPerson', t_label: '授权人', },
{ t_props: 'authorizingPhone', t_label: '授权人电话', },
// { t_props: 'itemType', t_label: '租赁单位类型', },
{ t_props: 'url', t_label: '合同文件', },
{ t_props: 'remark', t_label: '备注', },
]
export const dialogConfig = {

View File

@ -2,7 +2,11 @@
<!-- 协议管理页面 -->
<div class="app-container">
<!-- 表格 -->
<TableModel :formLabel="formLabel" :columnsList="columnsList">
<TableModel
:formLabel="formLabel"
:columnsList="columnsList"
:request-api="queryProtocolListApi"
>
<template slot="btn" slot-scope="{ queryParams }">
<el-button type="primary" @click="handleAddData()"
>新增协议</el-button
@ -47,12 +51,14 @@
import { formLabel, columnsList, dialogConfig } from './config'
import { commonMixin } from '../mixins/common'
import FormProtocol from './components/form-protocol'
import { queryProtocolListApi } from '@/api/base/agreement'
export default {
name: 'ProtocolManage',
mixins: [commonMixin], //
components: {
FormProtocol,
},
methods: { queryProtocolListApi },
data() {
return {
formLabel,

View File

@ -8,26 +8,28 @@
:model="contactUnitsParams"
:rules="contactUnitsParamsRules"
>
<el-form-item label="单位名称" prop="scrapNum">
<el-input v-model="contactUnitsParams.scrapNum" />
<el-form-item label="单位名称" prop="name">
<el-input v-model="contactUnitsParams.name" />
</el-form-item>
<el-form-item label="单位类型" prop="pro_type_of">
<el-select v-model="contactUnitsParams.pro_type_of"></el-select>
<el-form-item label="单位类型" prop="typeId">
<el-select v-model="contactUnitsParams.typeId"></el-select>
</el-form-item>
<el-form-item label="所属分公司" prop="pro_unit">
<el-select v-model="contactUnitsParams.pro_unit"></el-select>
<el-form-item label="所属分公司" prop="companyId">
<el-select v-model="contactUnitsParams.companyId"></el-select>
</el-form-item>
<el-form-item label="联系人" prop="pro_user">
<el-input v-model="contactUnitsParams.pro_user" />
<el-form-item label="材料员" prop="materialClerk">
<el-input v-model="contactUnitsParams.materialClerk" />
</el-form-item>
<el-form-item label="联系电话" prop="pro_phone">
<el-input v-model="contactUnitsParams.pro_phone" />
<el-form-item label="联系电话" prop="phone">
<el-input v-model="contactUnitsParams.phone" />
</el-form-item>
<el-form-item label="启用状态" prop="pro_type">
<el-form-item label="启用状态" prop="isActive">
<el-switch
active-text="启用"
inactive-text="禁用"
v-model="contactUnitsParams.pro_type"
active-value="1"
inactive-value="0"
v-model="contactUnitsParams.isActive"
></el-switch>
</el-form-item>
<el-form-item>
@ -46,6 +48,10 @@
</template>
<script>
import {
addContactUnitsApi,
editContactUnitsApi
} from '@/api/base/customer'
export default {
name: 'FormContactUnits',
props: {
@ -57,23 +63,25 @@ export default {
mounted() {
if (this.editParams) {
Object.assign(this.contactUnitsParams, this.editParams)
this.subSort = 2
} else {
this.subSort = 1
}
},
data() {
return {
subSort: '', // 1 / 2
contactUnitsParams: {
scrapNum: '',
pro_code: '',
pro_unit: '',
pro_type_of: '',
pro_type: '',
pro_nature: '',
pro_user: '',
pro_phone: '',
name: '', //
typeId: '', //
companyId: '', //
materialClerk: '', //
phone: '', //
isActive: '', //
},
//
contactUnitsParamsRules: {
pro_name: [
/* pro_name: [
{
required: true,
message: '请输入工程名称',
@ -107,7 +115,7 @@ export default {
message: '请选择工程性质',
trigger: 'blur',
},
],
], */
},
}
},
@ -116,8 +124,19 @@ export default {
onSubmit() {
this.$refs.contactUnitsParamsRef.validate((valid) => {
if (valid) {
console.log('校验通过')
console.log('校验通过', this.contactUnitsParams, this.subSort)
// 1. Api
if(this.subSort === 1) {
addContactUnitsApi(this.contactUnitsParams).then(res => {
console.log(res)
history.go(0)
}).catch(err => {})
} else if(this.subSort === 2) {
editContactUnitsApi(this.contactUnitsParams).then(res => {
console.log(res)
history.go(0)
}).catch(err => {})
}
// 2.
this.$emit('closeDialog')
}

View File

@ -1,18 +1,18 @@
export const formLabel = [
{ f_label: '分公司名称', f_model: 'keyWords', f_type: 'ipt' },
{ f_label: '单位名称', f_model: 'keyWords', f_type: 'ipt' },
]
export const columnsList = [
{ t_props: 'scrapNum', t_label: '单位名称', },
{ t_props: '', t_label: '单位类型' },
{ t_props: 'repairNum', t_label: '所属分公司' },
{ t_props: 'unitName', t_label: '联系人', },
{ t_props: 'projectName', t_label: '联系电话', },
{ t_props: 'itemType', t_label: '状态', },
{ t_props: 'name', t_label: '单位名称', },
{ t_props: 'typeId', t_label: '单位类型' },
{ t_props: 'companyId', t_label: '所属分公司' },
{ t_props: 'materialClerk', t_label: '材料员', },
{ t_props: 'phone', t_label: '联系电话', },
{ t_props: 'isActive', t_label: '状态', },
]
export const dialogConfig = {
outerWidth: '40%',
outerTitle: '',
outerVisible: false,
}
}

View File

@ -2,7 +2,11 @@
<!-- 往来单位管理页面 -->
<div class="app-container">
<!-- 列表 -->
<TableModel :formLabel="formLabel" :columnsList="columnsList">
<TableModel
:formLabel="formLabel"
:columnsList="columnsList"
:request-api="queryContactUnitsListApi"
>
<template slot="btn" slot-scope="{ queryParams }">
<el-button type="primary" @click="handleAddData()"
>新建</el-button
@ -48,10 +52,12 @@
import { formLabel, columnsList, dialogConfig } from './config'
import { commonMixin } from '../mixins/common'
import FormContactUnits from './components/form-contact-units.vue'
import { queryContactUnitsListApi } from '@/api/base/customer'
export default {
name: 'ContactUnits',
mixins: [commonMixin], //
components: { FormContactUnits },
methods: { queryContactUnitsListApi },
data() {
return {
formLabel,

View File

@ -10,21 +10,21 @@
>
<el-row type="flex" justify="space-between" :gutter="24">
<el-col :span="12">
<el-form-item label="工程名称" prop="projectName">
<el-input v-model="projectParams.projectName" />
<el-form-item label="工程名称" prop="name">
<el-input v-model="projectParams.name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工程编号" prop="pcNo">
<el-input v-model="projectParams.pcNo" />
<el-form-item label="工程编号" prop="num">
<el-input v-model="projectParams.num" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施单位" prop="pro_unit">
<el-select v-model="projectParams.pro_unit"></el-select>
<el-form-item label="实施单位" prop="impUnit">
<el-select v-model="projectParams.impUnit"></el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@ -45,50 +45,64 @@
<el-form-item label="工程性质" prop="pro_nature">
<el-select
v-model="projectParams.pro_nature"
></el-select>
>
<el-option
v-for="item in proSelRanges.pro_nature_range"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="项目经理" prop="pro_user">
<el-input v-model="projectParams.pro_user" />
<el-form-item label="项目经理" prop="manager">
<el-input v-model="projectParams.manager" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="pro_phone">
<el-input v-model="projectParams.pro_phone" />
<el-form-item label="联系电话" prop="phone">
<el-input v-model="projectParams.phone" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="合同主体单位">
<el-input />
<el-form-item label="合同主体单位" prop="htzt">
<el-input v-model="projectParams.htzt" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属项目中心">
<el-input />
<el-form-item label="项目部" prop="deptName">
<el-input v-model="projectParams.deptName" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="i8工程ID">
<el-input />
<el-form-item label="i8工程ID" prop="proId">
<el-input v-model="projectParams.proId" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联i8工程">
<el-input />
<el-form-item label="关联i8工程" prop="isMatch">
<el-switch
v-model="projectParams.isMatch"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="1"
inactive-value="0"
>
</el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="备注">
<el-input type="textarea" :rows="6" />
<el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="projectParams.remarks" :rows="4" />
</el-form-item>
</el-col>
<el-col :span="12"> </el-col>
@ -110,7 +124,10 @@
</template>
<script>
import { addProjectApi } from '@/api/base/project.js'
import {
addProjectApi,
editProjectApi
} from '@/api/base/project.js'
export default {
name: 'FormProject',
props: {
@ -120,25 +137,40 @@ export default {
},
},
mounted() {
console.log(this.editParams)
if (this.editParams) {
Object.assign(this.projectParams, this.editParams)
this.subSort = 2
} else {
this.subSort = 1
}
},
data() {
return {
subSort: '', // 1 / 2
projectParams: {
projectName: '', //
pcNo: '', //
pro_unit: '',
pro_type_of: '',
pro_type: '',
pro_nature: '',
pro_user: '',
pro_phone: '',
name: '', //
num: '', //
impUnit: '', //
manager: '', //
phone: '', //
htzt: '', //
deptName: '', //
proId: '', // i8id
isMatch: '', // i8
remarks: '', //
},
//
proSelRanges: {
pro_nature_range: [
{ label: 'a', value: '1' },
{ label: 'b', value: '2' },
{ label: 'c', value: '3' },
]
},
//
projectParamsRules: {
projectName: [
/* projectName: [
{
required: true,
message: '请输入工程名称',
@ -172,7 +204,7 @@ export default {
message: '请选择工程性质',
trigger: 'blur',
},
],
], */
},
}
},
@ -181,10 +213,27 @@ export default {
onSubmit() {
this.$refs.projectParamsRef.validate(valid => {
if (valid) {
console.log('校验通过')
console.log('校验通过', this.projectParams, this.subSort)
// 1. Api
// 2.
this.$emit('closeDialog')
if(this.subSort === 1) {
addProjectApi(this.projectParams).then(res => {
console.log(res)
// 2.
this.$emit('closeDialog')
history.go(0)
}).catch(err => {
console.log(err)
})
} else if(this.subSort === 2) {
editProjectApi(this.projectParams).then(res => {
console.log(res)
// 2.
this.$emit('closeDialog')
history.go(0)
}).catch(err => {
console.log(err)
})
}
}
})
},

View File

@ -1,17 +1,17 @@
export const formLabel = [
{ f_label: '分公司名称', f_model: 'keywords', f_type: 'ipt' },
{ f_label: '工程名称', f_model: 'keywords', f_type: 'ipt' },
]
export const columnsList = [
{ t_props: 'scrapNum', t_label: '工程项目名称', },
{ t_props: '', t_label: '实施单位' },
{ t_props: 'repairNum', t_label: '工程类型' },
{ t_props: 'unitName', t_label: 'i8工程编码', },
{ t_props: 'projectName', t_label: '是否匹配i8工程', },
{ t_props: 'itemType', t_label: '合同主体', },
{ t_props: 'itemType', t_label: '项目经理', },
{ t_props: 'itemType', t_label: '联系电话', },
{ t_props: 'itemType', t_label: '工程状态', },
{ t_props: 'name', t_label: '工程项目名称', },
{ t_props: 'impUnit', t_label: '实施单位' },
{ t_props: 'projectType', t_label: '工程类型' },
{ t_props: 'proId', t_label: 'i8工程id', },
{ t_props: 'isMatch', t_label: '是否匹配i8工程', },
{ t_props: 'htzt', t_label: '合同主体', },
{ t_props: 'manager', t_label: '项目经理', },
{ t_props: 'phone', t_label: '联系电话', },
{ t_props: 'stats', t_label: '工程状态', },
]
export const dialogConfig = {

View File

@ -2,7 +2,11 @@
<!-- 工程管理页面 -->
<div class="app-container">
<!-- 表格 -->
<TableModel :formLabel="formLabel" :columnsList="columnsList">
<TableModel
:formLabel="formLabel"
:columnsList="columnsList"
:request-api="queryProjectListApi"
>
<template slot="btn" slot-scope="{ queryParams }">
<el-button type="primary" @click="handleAddData()"
>新建</el-button
@ -21,7 +25,7 @@
<el-button
type="danger"
size="mini"
@click="handleDeleteData(data)"
@click="handleDeleteData(data.id)"
>删除</el-button
>
</template>
@ -47,8 +51,10 @@
import { formLabel, columnsList, dialogConfig } from './config'
import { commonMixin } from '../mixins/common'
import FormProject from './components/form-project'
import { queryProjectListApi } from '@/api/base/project'
export default {
name: 'ProjectManage',
methods: { queryProjectListApi },
mixins: [commonMixin], //
components: {
FormProject,

View File

@ -8,15 +8,17 @@
:model="unitsTypeParams"
:rules="unitsTypeParamsRules"
>
<el-form-item label="单位类型名称" prop="scrapNum">
<el-input v-model="unitsTypeParams.scrapNum" />
<el-form-item label="单位类型名称" prop="name">
<el-input v-model="unitsTypeParams.name" />
</el-form-item>
<el-form-item label="启用状态" prop="pro_type">
<el-form-item label="启用状态" prop="isActive">
<el-switch
active-text="启用"
inactive-text="禁用"
v-model="unitsTypeParams.pro_type"
active-value="1"
inactive-value="0"
v-model="unitsTypeParams.isActive"
></el-switch>
</el-form-item>
<el-form-item>
@ -35,6 +37,10 @@
</template>
<script>
import {
addUnitTypeApi,
editUnitTypeApi
} from '@/api/base/unitType'
export default {
name: 'FormUnitsType',
props: {
@ -44,19 +50,24 @@ export default {
},
},
mounted() {
console.log(this.editParams)
if (this.editParams) {
Object.assign(this.unitsTypeParams, this.editParams)
this.subSort = 2
} else {
this.subSort = 1
}
},
data() {
return {
subSort: '', // 1 / 2
unitsTypeParams: {
scrapNum: '',
pro_type: '',
name: '', //
isActive: '', //
},
//
unitsTypeParamsRules: {
scrapNum: [
/* scrapNum: [
{
required: true,
message: '请输入单位类型名称',
@ -69,7 +80,7 @@ export default {
message: '请选择施工单位',
trigger: 'blur',
},
],
], */
},
}
},
@ -78,8 +89,27 @@ export default {
onSubmit() {
this.$refs.unitsTypeParamsRef.validate((valid) => {
if (valid) {
console.log('校验通过')
console.log('校验通过', this.unitsTypeParams, this.subSort)
// 1. Api
if(this.subSort === 1) {
addUnitTypeApi(this.unitsTypeParams).then(res => {
console.log(res)
// 2.
this.$emit('closeDialog')
history.go(0)
}).catch(err => {
console.log(err)
})
} else if(this.subSort === 2) {
editUnitTypeApi(this.unitsTypeParams).then(res => {
console.log(res)
// 2.
this.$emit('closeDialog')
history.go(0)
}).catch(err => {
console.log(err)
})
}
// 2.
this.$emit('closeDialog')
}

View File

@ -3,8 +3,8 @@ export const formLabel = [
{ f_label: '单位名称', f_model: 'keywords', f_type: 'ipt' },
]
export const columnsList = [
{ t_props: 'scrapNum', t_label: '单位类型', },
{ t_props: '', t_label: '状态' },
{ t_props: 'name', t_label: '单位类型', },
{ t_props: 'isActive', t_label: '状态', t_slot: 'isActive' },
]
export const dialogConfig = {

View File

@ -29,6 +29,10 @@
>删除</el-button
>
</template>
<template slot="isActive" slot-scope="{ data }">
<!-- {{ data }}-->
{{ data.isActive == '1' ? '启用' : '禁用' }}
</template>
</TableModel>
<!-- 新增以及修改时的弹框 -->
@ -58,6 +62,7 @@ export default {
components: {
FormUnitsType,
},
methods: { queryUnitTypeListApi },
data() {
return {
formLabel,