Commit 17b04cd0 by xiehao

fix:删除了试用范围

1 parent ecbe8d8f
......@@ -74,7 +74,7 @@ export default {
url: collectDataConfiguration,
method: 'post',
queryParam: {
prjCode: ''
supervId: ''
},
},
selectId: '',
......@@ -85,7 +85,7 @@ export default {
watch: {
rowData: {
handler(v){
this.query.queryParam.prjCode = v.supervision ? v.supervision : ''
this.query.queryParam.supervId = v.supervId ? v.supervId : ''
this.$nextTick(() => {
this.$refs.searchTable.queryData()
})
......@@ -112,7 +112,7 @@ export default {
},
{
label: '开始时间', // label文字
prop: 'createTime', // 字段名
prop: 'startTime', // 字段名
type: 'date',
valueFormat: 'yyyy-MM-dd',
element: 'el-date-picker', // 指定elementui组件
......@@ -165,18 +165,16 @@ export default {
columns() {
let arr = [
{ label: '序号', type: 'index', prop: '序号', width: '80px' },
{ label: '单位', prop: 'manageDeptId', width: '150px' },
{ label: '单位', prop: 'manageDeptName', width: '150px' },
{ label: '项目名称', prop: 'prjName', },
{ label: '项目经理', prop: 'projectManager', width: '200px' },
{ label: '创建人', prop: 'createMan', width: '150px' },
]
if(Object.keys(this.rowData).length != 0){
arr = [
{ label: '序号', type: 'index', prop: '序号', width: '80px' },
{ label: '单位', prop: 'manageDeptId', width: '150px' },
{ label: '单位', prop: 'manageDeptName', width: '150px' },
{ label: '项目名称', prop: 'prjName', },
{ label: '项目经理', prop: 'projectManager', width: '200px' },
{ label: '创建人', prop: 'createMan', width: '150px' },
]
}else{
arr = [
......@@ -201,7 +199,7 @@ export default {
let params = !this.edit ? {
...formInfo,
materialType,
supervision: this.selectId
supervision: this.selectId
} : {
...this.rowData,
...formInfo,
......@@ -223,7 +221,7 @@ export default {
handleClose() {
this.showDialog = false
this.formOptions.forEach((v) => {
if (v.prop === 'createTime' || v.prop === 'endTime') {
if (v.prop === 'startTime' || v.prop === 'endTime') {
v.initValue = new Date().format('yyyy-MM-dd')
} else {
v.initValue = ''
......@@ -245,7 +243,7 @@ export default {
this.selectId = v.initValue
}
})
this.$nextTick(() => {
this.$refs['addForm'].addInitValue()
})
......@@ -264,9 +262,9 @@ export default {
this.selectRows = data
let idArr = []
data.forEach(item => {
idArr.push(item.prjCode)
idArr.push(item.prjId)
})
this.selectId = idArr.join(',')
this.selectId = idArr
},
},
}
......
......@@ -62,18 +62,16 @@ export default {
columns() {
let arr = [
{ label: '序号', type: 'index', prop: '序号',width: '80px' },
{ label: '单位', prop: 'manageDeptId', width: '150px' },
{ label: '单位', prop: 'manageDeptName', width: '150px' },
{ label: '项目名称', prop: 'prjName', },
{ label: '项目经理', prop: 'projectManager', width: '200px' },
{ label: '创建人', prop: 'createMan', width: '150px' },
]
if(this.title != '督查清单'){
arr = [
{ label: '序号', type: 'index',prop: '序号', width: '80px' },
{ label: '单位', prop: 'manageDeptId', width: '150px' },
{ label: '单位', prop: 'manageDeptName', width: '150px' },
{ label: '项目名称', prop: 'prjName', },
{ label: '项目经理', prop: 'projectManager', width: '200px' },
{ label: '创建人', prop: 'createMan', width: '150px' },
]
}else{
arr = [
......
......@@ -11,15 +11,10 @@
</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.supervision" class="detailBtn" size="medium" @click="detailBtn( data.row)">{{ data.row.supervision }}</el-button>
<span v-else>{{ data.row.supervision }}</span>
<el-button v-if="data.row.supervisionStr" class="detailBtn" size="medium" @click="detailBtn(data.row)">{{ data.row.supervisionStr }}</el-button>
<span v-else>{{ data.row.supervisionStr }}</span>
</template>
</table-config>
</template>
......@@ -72,6 +67,8 @@ export default {
options: materialTypeList
},
{label: '督查清单', prop: 'supervision', __slotName: 'supervision',},
{label: '开始时间', prop: 'startTime', width: '120px'},
{label: '截止时间', prop: 'endTime', width: '120px'},
{
label: '状态',
prop: 'state',
......@@ -80,8 +77,6 @@ export default {
options: stateCode,
},
{label: '备注', prop: 'notes', width: '100px'},
{label: '创建时间', prop: 'createTime', width: '120px'},
{label: '截止时间', prop: 'endTime', width: '120px'},
{
label: '操作',
type: 'operation',
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!