update 流程完善
This commit is contained in:
+3
-4
@@ -27,9 +27,8 @@
|
|||||||
<template v-slot:standard="{text, record}">
|
<template v-slot:standard="{text, record}">
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -288,7 +287,7 @@ export default {
|
|||||||
this.$openPageNewSheet({
|
this.$openPageNewSheet({
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
||||||
query: {
|
query: {
|
||||||
id: record.id
|
standardNumber: record.inspectNo
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -24,9 +24,8 @@
|
|||||||
<template v-slot:standard="{text, record}">
|
<template v-slot:standard="{text, record}">
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
</j-table>
|
</j-table>
|
||||||
@@ -168,7 +167,7 @@ export default {
|
|||||||
this.$openPageNewSheet({
|
this.$openPageNewSheet({
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
||||||
query: {
|
query: {
|
||||||
id: record.id
|
standardNumber: record.inspectNo
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
-19
@@ -25,16 +25,6 @@
|
|||||||
:scroll="{x: '100%'}"
|
:scroll="{x: '100%'}"
|
||||||
@change="tableOnChange">
|
@change="tableOnChange">
|
||||||
|
|
||||||
<!-- 企标号、企标名称 -->
|
|
||||||
<template v-slot:standard="{text, record}">
|
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- 操作 -->
|
<!-- 操作 -->
|
||||||
<template slot="action" slot-scope="{text, record, index}">
|
<template slot="action" slot-scope="{text, record, index}">
|
||||||
<a @click="handleEdit(record, index)" >{{ $t('edit') }}</a>
|
<a @click="handleEdit(record, index)" >{{ $t('edit') }}</a>
|
||||||
@@ -128,15 +118,6 @@ export default {
|
|||||||
this.$emit('close')
|
this.$emit('close')
|
||||||
this.visible = false
|
this.visible = false
|
||||||
},
|
},
|
||||||
// 跳转详情
|
|
||||||
detailClick (record) {
|
|
||||||
this.$openPageNewSheet({
|
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
|
||||||
query: {
|
|
||||||
id: record.id
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
tableOnChange (pagination, filters, sorter) {
|
tableOnChange (pagination, filters, sorter) {
|
||||||
this.orderBy = sorter.order === 'ascend' ? '1' : '2'
|
this.orderBy = sorter.order === 'ascend' ? '1' : '2'
|
||||||
this.orderByField = sorter.columnKey
|
this.orderByField = sorter.columnKey
|
||||||
|
|||||||
+2
-3
@@ -33,9 +33,8 @@
|
|||||||
<template v-slot:standard="{text, record}">
|
<template v-slot:standard="{text, record}">
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
-19
@@ -29,16 +29,6 @@
|
|||||||
:scroll="{x: '100%'}"
|
:scroll="{x: '100%'}"
|
||||||
@change="tableOnChange">
|
@change="tableOnChange">
|
||||||
|
|
||||||
<!-- 企标号、企标名称 -->
|
|
||||||
<template v-slot:standard="{text, record}">
|
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- 附件 -->
|
<!-- 附件 -->
|
||||||
<template v-slot:file="{text, record}">
|
<template v-slot:file="{text, record}">
|
||||||
<a v-if="text" @click="fileLook(record)">{{ $t('view') }}</a>
|
<a v-if="text" @click="fileLook(record)">{{ $t('view') }}</a>
|
||||||
@@ -173,15 +163,6 @@ export default {
|
|||||||
this.$emit('close')
|
this.$emit('close')
|
||||||
this.visible = false
|
this.visible = false
|
||||||
},
|
},
|
||||||
// 跳转详情
|
|
||||||
detailClick (record) {
|
|
||||||
this.$openPageNewSheet({
|
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
|
||||||
query: {
|
|
||||||
id: record.id
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
tableOnChange (pagination, filters, sorter) {
|
tableOnChange (pagination, filters, sorter) {
|
||||||
this.orderBy = sorter.order === 'ascend' ? '1' : '2'
|
this.orderBy = sorter.order === 'ascend' ? '1' : '2'
|
||||||
this.orderByField = sorter.columnKey
|
this.orderByField = sorter.columnKey
|
||||||
|
|||||||
+4
-4
@@ -20,11 +20,11 @@
|
|||||||
<template v-slot:standard="{text, record}">
|
<template v-slot:standard="{text, record}">
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- 实际稽查完成日期 -->
|
<!-- 实际稽查完成日期 -->
|
||||||
<template v-slot:actualInspectionCompletionDate="{text, record}">
|
<template v-slot:actualInspectionCompletionDate="{text, record}">
|
||||||
<div class="table-form" v-if="isInputInspectionReport">
|
<div class="table-form" v-if="isInputInspectionReport">
|
||||||
@@ -313,7 +313,7 @@ export default {
|
|||||||
this.$openPageNewSheet({
|
this.$openPageNewSheet({
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
||||||
query: {
|
query: {
|
||||||
id: record.id
|
standardNumber: record.inspectNo
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
+4
-4
@@ -45,9 +45,8 @@
|
|||||||
<template v-slot:standard="{text, record}">
|
<template v-slot:standard="{text, record}">
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
</j-table>
|
</j-table>
|
||||||
@@ -131,6 +130,7 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
show (record) {
|
show (record) {
|
||||||
this.filters.inspectStatus = '1'
|
this.filters.inspectStatus = '1'
|
||||||
|
this.filters.inspectUser = this.$store.getters.userInfo.id
|
||||||
this.loadData()
|
this.loadData()
|
||||||
this.model = Object.assign({}, record)
|
this.model = Object.assign({}, record)
|
||||||
this.visible = true
|
this.visible = true
|
||||||
@@ -172,7 +172,7 @@ export default {
|
|||||||
this.$openPageNewSheet({
|
this.$openPageNewSheet({
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
||||||
query: {
|
query: {
|
||||||
id: record.id
|
standardNumber: record.inspectNo
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
+3
-4
@@ -20,9 +20,8 @@
|
|||||||
<template v-slot:standard="{text, record}">
|
<template v-slot:standard="{text, record}">
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -266,7 +265,7 @@ export default {
|
|||||||
this.$openPageNewSheet({
|
this.$openPageNewSheet({
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
||||||
query: {
|
query: {
|
||||||
id: record.id
|
standardNumber: record.inspectNo
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
+3
-4
@@ -45,9 +45,8 @@
|
|||||||
<template v-slot:standard="{text, record}">
|
<template v-slot:standard="{text, record}">
|
||||||
<a-tooltip overlay-class-name="tooltip-style">
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
<a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
<div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
<div class="table-text" v-else>{{ global.emptyLine }}</div>
|
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
</j-table>
|
</j-table>
|
||||||
@@ -173,7 +172,7 @@ export default {
|
|||||||
this.$openPageNewSheet({
|
this.$openPageNewSheet({
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
||||||
query: {
|
query: {
|
||||||
id: record.id
|
standardNumber: record.inspectNo
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,6 +16,15 @@
|
|||||||
:scroll="{x: '100%'}"
|
:scroll="{x: '100%'}"
|
||||||
@change="tableOnChange">
|
@change="tableOnChange">
|
||||||
|
|
||||||
|
<!-- 企标号、企标名称 -->
|
||||||
|
<template v-slot:standard="{text, record}">
|
||||||
|
<a-tooltip overlay-class-name="tooltip-style">
|
||||||
|
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||||
|
<a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
|
||||||
|
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||||
|
</a-tooltip>
|
||||||
|
</template>
|
||||||
|
|
||||||
<!-- 操作 -->
|
<!-- 操作 -->
|
||||||
<template slot="action" slot-scope="{text, record, index}">
|
<template slot="action" slot-scope="{text, record, index}">
|
||||||
<a @click="handleDelete(index)" >{{ $t('delete') }}</a>
|
<a @click="handleDelete(index)" >{{ $t('delete') }}</a>
|
||||||
@@ -55,15 +64,15 @@ export default {
|
|||||||
title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardNumber'),
|
title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardNumber'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
dataIndex: 'standardName',
|
dataIndex: 'standardNumber',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'standard' }
|
||||||
},
|
},
|
||||||
{ // 企标名称
|
{ // 企标名称
|
||||||
title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardName'),
|
title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardName'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
dataIndex: 'standardNumber',
|
dataIndex: 'standardName',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'standard' }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// 操作
|
// 操作
|
||||||
@@ -110,7 +119,7 @@ export default {
|
|||||||
this.$openPageNewSheet({
|
this.$openPageNewSheet({
|
||||||
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
|
||||||
query: {
|
query: {
|
||||||
id: record.id
|
standardNumber: record.standardNumber
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -137,10 +137,9 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<a-form-model-item class="item-model" prop="initiator">
|
<a-form-model-item class="item-model" prop="initiator">
|
||||||
<a-input disabled
|
<user-selection :placeholder="$t('pleaseEnter')+$t('workCenter.standardPromotionProcess.contactPerson')"
|
||||||
v-model="formInline.initiator"
|
type="checkbox" :nameStr="initiatorName" :disabled="disabledInitiator" :show-btn="!disabledInitiator"
|
||||||
:maxLength="50"
|
v-model="formInline.initiator" />
|
||||||
:placeholder="$t('pleaseEnter')+$t('workCenter.standardPromotionProcess.contactPerson')" />
|
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</div>
|
</div>
|
||||||
<!-- 内容 -->
|
<!-- 内容 -->
|
||||||
@@ -204,6 +203,10 @@ export default {
|
|||||||
model: {},
|
model: {},
|
||||||
// 操作类型
|
// 操作类型
|
||||||
operationType: null,
|
operationType: null,
|
||||||
|
// 联络人名字
|
||||||
|
initiatorName: '',
|
||||||
|
// 是否禁用联络人
|
||||||
|
disabledInitiator: true,
|
||||||
rules: {
|
rules: {
|
||||||
// 操作类型
|
// 操作类型
|
||||||
operationType: [
|
operationType: [
|
||||||
@@ -248,6 +251,7 @@ export default {
|
|||||||
this.formInline = {
|
this.formInline = {
|
||||||
...data
|
...data
|
||||||
}
|
}
|
||||||
|
this.initiatorName = data.initiatorDictText
|
||||||
},
|
},
|
||||||
// 外层要获取数据
|
// 外层要获取数据
|
||||||
getData () {
|
getData () {
|
||||||
@@ -292,6 +296,9 @@ export default {
|
|||||||
getLiaisonList({ deptIds: val }).then(res => {
|
getLiaisonList({ deptIds: val }).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
const data = res.result || ''
|
const data = res.result || ''
|
||||||
|
// 如果是清空,设置禁用,否则根据返回内容设置禁用
|
||||||
|
this.disabledInitiator = val ? !!data : true
|
||||||
|
this.initiatorName = data
|
||||||
this.$set(this.formInline, 'initiator', data)
|
this.$set(this.formInline, 'initiator', data)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user