Browse Source

2024-10-23

优化
master
fengyuan_yang 1 year ago
parent
commit
bbef86150d
  1. 6
      src/views/modules/changeManagement/changeRecord.vue
  2. 44
      src/views/modules/part/bomManagement.vue
  3. 4
      src/views/modules/part/routingManagement.vue
  4. 17
      src/views/modules/project/projectPart/searchProjectPart.vue

6
src/views/modules/changeManagement/changeRecord.vue

@ -67,14 +67,14 @@
width="100" width="100"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-link v-if="scope.row.changeStatus !== '已完成'" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-link v-if="scope.row.changeStatus === '草稿'" style="cursor: pointer" @click="issueModal(scope.row)">下达</el-link> <el-link v-if="scope.row.changeStatus === '草稿'" style="cursor: pointer" @click="issueModal(scope.row)">下达</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页插件 --> <!-- 分页插件 -->
<el-pagination style="margin-top: 0px"
<el-pagination
@size-change="sizeChangeHandle" @size-change="sizeChangeHandle"
@current-change="currentChangeHandle" @current-change="currentChangeHandle"
:current-page="pageIndex" :current-page="pageIndex"
@ -709,7 +709,7 @@
<!-- 附件信息页签 --> <!-- 附件信息页签 -->
<el-tab-pane label="附件信息" name="fileInformation"> <el-tab-pane label="附件信息" name="fileInformation">
<oss-components label="变更单号" :height="secondHeight - 25" style="margin-top: 2px" :columns="fileColumnList" :order-ref2="currentRow.changeNo" :order-ref1="currentRow.site"></oss-components>
<oss-components :disabled="currentRow.changeStatus === '已完成'" label="变更单号" :height="secondHeight - 25" style="margin-top: 2px" :columns="fileColumnList" :order-ref2="currentRow.changeNo" :order-ref1="currentRow.site"></oss-components>
</el-tab-pane> </el-tab-pane>
<!-- 审批信息 --> <!-- 审批信息 -->

44
src/views/modules/part/bomManagement.vue

@ -720,7 +720,7 @@
<el-input v-model="copyBomData.site" disabled style="width: 85px"></el-input> <el-input v-model="copyBomData.site" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="BOM版本号"> <el-form-item label="BOM版本号">
<el-input v-model="copyBomData.engChgLevel" style="width: 85px"></el-input>
<el-input v-model="copyBomData.engChgLevel" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制造类型"> <el-form-item label="制造类型">
<el-select v-model="copyBomData.bomType" @change="copyBomTypeChange" style="width: 185px"> <el-select v-model="copyBomData.bomType" @change="copyBomTypeChange" style="width: 185px">
@ -844,7 +844,7 @@
<el-input v-model="copyAlternativeData.site" disabled style="width: 85px"></el-input> <el-input v-model="copyAlternativeData.site" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="BOM版本号"> <el-form-item label="BOM版本号">
<el-input v-model="copyAlternativeData.engChgLevel" style="width: 85px"></el-input>
<el-input v-model="copyAlternativeData.engChgLevel" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制造类型"> <el-form-item label="制造类型">
<el-select v-model="copyAlternativeData.bomType" style="width: 185px"> <el-select v-model="copyAlternativeData.bomType" style="width: 185px">
@ -1615,6 +1615,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 120 columnWidth: 120
}, },
{
userId: this.$store.state.user.name,
functionId: 104002,
serialNumber: '104002Table2PartStatus',
tableId: '104002Table2',
tableName: 'BOM子物料表',
columnProp: 'partStatus',
headerAlign: 'center',
align: 'left',
columnLabel: '零件状态编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 104002, functionId: 104002,
@ -1624,7 +1642,7 @@ export default {
columnProp: 'partStatusDesc', columnProp: 'partStatusDesc',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
columnLabel: '零件状态',
columnLabel: '零件状态名称',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1851,6 +1869,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 120 columnWidth: 120
}, },
{
userId: this.$store.state.user.name,
functionId: 104002,
serialNumber: '104002Table3PartStatus',
tableId: '104002Table3',
tableName: 'BOM副产品表',
columnProp: 'partStatus',
headerAlign: 'center',
align: 'left',
columnLabel: '零件状态编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 104002, functionId: 104002,
@ -1860,7 +1896,7 @@ export default {
columnProp: 'partStatusDesc', columnProp: 'partStatusDesc',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
columnLabel: '零件状态',
columnLabel: '零件状态名称',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,

4
src/views/modules/part/routingManagement.vue

@ -605,7 +605,7 @@
<el-input v-model="copyRoutingData.site" disabled style="width: 85px"></el-input> <el-input v-model="copyRoutingData.site" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="Routing版本号"> <el-form-item label="Routing版本号">
<el-input v-model="copyRoutingData.routingRevision" style="width: 85px"></el-input>
<el-input v-model="copyRoutingData.routingRevision" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工艺类型"> <el-form-item label="工艺类型">
<el-select v-model="copyRoutingData.routingType" @change="copyRoutingTypeChange" style="width: 185px"> <el-select v-model="copyRoutingData.routingType" @change="copyRoutingTypeChange" style="width: 185px">
@ -678,7 +678,7 @@
<el-input v-model="copyAlternativeData.site" disabled style="width: 85px"></el-input> <el-input v-model="copyAlternativeData.site" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="Routing版本号"> <el-form-item label="Routing版本号">
<el-input v-model="copyAlternativeData.routingRevision" style="width: 85px"></el-input>
<el-input v-model="copyAlternativeData.routingRevision" disabled style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工艺类型"> <el-form-item label="工艺类型">
<el-select v-model="copyAlternativeData.routingType" style="width: 185px"> <el-select v-model="copyAlternativeData.routingType" style="width: 185px">

17
src/views/modules/project/projectPart/searchProjectPart.vue

@ -62,9 +62,12 @@
:min-width="item.columnWidth" :min-width="item.columnWidth"
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.columnProp === 'testPartNo'">
<el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toPartMenu(scope.row.testPartNo)"> {{ scope.row[item.columnProp] }}</el-link>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span> <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -974,13 +977,19 @@
}) })
}, },
toPartMenu(partNo){
if (this.$router.resolve(`/part-partInformation`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`part-partInformation`,params:{partNo:partNo},})
}
},
// //
searchCustomer (row) { searchCustomer (row) {
}, },
} }
} }
</script> </script>

Loading…
Cancel
Save