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

2024-10-17 

优化
master
fengyuan_yang 1 year ago
parent
415f1585b4
commit
26a363e579
4 changed files with 141 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/changeManagement/changeRequest.vue
  2. 2
      src/views/modules/part/partInformation.vue
  3. 37
      src/views/modules/project/projectInfo/com_project_info_part.vue
  4. 143
      src/views/modules/project/projectPart/searchProjectPart.vue

2
src/views/modules/changeManagement/changeRequest.vue
View File

@ -4,7 +4,7 @@
<!-- 查询条件 -->
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 130px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 100px">
<el-option
v-for = "i in buList"
:key = "i.buNo"

2
src/views/modules/part/partInformation.vue
View File

@ -3724,7 +3724,7 @@
partDesc: '',
spec: '',
partTypeDb: '',
partType: 'Purchased (raw)',
partType: 'Manufactured',
familyId: '',
familyName: '',
groupId: '',

37
src/views/modules/project/projectInfo/com_project_info_part.vue
View File

@ -18,6 +18,7 @@
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
<el-button type="primary" @click="partImportModal">Excel导入</el-button>
</el-form>
</el-form>
@ -797,13 +798,13 @@
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4finalPartNo',
serialNumber: '101002001Table4TestPartNo',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "finalPartNo",
columnProp: "buNo",
headerAlign: "center",
align: "center",
columnLabel: "IFS物料编码",
columnLabel: "BU",
columnHidden: false,
columnImage: false,
status: true,
@ -813,34 +814,34 @@
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4TestPartNo',
serialNumber: '101002001Table4finalPartNo',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "testPartNo",
columnProp: "finalPartNo",
headerAlign: "center",
align: "center",
columnLabel: "物料编码",
align: "left",
columnLabel: "IFS物料编码",
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4PartDesc',
serialNumber: '101002001Table4CustomerPartNo',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "partDesc",
columnProp: "customerPartNo",
headerAlign: "center",
align: "left",
columnLabel: "物料描述",
columnLabel: "客户料号",
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 300
columnWidth: 120
},
{
userId: this.$store.state.user.name,
@ -848,10 +849,10 @@
serialNumber: '101002001Table4TestPartNo',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "buNo",
columnProp: "testPartNo",
headerAlign: "center",
align: "center",
columnLabel: "BU",
align: "left",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
status: true,
@ -864,10 +865,10 @@
serialNumber: '101002001Table4PartDesc',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "buDesc",
columnProp: "partDesc",
headerAlign: "center",
align: "left",
columnLabel: "BU Desc",
columnLabel: "物料描述",
columnHidden: false,
columnImage: false,
status: true,
@ -1771,7 +1772,7 @@
customerPartNo: '',
spec: '',
partTypeDb: '',
partType: 'Purchased (raw)',
partType: 'Manufactured',
familyId: '',
familyName: '',
groupId: '',

143
src/views/modules/project/projectPart/searchProjectPart.vue
View File

@ -1,11 +1,27 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 100px">
<el-option
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buNo"
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'项目编号'">
<el-input v-model="searchData.projectId" style="width: 160px"></el-input>
<el-input v-model="searchData.projectId" clearable style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="searchData.testPartNo" style="width: 160px"></el-input>
<el-input v-model="searchData.testPartNo" clearable style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="客户料号">
<el-input v-model="searchData.customerPartNo" clearable style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="IFS物料编码">
<el-input v-model="searchData.finalPartNo" clearable style="width: 160px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button @click="search()" type="primary" style="margin-left: 2px;margin-top:0px">查询</el-button>
@ -172,9 +188,11 @@
</template>
<script>
import {projectInfoPartSearch,
import {
projectInfoPartSearch,
projectInfoSearch,
} from "@/api/project/project.js"
import {getBuBySite} from "@/api/changeManagement/changeManagement.js"
import Chooselist from '@/views/modules/common/Chooselist'
import projectQuotation from "../projectInfo/com_project_puotation.vue";/*組件*/
import technicalSpecification from "./com_projectPart_technicalSpecification";
@ -195,6 +213,7 @@
name: "searchProjectPart",
data() {
return{
buList: [],
currentRow:{},
activeName: 'project',
tagNo:'',
@ -213,6 +232,24 @@
// 导出 start
dataList1:[],
columnList1:[
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1BuNo',
tableId: "101002002Table1",
tableName: "项目物料",
columnProp: "buNo",
headerAlign: "center",
align: "left",
columnLabel: "BU",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
@ -221,7 +258,7 @@
tableName: "项目物料",
columnProp: "testPartNo",
headerAlign: "center",
align: "center",
align: "left",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
@ -229,8 +266,45 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1CustomerPartNo',
tableId: "101002002Table1",
tableName: "项目物料",
columnProp: "customerPartNo",
headerAlign: "center",
align: "left",
columnLabel: "客户料号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1FinalPartNo',
tableId: "101002002Table1",
tableName: "项目物料",
columnProp: "finalPartNo",
headerAlign: "center",
align: "left",
columnLabel: "IFS物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1PartDesc',
@ -247,7 +321,8 @@
status: true,
fixed: '',
columnWidth: 200
},{
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1PartType',
@ -256,15 +331,16 @@
columnProp: "projectId",
headerAlign: "center",
align: "center",
columnLabel: "项目",
columnLabel: "项目编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1PartType',
@ -281,7 +357,8 @@
status: true,
fixed: '',
columnWidth: 100
},{
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1PartTypeDesc',
@ -298,7 +375,8 @@
status: true,
fixed: '',
columnWidth: 200
},{
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1CodeNo',
@ -315,7 +393,8 @@
status: true,
fixed: '',
columnWidth: 100
},{
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table1CodeDesc',
@ -348,7 +427,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 200
},{
userId: this.$store.state.user.name,
functionId: 101002002,
@ -357,7 +436,7 @@
tableName: "项目物料",
columnProp: "createDate",
headerAlign: "center",
align: "left",
align: "center",
columnLabel: "创建时间",
columnHidden: false,
columnImage: false,
@ -365,7 +444,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 140
},{
userId: this.$store.state.user.name,
functionId: 101002002,
@ -391,7 +470,7 @@
tableName: "项目物料",
columnProp: "updateDate",
headerAlign: "center",
align: "left",
align: "center",
columnLabel: "上次修改日期",
columnHidden: false,
columnImage: false,
@ -399,7 +478,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 140
},{
userId: this.$store.state.user.name,
functionId: 101002002,
@ -422,10 +501,13 @@
searchData:{
page: 1,
limit: 100,
site:this.$store.state.user.site,
projectId:'',
testPartNo:'',
userName:this.$store.state.user.name,
site: this.$store.state.user.site,
buNo: '',
projectId: '',
testPartNo: '',
userName: this.$store.state.user.name,
finalPartNo: '',
customerPartNo: ''
},
projectData: {
id: 0,
@ -458,7 +540,22 @@
this.height = window.innerHeight - 520;
})
},
created() {
this.getBuBySite()
},
methods: {
// 获取用户的bu
getBuBySite () {
let tempData = {
site: this.$store.state.user.site,
}
getBuBySite(tempData).then(({data}) => {
if (data.code === 0) {
this.buList = data.rows
}
})
},
// 获取基础数据列表S
getBaseList(val, type) {
this.tagNo = val
@ -573,7 +670,7 @@
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
projectInfoPartSearch(this.searchData).then(({data}) => {
if (data.code == 0) {
if (data.code === 0) {
this.dataList1 = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize

Write Preview
Loading…
Cancel
Save