wilson
/
krd-srm-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
常熟吴彦祖 4 weeks ago
parent
348c1cd7d1
commit
8d6b329183
3 changed files with 58 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/views/modules/srmPart/com_part_Approval.vue
  2. 43
      src/views/modules/srmPart/partApprovalList.vue
  3. 31
      src/views/modules/srmPart/partInfoList.vue

14
src/views/modules/srmPart/com_part_Approval.vue
View File

@ -21,11 +21,11 @@
style="width: 100%;"> style="width: 100%;">
<!-- <el-table-column prop="nodeOrder" label="序号" width="60" header-align="center" align="center"></el-table-column> <!-- <el-table-column prop="nodeOrder" label="序号" width="60" header-align="center" align="center"></el-table-column>
<el-table-column prop="nodeName" label="节点名称" min-width="100" header-align="center" align="center"></el-table-column> --> <el-table-column prop="nodeName" label="节点名称" min-width="100" header-align="center" align="center"></el-table-column> -->
<el-table-column prop="departmentName" label="审批部门" min-width="100" header-align="center" align="center">
<template slot-scope="scope">{{ scope.row.departmentName || '-' }}</template>
</el-table-column>
<!-- <el-table-column prop="departmentName" label="审批部门" min-width="100" header-align="center" align="center">-->
<!-- <template slot-scope="scope">{{ scope.row.departmentName || '-' }}</template>-->
<!-- </el-table-column>-->
<el-table-column prop="assigneeName" label="要求审批人" min-width="80" header-align="center" align="center"></el-table-column> <el-table-column prop="assigneeName" label="要求审批人" min-width="80" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="attemptNo" label="次数" width="60" header-align="center" align="center"></el-table-column> <!-- <el-table-column prop="attemptNo" label="次数" width="60" header-align="center" align="center"></el-table-column>
<el-table-column prop="approveType" label="审批类型" min-width="100" header-align="center" align="center"> <el-table-column prop="approveType" label="审批类型" min-width="100" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -40,21 +40,21 @@
<span :style="{ color: getNodeStatusColor(scope.row.status) }">{{ getNodeStatusText(scope.row.status) }}</span> <span :style="{ color: getNodeStatusColor(scope.row.status) }">{{ getNodeStatusText(scope.row.status) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="specialRelease" label="是否特别放行" min-width="80" header-align="center" align="center"></el-table-column> <el-table-column prop="specialRelease" label="是否特别放行" min-width="80" header-align="center" align="center"></el-table-column>
<el-table-column prop="completeTime" label="审批时间" min-width="150" header-align="center" align="center"> <el-table-column prop="completeTime" label="审批时间" min-width="150" header-align="center" align="center">
<template slot-scope="scope">{{ scope.row.completeTime || '-' }}</template> <template slot-scope="scope">{{ scope.row.completeTime || '-' }}</template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="approveName" label="实际审批人" min-width="80" header-align="center" align="center"></el-table-column> --> <!-- <el-table-column prop="approveName" label="实际审批人" min-width="80" header-align="center" align="center"></el-table-column> -->
<el-table-column prop="comment" label="备注" min-width="150" header-align="center" align="left" show-overflow-tooltip></el-table-column> <el-table-column prop="comment" label="备注" min-width="150" header-align="center" align="left" show-overflow-tooltip></el-table-column>
<!-- <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作"> <!-- <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="text" size="small" @click="openApproveDialog(scope.row)">审批</a> <a type="text" size="small" @click="openApproveDialog(scope.row)">审批</a>
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div> </div>
</template> </template>

43
src/views/modules/srmPart/partApprovalList.vue
View File

@ -89,7 +89,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'COMPLETED' || scope.row.flowStatus === 'TERMINATED'" @click="handleRestart(scope.row)">重新审批</el-link> <el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'COMPLETED' || scope.row.flowStatus === 'TERMINATED'" @click="handleRestart(scope.row)">重新审批</el-link>
<el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'RUNNING'" @click="openApproveDialog(scope.row)">审批</el-link> <el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'RUNNING'" @click="openApproveDialog(scope.row)">审批</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -158,7 +158,7 @@
</el-row> --> </el-row> -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否特殊放行">
<el-form-item label="是否特别放行">
<el-select v-model="approveData.specialRelease" style="width: 100%"> <el-select v-model="approveData.specialRelease" style="width: 100%">
<el-option label="否" value="N"></el-option> <el-option label="否" value="N"></el-option>
<el-option label="是" value="Y"></el-option> <el-option label="是" value="Y"></el-option>
@ -498,7 +498,7 @@ export default {
// } // }
], ],
exportName: '产品信息' + this.dayjs().format('YYYYMMDDHHmmss') exportName: '产品信息' + this.dayjs().format('YYYYMMDDHHmmss')
} }
}, },
/* 组件 */ /* 组件 */
@ -520,7 +520,7 @@ export default {
this.height = (window.innerHeight - 280) / 2 this.height = (window.innerHeight - 280) / 2
}) })
}, },
methods: { methods: {
getBaseList (val, type) { getBaseList (val, type) {
@ -539,9 +539,9 @@ export default {
// if (this.tagNo === 1100) { // if (this.tagNo === 1100) {
// this.searchData.partNo = val.part_no // this.searchData.partNo = val.part_no
// } // }
}, },
getMainData () { getMainData () {
this.searchData.limit = this.pageSize this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex this.searchData.page = this.pageIndex
@ -563,11 +563,11 @@ export default {
this.dataListLoading = false this.dataListLoading = false
}) })
}, },
tabClick (tab, event) { tabClick (tab, event) {
this.refreshCurrentTabTable() this.refreshCurrentTabTable()
}, },
// 每页数 // 每页数
sizeChangeHandle (val) { sizeChangeHandle (val) {
this.pageSize = val this.pageSize = val
@ -580,12 +580,12 @@ export default {
this.pageIndex = val this.pageIndex = val
this.getMainData() this.getMainData()
}, },
changeData (row) { changeData (row) {
this.currentRow = JSON.parse(JSON.stringify(row)) this.currentRow = JSON.parse(JSON.stringify(row))
this.refreshCurrentTabTable() this.refreshCurrentTabTable()
}, },
refreshCurrentTabTable () { refreshCurrentTabTable () {
if (this.currentRow === '' || this.currentRow === null) { if (this.currentRow === '' || this.currentRow === null) {
this.currentRow = {site: '', partNo: ''} this.currentRow = {site: '', partNo: ''}
@ -606,7 +606,7 @@ export default {
this.refreshAttachments() this.refreshAttachments()
} }
}, },
async exportExcel () { async exportExcel () {
this.searchData.limit = -1 this.searchData.limit = -1
this.searchData.page = 1 this.searchData.page = 1
@ -621,7 +621,7 @@ export default {
dropColumns: [] dropColumns: []
}) })
}, },
refreshBasicInfo () { refreshBasicInfo () {
let inData = { let inData = {
site: this.currentRow.site, site: this.currentRow.site,
@ -631,7 +631,7 @@ export default {
} }
this.$refs.basicInfo.init(inData) this.$refs.basicInfo.init(inData)
}, },
refreshSpecParams () { refreshSpecParams () {
let inData = { let inData = {
site: this.currentRow.site, site: this.currentRow.site,
@ -642,7 +642,7 @@ export default {
} }
this.$refs.specParams.init(inData) this.$refs.specParams.init(inData)
}, },
refreshSuppliers () { refreshSuppliers () {
let inData = { let inData = {
site: this.currentRow.site, site: this.currentRow.site,
@ -651,7 +651,7 @@ export default {
} }
this.$refs.suppliers.init(inData) this.$refs.suppliers.init(inData)
}, },
refreshApproval () { refreshApproval () {
let inData = { let inData = {
site: this.currentRow.site, site: this.currentRow.site,
@ -661,7 +661,7 @@ export default {
} }
this.$refs.approval.init(inData) this.$refs.approval.init(inData)
}, },
refreshAttachments () { refreshAttachments () {
let inData = { let inData = {
orderRef1: this.currentRow.site, orderRef1: this.currentRow.site,
@ -671,8 +671,8 @@ export default {
} }
this.$refs.attachments.init(inData) this.$refs.attachments.init(inData)
}, },
// 打开审批对话框 // 打开审批对话框
openApproveDialog(row) { openApproveDialog(row) {
this.approveData = { this.approveData = {
@ -682,8 +682,9 @@ export default {
flowCode: row.flowCode, flowCode: row.flowCode,
flowVersion: row.flowVersion, flowVersion: row.flowVersion,
nodeCode: row.nodeCode, nodeCode: row.nodeCode,
specialRelease :'N',
comment: '' comment: ''
} }
this.approveDialogVisible = true this.approveDialogVisible = true
}, },
@ -737,7 +738,7 @@ export default {
}) })
}).catch(() => {}) }).catch(() => {})
} }
} }
} }
@ -860,4 +861,4 @@ export default {
height: 28px; height: 28px;
} }
} }
</style>
</style>

31
src/views/modules/srmPart/partInfoList.vue
View File

@ -42,7 +42,11 @@
:min-width="item.columnWidth" :min-width="item.columnWidth"
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="!item.columnHidden">{{
item.columnProp === 'partStage'
? formatPartStageDesc(scope.row.partStage)
: scope.row[item.columnProp]
}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 100px"/></span> style="width: 100px; height: 100px"/></span>
</template> </template>
@ -457,6 +461,24 @@ export default {
status: true, status: true,
fixed: false fixed: false
}, },
{
userId: this.$store.state.user.name,
functionId: this.functionId,
serialNumber: 'partTablePartStage',
tableId: 'partTable',
tableName: '产品信息',
columnProp: 'partStage',
headerAlign: 'center',
align: 'center',
columnLabel: '物料阶段',
columnWidth: '100',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: this.functionId, functionId: this.functionId,
@ -625,6 +647,9 @@ export default {
methods: { methods: {
formatPartStageDesc (partStage) {
return partStage === 'Approved' ? '正式物料' : '新增物料'
},
getBaseList (val, type) { getBaseList (val, type) {
this.tagNo = val this.tagNo = val
this.$nextTick(() => { this.$nextTick(() => {
@ -769,7 +794,9 @@ export default {
params: this.searchData, params: this.searchData,
fileName: this.exportName + '.xlsx', fileName: this.exportName + '.xlsx',
rowFetcher: res => res.data, rowFetcher: res => res.data,
columnFormatter: [],
columnFormatter: [
{ columnProp: 'partStage', formatter: (val) => this.formatPartStageDesc(val) }
],
dropColumns: [] dropColumns: []
}) })
}, },

Write Preview
Loading…
Cancel
Save