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

plm BMM

master
ruanqi 2 years ago
parent
102eb663d8
commit
308b84452c
10 changed files with 151 additions and 100 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. 6
      src/views/modules/part/bomManagement.vue
  2. 5
      src/views/modules/part/routingManagement.vue
  3. 8
      src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
  4. 54
      src/views/modules/project/projectInfo/projectInfo.vue
  5. 23
      src/views/modules/project/projectPart/searchProjectPart.vue
  6. 94
      src/views/modules/quotation/sellForQuotation/customerInfo.vue
  7. 1
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  8. 1
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
  9. 1
      src/views/modules/sys/user-add-or-update.vue
  10. 58
      src/views/modules/sys/user.vue

6
src/views/modules/part/bomManagement.vue
View File

@ -2810,7 +2810,11 @@ export default {
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
if (localStorage.getItem('bomData') != undefined) {
this.updateModal(this.dataList[0])
let data = JSON.parse(localStorage.getItem('bomData'))
if(data.engChgLevel&&data.engChgLevel!==''&&data.engChgLevel!==null){
this.updateModal(this.dataList[0])
}
}
}
this.queryLoading = false

5
src/views/modules/part/routingManagement.vue
View File

@ -2795,7 +2795,10 @@ export default {
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
if (localStorage.getItem('routeData') != undefined) {
this.updateModal(this.dataList[0])
let data = JSON.parse(localStorage.getItem('routeData'))
if(data.routingRevision&&data.routingRevision!==''&&data.routingRevision!==null) {
this.updateModal(this.dataList[0])
}
}
}
this.queryLoading = false

8
src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
View File

@ -81,6 +81,11 @@
<!-- <el-input v-model="dataForm.finalCustomerName" disabled ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label="客户项目料号：">
<el-input v-model="dataForm.customerProjectNo" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="项目描述" style="height: 70px">
<el-input type="textarea" resize="none" :autosize="{minRows: 2, maxRows: 2}" v-model="dataForm.projectDesc" ></el-input>
@ -284,6 +289,7 @@
id: 0,
site:this.$store.state.user.site,
projectLevel:1,
customerProjectNo:'',
projectId:'',
projectTypeDb:'',
projectType:'',
@ -533,6 +539,7 @@
projectDesc:'',
needDate:'',
priority:'',
customerProjectNo:'',
projectSource:'',
priorityDesc:'',
projectSourceDesc:'',
@ -731,7 +738,6 @@
this.$refs.saveForm.validate((validate)=>{
if (validate){
this.dataForm.updateBy = this.$store.state.user.name
console.log(this.dataForm)
saveProjectInfo(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')

54
src/views/modules/project/projectInfo/projectInfo.vue
View File

@ -12,6 +12,9 @@
<el-form-item :label="'项目负责人'">
<el-input v-model="searchData.projectOwnerName" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'客户项目编码'">
<el-input v-model="searchData.customerProjectNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button @click="search()" type="primary" style="margin-left: 2px;margin-top:0px">查询</el-button>
<el-button @click="addOrUpdateHandle('save')" type="primary" style="margin-left: 2px;margin-top: 0px">新增</el-button>
@ -118,11 +121,21 @@
</el-form-item>
</div>
</el-col>
<el-col :span="19"><div class="grid-content bg-purple">
<el-col :span="10"><div class="grid-content bg-purple">
<el-form-item :label="'项目描述'">
<el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'最终客户'">
<el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'客户项目料号'">
<el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
@ -424,6 +437,7 @@
projectId:'',
projectType:'',
projectOwnerName:'',
customerProjectNo:'',
userName:this.$store.state.user.name,
},
contactChooseFlag:false,
@ -504,24 +518,24 @@
fixed: '',
columnWidth: 200
},
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table1Status',
// tableId: "101002001Table1",
// tableName: "项目信息主表",
// columnProp: "status",
// headerAlign: "center",
// align: "left",
// columnLabel: "项目状态",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 100
// },
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table1CustomerProjectNo',
tableId: "101002001Table1",
tableName: "项目信息主表",
columnProp: "customerProjectNo",
headerAlign: "center",
align: "left",
columnLabel: "客户项目料号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 4,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
@ -960,6 +974,8 @@
customerRemark:'',
remark:'',
userRoleName:'',
customerProjectNo:'',
finalCustomerName:'',
},
customerData:{
site: '',

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

@ -114,19 +114,26 @@
</el-row>
<el-row :gutter="20">
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'BU'">
<el-input v-model="projectData.buDesc" readonly style="" ></el-input>
<el-col :span="5">
<div class="grid-content bg-purple">
<el-form-item :label="'项目名称'">
<el-input v-model="projectData.projectName" readonly style="" ></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="10"><div class="grid-content bg-purple">
<el-form-item :label="'项目描述'">
<el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'项目名称'">
<el-input v-model="projectData.projectName" readonly style="" ></el-input>
<el-form-item :label="'最终客户'">
<el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="14"><div class="grid-content bg-purple">
<el-form-item :label="'项目描述'">
<el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'客户项目料号'">
<el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row>

94
src/views/modules/quotation/sellForQuotation/customerInfo.vue
View File

@ -1,10 +1,10 @@
<template>
<div class="mode-config">
<el-divider content-position="left">直接客户</el-divider>
<!-- <el-divider content-position="left">直接客户</el-divider>-->
<el-form label-position="top" label-width="100px" >
<el-row :gutter="20">
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'客户代码'">
<el-form-item :label="'直接客户代码'">
<el-input v-model="customerData.customerNo" readonly ></el-input>
</el-form-item>
</div></el-col>
@ -46,51 +46,51 @@
</el-form-item>
</div></el-col>
</el-row>
<el-divider content-position="left">终端客户</el-divider>
<el-row :gutter="20">
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'终端客户代码'">
<el-input v-model="finalCustomerData.customerNo" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple">
<el-form-item :label="'终端客户名称'">
<el-input v-model="finalCustomerData.customerDesc" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'客户币种'">
<el-input v-model="finalCustomerData.customerCurrency" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'年营业额'">
<el-input v-model="finalCustomerData.turnoverOfYear" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'年潜在投入'">
<el-input v-model="finalCustomerData.potentialRevenueOfYear" readonly ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'重要程度'">
<el-input v-model="finalCustomerData.importantCustomer" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'客户状态'">
<el-input v-model="finalCustomerData.customerStatus" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="16"><div class="grid-content bg-purple">
<el-form-item :label="'客户描述'">
<el-input v-model="finalCustomerData.customerDescription" readonly ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<!-- <el-divider content-position="left">终端客户</el-divider>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'终端客户代码'">-->
<!-- <el-input v-model="finalCustomerData.customerNo" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="8"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'终端客户名称'">-->
<!-- <el-input v-model="finalCustomerData.customerDesc" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户币种'">-->
<!-- <el-input v-model="finalCustomerData.customerCurrency" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'年营业额'">-->
<!-- <el-input v-model="finalCustomerData.turnoverOfYear" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'年潜在投入'">-->
<!-- <el-input v-model="finalCustomerData.potentialRevenueOfYear" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'重要程度'">-->
<!-- <el-input v-model="finalCustomerData.importantCustomer" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户状态'">-->
<!-- <el-input v-model="finalCustomerData.customerStatus" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="16"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户描述'">-->
<!-- <el-input v-model="finalCustomerData.customerDescription" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- </el-row>-->
</el-form>
</div>
</template>

1
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
View File

@ -472,6 +472,7 @@
});
tsdBasicInformationSearch(this.searchData).then(({data}) => {
this.baseForm=data.row;
this.bomData.partNo=data.row.finalPartNo
this.getNodeAuthority(data.row)
})
},

1
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
View File

@ -984,6 +984,7 @@
if(data&& data.code===0){
this.sheetData=data.row
this.baseForm=data.row;
this.routeData.partNo=data.row.finalPartNo
this.getNodeAuthority(data.row)
}else {
this.$message.error(data.msg)

1
src/views/modules/sys/user-add-or-update.vue
View File

@ -386,6 +386,7 @@ export default {
},
// 关闭弹窗
closeDataDialog() {
this.$emit('closeModel')
this.dataForm = {
buNo: '',
buDesc: '',

58
src/views/modules/sys/user.vue
View File

@ -2,7 +2,7 @@
<div class="mod-user">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.userName" placeholder="用户账号" clearable></el-input>
<el-input v-model="searchData.userName" placeholder="用户账号" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()" type="primary">{{ buttons.search || '查询' }}</el-button>
@ -324,7 +324,7 @@
</el-footer>
</el-dialog>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @closeModel="closeUpdateModel()" @refreshDataList="getDataList"></add-or-update>
<!-- 审核权限 -->
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputSearch1"
:visible.sync="setUp.reviewFlag" width="518px">
@ -673,6 +673,9 @@ import {
export default {
data() {
return {
searchData:{
userName:'',
},
saveCheckAll:'N',
accessSiteVisible: false,
projectRoleFlag: false,
@ -1251,28 +1254,37 @@ export default {
this.setUp.reviewFlag = true
})
},
closeUpdateModel(){
this.addOrUpdateVisible=false;
},
// 获取数据列表
getDataList: throttle(function () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/user/list'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
'username': this.dataForm.userName
})
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
this.totalPage = data.page.totalCount
} else {
this.dataList = []
this.totalPage = 0
}
this.dataListLoading = false
})
}, 1000),
// getDataList: throttle(function () {
getDataList () {
this.selectUser={
username:'',
userDisplay:'',
}
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/user/list'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
'username': this.searchData.userName
})
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
this.totalPage = data.page.totalCount
} else {
this.dataList = []
this.totalPage = 0
}
this.dataListLoading = false
})
},
// }, 1000),
// 每页数
sizeChangeHandle(val) {
this.pageSize = val

Write Preview
Loading…
Cancel
Save